updates

komrade/backend/messages.py

@@ -148,10 +148,10 @@ class Message(Logger):
         # for now this should be rolled out individually ,like an onion
         # ring_ring on client -> pronto_pronto on server
         # so we don't need or want to decrypt all at once
-        if recursive:
-            self.msg.decrypt()
-            self.log(f'decrypted sub msg! {self.msg}')
-            self.msg_d['_msg']=self.msg.msg_d
+            if recursive:
+                self.msg.decrypt()
+                self.log(f'decrypted sub msg! {self.msg}')
+                self.msg_d['_msg']=self.msg.msg_d
 
         self.log(f'done decrypting! {self}')
         return decr_msg

komrade/backend/operators.py

@@ -125,7 +125,6 @@ class Operator(Keymaker):
         from komrade.backend.messages import Message
         msg_obj = Message(msg_d,from_whom=from_whom,to_whom=to_whom)
         # decrypt msg
-        msg_obj.decrypt()
         return msg_obj
 
 

komrade/backend/the_operator.py

@@ -65,6 +65,9 @@ class TheOperator(Operator):
         )
         self.log(f'Operator understood message: {msg_obj} {msg_obj.route}')
         
+        # decrypt?
+        msg_obj.decrypt()
+
         # carry out message instructions
         resp_msg_obj = self.pronto_pronto(msg_obj) #,route=msg_obj.route)
         self.log('route_result <-',resp_msg_obj)

komrade/backend/the_telephone.py

@@ -47,10 +47,10 @@ class TheTelephone(Operator):
         # res =  resp_msg_b_unsealed
         self.log('unsealed resp_msg_obj',resp_msg_obj)
 
-        if resp_msg_obj.has_embedded_msg:
-            resp_msg_obj.msg.decrypt(recursive=True)
+        # decrypt
+        resp_msg_obj.decrypt()
+        self.log('returning decrypted form:',resp_msg_obj)
 
-        # ... pronto?
         return resp_msg_obj
         # return self.pronto_pronto(resp_msg_obj)