Merge branch 'master' into feat/al2_old_dockerfile

uc-cdis · Dec 13, 2024 · 397ff5c · 397ff5c
2 parents 4fc3058 + d76a19c
commit 397ff5c
Show file tree

Hide file tree

Showing 13 changed files with 493 additions and 34 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -305,14 +305,14 @@
         "filename": "tests/data/test_indexed_file.py",
         "hashed_secret": "a62f2225bf70bfaccbc7f1ef2a397836717377de",
         "is_verified": false,
-        "line_number": 411
+        "line_number": 449
       },
       {
         "type": "Secret Keyword",
         "filename": "tests/data/test_indexed_file.py",
         "hashed_secret": "c258a8d1264cc59de81f8b1975ac06732b1cf182",
         "is_verified": false,
-        "line_number": 432
+        "line_number": 470
       }
     ],
     "tests/keys/2018-05-01T21:29:02Z/jwt_private_key.pem": [
@@ -395,5 +395,6 @@
       }
     ]
   },
-  "generated_at": "2023-10-20T20:37:17Z"
+  "generated_at": "2024-11-04T09:20:13Z"
+
 }
diff --git a/fence/auth.py b/fence/auth.py
@@ -101,9 +101,8 @@ def set_flask_session_values(user):
 
     user = query_for_user(session=current_app.scoped_session(), username=username)
     if user:
-        if user.active is False:
-            # Abort login if user.active is False (user.active is None or True are both
-            # considered active in this case):
+        if user.active == False:
+            # Abort login if user.active == False:
             raise Unauthorized(
                 "User is known but not authorized/activated in the system"
             )