Compare commits

..

No commits in common. "bfdec0e727619cc7c06d63f05a95e3b3b79f7f03" and "d526063dcf7f1816a6c78deb83449c0aa790dc23" have entirely different histories.

2 changed files with 3 additions and 13 deletions

View File

@ -122,7 +122,6 @@ class NetWrapper:
return self.recieveEncryptedMessage(msg) return self.recieveEncryptedMessage(msg)
def logout(self) -> None: def logout(self) -> None:
self.serverInstance.logout()
self.clientAddr = "" self.clientAddr = ""
self.cipherkey = "".encode('UTF-8') self.cipherkey = "".encode('UTF-8')
self.currentClientPublicKey = "".encode('UTF-8') self.currentClientPublicKey = "".encode('UTF-8')

View File

@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from server.authentication import Authetication
from executor import Executor from executor import Executor
@ -18,19 +18,10 @@ class Server:
self.executor = Executor(homeDirectory) self.executor = Executor(homeDirectory)
def login(self, username: str, password: str) -> bool: def login(self, username: str, password: str) -> bool:
auth = Authetication() pass
self.isAuthenticated = True
home_directory = auth.login(username, password)
if not home_directory:
return False
else:
return True
def logout(self) -> None: def logout(self) -> None:
self.isAuthenticated = False pass
self.availableServer = False
self.homeDirectory = ""
self.currentDirectory = ""
def parseCommand(self, command: str) -> str: def parseCommand(self, command: str) -> str:
parsedCommand = command.split(" ") parsedCommand = command.split(" ")