From 7391bb32f65651c466fcbc5020b20ecb03517442 Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Mon, 14 Sep 2020 21:18:47 +0100
Subject: [PATCH] updates

---
 komrade/backend/phonelines.py   |  4 +++-
 komrade/backend/the_operator.py | 13 +++++-----
 komrade/cli/cli.py              | 42 ++++++++++++++++++---------------
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/komrade/backend/phonelines.py b/komrade/backend/phonelines.py
index f386296..77a1c1f 100644
--- a/komrade/backend/phonelines.py
+++ b/komrade/backend/phonelines.py
@@ -20,7 +20,9 @@ def create_phonelines():
     pass_encr = KomradeSymmetricKeyWithPassphrase().encrypt(op_privkey.data)
     # print('pass_encr',pass_encr)
     with open(PATH_SUPER_SECRET_OP_KEY,'wb') as of:
-        of.write(pass_encr)
+        #of.write(pass_encr)
+        # for now only!!! -->
+        of.write(op_privkey.data)
 
     with open(PATH_OPERATOR_WEB_KEYS_FILE,'w') as of:
         of.write(op_pubkey.data_b64_s)
diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py
index 0fb11d5..4d4d049 100644
--- a/komrade/backend/the_operator.py
+++ b/komrade/backend/the_operator.py
@@ -67,12 +67,13 @@ class TheOperator(Operator):
             else:
                 print('Dare I claim to be the one true Operator?')
                 with open(PATH_SUPER_SECRET_OP_KEY,'rb') as f:
-                    pass_encr=f.read()
-                    try:
-                        privkey=KomradeSymmetricKeyWithPassphrase().decrypt(pass_encr)
-                        if privkey: OP_PRIVKEY = privkey
-                    except ThemisError:
-                        exit('invalid password. operator shutting down.')
+                    #pass_encr=f.read()
+                    privkey = f.read()
+                    # try:
+                    #     privkey=KomradeSymmetricKeyWithPassphrase().decrypt(pass_encr)
+                    #     if privkey: OP_PRIVKEY = privkey
+                    # except ThemisError:
+                    #     exit('invalid password. operator shutting down.')
         if privkey:
             self._keychain['privkey']=KomradeAsymmetricPrivateKey(b64dec(privkey))
         self._keychain = {**self.keychain()}
diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py
index ea382b1..861abbe 100644
--- a/komrade/cli/cli.py
+++ b/komrade/cli/cli.py
@@ -3,14 +3,7 @@ from komrade import *
 from komrade.backend import *
 import art
 import textwrap as tw
-HELPSTR = """
-    /login [name]     -->  log back in
-    /register [name]  -->  new komrade
-    /meet [name]      -->  exchange info
-    /msg [name] [msg] -->  write to person or group
-    /who [name]       -->  show contact info
-    /help             -->  seek help
-"""
+
 
 class CLI(Logger):
     ROUTES = {
@@ -66,6 +59,17 @@ class CLI(Logger):
     def help(self,*x,**y):
         clear_screen()
         self.boot()
+
+        HELPSTR = """
+    /login [name]     -->  log back in
+    /register [name]  -->  new komrade""" + (("""
+    /meet [name]      -->  exchange info
+    /msg [name] [msg] -->  write to person or group
+    /who [name]       -->  show contact info""") 
+    if self.with_required_login(quiet=True) else "") + """ 
+    /help             -->  seek help
+"""
+        
         print(HELPSTR)
 
     def intro(self):
@@ -117,9 +121,10 @@ class CLI(Logger):
         return (self.loggedin and self.komrade and self.name)
 
     
-    def with_required_login(self):
+    def with_required_login(self,quiet=False):
         if not self.logged_in:
-            print('@Operator: You must be logged in first.\n')
+            if not quiet:
+                print('@Operator: You must be logged in first.\n')
             return False
         return True
 
@@ -133,15 +138,14 @@ class CLI(Logger):
         self.komrade.meet(name)
 
     def msg(self,dat):
-        name_or_pubkey,msg = dat.split(' ',1)
-        self.log(f'Composed msg to {name_or_pubkey}: {msg}')
-
-        msg_obj = self.komrade.msg(
-            name_or_pubkey,
-            msg
-        )
-        
-        self.log(f'Sent msg obj to {name_or_pubkey}: {msg_obj}')
+        if self.with_required_login():
+            name_or_pubkey,msg = dat.split(' ',1)
+            self.log(f'Composed msg to {name_or_pubkey}: {msg}')
+            msg_obj = self.komrade.msg(
+                name_or_pubkey,
+                msg
+            )
+            self.log(f'Sent msg obj to {name_or_pubkey}: {msg_obj}')