Updated client/client.py
This commit is contained in:
parent
bc2f652d16
commit
adda8caf74
|
|
@ -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}'
|
||||||
|
|
@ -72,7 +71,6 @@ class Client:
|
||||||
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())
|
||||||
|
|
@ -101,7 +99,6 @@ class Client:
|
||||||
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
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user