Skip to content

fix(sessions): invalidate legacy sessions with null aal #2792

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

Open
fadymak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(sessions): invalidate legacy sessions with null aal #2792

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
2 changes: 1 addition & 1 deletion internal/models/sessions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ func updateFactorAssociatedSessions(tx *storage.Connection, userID, factorID uui
}

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 < ?", userID, level).Exec()
return tx.RawQuery("DELETE FROM "+(&pop.Model{Value: Session{}}).TableName()+" WHERE user_id = ? AND (aal IS NULL OR aal < ?)", userID, level).Exec()
}

// Logout deletes all sessions for a user.
Expand Down
30 changes: 30 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 @@ -57,6 +57,36 @@ func (ts *SessionsTestSuite) TestFindBySessionIDWithForUpdate() {
require.Equal(ts.T(), session.ID, found.ID)
}

func (ts *SessionsTestSuite) TestInvalidateSessionsWithAALLessThan() {
u, err := FindUserByEmailAndAudience(ts.db, "test@example.com", ts.Config.JWT.Aud)
require.NoError(ts.T(), err)

aal1Session, err := NewSession(u.ID, nil)
require.NoError(ts.T(), err)
require.NoError(ts.T(), ts.db.Create(aal1Session))

// Simulates a legacy session created before the aal column was backfilled.
legacySession := &Session{ID: uuid.Must(uuid.NewV4()), UserID: u.ID, AAL: nil}
require.NoError(ts.T(), ts.db.Create(legacySession))

aal2Session, err := NewSession(u.ID, nil)
require.NoError(ts.T(), err)
aal2Session.AAL = AAL2.PointerString()
require.NoError(ts.T(), ts.db.Create(aal2Session))

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

_, err = FindSessionByID(ts.db, aal1Session.ID, false)
require.ErrorIs(ts.T(), err, SessionNotFoundError{})

_, err = FindSessionByID(ts.db, legacySession.ID, false)
require.ErrorIs(ts.T(), err, SessionNotFoundError{})

found, err := FindSessionByID(ts.db, aal2Session.ID, false)
require.NoError(ts.T(), err)
require.Equal(ts.T(), aal2Session.ID, found.ID)
}

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