Skip to content

Commit

Permalink
fix remove script by deleting encryption setup
Browse files Browse the repository at this point in the history
  • Loading branch information
rysecx committed Sep 23, 2024
1 parent 360bfd5 commit 45407aa
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions uc-v1.1.8-dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 45407aa

Please sign in to comment.