diff --git a/komrade/backend/messages.py b/komrade/backend/messages.py index 12e921d..2ea87f3 100644 --- a/komrade/backend/messages.py +++ b/komrade/backend/messages.py @@ -38,12 +38,14 @@ class Message(Logger): def __repr__(self): + msg_d_str=dict_format(self.msg_d) return f""" self.caller={self.caller} self.callee={self.callee} self.msg={self.msg} + self.msg_d={msg_d_str} self.route={self.route} diff --git a/komrade/backend/operators.py b/komrade/backend/operators.py index 60c55cf..63259dd 100644 --- a/komrade/backend/operators.py +++ b/komrade/backend/operators.py @@ -84,9 +84,15 @@ class Operator(Keymaker): def seal_msg(self,msg_obj): # make sure encrypted - # msg_obj.encrypt() + self.log('sealing msg!') + msg_obj.encrypt(recursive=True) # return pure binary version of self's entire msg_d + self.log('encrypted msg_d: ',msg_obj.msg_d) + msg_b = package_for_transmission(msg_obj.msg_d) + self.log('sealed msg_d: ',msg_b) + + # encrypt by omega key msg_b_encr = self.omega_key.encrypt(msg_b) return msg_b_encr @@ -119,7 +125,7 @@ class Operator(Keymaker): self.log(f'here is the message object I made, to send to {to_whom}: {msg_obj}') # encrypting - msg_obj.encrypt() + # msg_obj.encrypt() # self.log(f'now I look like: {msg_obj}') # get pure encrypted binary, sealed #msg_sealed = self.seal_msg(msg_obj) @@ -130,7 +136,7 @@ class Operator(Keymaker): self.log('resp_msg_obj <-',resp_msg_obj) # decrypt? - resp_msg_obj.decrypt() + # resp_msg_obj.decrypt() # unseal msg # resp_msg_obj = self.unseal_msg(resp_msg_b) diff --git a/komrade/utils.py b/komrade/utils.py index 508d47e..6981632 100644 --- a/komrade/utils.py +++ b/komrade/utils.py @@ -31,6 +31,19 @@ def clear_screen(): def pause(): input('') + +def dict_format(d, tab=0): + s = ['{\n'] + for k,v in d.items(): + if isinstance(v, dict): + v = format(v, tab+1) + else: + v = repr(v) + + s.append('%s%r: %s,\n' % (' '*tab, k, v)) + s.append('%s}' % (' '*tab)) + return ''.join(s) + import inspect class Logger(object): def log(self,*x):