jgaunt/truenas-kmip-unlocker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated variable name from pools to config

Browse Source 
Pools variable name doesn't make sense since the API key is also in there.  Better to call it config as it contains the config
This commit is contained in:
John Gaunt
2023-04-01 22:36:39 -04:00
parent c85ca8c51c
commit fe371810c0
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
truenas_kmip_unlock.py
View File

@@ -355,20 +355,20 @@ if __name__ == '__main__':
while True: while True:
user_input = input("n/q> ") user_input = input("n/q> ")
if user_input.casefold() == "n": if user_input.casefold() == "n":
pool_details = dict() config = dict()
api_key = input("Please enter your API key: ") api_key = input("Please enter your API key: ")
pool_details['API Key'] = api_key config['API Key'] = api_key
pool_details['Pools'] = new_pool_details() config['Pools'] = new_pool_details()
write_config_file(pool_details, secrets_config_file) write_config_file(config, secrets_config_file)
break break
elif user_input.casefold() == "q": elif user_input.casefold() == "q":
sys.exit(0) sys.exit(0)
else: else:
print("This value must be one of the following characters: n, q.") print("This value must be one of the following characters: n, q.")
pools = read_config_file(secrets_config_file) config = read_config_file(secrets_config_file)
print("Current pools:") print("Current pools:")
print(" ") print(" ")
for pool in pools['Pools']: for pool in config['Pools']:
print(pool) print(pool)
print(" ") print(" ")
print("a) Edit API Key") print("a) Edit API Key")
@@ -381,34 +381,34 @@ if __name__ == '__main__':
# Edit API Key # Edit API Key
if user_input.casefold() == "a": if user_input.casefold() == "a":
api_key = input("Please enter your API key: ") api_key = input("Please enter your API key: ")
pools['API Key'] = api_key config['API Key'] = api_key
write_config_file(pools, secrets_config_file) write_config_file(pools, secrets_config_file)
# Editing an account # Editing an account
elif user_input.casefold() == "e": elif user_input.casefold() == "e":
pool_to_edit = select_pool(pools['Pools']) pool_to_edit = select_pool(config['Pools'])
pool_details = edit_pool_details(pools['Pools'], pool_to_edit) pool_details = edit_pool_details(config['Pools'], pool_to_edit)
del pools['Pools'][pool_to_edit] del config['Pools'][pool_to_edit]
pools['Pools'].update(pool_details) config['Pools'].update(pool_details)
write_config_file(pools, secrets_config_file) write_config_file(config, secrets_config_file)
break break
# Createing a new account # Createing a new account
elif user_input.casefold() == "n": elif user_input.casefold() == "n":
pool_details = new_pool_details() pool_details = new_pool_details()
pools['Pools'].update(pool_details) config['Pools'].update(pool_details)
write_config_file(pools, secrets_config_file) write_config_fileconfig, secrets_config_file)
break break
# Deleting an account # Deleting an account
elif user_input.casefold() == "d": elif user_input.casefold() == "d":
pool_to_delete = select_pool(pools['Pools'], "delete") pool_to_delete = select_pool(config['Pools'], "delete")
if not ask_for_confirmation("Are you sure you wish to delete {} pool? ".format(pool_to_delete)): if not ask_for_confirmation("Are you sure you wish to delete {} pool? ".format(pool_to_delete)):
break break
del pools['Pools'][pool_to_delete] del config['Pools'][pool_to_delete]
if len(pools['Pools']) == 0: if len(config['Pools']) == 0:
# no more accounts, remove secrets file # no more accounts, remove secrets file
os.remove(secrets_config_file) os.remove(secrets_config_file)
else: else:
write_config_file(pools, secrets_config_file) write_config_file(config, secrets_config_file)
break break
# Quit the config # Quit the config
@@ -423,15 +423,15 @@ if __name__ == '__main__':
print("No configuration file found. Please run {} -c to configure your accounts.".format(script_name)) print("No configuration file found. Please run {} -c to configure your accounts.".format(script_name))
sys.exit(-1) sys.exit(-1)
# run the decryption of the keys and unlock the pool # run the decryption of the keys and unlock the pool
pools = read_config_file(secrets_config_file) config = read_config_file(secrets_config_file)
api_key = pools['API Key'] api_key = config['API Key']
logger.debug("API Key: {}".format(api_key)) logger.debug("API Key: {}".format(api_key))
API_POOLS = request('pool', api_key)['response'] API_POOLS = request('pool', api_key)['response']
API_DATASETS = request('pool/dataset', api_key)['response'] API_DATASETS = request('pool/dataset', api_key)['response']
for pool_dataset_name in pools['Pools']: for pool_dataset_name in config['Pools']:
if pool_dataset_name != 'DEFAULT': if pool_dataset_name != 'DEFAULT':
name = pool_dataset_name name = pool_dataset_name
pool_passphrase = pools['Pools'][name]['pool_passphrase'] pool_passphrase = config['Pools'][name]['pool_passphrase']
logger.info("Attempting to unlock {} pool.".format(name)) logger.info("Attempting to unlock {} pool.".format(name))
for pool in API_POOLS: for pool in API_POOLS:
if pool['name'] == name: if pool['name'] == name: