Move message parsing to backend

RomainL972 · Feb 13, 2020 · 7705d91 · 7705d91
1 parent 01e9638
commit 7705d91
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/backend.py b/backend.py
@@ -6,6 +6,7 @@
 import binascii
 import gmpy2 as gmp
 import urllib.request
+import re
 
 
 def createKey():
@@ -87,3 +88,18 @@ def getPublicIp():
     response = urllib.request.urlopen(req)
     data = response.read()
     return data.decode("utf-8")
+
+
+def parseMessage(message, key):
+    regex = re.search("^([a-z]) ([a-zA-Z0-9+/=]*)\n$", message)
+    if(regex):
+        command = regex.group(1)
+        arg = regex.group(2)
+        if command == "p":
+            return "pubkey", keyFromBase64(arg)
+        elif command == "m":
+            return "message", decryptText(key, arg)
+        else:
+            raise ValueError("Incorrect command : " + command)
+    else:
+        raise ValueError("Incorrect message : " + message)
diff --git a/mainserver.py b/mainserver.py
@@ -4,7 +4,6 @@
 import socket
 import select
 import miniupnpc
-import re
 
 from threading import Thread
 
@@ -118,28 +117,15 @@ def run(self):
                     else:
                         self.message += read_data.decode()
                         if(self.message[-1] == "\n"):
-                            regex = re.search(
-                                "^([a-z]) ([a-zA-Z0-9+/=]*)\n$", self.message)
-                            if(regex):
-                                command = regex.group(1)
-                                arg = regex.group(2)
-                                if command == "p":
-                                    self.key = backend.keyFromBase64(arg)
-                                    print("[Thr {}] Received public key"
-                                          .format(self.number))
-                                elif command == "m":
-                                    print("[Thr {}] Received message : {}"
-                                          .format(
-                                            self.number,
-                                            backend.decryptText(self.key, arg)
-                                            ))
-                                else:
-                                    raise ValueError("Incorrect command : "
-                                                     + repr(command))
-                                self.message = ""
-                            else:
-                                raise ValueError("Incorrect message : "
-                                                 + self.message)
+                            result = backend.parseMessage(
+                                self.message, self.key)
+                            if(result[0] == "pubkey"):
+                                print("[Thr {}] Received public key."
+                                      .format(self.number))
+                            elif(result[0] == "message"):
+                                print("[Thr {}] Received message : {}"
+                                      .format(self.number, result[1]))
+                            self.message = ""
             else:
                 print("[Thr {}] No client is connected, SocketServer can't " +
                       "receive data".format(self.number))