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

Compare commits

base: BiztProtoBois:58606caf3f63b96dc335349c1fd4a8fd70667278
Branches Tags
BiztProtoBois:master
..
compare: BiztProtoBois:3c9c224cf0fe24c646605b6c442f101da5fc63f5
Branches Tags
BiztProtoBois:master

No commits in common. "58606caf3f63b96dc335349c1fd4a8fd70667278" and "3c9c224cf0fe24c646605b6c442f101da5fc63f5" have entirely different histories.
58606caf3f ... 3c9c224cf0

1 changed files with 19 additions and 27 deletions
Show Stats Expand all files Collapse all files

46
client/netwrapper.py
View File

@ -5,7 +5,7 @@ import json
from base64 import b64encode, b64decode from base64 import b64encode, b64decode
import pyDH import pyDH
from Crypto.Hash import SHA512 from Crypto.Hash import SHA512
from Crypto.Cipher import ChaCha20_Poly1305, PKCS1_OAEP from Crypto.Cipher import ChaCha20, PKCS1_OAEP
from Crypto.PublicKey.RSA import RsaKey from Crypto.PublicKey.RSA import RsaKey
from Crypto.Random import get_random_bytes from Crypto.Random import get_random_bytes
@ -66,14 +66,11 @@ class NetWrapper:
def authenticate(self, password: str): def authenticate(self, password: str):
message = f"LIN {self.username} {password}".encode('UTF-8') message = f"LIN {self.username} {password}".encode('UTF-8')
cipher = ChaCha20_Poly1305.new(key=self.cipherkey) cipher = ChaCha20.new(key=self.cipherkey, nonce=get_random_bytes(12))
header = json.dumps({'type': 'AUT', 'source': self.network.own_addr}).encode('UTF-8') ciphertext = cipher.encrypt(message)
cipher.update(header) nonce = b64encode(cipher.nonce).decode('ASCII')
ciphertext, tag = cipher.encrypt_and_digest(message) ct = b64encode(ciphertext).decode('ASCII')
nonce = b64encode(cipher.nonce).decode('UTF-8') sendjson = json.dumps({'type': 'AUT', 'source': self.network.own_addr, 'nonce': nonce, 'message': ct}).encode(
ct = b64encode(ciphertext).decode('UTF-8')
b64tag = b64encode(tag).decode('UTF-8')
sendjson = json.dumps({'header': b64encode(header).decode('UTF-8'), 'nonce': nonce, 'message': ct, 'tag': b64tag}).encode(
'UTF-8') 'UTF-8')
self.network.send_msg(self.serverAddr, sendjson) self.network.send_msg(self.serverAddr, sendjson)
b64 = {'source': '', 'type': ''} b64 = {'source': '', 'type': ''}
@ -85,11 +82,9 @@ class NetWrapper:
try: try:
retnonce = b64decode(b64['nonce']) retnonce = b64decode(b64['nonce'])
retciphertext = b64decode(b64['message']) retciphertext = b64decode(b64['message'])
retcipher = ChaCha20_Poly1305.new(key=self.cipherkey, nonce=retnonce) retcipher = ChaCha20.new(key=self.cipherkey, nonce=retnonce)
retcipher.update(b64decode(b64['header'])) plaintext = retcipher.decrypt(retciphertext).decode('UTF-8')
retheader = json.loads(b64decode(b64['header']).decode('UTF-8')) if plaintext != "OK":
plaintext = retcipher.decrypt_and_verify(retciphertext,b64decode(b64['tag'])).decode('UTF-8')
if plaintext != "OK" or not (retheader['source'] == self.serverAddr and retheader['type'] == 'AUT'):
raise Exception('Authentication error') raise Exception('Authentication error')
except Exception as e: except Exception as e:
print(e) print(e)
@ -104,29 +99,26 @@ class NetWrapper:
self.authenticate(pw) self.authenticate(pw)
def sendMessage(self, message: bytes): def sendMessage(self, message: bytes):
cipher = ChaCha20_Poly1305.new(key=self.cipherkey) cipher = ChaCha20.new(key=self.cipherkey, nonce=get_random_bytes(12))
header = json.dumps({'type': 'CMD', 'source': self.network.own_addr}).encode('UTF-8') ciphertext = cipher.encrypt(message)
cipher.update(header) nonce = b64encode(cipher.nonce).decode('ASCII')
ciphertext, tag = cipher.encrypt_and_digest(message) ct = b64encode(ciphertext).decode('ASCII')
nonce = b64encode(cipher.nonce).decode('UTF-8') sendjson = json.dumps({'type': 'CMD', 'source': self.network.own_addr, 'nonce': nonce, 'message': ct}).encode(
ct = b64encode(ciphertext).decode('UTF-8')
sendjson = json.dumps({'header': b64encode(header).decode('UTF-8'), 'nonce': nonce, 'message': ct, 'tag': b64encode(tag).decode('UTF-8')}).encode(
'UTF-8') 'UTF-8')
self.network.send_msg(self.serverAddr, sendjson) self.network.send_msg(self.serverAddr, sendjson)
def recieveMessage(self) -> bytes: def recieveMessage(self) -> bytes:
try: b64 = {'source': '', 'type': ''}
while not (b64['source'] == self.serverAddr and b64['type'] == 'AUT'):
status, msg = self.network.receive_msg(blocking=True) status, msg = self.network.receive_msg(blocking=True)
if not status: if not status:
raise Exception('Network error during connection.') raise Exception('Network error during connection.')
b64 = json.loads(msg.decode('UTF-8')) b64 = json.loads(msg.decode('UTF-8'))
try:
retnonce = b64decode(b64['nonce']) retnonce = b64decode(b64['nonce'])
retciphertext = b64decode(b64['message']) retciphertext = b64decode(b64['message'])
retcipher = ChaCha20_Poly1305.new(key=self.cipherkey, nonce=retnonce) retcipher = ChaCha20.new(key=self.cipherkey, nonce=retnonce)
plaintext = retcipher.decrypt_and_verify(retciphertext,b64decode(b64['tag'])) plaintext = retcipher.decrypt(retciphertext)
retheader = json.loads(b64decode(b64['header']).decode('UTF-8'))
if not (retheader['source'] == self.serverAddr and retheader['type'] == 'CMD'):
return "ERROR".encode('UTF-8')
return plaintext return plaintext
except Exception: except Exception:
print("Incorrect decryption") print("Incorrect decryption")