Skip to content

Commit

Permalink
Merge branch 'master' into automatedCopy-feature/oidc-oauth-groups
Browse files Browse the repository at this point in the history
  • Loading branch information
Avantol13 authored Dec 19, 2024
2 parents 3cb11a7 + 87d4649 commit 4a206ae
Show file tree
Hide file tree
Showing 13 changed files with 502 additions and 44 deletions.
6 changes: 3 additions & 3 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -314,14 +314,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": [
Expand Down Expand Up @@ -422,5 +422,5 @@
}
]
},
"generated_at": "2024-08-22T19:43:39Z"
"generated_at": "2024-11-04T09:20:13Z"
}
5 changes: 2 additions & 3 deletions fence/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
Loading

0 comments on commit 4a206ae

Please sign in to comment.