Merge branch 'master' of https://git.kmlabz.com/BiztProtoBois/server

server/executor.py

@@ -72,11 +72,14 @@ class Executor:
         f.close()
         return currenctfile
 
-    def getFileInCurrentDirectory(self, file: str):
+    def getFileInCurrentDirectory(self, file: str) -> bytes:
         file = self.sanitizeFile(file)
         currentfile = os.path.join(self.currentDirectory, file)
         if os.path.exists(currentfile):
-            return open(currentfile, "r")
+            f = open(currentfile, "rb")
+            content = f.read()
+            f.close()
+            return content
         else:
             raise Exception('File not found')
 

server/netwrapper.py

@@ -140,3 +140,4 @@ class NetWrapper:
             return plaintext
         except Exception:
             print("Incorrect decryption")
+            return "ERROR".encode('UTF-8')

server/server.py

@@ -40,6 +40,8 @@ class Server:
             self.networkInstance.sendMessage("LINOK".encode('UTF-8'))
         elif command == "LINERROR":
             self.networkInstance.sendMessage("LINERROR".encode('UTF-8'))
+        elif command == "ERROR":
+            return None
         parsedCommand = command.split(" ")
         if len(parsedCommand) > 3:
             self.networkInstance.sendMessage("ERROR".encode('UTF-8'))