remove more redundant try
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
09c376debf
commit
00d4542404
@ -111,27 +111,23 @@ class NetWrapper:
|
||||
self.cipherkey = (hasher.hexdigest()[:32]).encode('UTF-8')
|
||||
|
||||
def login(self) -> bool:
|
||||
try:
|
||||
status, msg = self.network.receive_msg(blocking=True)
|
||||
if not status:
|
||||
raise Exception('Network error during connection.')
|
||||
cleartext = self.recieveEncryptedMessage(msg, "AUT").decode('UTF-8')
|
||||
if cleartext == "ERROR":
|
||||
return False
|
||||
else:
|
||||
plaintext = cleartext.split(' ')
|
||||
self.homeDirectory = self.authenticationInstance.login(plaintext[1], plaintext[2])
|
||||
linsuccess = (not (len(plaintext) != 3 or plaintext[0] != "LIN" or plaintext[
|
||||
1] != self.currentUser)) and self.homeDirectory
|
||||
if linsuccess:
|
||||
message = "OK".encode('UTF-8')
|
||||
else:
|
||||
message = "ERROR".encode('UTF-8')
|
||||
self.sendTypedMessage(message, "AUT")
|
||||
return linsuccess
|
||||
except Exception:
|
||||
print("Login failed")
|
||||
status, msg = self.network.receive_msg(blocking=True)
|
||||
if not status:
|
||||
raise Exception('Network error during connection.')
|
||||
cleartext = self.recieveEncryptedMessage(msg, "AUT").decode('UTF-8')
|
||||
if cleartext == "ERROR":
|
||||
return False
|
||||
else:
|
||||
plaintext = cleartext.split(' ')
|
||||
self.homeDirectory = self.authenticationInstance.login(plaintext[1], plaintext[2])
|
||||
linsuccess = (not (len(plaintext) != 3 or plaintext[0] != "LIN" or plaintext[
|
||||
1] != self.currentUser)) and self.homeDirectory
|
||||
if linsuccess:
|
||||
message = "OK".encode('UTF-8')
|
||||
else:
|
||||
message = "ERROR".encode('UTF-8')
|
||||
self.sendTypedMessage(message, "AUT")
|
||||
return linsuccess
|
||||
|
||||
def initClientConnection(self, msg: bytes) -> bytes:
|
||||
print('A client is trying to connect')
|
||||
|
@ -35,7 +35,6 @@ class Server:
|
||||
self.networkInstance.sendMessage("OK".encode('UTF-8'))
|
||||
return None
|
||||
elif command == "LINERROR":
|
||||
self.networkInstance.sendMessage("ERROR".encode('UTF-8'))
|
||||
return None
|
||||
elif command == "ERROR":
|
||||
self.networkInstance.sendMessage("ERROR".encode('UTF-8'))
|
||||
|
Loading…
Reference in New Issue
Block a user