Skip to content

Change TestDeleteMFADeviceSync to do per-delete assertions #26311

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
codingllama merged 2 commits into from
May 16, 2023
Merged

Change TestDeleteMFADeviceSync to do per-delete assertions #26311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51a61cb
Change TestDeleteMFADeviceSync to do per-delete assertions
codingllama May 15, 2023
2f35868
nit: Change minDevices to `1` for readability
codingllama May 15, 2023
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
6 changes: 3 additions & 3 deletions lib/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2768,16 +2768,16 @@ func (a *Server) deleteMFADeviceSafely(ctx context.Context, user, deviceName str
}

// Prevent users from deleting their last device for clusters that require second factors.
const minDevices = 2
const minDevices = 1
switch sf := authPref.GetSecondFactor(); sf {
case constants.SecondFactorOff, constants.SecondFactorOptional: // MFA is not required, allow deletion
case constants.SecondFactorOn:
if knownDevices < minDevices {
if knownDevices <= minDevices {
return nil, trace.BadParameter(
"cannot delete the last MFA device for this user; add a replacement device first to avoid getting locked out")
}
case constants.SecondFactorOTP, constants.SecondFactorWebauthn:
if sfToCount[sf] < minDevices {
if sfToCount[sf] <= minDevices {
return nil, trace.BadParameter(
"cannot delete the last %s device for this user; add a replacement device first to avoid getting locked out", sf)
}
Expand Down
78 changes: 44 additions & 34 deletions lib/auth/auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2091,13 +2091,16 @@ func TestNewWebSession(t *testing.T) {

func TestDeleteMFADeviceSync(t *testing.T) {
t.Parallel()
srv := newTestTLSServer(t)
ctx := context.Background()

testServer := newTestTLSServer(t)
authServer := testServer.Auth()
mockEmitter := &eventstest.MockEmitter{}
srv.Auth().emitter = mockEmitter
authServer.emitter = mockEmitter

ctx := context.Background()

username := "llama@goteleport.com"
_, _, err := CreateUserAndRole(srv.Auth(), username, []string{username}, nil)
_, _, err := CreateUserAndRole(authServer, username, []string{username}, nil /* allowRules */)
require.NoError(t, err)

authPreference, err := types.NewAuthPreference(types.AuthPreferenceSpecV2{
Expand All @@ -2108,73 +2111,80 @@ func TestDeleteMFADeviceSync(t *testing.T) {
},
})
require.NoError(t, err)
err = srv.Auth().SetAuthPreference(ctx, authPreference)
err = authServer.SetAuthPreference(ctx, authPreference)
require.NoError(t, err)

clt, err := srv.NewClient(TestUser(username))
clt, err := testServer.NewClient(TestUser(username))
require.NoError(t, err)

// Insert dummy devices.
webDev1, err := RegisterTestDevice(ctx, clt, "web-1", proto.DeviceType_DEVICE_TYPE_WEBAUTHN, nil /* authenticator */)
require.NoError(t, err)
webDev2, err := RegisterTestDevice(ctx, clt, "web-2", proto.DeviceType_DEVICE_TYPE_WEBAUTHN, webDev1)
_, err = RegisterTestDevice(ctx, clt, "web-2", proto.DeviceType_DEVICE_TYPE_WEBAUTHN, webDev1)
require.NoError(t, err)
totpDev1, err := RegisterTestDevice(ctx, clt, "otp-1", proto.DeviceType_DEVICE_TYPE_TOTP, webDev1, WithTestDeviceClock(srv.Clock()))
totpDev1, err := RegisterTestDevice(ctx, clt, "otp-1", proto.DeviceType_DEVICE_TYPE_TOTP, webDev1, WithTestDeviceClock(testServer.Clock()))
require.NoError(t, err)
totpDev2, err := RegisterTestDevice(ctx, clt, "otp-2", proto.DeviceType_DEVICE_TYPE_TOTP, webDev1, WithTestDeviceClock(srv.Clock()))
_, err = RegisterTestDevice(ctx, clt, "otp-2", proto.DeviceType_DEVICE_TYPE_TOTP, webDev1, WithTestDeviceClock(testServer.Clock()))
require.NoError(t, err)

tests := []struct {
name string
deviceToDelete string
tokenReq CreateUserTokenRequest
deviceToDelete string
}{
{
name: "recovery approved token",
deviceToDelete: webDev1.MFA.GetName(),
name: "recovery approved token",
tokenReq: CreateUserTokenRequest{
Name: username,
TTL: 5 * time.Minute,
Type: UserTokenTypeRecoveryApproved,
},
deviceToDelete: webDev1.MFA.GetName(),
},
{
name: "privilege token",
deviceToDelete: totpDev1.MFA.GetName(),
name: "privilege token",
tokenReq: CreateUserTokenRequest{
Name: username,
TTL: 5 * time.Minute,
Type: UserTokenTypePrivilege,
},
deviceToDelete: totpDev1.MFA.GetName(),
},
}

for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
token, err := srv.Auth().newUserToken(tc.tokenReq)
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
token, err := authServer.newUserToken(test.tokenReq)
require.NoError(t, err)
_, err = srv.Auth().CreateUserToken(ctx, token)
_, err = authServer.CreateUserToken(ctx, token)
require.NoError(t, err)

// Delete the TOTP device.
err = srv.Auth().DeleteMFADeviceSync(ctx, &proto.DeleteMFADeviceSyncRequest{
// Delete the device.
mockEmitter.Reset()
err = authServer.DeleteMFADeviceSync(ctx, &proto.DeleteMFADeviceSyncRequest{
TokenID: token.GetName(),
DeviceName: tc.deviceToDelete,
DeviceName: test.deviceToDelete,
})
require.NoError(t, err)
require.NoError(t, err, "DeleteMFADeviceSync failed")

// Verify device deletion.
devs, err := authServer.Services.GetMFADevices(ctx, username, false /* withSecrets */)
require.NoError(t, err, "GetMFADevices failed")
for _, dev := range devs {
if dev.GetName() == test.deviceToDelete {
t.Errorf("DeleteMFADeviceSync(%q): device not deleted", test.deviceToDelete)
return
}
}

// Verify deletion event.
event := mockEmitter.LastEvent()
assert.Equal(t, events.MFADeviceDeleteEvent, event.GetType(), "event.Type")
assert.Equal(t, events.MFADeviceDeleteEventCode, event.GetCode(), "event.Code")
require.IsType(t, &apievents.MFADeviceDelete{}, event, "underlying event type")
deleteEvent := event.(*apievents.MFADeviceDelete) // asserted above
assert.Equal(t, username, deleteEvent.User, "event.User")
})
}

// Check it's been deleted.
devs, err := srv.Auth().Services.GetMFADevices(ctx, username, false)
require.NoError(t, err)
compareDevices(t, false /* ignoreUpdateAndCounter */, devs, webDev2.MFA, totpDev2.MFA)

// Test last events emitted.
event := mockEmitter.LastEvent()
require.Equal(t, events.MFADeviceDeleteEvent, event.GetType())
require.Equal(t, events.MFADeviceDeleteEventCode, event.GetCode())
require.Equal(t, event.(*apievents.MFADeviceDelete).UserMetadata.User, username)
}

func TestDeleteMFADeviceSync_WithErrors(t *testing.T) {
Expand Down