finish netwrapper of server and executor improvements

server/executor.py

@@ -29,6 +29,7 @@ class Executor:
     def removeDirectory(self, dirName: str) -> str:
         dirName = self.sanitizeDirectory(dirName)
         actualDirName = os.path.join(self.currentDirectory, dirName)
+        if actualDirName:
             os.rmdir(actualDirName)
         return actualDirName
 
@@ -40,16 +41,19 @@ class Executor:
             if self.currentDirectory == self.baseDir:
                 return self.currentDirectory
             else:
-                directories = self.currentDirectory.split("/")
+                directories = self.currentDirectory.split(os.path.sep)
                 strdirectory = ""
                 for dir in directories:
-                    strdirectory += dir + "/"
+                    strdirectory += dir + os.path.sep
                     strdirectory = strdirectory[:-3]
+                if os.path.exists(strdirectory):
                     self.currentDirectory = strdirectory
                 return self.currentDirectory
         else:
             dirName = self.sanitizeDirectory(dirName)
-            self.currentDirectory = os.path.join(self.currentDirectory, dirName)
+            joinedDir = os.path.join(self.currentDirectory, dirName)
+            if os.path.exists(joinedDir):
+                self.currentDirectory = joinedDir
             return self.currentDirectory
 
     def listCurrentDirectoryContent(self) -> str:
@@ -71,10 +75,14 @@ class Executor:
     def getFileInCurrentDirectory(self, file: str):
         file = self.sanitizeFile(file)
         currentfile = os.path.join(self.currentDirectory, file)
+        if os.path.exists(currentfile):
             return open(currentfile, "r")
+        else:
+            raise Exception('File not found')
 
     def removeFileInCurrentDirectory(self, file: str) -> str:
         file = self.sanitizeFile(file)
         currentfile = os.path.join(self.currentDirectory, file)
+        if os.path.exists(currentfile):
             os.remove(currentfile)
         return currentfile

server/netwrapper.py

@@ -25,6 +25,8 @@ class NetWrapper:
 
     def serverIdentify(self, msg: bytes) -> None:
         incommingJson = json.loads(msg.decode('UTF-8'))
+        if incommingJson['type'] != "IDY":
+            raise Exception('Wrong message type encountered')
         self.clientAddr = incommingJson['source']
         self.currentUser = incommingJson['username']
         self.currentClientPublicKey = self.clientPublicKey[self.currentUser]
@@ -78,7 +80,8 @@ class NetWrapper:
             retciphertext = b64decode(b64['message'])
             retcipher = ChaCha20.new(self.cipherkey, nonce=retnonce)
             plaintext = retcipher.decrypt(retciphertext).decode('UTF-8').split(' ')
-            linsuccess = (not (len(plaintext) != 3 or plaintext[0] != "LIN" or plaintext[1] != self.currentUser)) and self.serverInstance.login(plaintext[1],plaintext[2])
+            linsuccess = (not (len(plaintext) != 3 or plaintext[0] != "LIN" or plaintext[
+                1] != self.currentUser)) and self.serverInstance.login(plaintext[1], plaintext[2])
             if linsuccess:
                 message = "OK".encode('UTF-8')
             else:
@@ -87,7 +90,8 @@ class NetWrapper:
             ciphertext = cipher.encrypt(message)
             nonce = b64encode(cipher.nonce).decode('UTF-8')
             ct = b64encode(ciphertext).decode('UTF-8')
-            sendjson = json.dumps({'type': 'AUT', 'source': self.network.own_addr, 'nonce': nonce, 'message': ct}).encode(
+            sendjson = json.dumps(
+                {'type': 'AUT', 'source': self.network.own_addr, 'nonce': nonce, 'message': ct}).encode(
                 'UTF-8')
             self.network.send_msg(self.clientAddr, sendjson)
             return linsuccess