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

updates

Browse Source
nothing-unencr
quadrismegistus 4 years ago
parent adf89eb47a
commit 7039f05c04
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

58
komrade/backend/phonelines.py
Unescape Escape View File

@ -32,8 +32,8 @@ def create_phonelines():
op_uri = op_res['uri_id']
op_decr_keys = op_res['_keychain']
print('op_uri',op_uri)
print('op_decr_keys',op_decr_keys)
#pring('op_uri',op_uri)
#pring('op_decr_keys',op_decr_keys)
# create keys for phone
phone_res = phone.forge_new_keys(
@ -44,8 +44,8 @@ def create_phonelines():
phone_uri = phone_res['uri_id']
phone_decr_keys = phone_res['_keychain']
print('phone_uri',phone_uri)
print('phone_decr_keys',phone_decr_keys)
#pring('phone_uri',phone_uri)
#pring('phone_decr_keys',phone_decr_keys)
# store URIs
# op.save_uri_as_qrcode(odir=PATH_OPERATOR_WEB_CONTACTS_DIR)
@ -63,7 +63,7 @@ def create_phonelines():
if key in phone_decr_keys:
THIRD_PARTY_DICT[TELEPHONE_NAME][key]=phone_decr_keys[key]
print('THIRD_PARTY_DICT',THIRD_PARTY_DICT)
#pring('THIRD_PARTY_DICT',THIRD_PARTY_DICT)
# store local keys
STORE_IN_APP = {OPERATOR_NAME:{}, TELEPHONE_NAME:{}}
@ -73,31 +73,31 @@ def create_phonelines():
for key in phone_keys_to_keep_on_client:
if key in phone_decr_keys:
STORE_IN_APP[TELEPHONE_NAME][key]=phone_decr_keys[key]
print('STORE_IN_APP',STORE_IN_APP)
#pring('STORE_IN_APP',STORE_IN_APP)
# package
STORE_IN_APP_pkg = package_for_transmission(STORE_IN_APP) #package_for_transmission(STORE_IN_APP[TELEPHONE_NAME]) + BSEP + package_for_transmission(STORE_IN_APP[OPERATOR_NAME])
THIRD_PARTY_DICT_pkg = package_for_transmission(THIRD_PARTY_DICT) #package_for_transmission(THIRD_PARTY_DICT[TELEPHONE_NAME]) + BSEP + package_for_transmission(THIRD_PARTY_DICT[OPERATOR_NAME])
print('THIRD_PARTY_DICT_pkg',THIRD_PARTY_DICT_pkg)
print('THIRD_PARTY_DICT_pkg',THIRD_PARTY_DICT_pkg)
#pring('THIRD_PARTY_DICT_pkg',THIRD_PARTY_DICT_pkg)
#pring('THIRD_PARTY_DICT_pkg',THIRD_PARTY_DICT_pkg)
# encrypt
omega_key = KomradeSymmetricKeyWithoutPassphrase()
STORE_IN_APP_encr = b64encode(omega_key.encrypt(STORE_IN_APP_pkg))
print('STORE_IN_APP_encr',STORE_IN_APP_encr)
#pring('STORE_IN_APP_encr',STORE_IN_APP_encr)
THIRD_PARTY_totalpkg = b64encode(omega_key.data + BSEP + omega_key.encrypt(THIRD_PARTY_DICT_pkg))
print('THIRD_PARTY_totalpkg',THIRD_PARTY_totalpkg)
#pring('THIRD_PARTY_totalpkg',THIRD_PARTY_totalpkg)
# save
with open(PATH_BUILTIN_KEYCHAIN,'wb') as of:
of.write(STORE_IN_APP_encr)
print('STORE_IN_APP_encr',STORE_IN_APP_encr)
#pring('STORE_IN_APP_encr',STORE_IN_APP_encr)
with open(PATH_OPERATOR_WEB_KEYS_FILE,'wb') as of:
of.write(THIRD_PARTY_totalpkg)
print('THIRD_PARTY_DICT_encr',THIRD_PARTY_totalpkg)
#pring('THIRD_PARTY_DICT_encr',THIRD_PARTY_totalpkg)
def connect_phonelines():
@ -106,7 +106,7 @@ def connect_phonelines():
if OMEGA_KEY and OPERATOR_KEYCHAIN and TELEPHONE_KEYCHAIN:
return (OPERATOR_KEYCHAIN,TELEPHONE_KEYCHAIN,OMEGA_KEY)
print('\n\n\n\nCONNECTING PHONELINES!\n\n\n\n')
#pring('\n\n\n\nCONNECTING PHONELINES!\n\n\n\n')
# import
from komrade.backend.mazes import tor_request
@ -114,48 +114,48 @@ def connect_phonelines():
# load local keys
if not os.path.exists(PATH_BUILTIN_KEYCHAIN):
print('builtin keys not present??')
#pring('builtin keys not present??')
return
with open(PATH_BUILTIN_KEYCHAIN,'rb') as f:
local_builtin_keychain_encr = b64decode(f.read())
# load remote keys
print('??',PATH_OPERATOR_WEB_KEYS_URL)
#pring('??',PATH_OPERATOR_WEB_KEYS_URL)
r = komrade_request(PATH_OPERATOR_WEB_KEYS_URL)
if r.status_code!=200:
print('cannot authenticate the keymakers')
#pring('cannot authenticate the keymakers')
return
# unpack remote pkg
pkg = r.text
print('got from onion:',pkg)
#pring('got from onion:',pkg)
pkg = b64decode(pkg)
print('got from onion:',pkg)
#pring('got from onion:',pkg)
OMEGA_KEY_b,remote_builtin_keychain_encr = pkg.split(BSEP)
print('OMEGA_KEY_b',OMEGA_KEY_b)
print('remote_builtin_keychain_encr',remote_builtin_keychain_encr)
#pring('OMEGA_KEY_b',OMEGA_KEY_b)
#pring('remote_builtin_keychain_encr',remote_builtin_keychain_encr)
OMEGA_KEY = KomradeSymmetricKeyWithoutPassphrase(key=OMEGA_KEY_b)
print('loaded Omega',OMEGA_KEY)
#pring('loaded Omega',OMEGA_KEY)
# from komrade.utils import unpackage_from_transmission
remote_builtin_keychain = unpackage_from_transmission(OMEGA_KEY.decrypt(remote_builtin_keychain_encr))
print('remote_builtin_keychain',remote_builtin_keychain)
#pring('remote_builtin_keychain',remote_builtin_keychain)
remote_builtin_keychain_phone_json,remote_builtin_keychain_op_json = remote_builtin_keychain[TELEPHONE_NAME],remote_builtin_keychain[OPERATOR_NAME]
print('remote_builtin_keychain_phone_json',remote_builtin_keychain_phone_json)
print('remote_builtin_keychain_op_json',remote_builtin_keychain_op_json)
#pring('remote_builtin_keychain_phone_json',remote_builtin_keychain_phone_json)
#pring('remote_builtin_keychain_op_json',remote_builtin_keychain_op_json)
# unpack local pkg
local_builtin_keychain = unpackage_from_transmission(OMEGA_KEY.decrypt(local_builtin_keychain_encr))
print('local_builtin_keychain',local_builtin_keychain)
#pring('local_builtin_keychain',local_builtin_keychain)
local_builtin_keychain_phone_json,local_builtin_keychain_op_json = local_builtin_keychain[TELEPHONE_NAME],local_builtin_keychain[OPERATOR_NAME]
print('local_builtin_keychain_phone_json',local_builtin_keychain_phone_json)
print('local_builtin_keychain_op_json',local_builtin_keychain_op_json)
#pring('local_builtin_keychain_phone_json',local_builtin_keychain_phone_json)
#pring('local_builtin_keychain_op_json',local_builtin_keychain_op_json)
# set builtin keychains
TELEPHONE_KEYCHAIN={}
@ -165,6 +165,6 @@ def connect_phonelines():
dict_merge(TELEPHONE_KEYCHAIN,remote_builtin_keychain_phone_json)
dict_merge(OPERATOR_KEYCHAIN,remote_builtin_keychain_op_json)
# print('>>>> loaded OPERATOR_KEYCHAIN',OPERATOR_KEYCHAIN)
# print('>>>> loaded TELEPHONE_KEYCHAIN',TELEPHONE_KEYCHAIN)
# #pring('>>>> loaded OPERATOR_KEYCHAIN',OPERATOR_KEYCHAIN)
# #pring('>>>> loaded TELEPHONE_KEYCHAIN',TELEPHONE_KEYCHAIN)
return (OPERATOR_KEYCHAIN,TELEPHONE_KEYCHAIN,OMEGA_KEY)

Write Preview
Loading…
Cancel
Save