Trilltechnician/hack-house
1
1
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Updated client/client.py

Browse Source
This commit is contained in:
mirai 2022-12-01 10:21:44 +03:00
parent bc2f652d16
commit adda8caf74
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/client.py
View File

@ -20,10 +20,10 @@ class Client:
f.write(pubkey.save_pkcs1()) f.write(pubkey.save_pkcs1())
def __init__(self, username: str): def __init__(self, username: str):
# Server info
self.server = input("server ip: \n") self.server = input("server ip: \n")
self.port = input("server port: \n") self.port = input("server port: \n")
self.username = username self.username = username
# Urls # Urls
self.base_url = f"http://{self.server}:{self.port}" self.base_url = f"http://{self.server}:{self.port}"
self.talk_url = f"{self.base_url}/talk" self.talk_url = f"{self.base_url}/talk"
@ -36,7 +36,6 @@ class Client:
self.fernet = None self.fernet = None
def send_info(self): def send_info(self):
while True: while True:
user_input = input("You're message: ") user_input = input("You're message: ")
message = f'{self.username}: {user_input}' message = f'{self.username}: {user_input}'
@ -71,8 +70,7 @@ class Client:
print(f"{actual_message}\n") print(f"{actual_message}\n")
else: else:
print(f"{actual_message}\n") print(f"{actual_message}\n")
def _key_request(self) -> None: def _key_request(self) -> None:
with open('private.pem', 'rb') as f: with open('private.pem', 'rb') as f:
self.privkey = rsa.PrivateKey.load_pkcs1(f.read()) self.privkey = rsa.PrivateKey.load_pkcs1(f.read())
@ -88,11 +86,11 @@ class Client:
message = r.raw.read(999) message = r.raw.read(999)
self.symetric_key = rsa.decrypt(message, self.privkey) self.symetric_key = rsa.decrypt(message, self.privkey)
self.fernet = Fernet(self.symetric_key) self.fernet = Fernet(self.symetric_key)
def _remove_keys(self) -> None: def _remove_keys(self) -> None:
os.remove("private.pem") os.remove("private.pem")
os.remove("public.pem") os.remove("public.pem")
def _validate_keys(self) -> None: def _validate_keys(self) -> None:
self._key_gen() self._key_gen()
self._key_request() self._key_request()
@ -100,8 +98,7 @@ class Client:
first_key = f.read() first_key = f.read()
self.pubkey = rsa.PublicKey.load_pkcs1(first_key) self.pubkey = rsa.PublicKey.load_pkcs1(first_key)
self._remove_keys() self._remove_keys()
def __call__(self): def __call__(self):
# Running two threads, # Running two threads,
# One for sending info # One for sending info