psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the auth logic more explicit and warnings if necessary

Browse source
This commit is contained in:
Tom Hubrecht 2023-02-25 20:03:37 +01:00
parent d80e716822
commit 9b071ff92f
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
borgmatic/hooks/ntfy.py
View file

@ -59,11 +59,18 @@ def ping_monitor(hook_config, config_filename, state, monitoring_log_level, dry_
username = hook_config.get('username') username = hook_config.get('username')
password = hook_config.get('password') password = hook_config.get('password')
auth = ( auth = None
requests.auth.HTTPBasicAuth(username, password) if (username and password) is not None:
if (username and password) is not None auth = requests.auth.HTTPBasicAuth(username, password)
else None logger.info(f'{config_filename}: Using basic auth with user {username} for Ntfy')
) elif username is not None:
logger.warn(
f'{config_filename}: Password missing for Ntfy authentication, defaulting to no auth'
)
elif password is not None:
logger.warn(
f'{config_filename}: Username missing for Ntfy authentication, defaulting to no auth'
)
if not dry_run: if not dry_run:
logging.getLogger('urllib3').setLevel(logging.ERROR) logging.getLogger('urllib3').setLevel(logging.ERROR)