Browse Source

Make the auth logic more explicit and warnings if necessary

Tom Hubrecht 2 years ago
parent
commit
9b071ff92f
1 changed files with 12 additions and 5 deletions
  1. 12 5
      borgmatic/hooks/ntfy.py

+ 12 - 5
borgmatic/hooks/ntfy.py

@@ -59,11 +59,18 @@ def ping_monitor(hook_config, config_filename, state, monitoring_log_level, dry_
         username = hook_config.get('username')
         password = hook_config.get('password')
 
-        auth = (
-            requests.auth.HTTPBasicAuth(username, password)
-            if (username and password) is not None
-            else None
-        )
+        auth = None
+        if (username and password) is not None:
+            auth = requests.auth.HTTPBasicAuth(username, password)
+            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:
             logging.getLogger('urllib3').setLevel(logging.ERROR)