finally! abolishing private key property

komrade/backend/keymaker.py

@@ -76,6 +76,7 @@ class KomradeAsymmetricPrivateKey(KomradeAsymmetricKey):
 class Keymaker(Logger):
     def __init__(self,name=None,passphrase=None, path_crypt_keys=None, path_crypt_data=None):
         self.name=name
+        self._keychain={}
         self.passphrase=passphrase
         self.path_crypt_keys=path_crypt_keys
         self.path_crypt_data=path_crypt_data
@@ -581,18 +582,18 @@ class Keymaker(Logger):
     #     for keyname in KEYNAMES:
     #         keychain=self.findkey(keyname, keychain, uri)
 
-    def keychain(self,passphrase=None,force=False,allow_builtin=True,keys_to_gen=KEYMAKER_DEFAULT_KEYS_TO_GEN,**kwargs):
+    def keychain(self,passphrase=None,force=False,allow_builtin=True,extra_keys={},keys_to_gen=KEYMAKER_DEFAULT_KEYS_TO_GEN,**kwargs):
         # assemble as many keys as we can!
         if not force and hasattr(self,'_keychain') and self._keychain: return self._keychain
         if passphrase: self.passphrase=passphrase
 
-        
-        _keychain = {}
+        self._keychain = _keychain = {**extra_keys}
+        self.log('_keychain at start of keychain() =',_keychain)
         
         # am I a builtin one?
         # self.log('hello///',self.name,self.name in BUILTIN_KEYCHAIN)
         if hasattr(self,'allow_builtin'):
-            allow_builtin = allow_builtin & self.allow_builtin
+            allow_builtin = allow_builtin and self.allow_builtin
 
         if self.name in BUILTIN_KEYCHAIN and allow_builtin:
             self.log('??',_keychain)

komrade/backend/the_operator.py

@@ -44,8 +44,7 @@ class TheOperator(Operator):
         DATA = {}
         KEYCHAIN = self.keychain(allow_builtin=False,force=True)
         self.log('as of now 1, I the operator have these keys:',KEYCHAIN.keys())
-        stop1
-
+        
         if data_unencr:
             self.log('unencrypted data:',data_unencr)
             if data_unencr:
@@ -54,7 +53,12 @@ class TheOperator(Operator):
                 if type(data_unencr_json) == dict:
                     dict_merge(DATA, data_unencr_json)
 
-        if '_keychain' in DATA: DATA['_keychain'] = self.valid_keychain(DATA['_keychain'])
+        if '_keychain' in DATA:
+            DATA['_keychain'] = self.valid_keychain(DATA['_keychain'])
+            self.log('found keys in unencrypted data:',DATA['_keychain'])
+
+            KEYCHAIN = self.keychain(allow_builtin=False,force=True,_ke)
+            self.log('as of now 1, I the operator have these keys:',KEYCHAIN.keys())
         self.log('DATA as of now!?',DATA)
         # stop