Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure OAuth falls back to OpenID userinfo if id_token is not sufficient #5939

Merged
merged 2 commits into from
Nov 29, 2023
Merged

Ensure OAuth falls back to OpenID userinfo if id_token is not sufficient #5939

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b54dc28
Ensure OAuth falls back to OpenID userinfo if id_token is not sufficient
philippjfr Nov 29, 2023
bba5fb9
Apply suggestions from code review
philippjfr Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions panel/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,13 @@ async def _fetch_access_token(
if expires_in:
expires_in = int(expires_in)
if id_token:= body.get('id_token'):
log.debug("%s successfully obtained tokens.", type(self).__name__)
user = self._on_auth(id_token, access_token, refresh_token, expires_in)
return user, access_token, refresh_token, expires_in
try:
user = self._on_auth(id_token, access_token, refresh_token, expires_in)
except HTTPError:
pass
else:
log.debug("%s successfully obtained access_token and id_token.", type(self).__name__)
return user, access_token, refresh_token, expires_in

user_headers = dict(self._API_BASE_HEADERS)
if self._access_token_header:
Expand All @@ -250,21 +254,22 @@ async def _fetch_access_token(
else:
user_url = '{}{}'.format(self._OAUTH_USER_URL, body['access_token'])

log.debug("%s requesting OpenID userinfo.", type(self).__name__)
try:
user_response = await http.fetch(user_url, headers=user_headers)
id_token = decode_response_body(user_response)
except HTTPClientError:
id_token = None

if not id_token:
log.debug("%s could not obtain id_token, falling back to decoding access_token.", type(self).__name__)
log.debug("%s could not obtain userinfo or id_token, falling back to decoding access_token.", type(self).__name__)
try:
id_token = decode_token(body['access_token'])
except Exception:
log.debug("%s could not decode access_token.", type(self).__name__)
self._raise_error(response, body, status=401)

log.debug("%s successfully obtained tokens.", type(self).__name__)
log.debug("%s successfully obtained access_token and userinfo.", type(self).__name__)
user = self._on_auth(id_token, access_token, refresh_token, expires_in)
return user, access_token, refresh_token, expires_in

Expand Down