Resolves #16770 The MFA login token redemption path (`POST /api/latest/fleet/sessions`) read the one-time verification token with a non-locking `SELECT` on the read replica, then created a session and deleted the token in a *separate* transaction without verifying the token was still present. Concurrent requests carrying the same token each passed the `SELECT` and each minted a distinct session, breaking the single-use guarantee. `SessionByMFAToken` now consumes the token and creates the session inside a single transaction: - The token row is locked with `SELECT ... FOR UPDATE`, then deleted, and the delete's rows-affected count is confirmed non-zero before the session is created. - Concurrent redemptions serialize on the row lock; the loser re-reads after the winner commits the delete, finds no row, and aborts before creating a session. - The user is still loaded *before* the transaction, so a concurrently-deleted user or a transient read error leaves the token intact for retry (preserving the pre-fix atomicity behavior). --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Juan Fernandez <juan@fleetdm.com>
226 lines
6.3 KiB
Go
226 lines
6.3 KiB
Go
package mysql
|
|
|
|
import (
|
|
"context"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/WatchBeam/clock"
|
|
"github.com/fleetdm/fleet/v4/server/fleet"
|
|
"github.com/fleetdm/fleet/v4/server/ptr"
|
|
"github.com/jmoiron/sqlx"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestSessions(t *testing.T) {
|
|
ds := CreateMySQLDS(t)
|
|
|
|
cases := []struct {
|
|
name string
|
|
fn func(t *testing.T, ds *Datastore)
|
|
}{
|
|
{"Getters", testSessionsGetters},
|
|
{"MFA", testMFA},
|
|
}
|
|
for _, c := range cases {
|
|
t.Run(c.name, func(t *testing.T) {
|
|
defer TruncateTables(t, ds)
|
|
c.fn(t, ds)
|
|
})
|
|
}
|
|
}
|
|
|
|
func testMFA(t *testing.T, ds *Datastore) {
|
|
user, err := ds.NewUser(context.Background(), &fleet.User{
|
|
Password: []byte("supersecret"),
|
|
Email: "me@example.com",
|
|
GlobalRole: ptr.String(fleet.RoleObserver),
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
token, err := ds.NewMFAToken(context.Background(), user.ID)
|
|
require.NoError(t, err)
|
|
require.NotEmpty(t, token)
|
|
|
|
// invalid token
|
|
session, mfaUser, err := ds.SessionByMFAToken(context.Background(), "notreal", 8)
|
|
require.Error(t, err)
|
|
require.Nil(t, mfaUser)
|
|
require.Nil(t, session)
|
|
|
|
// valid token
|
|
session, mfaUser, err = ds.SessionByMFAToken(context.Background(), token, 6)
|
|
require.NoError(t, err)
|
|
require.Equal(t, user.ID, session.UserID)
|
|
require.Equal(t, user.ID, mfaUser.ID)
|
|
require.Len(t, session.Key, 8) // 48 base64-encoded bits
|
|
|
|
// used token
|
|
session, mfaUser, err = ds.SessionByMFAToken(context.Background(), token, 8)
|
|
require.Error(t, err)
|
|
require.Nil(t, mfaUser)
|
|
require.Nil(t, session)
|
|
|
|
// expired token
|
|
token, err = ds.NewMFAToken(context.Background(), user.ID)
|
|
require.NoError(t, err)
|
|
require.NotEmpty(t, token)
|
|
ExecAdhocSQL(t, ds, func(q sqlx.ExtContext) error {
|
|
_, err := q.ExecContext(
|
|
context.Background(),
|
|
"UPDATE verification_tokens SET created_at = NOW() - INTERVAL ? SECOND - INTERVAL 0.5 SECOND",
|
|
fleet.MFALinkTTL.Seconds(),
|
|
)
|
|
return err
|
|
})
|
|
session, mfaUser, err = ds.SessionByMFAToken(context.Background(), token, 8)
|
|
require.Error(t, err)
|
|
require.Nil(t, mfaUser)
|
|
require.Nil(t, session)
|
|
|
|
// concurrent redemptions of the same token must only ever mint one session
|
|
sessionsBefore, err := ds.ListSessionsForUser(context.Background(), user.ID)
|
|
require.NoError(t, err)
|
|
|
|
token, err = ds.NewMFAToken(context.Background(), user.ID)
|
|
require.NoError(t, err)
|
|
require.NotEmpty(t, token)
|
|
|
|
const concurrentRedemptions = 8
|
|
var (
|
|
wg sync.WaitGroup
|
|
mu sync.Mutex
|
|
successes int
|
|
lastErr error
|
|
successKey string
|
|
)
|
|
wg.Add(concurrentRedemptions)
|
|
for range concurrentRedemptions {
|
|
go func() {
|
|
defer wg.Done()
|
|
s, _, err := ds.SessionByMFAToken(context.Background(), token, 8)
|
|
mu.Lock()
|
|
defer mu.Unlock()
|
|
if err != nil {
|
|
lastErr = err
|
|
return
|
|
}
|
|
successes++
|
|
if s != nil {
|
|
successKey = s.Key
|
|
}
|
|
}()
|
|
}
|
|
wg.Wait()
|
|
|
|
require.Equal(t, 1, successes, "exactly one concurrent redemption should succeed")
|
|
require.Error(t, lastErr, "losing redemptions should return an error")
|
|
|
|
// the token must be consumed and exactly one new session created for the user
|
|
sessionsAfter, err := ds.ListSessionsForUser(context.Background(), user.ID)
|
|
require.NoError(t, err)
|
|
require.Len(t, sessionsAfter, len(sessionsBefore)+1)
|
|
require.Contains(t, sessionKeys(sessionsAfter), successKey)
|
|
|
|
session, mfaUser, err = ds.SessionByMFAToken(context.Background(), token, 8)
|
|
require.Error(t, err)
|
|
require.Nil(t, mfaUser)
|
|
require.Nil(t, session)
|
|
}
|
|
|
|
func sessionKeys(sessions []*fleet.Session) []string {
|
|
keys := make([]string, 0, len(sessions))
|
|
for _, s := range sessions {
|
|
keys = append(keys, s.Key)
|
|
}
|
|
return keys
|
|
}
|
|
|
|
func testSessionsGetters(t *testing.T, ds *Datastore) {
|
|
user, err := ds.NewUser(context.Background(), &fleet.User{
|
|
Password: []byte("supersecret"),
|
|
Email: "other@bobcom",
|
|
GlobalRole: ptr.String(fleet.RoleObserver),
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
session, err := ds.NewSession(context.Background(), user.ID, 8)
|
|
require.NoError(t, err)
|
|
require.NotZero(t, session.ID)
|
|
|
|
gotByID, err := ds.SessionByID(context.Background(), session.ID)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, session.Key, gotByID.Key)
|
|
require.NotNil(t, gotByID.APIOnly)
|
|
assert.False(t, *gotByID.APIOnly)
|
|
|
|
gotByKey, err := ds.SessionByKey(context.Background(), session.Key)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, session.ID, gotByKey.ID)
|
|
require.NotNil(t, gotByKey.APIOnly)
|
|
assert.False(t, *gotByKey.APIOnly)
|
|
|
|
newSession, err := ds.NewSession(context.Background(), user.ID, 8)
|
|
require.NoError(t, err)
|
|
|
|
sessions, err := ds.ListSessionsForUser(context.Background(), user.ID)
|
|
require.NoError(t, err)
|
|
require.Len(t, sessions, 2)
|
|
|
|
require.NoError(t, ds.DestroySession(context.Background(), session))
|
|
|
|
prevAccessedAt := newSession.AccessedAt
|
|
|
|
// Advance ds's mock clock time (used by MarkSessionAccessed).
|
|
mc := ds.clock.(*clock.MockClock)
|
|
mc.AddTime(1 * time.Second)
|
|
|
|
require.NoError(t, ds.MarkSessionAccessed(context.Background(), newSession))
|
|
|
|
sessions, err = ds.ListSessionsForUser(context.Background(), user.ID)
|
|
require.NoError(t, err)
|
|
require.Len(t, sessions, 1)
|
|
require.NotEqual(t, prevAccessedAt, sessions[0].AccessedAt)
|
|
|
|
require.NoError(t, ds.DestroyAllSessionsForUser(context.Background(), user.ID))
|
|
|
|
// session for a non-existing user
|
|
newSession, err = ds.NewSession(context.Background(), user.ID+1, 8)
|
|
require.NoError(t, err)
|
|
|
|
gotByKey, err = ds.SessionByKey(context.Background(), newSession.Key)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, newSession.ID, gotByKey.ID)
|
|
require.Nil(t, gotByKey.APIOnly)
|
|
|
|
_, err = ds.SessionByID(context.Background(), newSession.ID)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, newSession.ID, gotByKey.ID)
|
|
require.Nil(t, gotByKey.APIOnly)
|
|
|
|
apiUser, err := ds.NewUser(context.Background(), &fleet.User{
|
|
Password: []byte("supersecret"),
|
|
GlobalRole: ptr.String(fleet.RoleObserver),
|
|
APIOnly: true,
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
// session for an api user
|
|
apiSession, err := ds.NewSession(context.Background(), apiUser.ID, 8)
|
|
require.NoError(t, err)
|
|
|
|
gotByKey, err = ds.SessionByKey(context.Background(), apiSession.Key)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, apiSession.ID, gotByKey.ID)
|
|
require.NotNil(t, gotByKey.APIOnly)
|
|
assert.True(t, *gotByKey.APIOnly)
|
|
|
|
_, err = ds.SessionByID(context.Background(), apiSession.ID)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, apiSession.ID, gotByKey.ID)
|
|
require.NotNil(t, gotByKey.APIOnly)
|
|
assert.True(t, *gotByKey.APIOnly)
|
|
}
|