updates

komrade/backend/switchboard.py

@@ -86,29 +86,23 @@ class TheSwitchboard(FlaskView, Logger):
 
         # first try to get from string to bytes
         self.log('incoming <--',encr_b64_str)
-
         try:
             encr_b64_b = encr_b64_str.encode('utf-8')
             self.log('encr_b64_b',encr_b64_b)
-
+        except UnicodeEncodeError:
-            encr_b = b64decode(encr_b64_b)
+            self.log('not valid unicode?')
-            self.log('encr_b',encr_b)
-            
-            return f'successfully understood input: {encr_b}'
-        except (UnicodeDecodeError,binascii.Error) as e:
             return OPERATOR_INTERCEPT_MESSAGE
 
-        if not encr_b64_str: return OPERATOR_INTERCEPT_MESSAGE
+        # then get from b64 bytes to raw bytes
-        
+        try:
-
+            data = b64decode(encr_b64_b)
-        data = request.data
+            self.log('data',data)
-        self.log('incoming_data! <--',data)
+            self.log(f'successfully understood input')
-
+        except binascii.Error as e:
-        # step 1: decode
+            self.log('not valid b64?')
-        data = b64decode(data)
+            return OPERATOR_INTERCEPT_MESSAGE
-        self.log('decoded data:',data)
 
-        # step 2: decrypt from phone
+        # then unwrap top level encryption
         data = SMessage(OPERATOR.privkey_, TELEPHONE_PUBKEY).unwrap(data)
         self.log('decrypted data:',data)