From 2775a9a4b951a62dadcf21a66787ec1225e87db0 Mon Sep 17 00:00:00 2001
From: petrucci4prez <natedwarshuis@gmail.com>
Date: Sat, 24 Jun 2017 00:24:31 -0400
Subject: [PATCH] move secrets to config

---
 config/pyledriver.yaml.default |  6 ++++++
 stateMachine.py                | 10 ++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/pyledriver.yaml.default b/config/pyledriver.yaml.default
index 67abdac..da0e381 100644
--- a/config/pyledriver.yaml.default
+++ b/config/pyledriver.yaml.default
@@ -8,3 +8,9 @@ gluster:
   volume: pyledriver
   mountpoint: /mnt/glusterfs/pyledriver
   options: backupvolfile-server=example.com
+secretTable:
+  DISARM: labrie
+  ARM: petrucci
+  INSTANT_ARM: rudess
+  LOCK: myung
+  INSTANT_LOCK: portnoy
diff --git a/stateMachine.py b/stateMachine.py
index 83e0441..31f6d06 100644
--- a/stateMachine.py
+++ b/stateMachine.py
@@ -16,7 +16,7 @@ from functools import partial
 from collections import namedtuple
 
 from exceptionThreading import ExceptionThread
-from config import stateFile
+from config import configFile, stateFile
 from sensors import startDoorSensor, startMotionSensor
 from gmail import intruderAlert
 from listeners import KeypadListener, PipeListener
@@ -168,13 +168,7 @@ class StateMachine:
 		for sig in _SIGNALS:
 			setattr(self, sig.name, partial(self.selectState, sig))
 
-		secretTable = {
-			'dynamoHum': self.DISARM,
-			'zombyWoof': self.ARM,
-			'imTheSlime': self.INSTANT_ARM,
-			'fiftyFifty': self.LOCK,
-			'dentalFloss': self.INSTANT_LOCK
-		}
+		secretTable = {secret: getattr(self, signal) for signal, secret in configFile['secretTable'].items()}
 		
 		def secretCallback(secret, logger):
 			if secret in secretTable: