removed temporary files
This commit is contained in:
parent
82a78e7053
commit
c3467b89ae
|
|
@ -1,4 +1,3 @@
|
||||||
import os
|
|
||||||
import rsa
|
import rsa
|
||||||
import requests
|
import requests
|
||||||
from cryptography.fernet import Fernet
|
from cryptography.fernet import Fernet
|
||||||
|
|
@ -12,10 +11,6 @@ class RSAService(CryptoService):
|
||||||
self.private_key = None
|
self.private_key = None
|
||||||
self.symmetric_key = None
|
self.symmetric_key = None
|
||||||
self.fernet = None
|
self.fernet = None
|
||||||
self.private_key_name = "private.pem"
|
|
||||||
self.public_key_name = "public.pem"
|
|
||||||
|
|
||||||
self.keys_path: list[str] = []
|
|
||||||
self._generate_keys()
|
self._generate_keys()
|
||||||
|
|
||||||
def _encrypt(self, message: str) -> str:
|
def _encrypt(self, message: str) -> str:
|
||||||
|
|
@ -25,48 +20,24 @@ class RSAService(CryptoService):
|
||||||
return self.fernet.decrypt(message.encode()).decode("utf-8")
|
return self.fernet.decrypt(message.encode()).decode("utf-8")
|
||||||
|
|
||||||
def _request_key(self, url: str, username: str, password: str | None = None):
|
def _request_key(self, url: str, username: str, password: str | None = None):
|
||||||
data = {
|
pubkey_bytes = self.public_key.save_pkcs1()
|
||||||
"pubkey": self._open_generated_file(self.public_key_name),
|
r = requests.post(
|
||||||
"username": username
|
url,
|
||||||
}
|
files={"pubkey": ("public.pem", pubkey_bytes)},
|
||||||
if password:
|
data={"username": username, "password": password or ""},
|
||||||
data["password"] = password
|
stream=True,
|
||||||
r = requests.post(url, files={"pubkey": ("public.pem", data["pubkey"])}, data={"username": username, "password": password or ""}, stream=True)
|
)
|
||||||
r.raise_for_status()
|
r.raise_for_status()
|
||||||
message = r.raw.read(999)
|
message = r.raw.read(999)
|
||||||
self.symmetric_key = rsa.decrypt(message, self.private_key)
|
self.symmetric_key = rsa.decrypt(message, self.private_key)
|
||||||
self.fernet = Fernet(self.symmetric_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):
|
def _generate_keys(self):
|
||||||
(public_key, private_key) = rsa.newkeys(512)
|
self.public_key, self.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"])
|
|
||||||
|
|
||||||
def _get_generated_keys(self):
|
def _get_generated_keys(self):
|
||||||
return self.private_key, self.public_key
|
return self.private_key, self.public_key
|
||||||
|
|
||||||
def _remove_keys(self):
|
def _remove_keys(self):
|
||||||
for key in self.keys_path:
|
self.public_key = None
|
||||||
try:
|
self.private_key = None
|
||||||
os.remove(key)
|
|
||||||
except FileNotFoundError:
|
|
||||||
pass
|
|
||||||
Loading…
Reference in New Issue
Block a user