From e5806992ced7a44d0300d0b6e6fef76256ed8da7 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Sat, 10 Dec 2022 00:00:42 +0100 Subject: [PATCH] Finished work for today --- Readme.md | 3 +++ scripts/classes/Decryption.py | 9 +++++---- scripts/main.py | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Readme.md b/Readme.md index 71074ff..4f2ab48 100644 --- a/Readme.md +++ b/Readme.md @@ -36,6 +36,9 @@ python scripts/main.py --mode cleanup --user "1" && python scripts/main.py --mo # setup ```bash pip install numpy + gpg + python + pip ``` ## Further Information diff --git a/scripts/classes/Decryption.py b/scripts/classes/Decryption.py index bb94bb1..04b8a36 100644 --- a/scripts/classes/Decryption.py +++ b/scripts/classes/Decryption.py @@ -20,8 +20,8 @@ class Decryption(AbstractSplittedSecret): file.close() return data - def getNeededEncryptersAmount(self): - return len(str(list(self.user_data['groups'].keys())[0]))-1 + def setNeededEncryptersAmount(self): + self.needed_encrypters_amount = len(str(list(self.user_data['groups'].keys())[0]))-1 def decryptFile(self,password,input_file_path,output_file_path): self.executeCommand('gpg --batch --passphrase "'+ password + '" -o "' + output_file_path +'" "'+ input_file_path+'"') @@ -35,6 +35,7 @@ class Decryption(AbstractSplittedSecret): output_file_path = self.getAccumulatedFilePath("decrypted") self.decryptFile(self.user_password, input_file_path, output_file_path) - def setUserData(self): + def initializeData(self): self.decryptUserFile() - self.user_data = self.loadJsonFile(self.user_file_decrypted_path) \ No newline at end of file + self.user_data = self.loadJsonFile(self.user_file_decrypted_path) + self.setNeededEncryptersAmount() \ No newline at end of file diff --git a/scripts/main.py b/scripts/main.py index 6243af9..8f50091 100644 --- a/scripts/main.py +++ b/scripts/main.py @@ -43,7 +43,7 @@ if __name__ == '__main__': decrypt.setUserPassword(getpass()) print("Decrypting User File...") try: - decrypt.setUserData(); + decrypt.initializeData(); break; except: print("Wrong password :(") @@ -51,7 +51,7 @@ if __name__ == '__main__': decrypt.setUserPassword(args.user_password) print("Decrypting User File...") try: - decrypt.setUserData(); + decrypt.initializeData(); except: print("Wrong password :(") exit() @@ -61,7 +61,7 @@ if __name__ == '__main__': print("user_id: " + contact_id) for label in decrypt.user_data['contacts'][contact_id]: print(label + ": " + decrypt.user_data['contacts'][contact_id][label]) - print("You need at least <<" + str(decrypt.getNeededEncryptersAmount()) +">> aditional people to decrypt the secret.") + print("You need at least <<" + str(decrypt.needed_encrypters_amount) +">> other person to decrypt the secret.") exit() print("Decrypting accumulated file...") decrypt.setUserPassword(args.master_password)