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

Merge branch 'master' of https://git.kmlabz.com/BiztProtoBois/server into master

Browse Source
This commit is contained in:
Torma Kristóf
2021-04-25 17:51:08 +02:00
parent 8d7754edc2 f6461273ab
commit 0874645719
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/authentication.py
View File

@@ -135,14 +135,14 @@ class Authetication:
return dictionary return dictionary
def loadServerPrivateKey(self) -> RsaKey: def loadServerPrivateKey(self, passphrase: str) -> RsaKey:
with open(self.CONFIG_FILE_LOCATION) as json_file: with open(self.CONFIG_FILE_LOCATION) as json_file:
data = json.load(json_file) data = json.load(json_file)
key = data['serverPrivateKey'] key = data['serverPrivateKey']
key = bytes.fromhex(key) key = bytes.fromhex(key)
try: try:
rsaKey = RSA.import_key(key) rsaKey = RSA.import_key(key, passphrase)
except ValueError: except ValueError:
print('Invalid server private key!') print('Invalid server private key!')
return rsaKey return rsaKey

12
server/server.py
View File

@@ -107,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)