From 45407aa0bcc4496eb8635dd89f2d7213024b085c Mon Sep 17 00:00:00 2001 From: rysecx Date: Mon, 23 Sep 2024 19:49:22 +0200 Subject: [PATCH] fix remove script by deleting encryption setup --- uc-v1.1.8-dev.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/uc-v1.1.8-dev.py b/uc-v1.1.8-dev.py index a93942d..5e64e37 100644 --- a/uc-v1.1.8-dev.py +++ b/uc-v1.1.8-dev.py @@ -120,7 +120,7 @@ def decrypt_data(self, ciphertext, text=True): if text: return plaintext.decode('utf-8') return plaintext - + def setup_encryption(self, conn): self.debugger.debug(f"[{threading.get_ident()}] Start of encryption setup") server_public_bytes = conn.recv(1024) @@ -147,7 +147,7 @@ def setup_encryption(self, conn): ).derive(shared_secret) self.key = derived_key[:32] self.iv = derived_key[32:48] - + # client implementation @@ -158,7 +158,7 @@ def __init__(self, host, port, debugger): # defines address and port self.serverAddr = host self.serverPort = port - + self.crypt_stub = EncryptionStub(debugger) self.debugger = debugger @@ -519,7 +519,7 @@ def download_script(self, downloadType, downloadName, clientToken): # receieving file name fileName = self.clientSock.recv(1024) fileName = self.crypt_stub.decrypt_data(fileName) - self.debugger.debug("[%s] Received file name %s"%(threading.get_ident(), fileName)) + self.debugger.debug("[%s] Received file name %s"%(threading.get_ident(), fileName)) destDir = self.download + pathName check_dir(destDir) dirSizeBefore = self.get_size(destDir) @@ -844,7 +844,7 @@ def upload_script(self, fileDirectory, userFile, userToken): # receiving ansewer from server answ = self.clientSock.recv(16) answ = self.crypt_stub.decrypt_data(answ) - + # trying to acquire write access to the client data if answ == cOP.LOCK: self.print_log( @@ -1099,12 +1099,12 @@ def send_backup(): # sending fileOperand time.sleep(self.time_buffer) self.clientSock.send(self.crypt_stub.encrypt_data(cOP.FILE)) - + answ = self.clientSock.recv(16) answ = self.crypt_stub.decrypt_data(answ) - + if answ != cOP.OK: - self.print_log("ERROR: failed to sent file: ", answ) + self.print_log("ERROR: failed to sent file: ", answ) else: # sending fileName fileNameEncr = str(fileName) @@ -1457,7 +1457,6 @@ def check_install(self, package): # removes package from system def remove(self, package): - self.crypt_stub.setup_encryption(self.clientSock) try: shutil.rmtree(self.package_path + package) os.remove("/usr/bin/" + package)