From fe1173d14b7fcad6a97a75990842778e908a587a Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Sun, 6 Sep 2020 10:25:13 +0100
Subject: [PATCH] updates

---
 komrade/backend/keymaker.py     |  2 +-
 komrade/backend/operators.py    |  4 ++--
 komrade/backend/the_operator.py | 13 +++++++++++--
 komrade/constants.py            | 14 +++++++++-----
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py
index d774821..940704e 100644
--- a/komrade/backend/keymaker.py
+++ b/komrade/backend/keymaker.py
@@ -3,7 +3,7 @@ from komrade import *
 from komrade.backend.crypt import *
 
 class Keymaker(Logger):
-    def __init__(self,name=None,passphrase=None):
+    def __init__(self,name=None,passphrase=None, path_crypt_keys=None, path_crypt_data=None):
         self.name=name
         self.passphrase=passphrase
 
diff --git a/komrade/backend/operators.py b/komrade/backend/operators.py
index 6a92f28..224f3f6 100644
--- a/komrade/backend/operators.py
+++ b/komrade/backend/operators.py
@@ -11,8 +11,8 @@ from komrade.backend.switchboard import *
 
 class Operator(Keymaker):
     
-    def __init__(self, name, passphrase=None):
-        super().__init__(name=name,passphrase=passphrase)
+    def __init__(self, name, passphrase=None,**kwargs):
+        super().__init__(name=name,passphrase=passphrase,**kwargs)
 
     def boot(self,create=False):
          # Do I have my keys?
diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py
index eb297ee..37f6d04 100644
--- a/komrade/backend/the_operator.py
+++ b/komrade/backend/the_operator.py
@@ -57,8 +57,17 @@ class TheOperator(Operator):
 
 
 def init_operators():
-    op = Operator(name=OPERATOR_NAME)
-    phone = Operator(name=TELEPHONE_NAME)
+    op = Operator(
+        name=OPERATOR_NAME,
+        path_crypt_keys=PATH_CRYPT_OP_KEYS,
+        path_crypt_data=PATH_CRYPT_OP_DATA
+    )
+
+    phone = Operator(
+        name=TELEPHONE_NAME,
+        path_crypt_keys=PATH_CRYPT_CA_KEYS,
+        path_crypt_data=PATH_CRYPT_CA_DATA
+    )
 
     op.get_new_keys()
     phone.get_new_keys()
diff --git a/komrade/constants.py b/komrade/constants.py
index 2467ea8..d241298 100644
--- a/komrade/constants.py
+++ b/komrade/constants.py
@@ -10,11 +10,15 @@ OPERATOR_API_URL = f'http://{KOMRADE_ONION}/op/'
 # paths
 import os
 PATH_KOMRADE = os.path.abspath(os.path.join(os.path.expanduser('~'),'.komrade'))
-PATH_OPERATOR = os.path.join(PATH_KOMRADE,'.operator')
-PATH_OPERATOR_PUBKEY = os.path.join(PATH_OPERATOR,'.op.key.pub.encr')
-PATH_OPERATOR_PRIVKEY = os.path.join(PATH_OPERATOR,'.op.key.priv.encr')
-PATH_CRYPT_KEYS = os.path.join(PATH_OPERATOR,'.op.db.keys.crypt')
-PATH_CRYPT_DATA = os.path.join(PATH_OPERATOR,'.op.db.data.encr')
+PATH_KOMRADE_KEYS = os.path.join(PATH_KOMRADE,'.keys')
+PATH_KOMRADE_DATA = os.path.join(PATH_KOMRADE,'.data')
+for x in [PATH_KOMRADE,PATH_KOMRADE_DATA,PATH_KOMRADE_KEYS]:
+    os.makedirs(x)
+PATH_CRYPT_OP_KEYS = os.path.join(PATH_KOMRADE_KEYS,'.op.db.keys.crypt')
+PATH_CRYPT_OP_DATA = os.path.join(PATH_KOMRADE_DATA,'.op.db.data.encr')
+PATH_CRYPT_CA_KEYS = os.path.join(PATH_KOMRADE_KEYS,'.ca.db.keys.crypt')
+PATH_CRYPT_CA_DATA = os.path.join(PATH_KOMRADE_DATA,'.ca.db.data.encr')
+
 
 # etc
 BSEP=b'||||||||||'