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

finally! abolishing private key property

Browse Source
operator-time
quadrismegistus 4 years ago
parent b9ef3964e7
commit aaae66d9f5
4 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File

6
komrade/backend/crypt.py
Unescape Escape View File

@ -47,9 +47,9 @@ class Crypt(Logger):
return k_b
def package_key(self,k,prefix=''):
self.log('k???',type(k),k)
# self.log('k???',type(k),k)
if not k: return b''
self.log('prefix???',type(prefix),prefix)
# self.log('prefix???',type(prefix),prefix)
k_b = self.force_binary(k)
self.log(type(k_b),k_b)
# k_s = k_b.decode()
@ -58,7 +58,7 @@ class Crypt(Logger):
# self.log(type(k_s2),k_s2)
# k_b2 = k_s2.encode()
k_b2 = self.force_binary(prefix) + k_b
self.log('k_b2',type(k_b2),k_b2)
# self.log('k_b2',type(k_b2),k_b2)
# k_b = self.cell.encrypt(k_b)
# prefix_b = self.force_binary(prefix)

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

@ -106,39 +106,39 @@ class Keymaker(Logger):
### STARTING WITH MOST ABSTRACT
def findkey(self, keyname, keychain={}, uri=None):
self.log(f'looking for key {keyname}, in keychain {keychain.keys()} or under crypt uri {uri}')
# self.log(f'looking for key {keyname}, in keychain {keychain.keys()} or under crypt uri {uri}')
# look in keychain, then in crypt, for this key
given_key = keychain.get(keyname)
if given_key:
self.log(f'{keyname} found in keychain: {given_key}')
# self.log(f'{keyname} found in keychain: {given_key}')
return given_key
found_key = self.crypt_keys.get(uri,prefix=f'/{keyname}/')
if found_key:
self.log(f'{keyname} found in crypt: {given_key}')
# self.log(f'{keyname} found in crypt: {given_key}')
return found_key
self.log(f'{keyname} not found!!')
# self.log(f'{keyname} not found!!')
def getkey(self, keyname, keychain={}, uri=None):
self.log(f'keyname={keyname}, keychain={keychain.keys()}, uri={uri}')
# self.log(f'keyname={keyname}, keychain={keychain.keys()}, uri={uri}')
# 1) I already have this key stored in either the keychain or the crypt; return straight away
key = self.findkey(keyname, keychain, uri)
if key:
self.log(f'>> I have {key} already, returning')
# self.log(f'>> I have {key} already, returning')
return key
## 2) I can assemble the key
self.log(f'assembling key: {keyname}_encr + {keyname}_decr')
# self.log(f'assembling key: {keyname}_encr + {keyname}_decr')
key_encr = self.findkey(keyname+'_encr', keychain,uri)
key_decr = self.findkey(keyname+'_decr', keychain, uri)
key = self.assemble_key(key_encr, key_decr)
return key
def get_cell(self, str_or_key_or_cell):
self.log('getting decr cell for',str_or_key_or_cell)
# self.log('getting decr cell for',str_or_key_or_cell)
if type(str_or_key_or_cell)==SCellSeal:
return str_or_key_or_cell
@ -148,17 +148,17 @@ class Keymaker(Logger):
return SCellSeal(key=str_or_key_or_cell)
def assemble_key(self, key_encr, key_decr):
self.log(f'assembling key: {key_decr} decrypting {key_encr}')
# self.log(f'assembling key: {key_decr} decrypting {key_encr}')
# need the encrypted half
if not key_encr:
self.log('!! encrypted half not given')
# self.log('!! encrypted half not given')
return
if not key_decr:
if self.passphrase:
key_decr = self.passphrase
else:
self.log('!! decryptor half not given')
# self.log('!! decryptor half not given')
return
# need some way to regenerate the decryptor
@ -166,17 +166,18 @@ class Keymaker(Logger):
# need the decryptor half
if not decr_cell:
self.log('!! decryptor cell not regenerable')
# self.log('!! decryptor cell not regenerable')
return
# decrypt!
try:
self.log(f'>> decrypting {key_encr} with cell {decr_cell}')
key = decr_cell.decrypt(key_encr)
self.log('assembled_key built:',key)
# self.log('assembled_key built:',key)
return key
except ThemisError as e:
self.log('!! decryption failed:',e)
return
# Concrete keys
## (1) Final keys
@ -589,7 +590,7 @@ class Keymaker(Logger):
if passphrase: self.passphrase=passphrase
self._keychain = _keychain = {**extra_keys}
self.log('_keychain at start of keychain() =',_keychain)
# self.log('_keychain at start of keychain() =',_keychain)
# # am I a builtin one?
# # self.log('hello///',self.name,self.name in BUILTIN_KEYCHAIN)
@ -605,15 +606,15 @@ class Keymaker(Logger):
# self.log('??',_keychain)
# # stop
self.log('_keychain',_keychain)
# self.log('_keychain',_keychain)
# stop
for keyname in keys_to_gen:
self.log('??',keyname,'...')
# self.log('??',keyname,'...')
if hasattr(self,keyname):
method=getattr(self,keyname)
res=method(keychain=_keychain, **kwargs)
self.log('res <--',res)
# self.log('res <--',res)
if res:
_keychain[keyname]=res
return _keychain

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

@ -137,9 +137,9 @@ from torpy.hiddenservice import HiddenService
from torpy.http.requests import TorRequests, tor_requests_session, do_request as requests_request
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.getLogger('requests').setLevel(logging.CRITICAL)
# logging.basicConfig(format='[%(asctime)s] [%(threadName)-16s] %(message)s', level=logging.DEBUG)
# logger = logging.getLogger(__name__)
HS_BASIC_HOST = os.getenv('HS_BASIC_HOST')

7
komrade/backend/the_telephone.py
Unescape Escape View File

@ -37,8 +37,13 @@ class TheTelephone(Operator):
async def req(self,json_coming_from_phone={},json_coming_from_caller={},caller=None,json_unencrypted={}):
async def req(self,json_coming_from_phone={},json_coming_from_caller={},caller=None):
if not caller: caller=self.caller
self.log(f"""
RING RING!
caller = {caller}
json_coming_from_phone = {json_coming_from_phone}
json_coming_from_caller = {json_coming_from_caller""")
# keychain = self.keychain(allow_builtin=self.allow_builtin, force=True)

Write Preview
Loading…
Cancel
Save