updates

komrade/backend/keymaker.py

@@ -242,7 +242,9 @@ class Keymaker(Logger):
 
     ### CREATING KEYS
     
-    def get_new_keys(self,pubkey_pass = None, privkey_pass = None, adminkey_pass = None):
+    def get_new_keys(self,pubkey_pass = None, privkey_pass = None, adminkey_pass = None,
+                    save_encrypted = True, return_encrypted = False,
+                    save_decrypted = False, return_decrypted = True):
         # Get decryptor keys back from The Operator (one half of the Keymaker)
         keychain = self.forge_new_keys(self.name)
         self.log('create_keys() res from Operator? <-',keychain)

komrade/backend/mazes.py

@@ -1,5 +1,6 @@
 import os,sys; sys.path.append(os.path.abspath(os.path.join(os.path.abspath(os.path.join(os.path.dirname(__file__),'..')),'..')))
 from komrade import *
+import requests_async
 
 log=print
 
@@ -7,10 +8,26 @@ def tor_request(url):
     return tor_request_in_python(url)
     # return tor_request_in_proxy(url)
 
+async def tor_request_async(url):
+    return tor_request_in_python_async(url)
+
 def tor_request_in_proxy(url):
     with get_tor_proxy_session() as s:
         return s.get(url,timeout=60)
 
+async def tor_request_in_python_async(url):
+    import requests_async
+    tor = TorClient()
+    with tor.get_guard() as guard:
+        adapter = TorHttpAdapter(guard, 3, retries=RETRIES)
+
+        with requests_async.Session() as s:
+            s.headers.update({'User-Agent': 'Mozilla/5.0'})
+            s.mount('http://', adapter)
+            s.mount('https://', adapter)
+            r = await s.get(url, timeout=60)
+            return r
+
 def tor_request_in_python(url):
     tor = TorClient()
     with tor.get_guard() as guard:
@@ -34,7 +51,6 @@ def tor_request_in_python(url):
             # return s
 
 def get_tor_proxy_session():
-    import requests
     session = requests.session()
     # Tor uses the 9050 port as the default socks port
     session.proxies = {'http':  'socks5://127.0.0.1:9050',

komrade/backend/the_operator.py

@@ -72,15 +72,15 @@ def init_operators():
     op.get_new_keys()
     phone.get_new_keys()
 
-
+    
 
     op_pub = op.pubkey_decr_
     phone_pub = phone.pubkey_decr_
     phone_priv = phone.privkey_decr_
 
-    print('OPERATOR_PUBKEY =',b64encode(op_pub))
-    print('TELEPHONE_PUBKEY =',b64encode(phone_pub))
-    print('TELEPHONE_PRIVKEY =',b64encode(phone_priv))
+    print('OPERATOR_PUBKEY_DECR =',b64encode(op_pub))
+    print('TELEPHONE_PUBKEY_DECR =',b64encode(phone_pub))
+    print('TELEPHONE_PRIVKEY_DECR =',b64encode(phone_priv))
     # return {
         # 'op.keychain()':op.keychain(),
         # 'phone.keychain()':phone.keychain()

komrade/backend/the_telephone.py

@@ -17,25 +17,24 @@ class TheTelephone(Logger):
     def op_pubkey(self):
         return b64decode(OPERATOR_PUBKEY)
 
-    def dial_operator(self,msg):
+    # def dial_operator(self,msg):
+    #     msg=msg.replace('/','_')
+    #     URL = OPERATOR_API_URL + msg + '/'
+    #     self.log("DIALING THE OPERATOR:",URL)
+    #     r=tor_request(URL)
+    #     print(r)
+    #     print(r.text)
+    #     return r
+    async def dial_operator(self,msg):
         msg=msg.replace('/','_')
         URL = OPERATOR_API_URL + msg + '/'
         self.log("DIALING THE OPERATOR:",URL)
-        r=tor_request(URL)
+        r=await tor_request(URL)
         print(r)
         print(r.text)
         return r
-        
-    @property
-    def sess(self):
-        """
-        Get connection to Tor
-        """
-        if not hasattr(self,'_sess'):
-            self._sess = get_tor_proxy_session()
-        return self._sess
 
-    def req(self,json_coming_from_phone={},json_coming_from_caller={}):
+    async def req(self,json_coming_from_phone={},json_coming_from_caller={}):
         # Two parts of every request:
         
         # 1) only overall encryption layer E2EE Telephone -> Operator:
@@ -72,15 +71,15 @@ class TheTelephone(Logger):
         # escape slashes
         req_data_encr_b64_str_esc = req_data_encr_b64_str.replace('/','_')
 
-        res = self.dial_operator(req_data_encr_b64_str)
+        res = await self.dial_operator(req_data_encr_b64_str)
         self.log('result from operator?',res)
         return res
 
 
-    def forge_new_keys(self, name, pubkey_is_public=False):
+    async def forge_new_keys(self, name, pubkey_is_public=False):
         req_json = {'_route':'forge_new_keys','name':name, 'pubkey_is_public':pubkey_is_public}
         # req_json_s = jsonify(req_json)
-        return self.req(json_coming_from_phone = req_json)
+        return await self.req(json_coming_from_phone = req_json)
 
 
 
@@ -94,7 +93,7 @@ def test_call():
     # req_json_s = jsonify(req_json)
     # res = phone.req({'forge_new_keys':{'name':'marx', 'pubkey_is_public':True}})
     # print(res)
-    phone.forge_new_keys('marx4')
+    asyncio.run(phone.forge_new_keys('marx4'))
 
 ## main
 if __name__=='__main__': test_call()

komrade/www/ssl-config.md

@@ -0,0 +1,7 @@
+```
+openssl req -nodes -newkey rsa:2048 -keyout komrade.app.key -out komrade.app.csr -subj "/C=US/ST=California/L=Weed/O=Marx Zuckerburg Industries/OU=Augmentation Research Center/CN=komrade.app"
+
+
+openssl req -nodes -newkey rsa:2048 -keyout komrade.app.key -subj "/C=US/ST=California/L=Weed/O=Marx Zuckerburg Industries/OU=Augmentation Research Center/CN=komrade.app"
+
+```