From b7b1628ecdcaaae49b324f3ca1c5502bf8e2b563 Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Fri, 18 Sep 2020 06:58:28 +0100 Subject: [PATCH] komrade update! --- komrade/backend/komrades.py | 18 ++++++++++++------ komrade/backend/the_operator.py | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/komrade/backend/komrades.py b/komrade/backend/komrades.py index 65f9229..9dd7bd0 100644 --- a/komrade/backend/komrades.py +++ b/komrade/backend/komrades.py @@ -15,13 +15,19 @@ class KomradeX(Caller): def __init__(self, name=None, pubkey=None): super().__init__(name=name) - # self.log(f'booted komrade with {name} and {passphrase} and\n\n{dict_format(self.keychain())}') - # if SHOW_STATUS: - # from komrade.cli import CLI - # self.cli = CLI(name=name, komrade=self) self.boot(create=False) - # self.name=name - # pass + # special? + if self.name==WORLD_NAME: + if os.path.exists(PATH_SUPER_SECRET_OP_KEY): + print(f'Dare I claim to be the one true @{WORLD_NAME}?') + with open(PATH_SUPER_SECRET_OP_KEY,'rb') as f: + #pass_encr=f.read() + opk1,opk2,privkey_decr,privkey_encr = b64dec(f.read()).split(BSEP) + privkey_decr_obj = KomradeSymmetricKeyWithoutPassphrase(privkey_decr) + privkey_encr_obj = KomradeEncryptedAsymmetricPrivateKey(privkey_encr) + self._keychain['privkey_decr']=privkey_decr_obj + self._keychain['privkey_encr']=privkey_encr_obj + def boot(self,create=False,ping=False): # Do I already have my keys? diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py index c8844af..d2b8c89 100644 --- a/komrade/backend/the_operator.py +++ b/komrade/backend/the_operator.py @@ -61,7 +61,7 @@ class TheOperator(Operator): print('Dare I claim to be the one true Operator?') with open(PATH_SUPER_SECRET_OP_KEY,'rb') as f: #pass_encr=f.read() - privkey_decr,privkey_encr = b64dec(f.read()).split(BSEP) + privkey_decr,privkey_encr,wk1,wk2 = b64dec(f.read()).split(BSEP) privkey_decr_obj = KomradeSymmetricKeyWithoutPassphrase(privkey_decr) privkey_encr_obj = KomradeEncryptedAsymmetricPrivateKey(privkey_encr) self._keychain['privkey_decr']=privkey_decr_obj