Skip to content

fix(oauth): Preserve session payload across cycle_key() in authorize flow #111738

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

Merged
michelletran-sentry merged 2 commits into from
Mar 30, 2026
Merged

fix(oauth): Preserve session payload across cycle_key() in authorize flow #111738

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21c19e3
fix(oauth): Preserve session payload across cycle_key() in authorize …
sentry[bot] Mar 27, 2026
e9f8f24
Merge branch 'master' into seer/fix/oauth-session-keyerror
michelletran-sentry Mar 30, 2026
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
11 changes: 8 additions & 3 deletions src/sentry/web/frontend/oauth_authorize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,12 +339,17 @@ def _logged_out_post(
response = super().post(request, application=application, **kwargs)
# once they login, bind their user ID
if request.user.is_authenticated:
# Save OAuth payload before session regeneration
oa2_payload = request.session.get("oa2")

# Regenerate session to prevent session fixation attacks
request.session.cycle_key()

# Update OAuth payload with authenticated user ID for validation in post()
request.session["oa2"]["uid"] = request.user.id
request.session.modified = True
# Restore OAuth payload after session regeneration and update user ID
if oa2_payload is not None:
oa2_payload["uid"] = request.user.id
request.session["oa2"] = oa2_payload
request.session.modified = True
return response

def post(self, request: HttpRequest, **kwargs) -> HttpResponseBase:
Expand Down
Loading