keychain-uses-objects
quadrismegistus 4 years ago
parent 074dcc2d15
commit 674009bb9a

@ -113,15 +113,42 @@ class Komrade(Caller):
# call from phone since I don't have pubkey on record on Op yet
# self.log('my keychain:',self._keychain,pubkey,self.op._keychain)
resp_msg_obj = self.ring_ring(
resp_msg_d = self.ring_ring(
{
'name':name,
'pubkey': pubkey.data,
},
route='register_new_user'
)
self.log('register got back from op:',dict_format(resp_msg_obj,tab=2))
if not resp_msg_d.get('success'):
self.log(f'Registration failed. Message from operator was:\n\n{dict_format(resp_msg_d)}')
return
# otherwise, save things on our end
self.log(f'Registration successful. Message from operator was:\n\n{dict_format(resp_msg_d)')
self.log('Now saving name and public key on local device:')
self.name=resp_msg_d.get('name')
pubkey_b = b64dec(resp_msg_d.get('pubkey'))
pubkey=self._keychain['pubkey']=KomradeAsymmetricPublicKey(pubkey_b)
self.crypt_keys.set(
self.name,
pubkey_b),
prefix='/pubkey/')
self.crypt_keys.set(
b64enc_s(pubkey_b),
self.name,
prefix='/name/')
# save qr too:
qr_str=self.qr_str()
fnfn=self.save_uri_as_qrcode(b64enc(pubkey_b)
self.log(f'saved QR code to: {fnfn}')
# done!
self.log(f'Congratulations. Welcome, Komrade {self}.')}')
def ring_ring(self,msg,route=None,**y):

@ -180,7 +180,7 @@ class Message(Logger):
# now, is the decrypted message itself a message?
if is_valid_msg_d(decr_msg):
self.log('Once decrypted, I discovered that I contain a valid msg in its own right!',self)
self.log('Once decrypted, I discovered that I contain a valid msg in its own right!\n',self)
# then ... make that, a message object and decrypt it too!
self.msg = Message(decr_msg)

@ -67,7 +67,7 @@ class TheOperator(Operator):
self.log(f'''Hello, this is the Operator.{ART_OLDPHONE4}I heard you say:\n\n {b64enc_s(data_b)}''')
# unseal
self.log('got:',data_b)
# self.log('got:',data_b)
msg_d = {
'msg':data_b,
'from_name':self.phone.name,
@ -76,10 +76,10 @@ class TheOperator(Operator):
'to':self.pubkey.data,
}
# msg_d = pickle.loads(data_b)
self.log('msg_d',msg_d)
# self.log('msg_d',msg_d)
msg_obj = Message(msg_d,from_whom=self.phone,to_whom=self)
self.log(f'Decoding the binary, I discovered an encrypted message from {self.phone}: {msg_obj}')
self.log(f'Decoding the binary, I discovered an encrypted message from {self.phone}\n: {msg_obj}')
# decrypt?
msg_obj.decrypt()

Loading…
Cancel
Save