netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2024-11-11 01:28:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

Improve data decryption messages

Browse source
This commit is contained in:
Orsiris de Jong 2023-05-27 18:50:06 +02:00
parent 4d362ceea6
commit 0240173b35
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
npbackup/configuration.py
View file

@ -61,7 +61,7 @@ ENCRYPTED_OPTIONS = [
{"section": "repo", "name": "password_command", "type": str},
{"section": "prometheus", "name": "http_username", "type": str},
{"section": "prometheus", "name": "http_password", "type": str},
{"section": "env", "name": "encrypted_variables", "type": list},
{"section": "env", "name": "encrypted_variables", "type": str},
{"section": "options", "name": "auto_upgrade_server_username", "type": str},
{"section": "options", "name": "auto_upgrade_server_password", "type": str},
]
@ -162,22 +162,19 @@ def decrypt_data(
logger.info(
"No {}:{} available.".format(option["section"], option["name"])
)
except ValueError as exc:
logger.error(
"Cannot decrypt this configuration file. Has the AES key changed ? {}".format(
exc
)
)
except ValueError as exc:
logger.error(
"Cannot decrypt this configuration file for option \"{}\". Has the AES key changed ? {}".format(option,
exc
)
)
logger.debug("Trace:", exc_info=True)
return False
except TypeError:
logger.error("Cannot decrypt this configuration file. No base64 encoded strings available.")
logger.debug("Trace:", exc_info=True)
return False
except TypeError as exc:
logger.error(
"Cannot decrypt this configuration file. No base64 encoded strings available: {}.".format(
exc
)
)
logger.debug("Trace:", exc_info=True)
return None
logger.critical("Won't run with a non properly encrypted config file.")
sys.exit(98)
return config_dict