BiztProtoBois/server
BiztProtoBois/server
3
0
Fork 0
Code Pull Requests Releases Activity

Compare commits

base: BiztProtoBois:4bd161de547594ab79a41c93aacc1186c3b51ed8
Branches Tags
BiztProtoBois:master
..
compare: BiztProtoBois:f6461273ab67a08ab15ef6e272f1482c8a65d9a9
Branches Tags
BiztProtoBois:master

No commits in common. "4bd161de547594ab79a41c93aacc1186c3b51ed8" and "f6461273ab67a08ab15ef6e272f1482c8a65d9a9" have entirely different histories.
4bd161de54 ... f6461273ab

3 changed files with 16 additions and 12 deletions
Show Stats Expand all files Collapse all files

1
server/main.py
View File

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

2
server/netwrapper.py
View File

@ -36,7 +36,7 @@ class NetWrapper:
cipher = PKCS1_OAEP.new(self.currentClientPublicKey) cipher = PKCS1_OAEP.new(self.currentClientPublicKey)
identMsg = json.dumps( identMsg = json.dumps(
{'type': 'IDY', 'source': self.network.own_addr, {'type': 'IDY', 'source': self.network.own_addr,
'message': b64encode(cipher.encrypt(retmsg.encode('UTF-8')))}).decode( 'message': b64encode(cipher.encrypt(retmsg.encode('UTF-8')))}).encode(
'ASCII') 'ASCII')
self.network.send_msg(self.clientAddr, identMsg) self.network.send_msg(self.clientAddr, identMsg)

19
server/server.py
View File

@ -12,13 +12,8 @@ class Server:
self.sessionTimeout = sessionTimeout self.sessionTimeout = sessionTimeout
self.availableServer = availableServer self.availableServer = availableServer
self.executor = Executor(homeDirectory) self.executor = Executor(homeDirectory)
def initServer(self):
print("Please enter your private key passphrase")
passphrase = input()
self.auth=Authetication() self.auth=Authetication()
self.networkInstance = NetWrapper(self.auth.loadUserPublicKeys(), self.auth.loadServerPrivateKey(passphrase), self.networkInstance = NetWrapper(self.auth.loadUserPublicKeys(),self.auth.loadServerPrivateKey(),self)
self)
def login(self, username: str, password: str) -> bool: def login(self, username: str, password: str) -> bool:
self.isAuthenticated = True self.isAuthenticated = True
@ -112,4 +107,14 @@ class Server:
def startServer(self): def startServer(self):
while True: while True:
message = self.networkInstance.recieveMessage().decode('UTF-8') message = self.networkInstance.recieveMessage().decode('UTF-8')
self.parseCommand(message) 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)