diff --git a/komrade/api/persona.py b/komrade/api/persona.py index 072a8bb..0eef112 100644 --- a/komrade/api/persona.py +++ b/komrade/api/persona.py @@ -31,7 +31,7 @@ class Persona(Model): # MAJOR OPERATIONS ### - def register(self,passphrase = None): + def register(self,passphrase = DEBUG_DEFAULT_PASSPHRASE): """ Register this new persona. Protect keys according to a passphrase. @@ -52,7 +52,7 @@ class Persona(Model): self.op.create_keys(privkey_pass=passphrase,adminkey_pass=passphrase) - def login(self,passphrase = None): + def login(self,passphrase = DEBUG_DEFAULT_PASSPHRASE): # Get passphrase if not passphrase: passphrase = getpass.getpass('Enter login password: ') diff --git a/komrade/api/persona0.py b/komrade/api/persona0.py index 7471c40..5e6674d 100644 --- a/komrade/api/persona0.py +++ b/komrade/api/persona0.py @@ -334,7 +334,7 @@ class Persona(object): # signed_public_key_file.write(encrypted_pubkey_b64) - def gen_keys(self,passphrase=None): + def gen_keys(self,passphrase=DEBUG_DEFAULT_PASSPHRASE): """ Generate private/public key pair Secure that with passphrase diff --git a/komrade/backend/callers.py b/komrade/backend/callers.py index 1b4b18e..bf49029 100644 --- a/komrade/backend/callers.py +++ b/komrade/backend/callers.py @@ -12,7 +12,7 @@ class Caller(Operator): """ - def get_new_keys(self, name = None, passphrase = None, is_group=None): + def get_new_keys(self, name = None, passphrase = DEBUG_DEFAULT_PASSPHRASE, is_group=None): if not name: name=self.name if name is None: name = input('\nWhat is the name for this account? ') diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py index ce6f85c..8f4b5e5 100644 --- a/komrade/backend/keymaker.py +++ b/komrade/backend/keymaker.py @@ -33,7 +33,7 @@ class KomradeSymmetricKey(KomradeKey): class KomradeSymmetricKeyWithPassphrase(KomradeSymmetricKey): - def __init__(self,passphrase=None, why=WHY_MSG): + def __init__(self,passphrase=DEBUG_DEFAULT_PASSPHRASE, why=WHY_MSG): self.passphrase=passphrase if not self.passphrase: self.passphrase=getpass.getpass(why) @@ -76,7 +76,7 @@ class KomradeAsymmetricPrivateKey(KomradeAsymmetricKey): class Keymaker(Logger): def __init__(self, name=None, - passphrase=None, + passphrase=DEBUG_DEFAULT_PASSPHRASE, uri_id=None, keychain={}, path_crypt_keys=None, @@ -121,7 +121,7 @@ class Keymaker(Logger): - def gen_keys_from_types(self,key_types=KEYMAKER_DEFAULT_KEY_TYPES,passphrase=None): + def gen_keys_from_types(self,key_types=KEYMAKER_DEFAULT_KEY_TYPES,passphrase=DEBUG_DEFAULT_PASSPHRASE): """ Get new asymmetric/symmetric keys, given a dictionary of constants describing their type """ @@ -149,7 +149,7 @@ class Keymaker(Logger): - def gen_encr_keys(self,keychain,keys_to_gen,passphrase=None): + def gen_encr_keys(self,keychain,keys_to_gen,passphrase=DEBUG_DEFAULT_PASSPHRASE): """ Encrypt other keys with still other keys! """ @@ -176,7 +176,7 @@ class Keymaker(Logger): def forge_new_keys(self, name=None, - passphrase=None, + passphrase=DEBUG_DEFAULT_PASSPHRASE, keys_to_save = KEYMAKER_DEFAULT_KEYS_TO_SAVE, keys_to_return = KEYMAKER_DEFAULT_KEYS_TO_RETURN, keys_to_gen = KEYMAKER_DEFAULT_KEYS_TO_GEN, @@ -229,7 +229,7 @@ class Keymaker(Logger): # gen import pyqrcode - qr = pycode.create(uri_id) + qr = pyqrcode.create(uri_id) ofnfn = os.path.join(PATH_QRCODES,self.name+'.png') qr.png(ofnfn) self.log('>> saved:',ofnfn) @@ -324,7 +324,7 @@ class Keymaker(Logger): def keychain(self, - passphrase=None, + passphrase=DEBUG_DEFAULT_PASSPHRASE, force=False, allow_builtin=True, extra_keys={}, diff --git a/komrade/backend/keymaker0.py b/komrade/backend/keymaker0.py index 67bc47c..d8ef210 100644 --- a/komrade/backend/keymaker0.py +++ b/komrade/backend/keymaker0.py @@ -33,7 +33,7 @@ class KomradeSymmetricKey(KomradeKey): class KomradeSymmetricKeyWithPassphrase(KomradeSymmetricKey): - def __init__(self,passphrase=None, why=WHY_MSG): + def __init__(self,passphrase=DEBUG_DEFAULT_PASSPHRASE, why=WHY_MSG): self.passphrase=passphrase if not self.passphrase: self.passphrase=getpass.getpass(why) @@ -74,7 +74,7 @@ class KomradeAsymmetricPrivateKey(KomradeAsymmetricKey): class Keymaker(Logger): - def __init__(self,name=None,passphrase=None,keychain={}, path_crypt_keys=None, path_crypt_data=None, allow_builtin=True): + def __init__(self,name=None,passphrase=DEBUG_DEFAULT_PASSPHRASE,keychain={}, path_crypt_keys=None, path_crypt_data=None, allow_builtin=True): self.name=name self._keychain=keychain self.passphrase=passphrase @@ -341,7 +341,7 @@ class Keymaker(Logger): def get_new_keys(self): raise KomradeException('Every keymaker must make their own get_new_keys() !') - def gen_keys_from_types(self,key_types,passphrase=None): + def gen_keys_from_types(self,key_types,passphrase=DEBUG_DEFAULT_PASSPHRASE): asymmetric_pubkey=None asymmetric_privkey=None keychain = {} @@ -364,7 +364,7 @@ class Keymaker(Logger): keychain[key_name]=KomradeSymmetricKeyWithPassphrase(passphrase=passphrase) return keychain - def gen_encr_keys(self,keychain,keys_to_gen,passphrase=None): + def gen_encr_keys(self,keychain,keys_to_gen,passphrase=DEBUG_DEFAULT_PASSPHRASE): # generate encrypted keys too for key_name in keys_to_gen: if key_name.endswith('_encr') and key_name not in keychain: @@ -385,7 +385,7 @@ class Keymaker(Logger): def forge_new_keys(self, name=None, - passphrase=None, + passphrase=DEBUG_DEFAULT_PASSPHRASE, keys_to_save = KEYMAKER_DEFAULT_KEYS_TO_SAVE, keys_to_return = KEYMAKER_DEFAULT_KEYS_TO_RETURN, keys_to_gen = KEYMAKER_DEFAULT_KEYS_TO_GEN, @@ -596,7 +596,7 @@ class Keymaker(Logger): return _keychain - def keychain(self,passphrase=None,force=False,allow_builtin=True,extra_keys={},keys_to_gen=KEYMAKER_DEFAULT_KEYS_TO_GEN,**kwargs): + def keychain(self,passphrase=DEBUG_DEFAULT_PASSPHRASE,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 diff --git a/komrade/backend/operators.py b/komrade/backend/operators.py index a3a193c..247fb25 100644 --- a/komrade/backend/operators.py +++ b/komrade/backend/operators.py @@ -11,7 +11,7 @@ from komrade.backend.switchboard import * class Operator(Keymaker): - def __init__(self, name, passphrase=None, keychain = {}, path_crypt_keys=PATH_CRYPT_CA_KEYS, path_crypt_data=PATH_CRYPT_CA_DATA): + def __init__(self, name, passphrase=DEBUG_DEFAULT_PASSPHRASE, keychain = {}, path_crypt_keys=PATH_CRYPT_CA_KEYS, path_crypt_data=PATH_CRYPT_CA_DATA): super().__init__(name=name,passphrase=passphrase, keychain=keychain, path_crypt_keys=path_crypt_keys, path_crypt_data=path_crypt_data) self.boot(create=False) diff --git a/komrade/constants.py b/komrade/constants.py index 8982ddc..20efeca 100644 --- a/komrade/constants.py +++ b/komrade/constants.py @@ -137,4 +137,7 @@ PATH_OPERATOR_WEB_KEYS_URL = f'http://{KOMRADE_URL}/.builtin.keys' # dangerous! leave on only if absolutely necessary for initial dev -ALLOW_CLEARNET = True \ No newline at end of file +ALLOW_CLEARNET = True + + +DEBUG_DEFAULT_PASSPHRASE = 'all your base are belong to us' \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 2bbc2c5..165605f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +as==0.1 astroid==2.4.2 certifi==2020.6.20 cffi==1.14.2 @@ -7,7 +8,13 @@ cryptography==3.0 docutils==0.16 Flask==1.1.2 Flask-Classful==0.14.2 +h11==0.8.1 +h2==3.2.0 +hpack==3.0.0 +http3==0.6.7 +hyperframe==5.2.0 idna==2.10 +import==0.0.1 isort==5.4.2 itsdangerous==1.1.0 Jinja2==2.11.2 @@ -24,9 +31,14 @@ plyer==1.4.3 pycparser==2.20 Pygments==2.6.1 pylint==2.6.0 +PyQRCode==1.2.1 +PySocks==1.7.1 pythemis==0.13.0 +pyzbar==0.1.8 redis==3.5.3 requests==2.24.0 +requests-async==0.6.2 +rfc3986==1.4.0 rpcudp==4.0.1 simplekv==0.14.1 six==1.15.0