diff --git a/client/client.py b/client/client.py index f4cbdfc..563a806 100644 --- a/client/client.py +++ b/client/client.py @@ -99,12 +99,15 @@ while True: if separatedCommand[0] == 'LIN' and len(separatedCommand) == 3: network = NetWrapper(CLIENT_PRIVATE_KEY, CLIENT_ADDRESS, separatedCommand[1], SERVER_PUBLIC_KEY) + print('Start') if not network.identifyServer(): print('Server identification failed!') continue - + print('Identified') network.createEncryptedChannel() + print('Channel created') network.authenticate(password=separatedCommand[2]) + print('Authenticated') LOGGED_IN = True continue diff --git a/client/netwrapper.py b/client/netwrapper.py index 7738380..d664b44 100644 --- a/client/netwrapper.py +++ b/client/netwrapper.py @@ -23,7 +23,7 @@ class NetWrapper: self.cipherkey = "".encode('UTF-8') - def randomStringGenerator(self, str_size: int = 512, + def randomStringGenerator(self, str_size: int = 128, allowed_chars: str = string.ascii_letters + string.punctuation) -> str: return ''.join(random.choice(allowed_chars) for x in range(str_size)) @@ -33,7 +33,8 @@ class NetWrapper: cipher_rsa = PKCS1_OAEP.new(self.serverPubKey) identMsg = json.dumps( {'type': 'IDY', 'source': self.network.own_addr, 'username': self.username, - 'message': b64encode(cipher_rsa.encrypt(randommsg.encode('UTF-8')))}).encode( + ##b64encode has to str + 'message': str(b64encode(cipher_rsa.encrypt(randommsg.encode('UTF-8'))))}).encode( 'UTF-8') self.network.send_msg(self.serverAddr, identMsg) returnJson = {'source': '', 'type': ''}