From c09b4c80f91f6f68e79c144efde100a49ea0320b Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Thu, 24 Sep 2020 16:46:34 +0100 Subject: [PATCH] back to file mode! --- komrade/app/screens/login/login.py | 1 + komrade/backend/crypt.py | 8 ++++---- komrade/backend/komrades.py | 6 +++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/komrade/app/screens/login/login.py b/komrade/app/screens/login/login.py index fbab26c..bef20e6 100644 --- a/komrade/app/screens/login/login.py +++ b/komrade/app/screens/login/login.py @@ -193,6 +193,7 @@ class LoginScreen(BaseScreen): kommie = Komrade(un) self.log('KOMMIE!?!?',kommie) + self.log('wtf',PATH_CRYPT_CA_KEYS) logger.info(f'booted kommie: {kommie}') if kommie.exists_locally_as_account(): diff --git a/komrade/backend/crypt.py b/komrade/backend/crypt.py index 94c8de3..bc56951 100644 --- a/komrade/backend/crypt.py +++ b/komrade/backend/crypt.py @@ -4,8 +4,8 @@ Storage for both keys and data import os,sys; sys.path.append(os.path.abspath(os.path.join(os.path.abspath(os.path.join(os.path.dirname(__file__),'..')),'..'))) from komrade import * from simplekv.fs import FilesystemStore -from simplekv.memory.redisstore import RedisStore -import redis +# from simplekv.memory.redisstore import RedisStore +# import redis import hashlib,os import zlib from pythemis.exception import ThemisError @@ -57,8 +57,8 @@ class Crypt(Logger): self.encryptor_func=encryptor_func self.decryptor_func=decryptor_func - #self.store = FilesystemStore(self.fn) - self.store = RedisStore(redis.StrictRedis()) + self.store = FilesystemStore(self.fn) + # self.store = RedisStore(redis.StrictRedis()) def log(self,*x): diff --git a/komrade/backend/komrades.py b/komrade/backend/komrades.py index fc4a412..341f9c2 100644 --- a/komrade/backend/komrades.py +++ b/komrade/backend/komrades.py @@ -78,9 +78,13 @@ class KomradeX(Caller): def exists_locally_as_account(self): #return bool(self.pubkey) and bool(self.privkey_encr) pubkey=self.find_pubkey() + self.log('found pubkey:',pubkey) if not pubkey: return False uri=pubkey.data_b64 - if self.crypt_keys.get(uri,prefix='/privkey_encr/'): + self.log('crypt????',self.crypt_keys.fn) + res = self.crypt_keys.get(uri,prefix='/privkey_encr/') + if res: + self.log('found privkey_encr:',res) return True return False