From c85c108db5b389afdc8a0269a5d1f0bf6719c281 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Sat, 10 Dec 2022 22:27:28 +0100 Subject: [PATCH] Moved functions from Paths to Encryption --- scripts/classes/Encryption.py | 14 ++++++++++++-- scripts/classes/Paths.py | 10 ---------- scripts/main.py | 5 ++--- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/scripts/classes/Encryption.py b/scripts/classes/Encryption.py index 47e0a5b..a41bdfb 100644 --- a/scripts/classes/Encryption.py +++ b/scripts/classes/Encryption.py @@ -11,6 +11,10 @@ class Encryption(): USER_PASSWORD_LENGTHS = 64 OVERALL_PASSWORD_LENGTHS = 128 + # At the moment the programm can only deal with one digit numbers. + MAXIMUM_SECRET_HOLDERS = 9 + MINIMUM_SECRET_HOLDERS = 2 + def __init__(self, cli, paths, amount_of_secret_holders, decryption_quota,master_password): self.amount_of_secret_holders = amount_of_secret_holders self.decryption_quota = decryption_quota @@ -21,7 +25,7 @@ class Encryption(): self.initializeGroupData() self.cli = cli self.paths = paths - + def initializeUserData(self): self.user_mapped_data = {} user_count = 1 @@ -34,7 +38,13 @@ class Encryption(): def addInformationToUser(self,user_id,label,content): self.user_mapped_data[user_id]['about'][label] = content; - + + def getCoSecretHoldersRange(): + return range(Encryption.MINIMUM_SECRET_HOLDERS,Encryption.MAXIMUM_SECRET_HOLDERS) + + def getSecretHoldersRange(): + return range(1,Encryption.MAXIMUM_SECRET_HOLDERS) + def getStartnumber(self): index = 0 start_number = '' diff --git a/scripts/classes/Paths.py b/scripts/classes/Paths.py index 1ee6edd..68b3969 100644 --- a/scripts/classes/Paths.py +++ b/scripts/classes/Paths.py @@ -2,16 +2,6 @@ import os class Paths(): - # At the moment the programm can only deal with one digit numbers. - MAXIMUM_SECRET_HOLDERS = 9 - MINIMUM_SECRET_HOLDERS = 2 - - def getCoSecretHoldersRange(): - return range(Paths.MINIMUM_SECRET_HOLDERS,Paths.MAXIMUM_SECRET_HOLDERS) - - def getSecretHoldersRange(): - return range(1,Paths.MAXIMUM_SECRET_HOLDERS) - TYPE_ENCRYPTED="encrypted" TYPE_DECRYPTED="decrypted" diff --git a/scripts/main.py b/scripts/main.py index 8ea0feb..139b3c6 100644 --- a/scripts/main.py +++ b/scripts/main.py @@ -3,7 +3,6 @@ from classes.Encryption import Encryption from classes.Cleanup import Cleanup from classes.Decryption import Decryption from getpass import getpass -from classes.Paths import Paths import traceback from classes.Cli import Cli from classes.Paths import Paths @@ -34,11 +33,11 @@ try: parser = argparse.ArgumentParser() parser.add_argument('--mode',type=str, dest='mode',required=True,choices=['cleanup','encrypt','decrypt']) parser.add_argument('--file-types',type=str, dest='file_types',required=False,choices=[Paths.TYPE_DECRYPTED, Paths.TYPE_ENCRYPTED]) - parser.add_argument('--amount',type=int, dest='amount_of_secret_holders',required=False,choices=Paths.getCoSecretHoldersRange()) + parser.add_argument('--amount',type=int, dest='amount_of_secret_holders',required=False,choices=Encryption.getCoSecretHoldersRange()) parser.add_argument('--quota', type=int, dest='decryption_quota', choices=range(1,101),required=False) parser.add_argument('--master-password',type=str, dest='master_password',required=False) parser.add_argument('--user-password',type=str, dest='user_password',required=False) - parser.add_argument('--user',type=int, dest='user',choices=Paths.getSecretHoldersRange(),required=False) + parser.add_argument('--user',type=int, dest='user',choices=Encryption.getSecretHoldersRange(),required=False) parser.add_argument('--add-user-information',type=bool, dest='add_user_information', default=False, required=False, action=argparse.BooleanOptionalAction) args = parser.parse_args()