Archives/Comrad
2
0
Fork 0
mirror of https://github.com/ComradCollective/Comrad synced 2024-11-11 13:10:45 +00:00
Code Issues Releases Wiki Activity

updates

Browse Source
This commit is contained in:
quadrismegistus 2020-09-12 20:07:27 +01:00
parent e1d38700df
commit 2ba0789a8a
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
komrade/backend/operators.py
View File

@ -109,16 +109,22 @@ class Operator(Keymaker):
# self.log('Message has being sealed in a final binary package:',b64encode(msg_b)) # self.log('Message has being sealed in a final binary package:',b64encode(msg_b))
# return msg_b # return msg_b
def unseal_msg(self,msg_b_encr,from_whom=None,to_whom=None): def unseal_msg(self,msg_b,from_whom=None,to_whom=None):
# default to assumption that I am the recipient # default to assumption that I am the recipient
if not to_whom: to_whom=self if not to_whom: to_whom=self
# decrypt by omega # decrypt by omega
# msg_b = self.omega_key.decrypt(msg_b_encr) # msg_b = self.omega_key.decrypt(msg_b_encr)
msg_b = msg_b_encr # msg_b = msg_b_encr
# unpackage from transmission # unpackage from transmission
msg_d = pickle.loads(msg_b) # msg_d = pickle.loads(msg_b)
# get message obj # get message obj
# print('unsealed msg:',msg_d) # print('unsealed msg:',msg_d)
msg_d = {
'from':from_whom.pubkey,
'to':to_whom,
'msg':msg_b
}
from komrade.backend.messages import Message from komrade.backend.messages import Message
msg_obj = Message(msg_d,from_whom=from_whom,to_whom=to_whom) msg_obj = Message(msg_d,from_whom=from_whom,to_whom=to_whom)
# decrypt msg # decrypt msg

5
komrade/backend/the_operator.py
View File

@ -58,12 +58,13 @@ class TheOperator(Operator):
# ends the ring_ring() chain # ends the ring_ring() chain
def answer_phone(self,data_b): def answer_phone(self,data_b):
# route incoming call from the switchboard # route incoming call from the switchboard
self.log('Hello, this is the Operator. You said: ',data_b) self.log('Hello, this is the Operator. I heard you say:\n\n',b64encode(data_b))
# unseal # unseal
msg_obj = self.unseal_msg( msg_obj = self.unseal_msg(
data_b, data_b,
from_whom=self.phone from_whom=self.phone,
to_whom = self
) )
self.log(f'Operator understood message: {msg_obj} {msg_obj.route}') self.log(f'Operator understood message: {msg_obj} {msg_obj.route}')

9
komrade/utils.py
View File

@ -35,11 +35,14 @@ def do_pause():
except KeyboardInterrupt: except KeyboardInterrupt:
exit('\n\nGoodbye.') exit('\n\nGoodbye.')
import textwrap as tw
def dict_format(d, tab=0): def dict_format(d, tab=0):
def reppr(v): def reppr(v):
if type(v)==bytes and not isBase64(v): if type(v)==bytes:
return b64encode(v).decode() if not isBase64(v):
v=b64encode(v)
v=v.decode()
v='\n'.join(tw.wrap(v,10))
return v return v
s = ['{\n\n'] s = ['{\n\n']