updates

docs/www/README.md

@@ -0,0 +1,42 @@
+
+
+
+
+
+```
+@Tor: Hiding your IP by hopping it around the globe:
+--> Brighton, United States (notem2)__________                          _        ____________  _
+--> Passau, Germany (2VirtualMachineOrg)______                         __    _ _________________ _  ___
+--> Amsterdam, Netherlands (Unnamed)_________                 ___           __ ___________________________
+--> Berlin, Germany (niftyentry74)   ________               _______       __ _ ____________________________
+--> Düsseldorf, Germany (grobosolforte)____                _________ _________ ____________________________
+___________________________  ___     ____      __         ____ ___  _______________________________________
+ ________________________      __    ___                 ____ _____________________________________________
+_______________________      __       __                ____  ___________________________________________ _
+  __     _________________   _____                  _    ___  ______________________________________     __
+            _______________ ________               _  _  ___________________________________________     _
+             _______________________                _ _@@+@_________________________________________
+              ___________________  __      +++++++++++++++@_________________________________________
+              ______________@++++++++++++++           _____ ____   ___ ____________________________ _
+              _________________                    __ __   _ ___ __ ___ _________________________
+              _______________                      __ _    _  _________ _____________________  _
+               ______________                       _ ____        ____________________________   __
+                ____________                       __ ________________________________________
+                 _ ___     __                   _____ _______________________________________
+                     ____                        ____ _____________ _____     ____   ____
+                         __                     _____ ______________ _         __     ____    _
+                            ______                ___ _________________        _      _        _
+                             ________              _      ____________                 _    _
+                            __________                    ___________                  _  ____
+                            ______________                 ________                     _    _     ___
+                            ______________                 _________                                _ _
+                             ____________                  _________  _                          __ _
+                               __________                  ________  __                     ___________
+                               _______                      _____                          _____________
+                               _______                      _____                           ____________
+                               _____                         _                              _     ______
+                              _____                                                                 ___
+                              ___                                                                     _
+                              ___
+                              ___
+```

komrade/backend/komrades.py

@@ -270,20 +270,22 @@ class KomradeX(Caller):
 
         return resp_msg_d
 
-
-    @property
-    def secret_login(self):
+    def get_secret_login(self,pubkey):
         return self.crypt_keys.get(
-            self.pubkey.data_b64,
+            b64enc(pubkey),
             prefix='/secret_login/'
         )
 
+    @property
+    def secret_login(self):
+        return self.get_secret_login(self.pubkey.data_b64)
+
     def login(self,passphrase=None):
         # what keys do I have?
         keys = self.keychain()
 
         # check hardware
-        if not 'pubkey' in keys:
+        if not 'pubkey' in keys or not self.pubkey:
             emsg='''Login impossible. I do not have this komrade's public key, much less private one.'''
             # self.log()
             return {'success':False, 'status':emsg}
@@ -301,7 +303,7 @@ class KomradeX(Caller):
         msg = {
             'name':self.name,
             'pubkey':keys['pubkey'].data,
-            'secret_login':self.secret_login
+            'secret_login':self.get_secret_login(keys['pubkey'].data)
         }
 
         # ask operator and get response
@@ -580,7 +582,11 @@ class KomradeX(Caller):
     def get_updates(self,include_posts=True):
         # get any parameters we need
         # post_ids_read = list(self.inbox_read_db.values)
-
+        if not self.pubkey:
+            return {'success':False, 'status':'Cannot log into this user whose public key I do not have'}
+        if not self.privkey:
+            return {'success':False, 'status':'Cannot log into this user whose private key I do not have'}
+        
         # compose msg
         msg_to_op = {
             **self.login_details,

komrade/cli/cli.py

@@ -393,9 +393,14 @@ class CLI(Logger):
 
         ## get updates
         # this does login, msgs, and posts in one req
-        self.stat('@Telephone: Patching you through to the @Operator. One moment please...')
         time.sleep(0.25)
         res = self.komrade.get_updates()
+        #print(res.get('success'))
+        if not res.get('success'):
+            self.stat(res.get('status'))
+            return
+
+        self.stat('@Telephone: Patching you through to the @Operator. One moment please...')
         if hasattr(self,'_mapscr') and self._mapscr:
             #stop
             msg=self._mapscr.msg + ['???, ??? (@Operator)']