updates

komrade/api/api.py

@@ -191,6 +191,7 @@ class Api(object):
 
 
     def tor_request(self,url,method='get',data=None):
+        stopfixthis
         with self.get_tor_proxy_session() as s:
             if method=='get':
                 return s.get(url)

komrade/app/main.py

@@ -234,7 +234,7 @@ class MainApp(MDApp):
             handler = logging.StreamHandler()
             formatter = logging.Formatter('[%(asctime)s]\n%(message)s\n')
             handler.setFormatter(formatter)
-            self._logger = logger = logging.getLogger(__file__)
+            self._logger = logger = logging.getLogger('komrade')
             logger.addHandler(handler)
             logger.setLevel(logging.DEBUG)
         return self._logger

komrade/backend/mazes.py

@@ -4,8 +4,9 @@ from komrade import *
 
 log=print
 
-def komrade_request(url):
-    # return tor_request(url)
+def komrade_request(url,allow_clearnet = ALLOW_CLEARNET):
+    if '.onion' in url or not allow_clearnet:
+        return tor_request(url)
     return requests.get(url,timeout=60)
 
 def tor_request(url):

komrade/backend/operators.py

@@ -36,6 +36,8 @@ class Operator(Keymaker):
         if not TELEPHONE_KEYCHAIN:
             self.log('!! getting telephone keychain !!')
             connect_phonelines()
+
+        from komrade.backend.the_telephone import TheTelephone
         TELEPHONE=TheTelephone(keychain=TELEPHONE_KEYCHAIN)
         return TELEPHONE
 
@@ -47,6 +49,8 @@ class Operator(Keymaker):
         if not OPERATOR_KEYCHAIN:
             self.log('!! getting operator keychain !!')
             connect_phonelines()
+        
+        from komrade.backend.the_operator import TheOperator
         OPERATOR=TheOperator(keychain=OPERATOR_KEYCHAIN)
         return OPERATOR
 
@@ -227,7 +231,7 @@ def connect_phonelines():
     # globals
     global OMEGA_KEY,OPERATOR_KEYCHAIN,TELEPHONE_KEYCHAIN
     if OMEGA_KEY and OPERATOR_KEYCHAIN and TELEPHONE_KEYCHAIN:
-        return (OPERATOR,TELEPHONE)
+        return (OPERATOR_KEYCHAIN,TELEPHONE_KEYCHAIN)
 
     # import
     from komrade.backend.mazes import tor_request

komrade/backend/the_operator.py

@@ -19,19 +19,26 @@ class TheOperator(Operator):
     def phone(self):
         global TELEPHONE
         from komrade.backend.the_telephone import TheTelephone
-        if not TELEPHONE: TELEPHONE=TheTelephone(allow_builtin=False)
+        if not TELEPHONE: TELEPHONE=TheTelephone()
         return TELEPHONE
     
 
-    def __init__(self, name = OPERATOR_NAME, passphrase='acc', keychain = {}):
+    def __init__(self, name = OPERATOR_NAME, passphrase='acc'):
         """
         Boot up the operator. Requires knowing or setting a password of memory.
         """
         # init req paths
         # if not os.path.exists(PATH_OPERATOR): os.makedirs(PATH_OPERATOR)
-        if not passphrase:
-            passphrase=getpass.getpass('Hello, this is the Operator speaking. What is the passphrase?\n> ')
-        super().__init__(name,passphrase,path_crypt_keys=PATH_CRYPT_OP_KEYS,path_crypt_data=PATH_CRYPT_OP_DATA,keychain=keychain)
+        global OPERATOR_KEYCHAIN,TELEPHONE_KEYCHAIN
+        if not TELEPHONE_KEYCHAIN or not OPERATOR_KEYCHAIN:
+            OPERATOR_KEYCHAIN,TELEPHONE_KEYCHAIN = connect_phonelines()
+        if not passphrase: passphrase=getpass.getpass('Hello, this is the Operator speaking. What is the passphrase?\n> ')
+        super().__init__(
+            name,
+            passphrase,
+            keychain=OPERATOR_KEYCHAIN,
+            path_crypt_keys=PATH_CRYPT_OP_KEYS,
+            path_crypt_data=PATH_CRYPT_OP_DATA)
 
     def decrypt_incoming(self,data):
         # step 1 split:

komrade/backend/the_telephone.py

@@ -8,10 +8,13 @@ class TheTelephone(Operator):
     """
     API client class for Caller to interact with The Operator.
     """
-    def __init__(self, caller=None, keychain={}):
+    def __init__(self, caller=None):
+        global OPERATOR_KEYCHAIN,TELEPHONE_KEYCHAIN
+        if not TELEPHONE_KEYCHAIN or not OPERATOR_KEYCHAIN:
+            OPERATOR_KEYCHAIN,TELEPHONE_KEYCHAIN = connect_phonelines()
         super().__init__(
             name=TELEPHONE_NAME,
-            keychain=keychain,
+            keychain=TELEPHONE_KEYCHAIN,
             path_crypt_keys=PATH_CRYPT_CA_KEYS,
             path_crypt_data=PATH_CRYPT_CA_KEYS
         )

komrade/constants.py

@@ -4,7 +4,8 @@ KOMRADE_ONION = 'u7spnj3dmwumzoa4.onion'
 KOMRADE_ONION2 = 'rwg4zcnpwshv4laq.onion' #'128.232.229.63' #'komrade.app'
 
 
-OPERATOR_API_URL = f'http://{KOMRADE_ONION}/op/'
+# OPERATOR_API_URL = f'http://{KOMRADE_ONION}/op/'
+OPERATOR_API_URL = f'http://{KOMRADE_URL}/op/'
 
 
 # paths
@@ -130,3 +131,8 @@ TELEPHONE = None
 
 PATH_OPERATOR_WEB_KEYS_FILE = f'/home/ryan/www/website-komrade/.builtin.keys'
 PATH_OPERATOR_WEB_KEYS_URL = f'http://{KOMRADE_URL}/.builtin.keys'
+
+
+
+# dangerous! leave on only if absolutely necessary for initial dev
+ALLOW_CLEARNET = True