From d7f4d446fbf8e5a266aa9e475f23d0bd72af0c53 Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Thu, 3 Sep 2020 17:40:48 +0100
Subject: [PATCH] updating files

---
 operator/caller.py   |  5 +++
 operator/ether.py    |  5 +++
 operator/operator.py |  1 +
 p2p/.keyserver.loc   |  1 -
 p2p/keyserver.py     | 81 --------------------------------------------
 5 files changed, 11 insertions(+), 82 deletions(-)
 create mode 100644 operator/ether.py
 delete mode 100644 p2p/.keyserver.loc
 delete mode 100644 p2p/keyserver.py

diff --git a/operator/caller.py b/operator/caller.py
index e69de29..6d246b9 100644
--- a/operator/caller.py
+++ b/operator/caller.py
@@ -0,0 +1,5 @@
+"""
+Code for Caller to interact with Operator
+"""
+
+pass
\ No newline at end of file
diff --git a/operator/ether.py b/operator/ether.py
new file mode 100644
index 0000000..4879255
--- /dev/null
+++ b/operator/ether.py
@@ -0,0 +1,5 @@
+"""
+P2P Storage for the Operator
+"""
+
+pass
\ No newline at end of file
diff --git a/operator/operator.py b/operator/operator.py
index c524c6a..c788e38 100644
--- a/operator/operator.py
+++ b/operator/operator.py
@@ -17,6 +17,7 @@ BSEP3=b'##########'
 HOME_OPERATOR = os.path.abspath(__file__)
 PATH_DB_KEYS = os.path.join(HOME_OPERATOR, '.keydb')
 
+
 keyhome = os.path.join(os.path.expanduser('~'),'.komrade','.keyserver')
 if not os.path.exists(keyhome): os.makedirs(keyhome)
 
diff --git a/p2p/.keyserver.loc b/p2p/.keyserver.loc
deleted file mode 100644
index 276e336..0000000
--- a/p2p/.keyserver.loc
+++ /dev/null
@@ -1 +0,0 @@
-VUVDMgAAAC1r2HwyA1oZm3fpNJ48+JOTQEgUNtKPfBQ7wsafzaIMhVu58rf3
\ No newline at end of file
diff --git a/p2p/keyserver.py b/p2p/keyserver.py
deleted file mode 100644
index 99f1e93..0000000
--- a/p2p/keyserver.py
+++ /dev/null
@@ -1,81 +0,0 @@
-"""
-Run primitive keyserver
-Only on node prime!
-"""
-import os
-from flask import Flask
-from flask import request
-import asyncio
-from pythemis.skeygen import KEY_PAIR_TYPE, GenerateKeyPair
-from pythemis.smessage import SMessage, ssign, sverify
-from pythemis.exception import ThemisError
-from base64 import b64encode,b64decode
-BSEP=b'||||||||||'
-BSEP2=b'@@@@@@@@@@'
-BSEP3=b'##########'
-
-keyhome = os.path.join(os.path.expanduser('~'),'.komrade','.keyserver')
-if not os.path.exists(keyhome): os.makedirs(keyhome)
-
-keyserver = 'komrade.app'
-keyserver_port = 5566
-
-app = Flask(__name__)
-
-async def init():
-    from api import Api
-    api = Api()
-    # keyserver = await api.personate('keyserver')
-
-    keypair = GenerateKeyPair(KEY_PAIR_TYPE.EC)
-    privkey = keypair.export_private_key()
-    pubkey = keypair.export_public_key()
-
-    print('pubkey:',pubkey)
-    with open('.keyserver.loc','wb') as of: of.write(b64encode(pubkey))
-    with open(os.path.join(keyhome,'.keyserver.key'),'wb') as of: of.write(b64encode(privkey))    
-
-## load pubkey
-PATH_PUBKEY = os.path.join(os.path.dirname(__file__),'.keyserver.loc')
-PATH_PRIVKEY = os.path.join(keyhome,'.keyserver.key')
-if not os.path.exists(PATH_PRIVKEY) or not os.path.exists(PATH_PUBKEY):
-    asyncio.run(init())
-
-with open(PATH_PUBKEY) as f:
-    PUBKEY_b64 = f.read()
-    PUBKEY = b64decode(PUBKEY_b64)
-with open(PATH_PRIVKEY) as f:
-    PRIVKEY_b64 = f.read()
-    PRIVKEY = b64decode(PRIVKEY_b64)
-
-@app.route('/pub')
-def pubkey():
-    return PUBKEY_b64
-
-@app.route('/add/<name>',methods=['POST'])
-def add(name):
-    key_fn = os.path.join(keyhome,name+'.loc')
-    if not os.path.exists(key_fn):
-        with open(key_fn,'wb') as of:
-            pubkey,signed_pubkey=request.data.split(BSEP)
-            server_signed_pubkey = b64encode(ssign(PRIVKEY,pubkey))
-            package = pubkey + BSEP + signed_pubkey + BSEP + server_signed_pubkey
-            package_b64 = b64encode(package)
-            print('add package -->',package)     
-            print('add package_b64 -->',package_b64)
-            of.write(package_b64)
-            return package_b64
-    return None
-
-@app.route('/get/<name>')
-def get(name):
-    key_fn = os.path.join(keyhome,name+'.loc')
-    if os.path.exists(key_fn):
-        with open(key_fn,'rb') as f:
-            signed_key=f.read()
-            return signed_key
-    return b''
-
-if __name__ == '__main__':
-    app.run(host='0.0.0.0',port=keyserver_port)
-    # asyncio.run(init())
\ No newline at end of file