diff --git a/api/persona0.py b/api/persona0.py
new file mode 100644
index 0000000..7471c40
--- /dev/null
+++ b/api/persona0.py
@@ -0,0 +1,739 @@
+import os
+import asyncio
+from pythemis.skeygen import KEY_PAIR_TYPE, GenerateKeyPair
+from pythemis.smessage import SMessage, ssign, sverify
+from pythemis.exception import ThemisError
+from pythemis.scell import SCellSeal
+
+from base64 import b64decode,b64encode
+# from kademlia.network import Server
+import os,time,sys,logging
+from pathlib import Path
+import requests
+
+sys.path.append('../p2p')
+BSEP=b'||||||||||'
+BSEP2=b'@@@@@@@@@@'
+BSEP3=b'##########'
+NODE_SLEEP_FOR=1
+
+P2P_PREFIX=b'/persona/'
+P2P_PREFIX_POST=b'/msg/'
+P2P_PREFIX_INBOX=b'/inbox/'
+P2P_PREFIX_OUTBOX=b'/outbox/'
+
+WORLD_PUB_KEY = b'VUVDMgAAAC1z53KeApQY4RICK5k0nXnnS+K17veIFMPlFKo7mqnRhTZDhAmG'
+WORLD_PRIV_KEY = b'UkVDMgAAAC26HXeGACxZUoKYKlZ7sDmVoLwffNj3CrdqoPrE94+2ysfhufmP'
+
+KOMRADE_PUB_KEY = b'VUVDMgAAAC09uo+wAgu/V9xyvMkMDbOQEk1ssOrFADaiyTzfwVjE6o8FHoil'
+KOMRADE_PRIV_KEY = b'UkVDMgAAAC33fFiaAIpmQewjkYndzMcMkj1mLy/lE4RXJQzIlUN94tyC5g29'
+
+DEBUG = True
+UPLOAD_DIR = 'uploads/'
+ALLOWED_EXTENSIONS = {'png', 'jpg', 'jpeg', 'gif'}
+
+PORT_LISTEN = 5639
+NODE_SLEEP_FOR=1
+NODES_PRIME = [("128.232.229.63",8467)]
+KEYSERVER_ADDR = 'komrade.app' #'128.232.229.63'
+KEYSERVER_PORT = 5566
+
+
+KEY_PATH = os.path.join(os.path.expanduser('~'),'.komrade')
+KEY_PATH_PUB = os.path.join(KEY_PATH,'.locs')
+KEY_PATH_PRIV = os.path.join(KEY_PATH,'.keys')
+
+for x in [KEY_PATH,KEY_PATH_PUB,KEY_PATH_PRIV]:
+ if not os.path.exists(x): os.makedirs(x)
+
+WORLD_PRIV_KEY_FN = os.path.join(KEY_PATH_PRIV,'.world.key')
+WORLD_PUB_KEY_FN = os.path.join(KEY_PATH_PUB,'.world.loc')
+KOMRADE_PRIV_KEY_FN = os.path.join(KEY_PATH_PRIV,'.komrade.key')
+KOMRADE_PUB_KEY_FN = os.path.join(KEY_PATH_PUB,'.komrade.loc')
+
+
+def check_world_keys():
+ if not os.path.exists(WORLD_PRIV_KEY_FN):
+ with open(WORLD_PRIV_KEY_FN,'wb') as of:
+ of.write(WORLD_PRIV_KEY)
+
+ if not os.path.exists(WORLD_PUB_KEY_FN):
+ with open(WORLD_PUB_KEY_FN,'wb') as of:
+ of.write(WORLD_PUB_KEY)
+
+ if not os.path.exists(KOMRADE_PRIV_KEY_FN):
+ with open(KOMRADE_PRIV_KEY_FN,'wb') as of:
+ of.write(KOMRADE_PRIV_KEY)
+
+ if not os.path.exists(KOMRADE_PUB_KEY_FN):
+ with open(KOMRADE_PUB_KEY_FN,'wb') as of:
+ of.write(KOMRADE_PUB_KEY)
+
+# check_world_keys()
+
+
+## CONNECTING
+
+
+
+
+## utils
+
+def get_random_id():
+ import uuid
+ return uuid.uuid4().hex
+
+def get_random_binary_id():
+ import base64
+ idstr = get_random_id()
+ return base64.b64encode(idstr.encode())
+
+
+def logger():
+ import logging
+ handler = logging.StreamHandler()
+ formatter = logging.Formatter('[%(asctime)s]\n%(message)s\n')
+ handler.setFormatter(formatter)
+ logger = logging.getLogger(__file__)
+ logger.addHandler(handler)
+ logger.setLevel(logging.DEBUG)
+ return logger
+
+LOG = None
+
+def log(*x):
+ global LOG
+ if not LOG: LOG=logger().debug
+
+ tolog=' '.join(str(_) for _ in x)
+ LOG(tolog)
+
+
+
+class NetworkStillConnectingError(OSError): pass
+
+
+
+
+
+
+
+class Persona(object):
+
+ def __init__(self,name,api=None,node=None,create_if_missing=True):
+ self.name=name
+ self.log=log
+ self.privkey=None
+ self.pubkey=None
+ self.api=api
+
+ self.can_receive = False
+ self.can_send = False
+ # self.can_login = False
+ self.external_keys_loaded = False
+
+
+ self.pubkey_enc = None
+ self.pubkey_decr = None
+
+ # self._node=node
+ self.create_if_missing=create_if_missing
+ # self.log(f'>> Persona.__init__(name={name},create_if_missing={create_if_missing})')
+
+ # load at least any local keys (non-async)
+ self.find_keys_local()
+ # self.login_or_register()
+
+
+
+ def __repr__(self):
+ #pkeystr = '+loc' if self.has_public_key() else ''
+ #privkeystr = ' +key' if self.has_private_key() else ''
+ # ptypestr='acccount' if self.has_private_key() else 'contact'
+ ptypestr='loc' if not self.has_private_key() else 'keyloc'
+
+ return f'{self.name} ({ptypestr})'
+
+ def get_keyserver_pubkey(self):
+ Q=f'http://{KEYSERVER_ADDR}:{KEYSERVER_PORT}/pub'
+
+ r = self.api.request(Q)
+ return r.content
+ # self.log('r =',r,b64encode(r.content))
+ # pubkey_b64 = b64encode(r.content)
+ # return pubkey_b64
+
+ def get_externally_signed_pubkey(self):
+ Q=f'http://{KEYSERVER_ADDR}:{KEYSERVER_PORT}/get/{self.name}'
+ self.log('Q:',Q)
+ r = self.api.request(Q)
+ package_b64 = r.content
+ package = b64decode(package_b64)
+ self.log('package <--',package)
+ if not package: return (b'',b'',b'')
+ return package.split(BSEP)
+ # pubkey_b64, signed_pubkey_b64, server_signed_pubkey_b64 = package.split(BSEP)
+
+ # signed_pubkey = b64encode(r.content)
+ # return (b64encode(pubkey), b64encode(signed_pubkey))
+
+ def set_externally_signed_pubkey(self):
+ import requests
+ Q=f'http://{KEYSERVER_ADDR}:{KEYSERVER_PORT}/add/{self.name}' #/{name}/{key}
+
+ package = self.pubkey_b64 + BSEP + self.signed_pubkey_b64
+ self.log('set_externally_signed_pubkey package -->',package)
+
+ r = requests.post(Q, data=package) #{'name':self.name,'key':self.pubkey_b64})
+ return r
+
+ def has_private_key(self):
+ return self.privkey is not None
+
+ def has_public_key(self):
+ return self.pubkey is not None
+
+
+ @property
+ async def node(self):
+ node = await self.api.node
+ return node
+
+
+ def load_keyserver_pubkey(self):
+ self.keyserver_pubkey_b64 = self.get_keyserver_pubkey()
+ self.keyserver_pubkey = b64decode(self.keyserver_pubkey_b64)
+ self.log('keyserver_pubkey =',self.keyserver_pubkey)
+ return self.keyserver_pubkey
+
+ def load_external_keys(self):
+ if self.external_keys_loaded: return
+
+ self.pubkey_ext_b64, self.signed_pubkey_ext_b64, self.server_signed_pubkey_ext_b64 = self.get_externally_signed_pubkey()
+ self.log('pubkey_ext_b64 =',self.pubkey_ext_b64)
+ self.log('signed_pubkey_ext_b64 =',self.signed_pubkey_ext_b64)
+ self.log('server_signed_pubkey_ext_b64 =',self.server_signed_pubkey_ext_b64)
+ self.external_keys_loaded = True
+
+ def keyserver_name_exists(self):
+ user_missing = (self.pubkey_ext_b64 is b'' or self.signed_pubkey_ext_b64 is b'' or self.server_signed_pubkey_ext_b64 is b'')
+ return not user_missing
+
+
+ def meet(self,save_loc=True):
+ pubkey_ext = b64decode(self.pubkey_keyserver_verified)
+ self.log('pubkey_ext',pubkey_ext)
+ self.pubkey=pubkey_ext
+ self.log('setting self.pubkey to external value:',self.pubkey)
+ self.log('self.pubkey_64',self.pubkey_b64)
+ self.log('keyserver_verified',self.pubkey_keyserver_verified)
+
+ with open(self.key_path_pub,'wb') as of:
+ of.write(self.pubkey_keyserver_verified)
+
+ return {'success':'Met person as acquaintance'}
+
+ def register(self):
+ # register
+ if self.create_if_missing:
+ self.gen_keys()
+ res = self.set_externally_signed_pubkey()
+ self.log('set_externally_signed_pubkey res =',res)
+ if res is None:
+ return {'error':'Could not set externally signed pubkey'}
+ else:
+ return {'success':'Created new pubkey'}
+ else:
+ return {'error':'No public key externally, but create_if_missing==False'}
+
+
+ # login, meet, or register
+ def boot(self):
+ # keyserver active?
+ keyserver_pubkey = self.keyserver_pubkey = self.load_keyserver_pubkey()
+ if keyserver_pubkey is None:
+ return {'error':'Cannot conntact keyserver'}
+
+ # load external keys
+ self.load_external_keys()
+
+ # user exists...
+ if self.keyserver_name_exists():
+
+ # if I claim to be this person
+ if self.privkey and self.pubkey_decr:
+ attempt = self.login()
+ self.log('login attempt ->',attempt)
+ return attempt
+
+ # otherwise just meet them
+ attempt = self.meet()
+ self.log('meet attempt ->',attempt)
+ return attempt
+
+ # user does not exist
+ attempt = self.register()
+ self.log('register attempt -->',attempt)
+ return attempt
+
+ @property
+ def key_path_pub(self):
+ return os.path.join(KEY_PATH_PUB,'.'+self.name+'.loc')
+
+ @property
+ def key_path_pub_enc(self):
+ return os.path.join(KEY_PATH_PUB,'.'+self.name+'.loc.box')
+
+
+ @property
+ def key_path_priv(self):
+ return os.path.join(KEY_PATH_PRIV,'.'+self.name+'.key')
+
+ @property
+ def name_b64(self):
+ return b64encode(self.name.encode())
+
+
+ @property
+ def privkey_b64(self):
+ return b64encode(self.privkey)
+
+ @property
+ def pubkey_b64(self):
+ return b64encode(self.pubkey) if self.pubkey else b''
+
+ @property
+ def signed_pubkey_b64(self):
+ return self.sign(self.pubkey_b64)
+ # return self.encrypt(self.pubkey_b64, self.pubkey_b64)
+
+ ## genearating keys
+
+ # def gen_keys1(self):
+ # self.log('gen_keys()')
+ # keypair = GenerateKeyPair(KEY_PAIR_TYPE.EC)
+ # self.privkey = keypair.export_private_key()
+ # self.pubkey = keypair.export_public_key()
+
+ # self.log(f'priv_key saved to {self.key_path_priv}')
+ # with open(self.key_path_priv, "wb") as private_key_file:
+ # private_key_file.write(self.privkey_b64)
+
+ # with open(self.key_path_pub, "wb") as public_key_file:
+ # # save SIGNED public key
+ # public_key_file.write(self.pubkey_b64)
+
+ # with open(self.key_path_pub_enc,'wb') as signed_public_key_file:
+ # # self.log('encrypted_pubkey_b64 -->',self.encrypted_pubkey_b64)
+ # pubkey_b64 = b64encode(self.pubkey)
+ # self.log('pubkey',self.pubkey)
+ # self.log('pubkey_b64',pubkey_b64)
+
+ # encrypted_pubkey_b64 = self.encrypt(pubkey_b64, pubkey_b64, KOMRADE_PRIV_KEY)
+ # self.log('encrypted_pubkey_b64 -->',encrypted_pubkey_b64)
+
+ # signed_public_key_file.write(encrypted_pubkey_b64)
+
+ def gen_keys(self,passphrase=None):
+ """
+ Generate private/public key pair
+ Secure that with passphrase
+ """
+
+ ## Generate key pair
+ self.log('gen_keys()')
+ keypair = GenerateKeyPair(KEY_PAIR_TYPE.EC)
+ self.privkey = keypair.export_private_key()
+ self.pubkey = keypair.export_public_key()
+
+ ## Secure with passphrase
+ if passphrase is None: passphrase=input('Please protect account with passphrase:\n')
+ cell = SCellSeal(passphrase=passphrase)
+ keypair_b = self.privkey + BSEP + self.pubkey
+
+ keypair_b_encr = cell.encrypt(keypair_b)
+
+
+ self.log(f'priv_key saved to {self.key_path_priv}')
+ with open(self.key_path_priv, "wb") as private_key_file:
+ private_key_file.write(self.privkey_b64)
+
+ with open(self.key_path_pub, "wb") as public_key_file:
+ # save SIGNED public key
+ public_key_file.write(self.pubkey_b64)
+
+ with open(self.key_path_pub_enc,'wb') as signed_public_key_file:
+ # self.log('encrypted_pubkey_b64 -->',self.encrypted_pubkey_b64)
+ pubkey_b64 = b64encode(self.pubkey)
+ self.log('pubkey',self.pubkey)
+ self.log('pubkey_b64',pubkey_b64)
+
+ encrypted_pubkey_b64 = self.encrypt(pubkey_b64, pubkey_b64, KOMRADE_PRIV_KEY)
+ self.log('encrypted_pubkey_b64 -->',encrypted_pubkey_b64)
+
+ signed_public_key_file.write(encrypted_pubkey_b64)
+
+
+ ## loading keys from disk
+
+ def find_keys_local(self):
+ self.log(f'find_keys_local(path_pub={self.key_path_pub}, path_priv={self.key_path_priv})')
+
+ if os.path.exists(self.key_path_priv):
+ with open(self.key_path_priv) as priv_f:
+ self.privkey=b64decode(priv_f.read())
+
+ # Load from encrypted?
+ if os.path.exists(self.key_path_pub_enc) and self.privkey:
+ with open(self.key_path_pub_enc) as pub_f:
+ self.pubkey_enc=pub_f.read()
+ self.pubkey_decr=self.decrypt(self.pubkey_enc, KOMRADE_PUB_KEY)
+ # self.pubkey=self.pubkey_decr
+ self.log('loaded self.pubkey from enc',self.pubkey)
+ self.can_receive = True
+ self.can_send = True
+
+ # load from nonencrypted pubkey?
+ if os.path.exists(self.key_path_pub):
+ with open(self.key_path_pub) as pub_f:
+ self.pubkey=b64decode(pub_f.read())
+ self.log('loaded self.pubkey from UNenc',self.pubkey)
+ self.can_receive = True
+
+ @property
+ def pubkey_keyserver_verified(self):
+ # test if remote data agrees
+ if not hasattr(self,'_keyserver_verified'):
+ self._keyserver_verified = self.verify(self.server_signed_pubkey_ext_b64, self.keyserver_pubkey_b64)
+ return self._keyserver_verified
+
+ def login(self):
+ # test if local data present
+ if not self.pubkey or not self.pubkey_decr:
+ return {'error':'Public keys not present'}
+
+ # test if local data agrees
+ self.log('self.pubkey',self.pubkey_b64)
+ self.log('self.pubkey_decr',self.pubkey_decr)
+ if self.pubkey_b64 != self.pubkey_decr:
+ return {'error':'Public keys do not match'}
+
+ # test if remote data agrees
+ keyserver_verified = self.pubkey_keyserver_verified
+ if keyserver_verified is None:
+ return {'error':'Keyserver verification failed'}
+
+ # test if pubkey match
+ enc_match = self.pubkey_decr == keyserver_verified
+ if enc_match:
+ return {'success':'Keys matched'}
+ return {'error':'Keys did not match'}
+
+
+
+
+
+
+ ## E/D/S/V
+
+ def encrypt(self,msg_b64,for_pubkey_b64, privkey_b64=None):
+ self.log('encrypt()',msg_b64,for_pubkey_b64,privkey_b64)
+
+ privkey = b64decode(privkey_b64) if privkey_b64 else self.privkey
+ # handle verification failure
+ for_pubkey = b64decode(for_pubkey_b64)
+ encrypted_msg = SMessage(privkey, for_pubkey).wrap(msg_b64)
+ return b64encode(encrypted_msg)
+
+ def decrypt(self,encrypted_msg_b64,from_pubkey_b64, privkey_b64=None):
+ privkey = b64decode(privkey_b64) if privkey_b64 else self.privkey
+
+ # handle verification failure
+ from_pubkey = b64decode(from_pubkey_b64)
+ encrypted_msg = b64decode(encrypted_msg_b64)
+ decrypted_msg = SMessage(privkey, from_pubkey).unwrap(encrypted_msg)
+ return decrypted_msg
+
+ def sign(self,msg_b64, privkey=None):
+ if not privkey: privkey=self.privkey
+ signed_msg = b64encode(ssign(privkey, msg_b64))
+ return signed_msg
+
+ def verify(self,signed_msg_b64,pubkey_b64=None):
+ if pubkey_b64 is None: pubkey_b64=self.pubkey_b64
+
+ self.log('verify() signed_msg_b64 =',signed_msg_b64)
+ self.log('verify() pubkey_b64 =',pubkey_b64)
+ signed_msg = b64decode(signed_msg_b64)
+ public_key = b64decode(pubkey_b64)
+
+ self.log('verify() signed_msg =',signed_msg)
+ self.log('verify() public_key =',public_key)
+
+ try:
+ verified_msg = sverify(public_key, signed_msg)
+ return verified_msg
+ except ThemisError as e:
+ print('!!',e)
+ return None
+
+
+
+
+ @property
+ def uri_inbox(self):
+ return P2P_PREFIX_INBOX+self.name.encode()
+
+ @property
+ def uri_outbox(self):
+ return P2P_PREFIX_OUTBOX+self.name.encode()
+
+ @property
+ def app_pubkey_b64(self):
+ return KOMRADE_PUB_KEY
+
+
+
+
+ ## POSTING/SENDING MSGS
+
+ async def post(self,encrypted_payload_b64,to_person):
+ # double wrap
+ double_encrypted_payload = self.encrypt(encrypted_payload_b64, to_person.pubkey_b64, KOMRADE_PRIV_KEY)
+ self.log('double_encrypted_payload =',double_encrypted_payload)
+
+ post_id = get_random_binary_id() #get_random_id().encode()
+ node = await self.node
+
+ uri_post = P2P_PREFIX_POST + post_id
+ res = await node.set(uri_post, double_encrypted_payload)
+ self.log('result of post() =',res)
+
+ return uri_post
+
+ async def send(self,msg_b,to,from_person=None):
+ """
+ 1) [Encrypted payload:]
+ 1) Timestamp
+ 2) Public key of sender
+ 3) Public key of recipient
+ 4) AES-encrypted Value
+ 2) [Decryption tools]
+ 1) AES-decryption key
+ 2) AES decryption IV value
+ 5) Signature of value by author
+ """
+
+ if type(msg_b)==str: msg_b=msg_b.encode()
+ msg_b64=b64encode(msg_b)
+
+ # encrypt and sign
+ to_person = to
+ if from_person is None: from_person = self
+ encrypted_payload = from_person.encrypt(msg_b64, to_person.pubkey_b64)
+ signed_encrypted_payload = from_person.sign(encrypted_payload)
+
+ # package
+ time_b64 = b64encode(str(time.time()).encode())
+ WDV_b64 = b64encode(BSEP.join([
+ signed_encrypted_payload,
+ from_person.pubkey_b64,
+ from_person.name_b64,
+ time_b64]))
+ self.log('WDV_b64 =',WDV_b64)
+
+ # post
+ post_id = await self.post(WDV_b64, to_person)
+ self.log('post_id <-',post_id)
+
+ # add to inbox
+ res = await to_person.add_to_inbox(post_id)
+ self.log('add_to_inbox <-',res)
+
+ # add to outbox?
+ # pass
+
+
+
+
+
+
+
+
+
+
+ async def load_inbox(self,decrypt_msg_uri=False,last=None):
+ node = await self.node
+ encrypted_inbox_idstr_b64 = await node.get(self.uri_inbox)
+ self.log('encrypted_inbox_idstr_b64 =',encrypted_inbox_idstr_b64)
+ if encrypted_inbox_idstr_b64 is None: return []
+
+ # inbox_idstr = self.decrypt(encrypted_inbox_idstr_b64, self.app_pubkey_b64)
+ # self.log('decrypted inbox_idstr =',inbox_idstr)
+ # decrypt!
+
+ encrypted_inbox_idstr = b64decode(encrypted_inbox_idstr_b64)
+ self.log('encrypted_inbox_idstr =',encrypted_inbox_idstr)
+
+ inbox_ids = encrypted_inbox_idstr.split(BSEP) if encrypted_inbox_idstr is not None else []
+ self.log('inbox_ids =',inbox_ids)
+
+ if decrypt_msg_uri:
+ inbox_ids = [self.decrypt(enc_msg_id_b64,KOMRADE_PUB_KEY) for enc_msg_id_b64 in inbox_ids]
+ self.log('inbox_ids decrypted =',inbox_ids)
+
+ return inbox_ids[:last]
+
+ async def add_to_inbox(self,msg_uri,inbox_sofar=None):
+ # encrypt msg id so only inbox owner can resolve the pointer
+ self.log('unencrypted msg uri:',msg_uri)
+ encrypted_msg_uri = self.encrypt(msg_uri, self.pubkey_b64, KOMRADE_PRIV_KEY)
+ self.log('encrypted msg uri:',encrypted_msg_uri)
+
+ # get current inbox
+ if inbox_sofar is None: inbox_sofar=await self.load_inbox()
+ self.log('inbox_sofar:',inbox_sofar)
+
+ # add new value
+ new_inbox = inbox_sofar + [encrypted_msg_uri]
+ new_inbox_b = BSEP.join(new_inbox)
+ self.log('new_inbox_b:',new_inbox_b)
+
+ new_inbox_b64 = b64encode(new_inbox_b)
+
+ self.log('new_inbox_b64:',new_inbox_b64)
+
+ # set on net
+ node = await self.node
+ await node.set(self.uri_inbox,new_inbox_b64)
+
+ new_length = len(new_inbox)
+ return {'success':'Inbox length increased to %s' % new_length}
+ #return {'error':'Could not append data'}
+
+
+ async def add_to_outbox(self):
+ """
+ Do not store on server!
+ """
+ pass
+
+ async def read_inbox(self,uri_inbox=None):
+ if uri_inbox is None: uri_inbox = P2P_PREFIX_INBOX+self.name.encode()
+ node = await self.node
+ inbox_ids = await node.get(uri_inbox)
+ if inbox_ids is not None:
+ inbox_ids = inbox_ids.split(BSEP)
+ self.log('found inbox IDs:',inbox_ids)
+
+ msgs_toread = [self.read_msg(msg_id) for msg_id in inbox_ids]
+ msgs = await asyncio.gather(*msgs_toread)
+ self.log('read_inbox() msgs = ',msgs)
+ return msgs
+ return []
+
+ async def read_outbox(self,uri_outbox=None):
+ if uri_outbox is None: uri_outbox = P2P_PREFIX_OUTBOX+self.name.encode()
+ return await self.read_inbox(uri_outbox)
+
+
+ async def read_msg(self,msg_id):
+ self.log(f'Persona.read_msg({msg_id}) ?')
+ uri_msg=P2P_PREFIX_POST+msg_id
+ node = await self.node
+
+ res = await node.get(uri_msg)
+ self.log('res = ',res)
+ if res is not None:
+ double_encrypted_payload_b64 = res
+ single_encrypted_payload = self.decrypt(double_encrypted_payload_b64, KOMRADE_PUB_KEY)
+ self.log('GOT ENRYPTED PAYLOAD:',single_encrypted_payload)
+
+ signed_encrypted_payload_b64,from_pubkey_b64,name_b64,time_b64 = single_encrypted_payload.split(BSEP)
+ self.log('signed_encrypted_payload =',signed_encrypted_payload_b64)
+ self.log('from_pubkey_b64 =',from_pubkey_b64)
+ self.log('time_b64 =',time_b64)
+
+ from_name = b64decode(name_b64).decode()
+ self.log('from_name =',from_name)
+ timestamp = b64decode(time_b64).decode()
+ tmpP = Persona(from_name)
+ await tmpP.boot()
+ from_pubkey_b64_acc_to_name = tmpP.pubkey_b64
+ assert from_pubkey_b64==from_pubkey_b64_acc_to_name
+
+ encrypted_payload_b64 = self.verify(signed_encrypted_payload_b64, from_pubkey_b64)
+ self.log('encrypted_payload_b64 =',encrypted_payload_b64)
+
+ payload = self.decrypt(encrypted_payload_b64, from_pubkey_b64)
+ self.log('payload =',payload)
+ return {
+ 'success':True,
+ 'content':payload,
+ 'from_name':from_name,
+ 'from_pubkey_b64':from_pubkey_b64,
+ 'timestamp':timestamp
+ }
+ return {'error':'Unknown'}
+
+
+
+def run_multiple_tasks(tasks):
+ async def _go(tasks):
+ res = await asyncio.gather(*tasks, return_exceptions=True)
+ return res
+ return asyncio.get_event_loop().run_until_complete(_go(tasks))
+
+async def main():
+
+ # start node
+ from kademlia.network import Server
+ #from p2p_api import
+ PORT_LISTEN = 5969
+
+ # NODES_PRIME = [("128.232.229.63",8467), ("68.66.241.111",8467)]
+ NODES_PRIME = [("128.232.229.63",8467)]
+
+ node = Server(log=log)
+ await node.listen(PORT_LISTEN)
+ await node.bootstrap(NODES_PRIME)
+
+ marx = Persona('marx',node=node)
+ elon = Persona('elon2',node=node)
+ world = Persona('world',node=node)
+ await world.boot()
+
+
+ await marx.boot()
+ await elon.boot()
+
+ # await marx.send(b'Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! Secret message 2! ',to=elon)
+
+
+ # await elon.read_inbox()
+
+ await marx.send(b'A specter is haunting the internet',to=world)
+ await elon.send(b'My rockets explode and so will your mind',to=world)
+ await elon.send(b'My rockets explode and so will your mind',to=world)
+
+ await world.read_inbox()
+
+ return True
+
+
+if __name__=='__main__':
+ asyncio.run(main())
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/backend/caller.py b/backend/caller.py
index 89fa96c..19e16ca 100644
--- a/backend/caller.py
+++ b/backend/caller.py
@@ -3,9 +3,203 @@ from pythemis.smessage import SMessage, ssign, sverify
from pythemis.skeygen import GenerateSymmetricKey
from pythemis.scell import SCellSeal
from pythemis.exception import ThemisError
+import getpass,os
+from crypt import Crypt
+from the_operator import TheOperator
+
+# paths
+PATH_KOMRADE = os.path.abspath(os.path.join(os.path.expanduser('~'),'.komrade'))
+PATH_CALLER = os.path.join(PATH_KOMRADE,'.caller')
+PATH_CALLER_PUBKEY = os.path.join(PATH_CALLER,'.ca.key.pub.encr')
+PATH_CALLER_PRIVKEY = os.path.join(PATH_CALLER,'.ca.key.priv.encr')
+PATH_CRYPT_KEYS = os.path.join(PATH_CALLER,'.ca.db.keys.crypt')
+PATH_CRYPT_DATA = os.path.join(PATH_CALLER,'.ca.db.data.encr')
+
+
+
+# class HelloOperator(object):
+# def __init__(self,op=None):
+# # for now
+# self.op = TheOperator()
+
+# def create_keys(self,name):
+# return self.op.create_keys(name)
+
+# def exists(self,*x,**y): return self.op.exists(*x,**y)
class Caller(object):
- def create_keys(self,name):
- #
- pass
\ No newline at end of file
+
+ ### INIT CODE
+ def __init__(self,name):
+ self.name=name
+ self.op = TheOperator()
+
+
+ def log(self,*x): print(*x)
+
+
+ ## CRYPT BASICS
+
+ @property
+ def crypt_cell(self):
+ pass
+
+ @property
+ def crypt_keys(self):
+ if not hasattr(self,'_crypt_keys'):
+ self._crypt_keys = Crypt(fn=PATH_CRYPT_KEYS)
+ return self._crypt_keys
+
+ @property
+ def crypt_data(self):
+ if not hasattr(self,'_crypt_data'):
+ self._crypt_data = Crypt(fn=PATH_CRYPT_DATA)
+ return self._crypt_data
+
+
+
+ ### CREATION OF KEYS
+
+ # Get key de-cryptors
+ def gen_pass_keycell(self,pass_phrase,q_name='Read permissions?'):
+ if pass_phrase is None:
+ pass_key = GenerateSymmetricKey()
+ pass_cell = SCellSeal(key=pass_key)
+ else:
+ if pass_phrase is True: pass_phrase=getpass.getpass(f'Enter pass phrase [{q_name}]: ')
+ pass_key = None
+ pass_cell = SCellSeal(passphrase=pass_phrase)
+ return (pass_key, pass_cell)
+
+
+ def create_keys(self,pubkey_pass = None, privkey_pass = None, adminkey_pass = None):
+ # Get keys back from The Operator
+ res = self.op.create_keys(self.name)
+ self.log('create_keys() res from Operator? <-',res)
+ assert type(res)==tuple and len(res)==3
+ (pubkey_decr, privkey_decr, adminkey_decr) = res
+
+ # Get new encryptors
+ pubkey_passkey,pubkey_passcell = self.gen_pass_keycell(pubkey_pass,q_name='Permission key, to find')
+ privkey_passkey,privkey_passcell = self.gen_pass_keycell(privkey_pass,q_name='Permission key, to read')
+ adminkey_passkey,adminkey_passcell = self.gen_pass_keycell(adminkey_pass,q_name='Permission key, to admin')
+
+ # double-encrypt what was received
+ pubkey_decr_encr = pubkey_passcell.encrypt(pubkey_decr)
+ privkey_decr_encr = privkey_passcell.encrypt(privkey_decr)
+ adminkey_decr_encr = adminkey_passcell.encrypt(adminkey_decr)
+
+ # store double encrypted keys
+ self.crypt_keys.set(self.name,pubkey_decr_encr,prefix='/pub_decr_encr/')
+ self.crypt_keys.set(pubkey_decr,privkey_decr_encr,prefix='/priv_decr_encr/')
+ self.crypt_keys.set(privkey_decr,adminkey_decr_encr,prefix='/admin_decr_encr/')
+
+ # store decryption keys if not passworded?
+ if pubkey_passkey: self.crypt_keys.set(self.name,pubkey_passkey,prefix='/pub_decr_decr/')
+ if privkey_passkey: self.crypt_keys.set(pubkey_decr,privkey_passkey,prefix='/priv_decr_decr/')
+ if adminkey_passkey: self.crypt_keys.set(privkey_decr,adminkey_passkey,prefix='/admin_decr_decr/')
+
+ # done?
+
+
+
+ ## MAGIC KEY ATTRIBUTES
+
+ @property
+ def pubkey_decr_encr(self):
+ return self.crypt_keys.get(self.name,prefix='/pub_decr_encr/')
+
+ @property
+ def privkey_decr_encr(self):
+ return self.crypt_keys.get(self.pubkey_decr,prefix='/priv_decr_encr/')
+
+ @property
+ def pubkey_decr_encr(self):
+ return self.crypt_keys.get(self.privkey_decr,prefix='/admin_decr_encr/')
+
+
+
+
+
+ # loading keys back
+
+ @property
+ def pubkey_decr_cell(self):
+ decr_key = self.crypt_keys.get(self.name,prefix='/pub_decr_encr/')
+ if not decr_key:
+ if not self.passphrase: return
+ decr_cell = SCellSeal(passphrase=self.passphrase)
+ else:
+ decr_cell = SCellSeal(key=decr_key)
+ return decr_cell
+
+
+ @property
+ def privkey_decr_cell(self):
+ decr_key = self.crypt_keys.get(self.name,prefix='/priv_decr_encr/')
+ if not decr_key:
+ if not self.passphrase: return
+ decr_cell = SCellSeal(passphrase=self.passphrase)
+ else:
+ decr_cell = SCellSeal(key=decr_key)
+ return decr_cell
+
+ @property
+ def adminkey_decr_cell(self):
+ decr_key = self.crypt_keys.get(self.name,prefix='/admin_decr_encr/')
+ if not decr_key:
+ if not self.passphrase: return
+ decr_cell = SCellSeal(passphrase=self.passphrase)
+ else:
+ decr_cell = SCellSeal(key=decr_key)
+ return decr_cell
+
+ @property
+ def pubkey_decr(self):
+ return self.pubkey_decr_cell.decrypt(self.pubkey_decr_encr)
+
+ @property
+ def privkey_decr(self):
+ return self.privkey_decr_cell.decrypt(self.privkey_decr_encr)
+
+ @property
+ def adminkey_decr(self):
+ return self.adminkey_decr_cell.decrypt(self.adminkey_decr_encr)
+
+
+
+
+
+
+ ### HIGH LEVEL
+ # Do I exist?
+
+ def exists(self):
+ return self.op.exists(self.name)
+
+ def register(self,passphrase = None, as_group=False):
+ if self.exists():
+ self.log('ERROR: user already exists')
+ return
+
+ if not passphrase: passphrase = getpass.getpass('Enter password for new account: ')
+ self.passphrase=passphrase
+
+ if as_group:
+ self.create_keys(adminkey_pass=passphrase)
+ else:
+ self.create_keys(privkey_pass=passphrase, adminkey_pass=passphrase)
+
+
+ def login(self,passphrase = None):
+ if not passphrase: passphrase = getpass.getpass('Enter login password: ')
+ self.passphrase = passphrase
+ if not
+
+
+
+if __name__ == '__main__':
+ caller = Caller('elon2')
+
+ caller.register()
\ No newline at end of file
diff --git a/backend/crypt.py b/backend/crypt.py
index 4ee2e4d..46d51b9 100644
--- a/backend/crypt.py
+++ b/backend/crypt.py
@@ -34,28 +34,30 @@ class Crypt(object):
if type(k_b)!=bytes: k_b=str(k_b).encode()
return k_b
- def package_key(self,k):
+ def package_key(self,k,prefix=''):
k_b = self.force_binary(k)
# k_b = self.cell.encrypt(k_b)
- k_b = self.hash(k_b)
+ prefix_b = self.force_binary(prefix)
+ k_b = self.hash(prefix_b + k_b)
return k_b
def package_val(self,k):
k_b = self.force_binary(k)
- k_b = self.cell.encrypt(k_b)
+ if self.cell is not None: k_b = self.cell.encrypt(k_b)
return k_b
def unpackage_val(self,k_b):
try:
- return self.cell.decrypt(k_b)
+ if self.cell is not None: k_b = self.cell.decrypt(k_b)
except ThemisError:
- return None
+ pass
+ return k_b
- def set(self,k,v):
+ def set(self,k,v,prefix=''):
self.log('set() k -->',k)
- k_b=self.package_key(k)
+ k_b=self.package_key(k,prefix=prefix)
self.log('set() k_b -->',k_b)
self.log('set() v -->',v)
@@ -64,12 +66,15 @@ class Crypt(object):
return self.store.put(k_b,v_b)
- def get(self,k):
+ def get(self,k,prefix=''):
self.log('get() k -->',k)
- k_b=self.package_key(k)
+ k_b=self.package_key(k,prefix=prefix)
self.log('get() k_b -->',k_b)
- v=self.store.get(k_b)
+ try:
+ v=self.store.get(k_b)
+ except KeyError:
+ return None
self.log('get() v -->',v)
v_b=self.unpackage_val(v)
self.log('get() v_b -->',v_b)
diff --git a/backend/the_operator.py b/backend/the_operator.py
index 1402f84..0175fed 100644
--- a/backend/the_operator.py
+++ b/backend/the_operator.py
@@ -15,6 +15,11 @@ import getpass
PATH_HERE = os.path.dirname(__file__)
sys.path.append(PATH_HERE)
from crypt import *
+### Constants
+BSEP=b'||||||||||'
+BSEP2=b'@@@@@@@@@@'
+BSEP3=b'##########'
+
# paths
PATH_KOMRADE = os.path.abspath(os.path.join(os.path.expanduser('~'),'.komrade'))
@@ -129,60 +134,45 @@ class TheOperator(object):
# Key CRUD
####
- def create_keys(self,name):
+ def create_keys(self,name,pubkey_is_public=False):
# Create public and private keys
keypair = GenerateKeyPair(KEY_PAIR_TYPE.EC)
privkey = keypair.export_private_key()
pubkey = keypair.export_public_key()
+ adminkey = GenerateSymmetricKey()
- # Create permission keys
- permkey_find = GenerateSymmetricKey()
- permkey_read = GenerateSymmetricKey()
- permkey_admin = GenerateSymmetricKey()
- permkey_adminX = GenerateSymmetricKey()
-
- # (1) Encrypted pubkey
- pubkey_decr = permkey_find
+ # Create decryption/permission keys
+ pubkey_decr = GenerateSymmetricKey()
+ privkey_decr = GenerateSymmetricKey()
+ adminkey_decr = GenerateSymmetricKey() #SCellSeal(passphrase=passphrase)
+
+ # Encrypt original keys
pubkey_encr = SCellSeal(key=pubkey_decr).encrypt(pubkey)
-
- # (2) Encnrypted priv key
- privkey_decr = permkey_read
privkey_encr = SCellSeal(key=privkey_decr).encrypt(privkey)
-
- # (3) Encrypted admin key?
- adminkey_decr = permkey_adminX
- adminkey_encr = SCellSeal(key=adminkey_decr).encrypt(permkey_admin)
-
+ adminkey_encr = SCellSeal(key=adminkey_decr).encrypt(adminkey)
+ # store encrypted on my hardware
+ self.crypt_keys.set(name,pubkey_encr,prefix='/pub_encr/')
+ self.crypt_keys.set(pubkey,privkey_encr,prefix='/priv_encr/')
+ self.crypt_keys.set(privkey,adminkey_encr,prefix='/admin_encr/')
-
-
- self.log(f'priv_key saved to {self.key_path_priv}')
- with open(self.key_path_priv, "wb") as private_key_file:
- private_key_file.write(self.privkey_b64)
+ # store permissions file?
+ secret_admin_val = pubkey_encr + BSEP + b'find,read,admin'
+ if pubkey_is_public: secret_admin_val += b'*'+BSEP+b'find'
+ secret_admin_val_encr = SCellSeal(key=adminkey).encrypt(secret_admin_val)
+ self.crypt_keys.set(adminkey,secret_admin_val_encr,prefix='/perm_encr/')
- with open(self.key_path_pub, "wb") as public_key_file:
- # save SIGNED public key
- public_key_file.write(self.pubkey_b64)
+ # keep public key?
+ if pubkey_is_public: self.crypt_keys.set(name,pubkey_decr,prefix='/pub_decr/')
- with open(self.key_path_pub_enc,'wb') as signed_public_key_file:
- # self.log('encrypted_pubkey_b64 -->',self.encrypted_pubkey_b64)
- pubkey_b64 = b64encode(self.pubkey)
- self.log('pubkey',self.pubkey)
- self.log('pubkey_b64',pubkey_b64)
-
- encrypted_pubkey_b64 = self.encrypt(pubkey_b64, pubkey_b64, KOMRADE_PRIV_KEY)
- self.log('encrypted_pubkey_b64 -->',encrypted_pubkey_b64)
-
- signed_public_key_file.write(encrypted_pubkey_b64)
+ # send back decryption keys to client
+ return (pubkey_decr, privkey_decr, adminkey_decr)
- def create_permissions_file(self):
- pass
-
-
+ def exists(self,name):
+ return self.crypt_keys.get(name,prefix='/pub_encr/') is not None
@@ -209,6 +199,15 @@ class TheOperatorView(FlaskView):
+def get_random_id():
+ import uuid
+ return uuid.uuid4().hex
+
+def get_random_binary_id():
+ import base64
+ idstr = get_random_id()
+ return base64.b64encode(idstr.encode())
+
@@ -226,6 +225,7 @@ if __name__ == '__main__':
op = TheOperator()
- print(op.crypt_keys.set('aaaa','1111'))
+ #print(op.crypt_keys.set('aaaa','1111'))
- print(op.crypt_keys.get('aaaa'))
\ No newline at end of file
+ # print(op.crypt_keys.get('aaaa'))
+ op.create_keys(name='marx')
\ No newline at end of file
diff --git a/docs/cryptosystems.drawio b/docs/cryptosystems.drawio
index 3e2ebad..dd2a029 100644
--- a/docs/cryptosystems.drawio
+++ b/docs/cryptosystems.drawio
@@ -1 +1 @@
-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
\ No newline at end of file
+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
\ No newline at end of file
diff --git a/docs/cryptosystems.pdf b/docs/cryptosystems.pdf
new file mode 100644
index 0000000..fcb9935
Binary files /dev/null and b/docs/cryptosystems.pdf differ
diff --git a/docs/cryptosystems.png b/docs/cryptosystems.png
new file mode 100644
index 0000000..7fd52f4
Binary files /dev/null and b/docs/cryptosystems.png differ