From d526063dcf7f1816a6c78deb83449c0aa790dc23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torma=20Krist=C3=B3f?= Date: Sun, 25 Apr 2021 13:24:23 +0200 Subject: [PATCH 1/2] linerror --- server/netwrapper.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/netwrapper.py b/server/netwrapper.py index 496caa7..8539fa6 100644 --- a/server/netwrapper.py +++ b/server/netwrapper.py @@ -107,8 +107,10 @@ class NetWrapper: return b"LINOK" else: self.logout() + return b"LINERROR" except Exception: self.logout() + return b"LINERROR" def recieveMessage(self) -> bytes: status, msg = self.network.receive_msg(blocking=True) From 977b87634c72e03a2dd6927d791ddd4739d313a1 Mon Sep 17 00:00:00 2001 From: Attila Szigeti Date: Sun, 25 Apr 2021 14:28:29 +0200 Subject: [PATCH 2/2] login, logout in server, invoke server's logout in netwrapper --- server/netwrapper.py | 1 + server/server.py | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/server/netwrapper.py b/server/netwrapper.py index 496caa7..02623f1 100644 --- a/server/netwrapper.py +++ b/server/netwrapper.py @@ -120,6 +120,7 @@ class NetWrapper: return self.recieveEncryptedMessage(msg) def logout(self) -> None: + self.serverInstance.logout() self.clientAddr = "" self.cipherkey = "".encode('UTF-8') self.currentClientPublicKey = "".encode('UTF-8') diff --git a/server/server.py b/server/server.py index a938dc7..089251f 100644 --- a/server/server.py +++ b/server/server.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 - +from server.authentication import Authetication from executor import Executor @@ -18,10 +18,19 @@ class Server: self.executor = Executor(homeDirectory) def login(self, username: str, password: str) -> bool: - pass + auth = Authetication() + self.isAuthenticated = True + home_directory = auth.login(username, password) + if not home_directory: + return False + else: + return True def logout(self) -> None: - pass + self.isAuthenticated = False + self.availableServer = False + self.homeDirectory = "" + self.currentDirectory = "" def parseCommand(self, command: str) -> str: parsedCommand = command.split(" ")