Merge pull request #2 from tchey290/patch-1

always use password override even if already set
NebraLtd · Oct 28, 2024 · 1566aec · 1566aec
2 parents fc3eff1 + 7501139
commit 1566aec
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/hw_diag/utilities/auth.py b/hw_diag/utilities/auth.py
@@ -71,19 +71,19 @@ def write_password(password):
 
 def read_password():
     PASSWORD_OVERRIDE = os.getenv('PASSWORD_OVERRIDE', 'false')
-    try:
-        password_row = g.db.query(AuthKeyValue). \
+    if PASSWORD_OVERRIDE != "false":  # nosec
+        default_password = PASSWORD_OVERRIDE
+        password_row = write_password(default_password)
+        logging.info("Using password from override env var!")
+    else:
+        try:
+            password_row = g.db.query(AuthKeyValue). \
             filter(AuthKeyValue.key == 'password_hash'). \
             one()
-    except NoResultFound:
-        if PASSWORD_OVERRIDE != "false":  # nosec
-            default_password = PASSWORD_OVERRIDE
-            logging.info("Using password from override env var!")
-        else:
+        except NoResultFound:
             default_password = generate_default_password()
+            password_row = write_password(default_password)
             logging.info("No password override. Generating default!")
-
-        password_row = write_password(default_password)
     return password_row