From c3467b89aec56e6d325e3fb4d1b66a4870b84dcc Mon Sep 17 00:00:00 2001 From: mirai Date: Fri, 3 Oct 2025 21:08:43 +0300 Subject: [PATCH] removed temporary files --- cmd_chat/client/core/crypto.py | 49 +++++++--------------------------- 1 file changed, 10 insertions(+), 39 deletions(-) diff --git a/cmd_chat/client/core/crypto.py b/cmd_chat/client/core/crypto.py index 90cec67..fa87b6c 100644 --- a/cmd_chat/client/core/crypto.py +++ b/cmd_chat/client/core/crypto.py @@ -1,4 +1,3 @@ -import os import rsa import requests from cryptography.fernet import Fernet @@ -12,10 +11,6 @@ class RSAService(CryptoService): self.private_key = None self.symmetric_key = None self.fernet = None - self.private_key_name = "private.pem" - self.public_key_name = "public.pem" - - self.keys_path: list[str] = [] self._generate_keys() def _encrypt(self, message: str) -> str: @@ -25,48 +20,24 @@ class RSAService(CryptoService): return self.fernet.decrypt(message.encode()).decode("utf-8") def _request_key(self, url: str, username: str, password: str | None = None): - data = { - "pubkey": self._open_generated_file(self.public_key_name), - "username": username - } - if password: - data["password"] = password - r = requests.post(url, files={"pubkey": ("public.pem", data["pubkey"])}, data={"username": username, "password": password or ""}, stream=True) + pubkey_bytes = self.public_key.save_pkcs1() + r = requests.post( + url, + files={"pubkey": ("public.pem", pubkey_bytes)}, + data={"username": username, "password": password or ""}, + stream=True, + ) r.raise_for_status() message = r.raw.read(999) self.symmetric_key = rsa.decrypt(message, self.private_key) self.fernet = Fernet(self.symmetric_key) - def __update_keys_path(self, path_list: list[str]) -> None: - for file in path_list: - self.keys_path.append(file) - - def __write_generated_key(self, name: str, key) -> None: - with open(name, "wb") as f: - f.write(key.save_pkcs1()) - - def _open_generated_file(self, name: str) -> bytes: - with open(name, "rb") as f: - return f.read() - def _generate_keys(self): - (public_key, private_key) = rsa.newkeys(512) - self.__write_generated_key(self.private_key_name, private_key) - self.__write_generated_key(self.public_key_name, public_key) - self.private_key = rsa.PrivateKey.load_pkcs1( - self._open_generated_file(self.private_key_name) - ) - self.public_key = rsa.PublicKey.load_pkcs1( - self._open_generated_file(self.public_key_name) - ) - self.__update_keys_path(["public.pem", "private.pem"]) + self.public_key, self.private_key = rsa.newkeys(512) def _get_generated_keys(self): return self.private_key, self.public_key def _remove_keys(self): - for key in self.keys_path: - try: - os.remove(key) - except FileNotFoundError: - pass + self.public_key = None + self.private_key = None \ No newline at end of file