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

szezon meg a fazon
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Torma Kristóf
2021-04-26 22:06:07 +02:00
parent d40b20e753
commit b4a9ccb334
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/netwrapper.py
View File

@@ -52,6 +52,9 @@ class NetWrapper:
def serverIdentify(self, msg: bytes) -> None: def serverIdentify(self, msg: bytes) -> None:
incommingJson = json.loads(msg.decode('UTF-8')) incommingJson = json.loads(msg.decode('UTF-8'))
header = json.loads(b64decode(incommingJson['header']).decode('UTF-8')) header = json.loads(b64decode(incommingJson['header']).decode('UTF-8'))
self.clientAddr = header['source']
self.currentUser = header['username']
self.currentClientPublicKey = self.clientPublicKey[self.currentUser]
try: try:
if not self.verifyRSAHeaderSignature(b64decode(incommingJson['header']), if not self.verifyRSAHeaderSignature(b64decode(incommingJson['header']),
b64decode(incommingJson['headersignature'])) or header[ b64decode(incommingJson['headersignature'])) or header[
@@ -59,9 +62,6 @@ class NetWrapper:
raise Exception('Bad initial message') raise Exception('Bad initial message')
except Exception: except Exception:
raise Exception('Bad initial message') raise Exception('Bad initial message')
self.clientAddr = header['source']
self.currentUser = header['username']
self.currentClientPublicKey = self.clientPublicKey[self.currentUser]
retheader, retheadersignature = self.signRSAHeader("IDY", {}) retheader, retheadersignature = self.signRSAHeader("IDY", {})
retmsg = self.ecryptRSAMessage(b64decode(incommingJson['message']).decode('UTF-8')) retmsg = self.ecryptRSAMessage(b64decode(incommingJson['message']).decode('UTF-8'))
identMsg = json.dumps( identMsg = json.dumps(