flifloo/SecureSocketService
Archived
1
0
Fork 0
Code Activity

Upgrade dynamic buffer and switch to SHA256

Browse source
This commit is contained in:
Ethanell 2019-07-24 17:00:11 +02:00
parent 42fc2f09df
commit fc1f5ee436
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
SecureSocketService/__init__.py
View file

@ -14,6 +14,7 @@ class Socket:
"""Self """Self
Socket service with security system""" Socket service with security system"""
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) # Set the socket object self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) # Set the socket object
self.buffer_size = 8
self.service_id = 0 self.service_id = 0
self.key = None # Set the key encryption self.key = None # Set the key encryption
self.fernet = None # Set the encryption object self.fernet = None # Set the encryption object
@ -26,7 +27,10 @@ class Socket:
if self.fernet and encryption: # Encrypt if available if self.fernet and encryption: # Encrypt if available
message = self.fernet.encrypt(message) message = self.fernet.encrypt(message)
try: # Try to send, if fail raise a custom error try: # Try to send, if fail raise a custom error
sock.send(f"Buffer size: {len(message)}".encode("Utf8")) buffer_size = str(len(message))
while len(buffer_size) != self.buffer_size:
buffer_size = "0" + buffer_size
sock.send(buffer_size.encode("Utf8"))
sock.send(message) sock.send(message)
except socket.error: except socket.error:
raise ConnectionError("Fail to send") raise ConnectionError("Fail to send")
@ -37,8 +41,9 @@ class Socket:
"""self, sock (socket), decode (str): Utf8, encryption (bool) """self, sock (socket), decode (str): Utf8, encryption (bool)
Receive a message from a socket""" Receive a message from a socket"""
try: # Try to receive, else raise a custom error try: # Try to receive, else raise a custom error
buffer_size = int(sock.recv(1028).decode("Utf8")[13:]) buffer_size = int(sock.recv(self.buffer_size, socket.MSG_WAITALL).decode("Utf8"))
response = sock.recv(buffer_size) print(buffer_size)
response = sock.recv(buffer_size, socket.MSG_WAITALL)
except (socket.error, ValueError): except (socket.error, ValueError):
raise ConnectionError("Fail to receive") raise ConnectionError("Fail to receive")
else: else:
@ -67,8 +72,8 @@ class Socket:
public_key.encrypt( public_key.encrypt(
self.key, self.key,
padding.OAEP( padding.OAEP(
mgf=padding.MGF1(algorithm=hashes.SHA256()), mgf=padding.MGF1(algorithm=hashes.SHA512()),
algorithm=hashes.SHA256(), algorithm=hashes.SHA512(),
label=None label=None
) )
), ),
@ -104,10 +109,10 @@ class Socket:
# Decrypt the receive key with the private key and set it # Decrypt the receive key with the private key and set it
self.key = private_key.decrypt( self.key = private_key.decrypt(
self.receive(sock, False, False), self.receive(sock, "", False),
padding.OAEP( padding.OAEP(
mgf=padding.MGF1(algorithm=hashes.SHA256()), mgf=padding.MGF1(algorithm=hashes.SHA512()),
algorithm=hashes.SHA256(), algorithm=hashes.SHA512(),
label=None label=None
) )
) )

2
setup.py
View file

@ -7,7 +7,7 @@ def readme():
setup(name="SecureSocketService", setup(name="SecureSocketService",
version="1.0.3", version="1.1.4",
description="A socket service with secure connexion", description="A socket service with secure connexion",
long_description=readme(), long_description=readme(),
classifiers=[ classifiers=[