nothing-unencr
quadrismegistus 4 years ago
parent 0e6ee613f4
commit 7fbd6c2cf9

@ -151,8 +151,9 @@ class Operator(Keymaker):
def route_msg(self,msg_obj): def route_msg(self,msg_obj):
# decrypt # decrypt
if msg_obj.is_encrypted: self.log('got msg_obj!',msg_obj)
msg_obj.decrypt() # if msg_obj.is_encrypted:
# msg_obj.decrypt()
# are there instructions for us? # are there instructions for us?
if msg_obj.route: if msg_obj.route:
# get result from routing # get result from routing
@ -163,19 +164,26 @@ class Operator(Keymaker):
elif msg_obj.has_embedded_msg: elif msg_obj.has_embedded_msg:
embedded_msg = msg_obj.msg embedded_msg = msg_obj.msg
embedded_recipient = embedded_msg.to_whom embedded_recipient = embedded_msg.to_whom
# whew, then we can make someone else take the phone # whew, then we can make someone else take the phone
self.log(f'passing msg onto {embedded_recipient} ...') self.log(f'passing msg onto {embedded_recipient} ...')
response = embedded_recipient.route_msg(embedded_msg) response = embedded_recipient.route_msg(embedded_msg)
# from komrade.backend.messages import Message # from komrade.backend.messages import Message
# if response and type(response)==Message: # if response and type(response)==Message:
# response = response.msg_d # response = response.msg_d
self.log(f'passed msg onto {embedded_recipient}, got this response: {response} ...') self.log(f'passed msg onto {embedded_recipient}, got this response: {response} ...')
# otherwise what are we doing? # otherwise what are we doing?
else: else:
response = msg_obj response = msg_obj
# turn msg back around?
resp_msg_obj =
# ??? # ???
return response # return response

@ -88,34 +88,6 @@ class TheOperator(Operator):
return encr_data_b return encr_data_b
# def route(self, msg_obj):
# if not msg_obj.route:
# # nothign explicitly requested yet?
# # can we pass the msg on?
# if msg_obj.has_embedded_msg:
# self.route(msg_obj, route=msg_obj)
# # self.log('my messages:',msg_obj.messages)
# if not route: raise KomradeException('no route!')
# # what we working with?
# self.log(f'route() got incoming msg data = {data} and route = {route}')
# ## hard code the acceptable routes
# if route == 'forge_new_keys':
# return self.forge_new_keys(data)
# elif route == 'does_username_exist':
# return self.does_username_exist(data)
# # otherwise, hang up and try again
# return OPERATOR_INTERCEPT_MESSAGE
### ROUTES ### ROUTES

@ -40,7 +40,8 @@ def dict_format(d, tab=0):
else: else:
v = repr(v) v = repr(v)
s.append('%s%r: %s (%s),\n' % (' '*tab, k, v, type(v).__name__)) # s.append('%s%r: %s (%s),\n' % (' '*tab, k, v, type(v).__name__))
s.append('%s%r: %s,\n' % (' '*tab, k, v)
s.append('%s}' % (' '*tab)) s.append('%s}' % (' '*tab))
return ''.join(s) return ''.join(s)

Loading…
Cancel
Save