Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Apr 11, 2023
1 parent 24d64fd commit 4834c99
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 9 deletions.
8 changes: 4 additions & 4 deletions oauthenticator/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,7 @@ def get_user_groups(self, user_info):
groups = self.claim_groups_key(user_info)
else:
try:
groups = reduce(
dict.get, self.claim_groups_key.split("."), user_info
)
groups = reduce(dict.get, self.claim_groups_key.split("."), user_info)
except TypeError:
# This happens if a nested key does not exist (reduce trying to call None.get)
self.log.error(
Expand All @@ -127,7 +125,9 @@ async def user_is_authorized(self, auth_model):
if not groups:
return False

if not self.user_groups_in_allowed_groups(groups, self.allowed_groups + self.admin_groups):
if not self.user_groups_in_allowed_groups(
groups, self.allowed_groups + self.admin_groups
):
return False

return True
Expand Down
9 changes: 6 additions & 3 deletions oauthenticator/google.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@ async def user_is_authorized(self, auth_model):
auth_model['auth_state']['google_user']['google_groups'] = google_groups

# Check if user is a member of any allowed or admin groups.
allowed_groups_per_domain = self.allowed_google_groups.get(user_email_domain, []) + self.admin_google_groups.get(user_email_domain, [])
allowed_groups_per_domain = self.allowed_google_groups.get(
user_email_domain, []
) + self.admin_google_groups.get(user_email_domain, [])
if not allowed_groups_per_domain:
return False
else:
Expand All @@ -153,7 +155,6 @@ async def user_is_authorized(self, auth_model):

return True


async def update_auth_model(self, auth_model):
username = auth_model["name"]
admin_status = True if username in self.admin_users else None
Expand All @@ -163,7 +164,9 @@ async def update_auth_model(self, auth_model):

if user_email_domain in self.admin_google_groups.keys():
# Check if user is a member of any admin groups.
google_groups = self._google_groups_for_user(user_email, user_email_domain)
google_groups = self._google_groups_for_user(
user_email, user_email_domain
)
if google_groups:
auth_model['admin'] = self.user_groups_in_allowed_groups(
google_groups, self.admin_google_groups[user_email_domain]
Expand Down
8 changes: 6 additions & 2 deletions oauthenticator/openshift.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,9 @@ async def update_auth_model(self, auth_model):

# Check if user has been marked as admin by membership in self.admin_groups
if not admin_status and self.admin_groups:
auth_model['admin'] = self.user_groups_in_allowed_groups(user_groups, self.admin_groups)
auth_model['admin'] = self.user_groups_in_allowed_groups(
user_groups, self.admin_groups
)

return auth_model

Expand All @@ -116,7 +118,9 @@ async def user_is_authorized(self, auth_model):
if self.allowed_groups or self.admin_groups:
msg = f"username:{username} User not in any of the allowed/admin groups"
# User is authorized if either in allowed_groups or in admin_groups
if not self.user_groups_in_allowed_groups(user_groups, self.allowed_groups.union(self.admin_groups)):
if not self.user_groups_in_allowed_groups(
user_groups, self.allowed_groups.union(self.admin_groups)
):
self.log.warning(msg)
return False

Expand Down
1 change: 1 addition & 0 deletions oauthenticator/tests/test_openshift.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ async def test_openshift_in_allowed_groups_and_is_not_admin(openshift_client):
assert sorted(user_info) == ['admin', 'auth_state', 'name']
assert user_info['admin'] == False


async def test_openshift_not_in_admin_users_but_not_in_admin_groups(openshift_client):
authenticator = OpenShiftOAuthenticator()
authenticator.allowed_groups = {'group1'}
Expand Down

0 comments on commit 4834c99

Please sign in to comment.