Skip to content

[All] Fix handling of expired id tokens when userdata_from_id_token is True #795

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −3
Draft

[All] Fix handling of expired id tokens when userdata_from_id_token is True #795

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 17 additions & 3 deletions oauthenticator/oauth2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ def _refresh_pre_spawn_default(self):

- True (no change)
- False (require new login)
- auth_model (dict - the new auth model, if anything should be changeed)
- auth_model (dict - the new auth model, if anything should be changed)
- None (proceed with default refresh_user behavior -
allows overriding refresh_user behavior for _some_ users)

Expand Down Expand Up @@ -1141,12 +1141,21 @@ async def token_to_user(self, token_info):
id_token,
audience=self.client_id,
options=dict(
verify_signature=False, verify_aud=True, verify_exp=True
# setting verify_signature to False makes all other
# verification default to False, making us need to
# opt-in to what we want to check
verify_signature=False,
verify_aud=True,
verify_exp=True,
),
Copy link
Member

@manics manics Jun 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
),
require=["exp"],
),

https://pyjwt.readthedocs.io/en/stable/api.html

Warning

exp, iat and nbf will only be verified if present. Please pass respective value to require if you want to make sure that they are always present (and therefore always verified if verify_exp, verify_iat, and verify_nbf respectively is set to True).

)
except jwt.InvalidAudienceError:
raise
except jwt.ExpiredSignatureError:
raise
except Exception as err:
raise web.HTTPError(
500, f"Unable to decode id token: {id_token}\n{err}"
500, f"Unknown error decoding id token: {id_token}\n{err}"
)

access_token = token_info["access_token"]
Expand Down Expand Up @@ -1381,6 +1390,10 @@ async def refresh_user(self, user, handler=None, **kwargs):
auth_model = None
try:
auth_model = await self._token_to_auth_model(token_info)
except jwt.ExpiredSignatureError:
self.log.info(
f"id_token expired for {user.name}. Will try to refresh, if possible."
)
except HTTPClientError as e:
# assume any client error means an expired token
# most likely 401 or 403 for well-behaved providers
Expand All @@ -1390,6 +1403,7 @@ async def refresh_user(self, user, handler=None, **kwargs):
)
else:
raise

refresh_token = auth_state.get("refresh_token", None)
if refresh_token and not auth_model:
self.log.info(f"Refreshing oauth access token for {user.name}")
Expand Down