netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-09-10 23:15:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Don't encrypt null values

Browse source
This commit is contained in:
deajan 2024-04-23 23:28:36 +02:00
parent 4ab2d0f5dd
commit 668b99e1eb
1 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
npbackup/configuration.py
View file

@ -261,31 +261,32 @@ def crypt_config(
def _crypt_config(key: str, value: Any) -> Any:
if key_should_be_encrypted(key, encrypted_options):
if operation == "encrypt":
if (
isinstance(value, str)
and (
not value.startswith(ID_STRING)
or not value.endswith(ID_STRING)
)
) or not isinstance(value, str):
value = enc.encrypt_message_hf(
value, aes_key, ID_STRING, ID_STRING
).decode("utf-8")
elif operation == "decrypt":
if (
isinstance(value, str)
and value.startswith(ID_STRING)
and value.endswith(ID_STRING)
):
_, value = enc.decrypt_message_hf(
value,
aes_key,
ID_STRING,
ID_STRING,
)
else:
raise ValueError(f"Bogus operation {operation} given")
if value is not None:
if operation == "encrypt":
if (
isinstance(value, str)
and (
not value.startswith(ID_STRING)
or not value.endswith(ID_STRING)
)
) or not isinstance(value, str):
value = enc.encrypt_message_hf(
value, aes_key, ID_STRING, ID_STRING
).decode("utf-8")
elif operation == "decrypt":
if (
isinstance(value, str)
and value.startswith(ID_STRING)
and value.endswith(ID_STRING)
):
_, value = enc.decrypt_message_hf(
value,
aes_key,
ID_STRING,
ID_STRING,
)
else:
raise ValueError(f"Bogus operation {operation} given")
return value
return replace_in_iterable(
@ -307,10 +308,11 @@ def is_encrypted(full_config: dict) -> bool:
nonlocal is_encrypted
if key_should_be_encrypted(key, ENCRYPTED_OPTIONS):
if isinstance(value, str) and (
not value.startswith(ID_STRING) or not value.endswith(ID_STRING)
):
is_encrypted = False
if value is not None:
if isinstance(value, str) and (
not value.startswith(ID_STRING) or not value.endswith(ID_STRING)
):
is_encrypted = False
return value
replace_in_iterable(