Skip to content

fix(mfa): preserve OAuth 2.1 client sessions during AAL step-up (closes #2801) #2863

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

Closed
61465 wants to merge 1 commit into from
Closed

fix(mfa): preserve OAuth 2.1 client sessions during AAL step-up (closes #2801) #2863

Show file tree
Hide file tree
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
13 changes: 12 additions & 1 deletion internal/models/sessions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,19 @@ func updateFactorAssociatedSessions(tx *storage.Connection, userID, factorID uui
return tx.RawQuery("UPDATE "+(&pop.Model{Value: Session{}}).TableName()+" set aal = ?, factor_id = ? WHERE user_id = ? AND factor_id = ?", aal, nil, userID, factorID).Exec()
}

// InvalidateSessionsWithAALLessThan deletes a user's sessions whose AAL is
// below the given level. All four callers are MFA step-up paths
// (verifyTOTPFactor / verifyPhoneFactor / verifyWebAuthnFactor / recoveryCodesVerify)
// and want to force re-authentication on the user's other first-party sessions
// after the step-up succeeds.
//
// OAuth 2.1 client sessions (identified by a non-NULL oauth_client_id) are
// explicitly preserved: they represent third-party-client consent grants whose
// lifecycle is managed independently via RevokeOAuthSessions. Including them
// in the MFA sweep breaks every MCP / OAuth integration the user has authorized
// the moment they verify a factor in a first-party surface (issue #2801).
func InvalidateSessionsWithAALLessThan(tx *storage.Connection, userID uuid.UUID, level string) error {
return tx.RawQuery("DELETE FROM "+(&pop.Model{Value: Session{}}).TableName()+" WHERE user_id = ? AND (aal IS NULL OR aal < ?)", userID, level).Exec()
return tx.RawQuery("DELETE FROM "+(&pop.Model{Value: Session{}}).TableName()+" WHERE user_id = ? AND (aal IS NULL OR aal < ?) AND oauth_client_id IS NULL", userID, level).Exec()
}

// Logout deletes all sessions for a user.
Expand Down
60 changes: 60 additions & 0 deletions internal/models/sessions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,66 @@ func (ts *SessionsTestSuite) TestInvalidateSessionsWithAALLessThan() {
require.Equal(ts.T(), aal2Session.ID, found.ID)
}

// Regression test for #2801 — MFA step-up must not delete OAuth client sessions.
// Covers four scenarios:
// 1. aal1 OAuth client session survives (previously wiped — the user-visible bug)
// 2. aal1 first-party session alongside it is still removed (MFA still enforces step-up)
// 3. aal2 OAuth client session also survives (ownership is by oauth_client_id, not AAL)
// 4. RevokeOAuthSessions remains the sole authoritative path to drop OAuth sessions
func (ts *SessionsTestSuite) TestInvalidateSessionsWithAALLessThan_PreservesOAuthClientSessions() {
u, err := FindUserByEmailAndAudience(ts.db, "test@example.com", ts.Config.JWT.Aud)
require.NoError(ts.T(), err)

oauthClientID := uuid.Must(uuid.NewV4())

// (1) OAuth client session at aal1 — should SURVIVE the MFA sweep.
oauthAAL1 := &Session{
ID: uuid.Must(uuid.NewV4()),
UserID: u.ID,
AAL: AAL1.PointerString(),
OAuthClientID: &oauthClientID,
}
require.NoError(ts.T(), ts.db.Create(oauthAAL1))

// (2) First-party aal1 session — should be removed.
firstPartyAAL1, err := NewSession(u.ID, nil)
require.NoError(ts.T(), err)
require.NoError(ts.T(), ts.db.Create(firstPartyAAL1))

// (3) OAuth client session with AAL already at aal2 — SURVIVES unconditionally.
oauthAAL2 := &Session{
ID: uuid.Must(uuid.NewV4()),
UserID: u.ID,
AAL: AAL2.PointerString(),
OAuthClientID: &oauthClientID,
}
require.NoError(ts.T(), ts.db.Create(oauthAAL2))

require.NoError(ts.T(), InvalidateSessionsWithAALLessThan(ts.db, u.ID, AAL2.String()))

// (1) OAuth aal1 preserved.
foundOAuth1, err := FindSessionByID(ts.db, oauthAAL1.ID, false)
require.NoError(ts.T(), err, "OAuth client session at aal1 must survive MFA step-up (#2801)")
require.Equal(ts.T(), oauthAAL1.ID, foundOAuth1.ID)

// (2) First-party aal1 removed.
_, err = FindSessionByID(ts.db, firstPartyAAL1.ID, false)
require.ErrorIs(ts.T(), err, SessionNotFoundError{},
"first-party aal1 session must still be invalidated by MFA step-up")

// (3) OAuth aal2 preserved.
foundOAuth2, err := FindSessionByID(ts.db, oauthAAL2.ID, false)
require.NoError(ts.T(), err)
require.Equal(ts.T(), oauthAAL2.ID, foundOAuth2.ID)

// (4) RevokeOAuthSessions remains the authoritative cleanup for OAuth sessions.
require.NoError(ts.T(), RevokeOAuthSessions(ts.db, u.ID, oauthClientID))
_, err = FindSessionByID(ts.db, oauthAAL1.ID, false)
require.ErrorIs(ts.T(), err, SessionNotFoundError{})
_, err = FindSessionByID(ts.db, oauthAAL2.ID, false)
require.ErrorIs(ts.T(), err, SessionNotFoundError{})
}

func (ts *SessionsTestSuite) AddClaimAndReloadSession(session *Session, claim AuthenticationMethod) *Session {
err := AddClaimToSession(ts.db, session.ID, claim)
require.NoError(ts.T(), err)
Expand Down