create init function
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Torma Kristóf 2021-04-25 17:55:05 +02:00
parent 0874645719
commit 4bd161de54
Signed by: tormakris
GPG Key ID: DC83C4F2C41B1047
2 changed files with 11 additions and 15 deletions

View File

@ -3,4 +3,5 @@ from server import Server
if __name__ == '__main__':
server = Server()
server.initServer()
server.startServer()

View File

@ -12,13 +12,18 @@ class Server:
self.sessionTimeout = sessionTimeout
self.availableServer = availableServer
self.executor = Executor(homeDirectory)
self.auth=Authetication()
self.networkInstance = NetWrapper(self.auth.loadUserPublicKeys(),self.auth.loadServerPrivateKey(),self)
def initServer(self):
print("Please enter your private key passphrase")
passphrase = input()
self.auth = Authetication()
self.networkInstance = NetWrapper(self.auth.loadUserPublicKeys(), self.auth.loadServerPrivateKey(passphrase),
self)
def login(self, username: str, password: str) -> bool:
self.isAuthenticated = True
home_directory = self.auth.login(username, password)
self.executor.baseDir=Executor(home_directory)
self.executor.baseDir = Executor(home_directory)
if not home_directory:
return False
else:
@ -28,7 +33,7 @@ class Server:
self.isAuthenticated = False
self.availableServer = False
self.homeDirectory = ""
self.executor.baseDir=Executor(self.homeDirectory)
self.executor.baseDir = Executor(self.homeDirectory)
def parseCommand(self, command: str) -> str:
if command == "LINOK":
@ -107,14 +112,4 @@ class Server:
def startServer(self):
while True:
message = self.networkInstance.recieveMessage().decode('UTF-8')
command = self.parseCommand(message)
#ha LINOK vagy LINERROR donothing
if command == "LINERROR" or command == "LINOK" or command == "ERROR":
print("not right commands")
elif len(command) == 1:
execute_message = self.execute(self,command, "", "")
elif len(command) == 2:
execute_message = self.execute(self, command, command[1], "")
elif len(command) == 3:
execute_message = self.execute(self, command, command[1], command[2])
self.networkInstance.sendMessage(self, execute_message)
self.parseCommand(message)