Archives
/
Comrad
mirror of https://github.com/ComradCollective/Comrad
2
0
Fork 0
Code Issues Releases Wiki Activity

updates

Browse Source
operator-time
quadrismegistus 4 years ago
parent fa7edf2824
commit aad2b9f36b
4 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File

41
komrade/backend/keymaker.py
Unescape Escape View File

@ -371,8 +371,8 @@ class Keymaker(Logger):
return keychain
def check_builtin_keys(self):
global OMEGA_KEY,BUILTIN_KEYCHAIN
if OMEGA_KEY and BUILTIN_KEYCHAIN: return
global OMEGA_KEY,OPERATOR_KEYCHAIN,TELEPHONE_KEYCHAIN
if OMEGA_KEY and OPERATOR_KEYCHAIN and TELEPHONE_KEYCHAIN: return
self.log('getting built in keys!')
if not os.path.exists(PATH_OMEGA_KEY) or not os.path.exists(PATH_BUILTIN_KEYCHAIN):
@ -409,29 +409,24 @@ class Keymaker(Logger):
self.log('cannot authenticate the keymakers')
return
remote_builtin_keychain_encr = b64decode(r.text)
print('remote',remote_builtin_keychain_encr)
# stop
remote_builtin_keychain = unpackage_from_transmission(
OMEGA_KEY.decrypt(
remote_builtin_keychain_encr
)
)
self.log('remote_builtin_keychain',remote_builtin_keychain)
remote_builtin_keychain = OMEGA_KEY.decrypt(remote_builtin_keychain_encr)
remote_builtin_keychain_phone,remote_builtin_keychain_op = remote_builtin_keychain.split(BSEP)
remote_builtin_keychain_phone_json = unpackage_from_transmission(remote_builtin_keychain_phone)
remote_builtin_keychain_op_json = unpackage_from_transmission(remote_builtin_keychain_op)
# for nm in [OPERATOR_NAME,TELEPHONE_NAME]:
# local_builtin_keychain[nm]=unpackage_from_transmission(local_builtin_keychain[nm])
# remote_builtin_keychain[nm]=unpackage_from_transmission(remote_builtin_keychain[nm])
# self.log('unpackaged local',unpackage_from_transmission(local_builtin_keychain))
# self.log('unpackaged remote',unpackage_from_transmission(remote_builtin_keychain))
self.log('remote_builtin_keychain_phone_json',remote_builtin_keychain_phone_json)
self.log('remote_builtin_keychain_op_json',remote_builtin_keychain_op_json)
dict_merge(meta_keychain,local_builtin_keychain)
dict_merge(meta_keychain,remote_builtin_keychain)
BUILTIN_KEYCHAIN = meta_keychain
self.log('meta_keychain',meta_keychain)
TELEPHONE_KEYCHAIN={}
OPERATOR_KEYCHAIN={}
dict_merge(TELEPHONE_KEYCHAIN,local_builtin_keychain_phone_json)
dict_merge(OPERATOR_KEYCHAIN,local_builtin_keychain_op_json)
dict_merge(TELEPHONE_KEYCHAIN,remote_builtin_keychain_phone_json)
dict_merge(OPERATOR_KEYCHAIN,remote_builtin_keychain_op_json)
# BUILTIN_KEYCHAIN = meta_keychain
self.log('OPERATOR_KEYCHAIN',OPERATOR_KEYCHAIN)
self.log('TELEPHONE_KEYCHAIN',TELEPHONE_KEYCHAIN)
stop
return BUILTIN_KEYCHAIN

4
komrade/backend/mazes.py
Unescape Escape View File

@ -131,8 +131,8 @@ from torpy.http.requests import TorRequests, tor_requests_session, do_request as
from torpy.http.urlopener import do_request as urllib_request
# logging.getLogger('requests').setLevel(logging.CRITICAL)
# logging.basicConfig(format='[%(asctime)s] [%(threadName)-16s] %(message)s', level=logging.DEBUG)
# logger = logging.getLogger(__name__)
logging.basicConfig(format='[%(asctime)s] [%(threadName)-16s] %(message)s', level=logging.DEBUG)
logger = logging.getLogger(__name__)
HS_BASIC_HOST = os.getenv('HS_BASIC_HOST')

32
komrade/backend/the_operator.py
Unescape Escape View File

@ -200,17 +200,31 @@ def init_operators():
op = Operator(name=OPERATOR_NAME)
# save what we normally save for a client on the server -- The Op is a client from our pov
op_keys_to_keep_on_client = ['pubkey_decr']
op_keys_to_keep_on_3rdparty = ['pubkey_encr','privkey_encr']
# take 1
# op_keys_to_keep_on_client = ['pubkey_decr']
# op_keys_to_keep_on_3rdparty = ['pubkey_encr','privkey_encr']
# op_keys_to_keep_on_server = ['adminkey_encr',
# 'privkey_decr_encr',
# 'privkey_decr_decr',
# 'adminkey_decr_encr',
# 'adminkey_decr_decr']
# phone_keys_to_keep_on_client = ['privkey_decr']
# phone_keys_to_keep_on_3rdparty = ['privkey_encr','pubkey_encr']
# phone_keys_to_keep_on_server = ['pubkey_decr']
op_keys_to_keep_on_client = ['pubkey_encr']
op_keys_to_keep_on_3rdparty = ['pubkey_decr','privkey_decr']
op_keys_to_keep_on_server = ['adminkey_encr',
'privkey_decr_encr',
'privkey_decr_decr',
'adminkey_decr_encr',
'adminkey_decr_decr']
phone_keys_to_keep_on_client = ['privkey_decr']
phone_keys_to_keep_on_3rdparty = ['privkey_encr','pubkey_encr']
phone_keys_to_keep_on_server = ['pubkey_decr']
phone_keys_to_keep_on_client = ['privkey_encr']
phone_keys_to_keep_on_3rdparty = ['privkey_decr','pubkey_decr']
phone_keys_to_keep_on_server = ['pubkey_encr']
op_decr_keys = op.forge_new_keys(
keys_to_save=op_keys_to_keep_on_server, # on server only; flipped around
@ -269,16 +283,16 @@ def init_operators():
omega_key = KomradeSymmetricKeyWithoutPassphrase()
STORE_IN_APP_encr = b64encode(omega_key.encrypt(STORE_IN_APP_pkg))
THIRD_PARTY_DICT_encr = b64encode(omega_key.encrypt(THIRD_PARTY_DICT_pkg))
THIRD_PARTY_totalpkg = b64encode(omega_key.data + BSEP + omega_key.encrypt(THIRD_PARTY_DICT_pkg))
with open(PATH_OMEGA_KEY,'wb') as of:
of.write(b64encode(omega_key.data))
of.write()
with open(PATH_BUILTIN_KEYCHAIN,'wb') as of:
of.write(STORE_IN_APP_encr)
print('STORE_IN_APP_encr',STORE_IN_APP_encr)
with open(PATH_OPERATOR_WEB_KEYS_FILE,'wb') as of:
of.write(THIRD_PARTY_DICT_encr)
print('THIRD_PARTY_DICT_encr',THIRD_PARTY_DICT_encr)
of.write(THIRD_PARTY_totalpkg)
print('THIRD_PARTY_DICT_encr',THIRD_PARTY_totalpkg)
def test_op():

4
komrade/constants.py
Unescape Escape View File

@ -119,6 +119,6 @@ WHY_MSG = 'Forge the password of memory: '
BUILTIN_KEYCHAIN = None
TELEPHONE_KEYCHAIN = None
OPERATOR_KEYCHAIN = None
OMEGA_KEY = None
Write Preview
Loading…
Cancel
Save