Skip to content

accountrecovery.go: Unconditionally delete the token after use #36527

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
jentfoo merged 1 commit into from
Jan 11, 2024
Merged

accountrecovery.go: Unconditionally delete the token after use #36527

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
7 changes: 2 additions & 5 deletions lib/auth/accountrecovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,11 +488,8 @@ func (a *Server) CreateAccountRecoveryCodes(ctx context.Context, req *proto.Crea
return nil, trace.AccessDenied(unableToCreateCodesMsg)
}

// If used as part of the recovery flow, getting new recovery codes marks the end of the flow in the UI.
if token.GetSubKind() == UserTokenTypeRecoveryApproved {
if err := a.deleteUserTokens(ctx, token.GetUser()); err != nil {
log.Error(trace.DebugReport(err))
}
if err := a.deleteUserTokens(ctx, token.GetUser()); err != nil {
log.Error(trace.DebugReport(err))
}

return newRecovery, nil
Expand Down
17 changes: 5 additions & 12 deletions lib/auth/accountrecovery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,10 +1192,9 @@ func TestCreateAccountRecoveryCodes(t *testing.T) {
require.NoError(t, err)

cases := []struct {
name string
wantErr bool
forRecovery bool
getRequest func() *proto.CreateAccountRecoveryCodesRequest
name string
wantErr bool
getRequest func() *proto.CreateAccountRecoveryCodesRequest
}{
{
name: "invalid token type",
Expand Down Expand Up @@ -1231,8 +1230,7 @@ func TestCreateAccountRecoveryCodes(t *testing.T) {
},
},
{
name: "recovery approved token",
forRecovery: true,
name: "recovery approved token",
getRequest: func() *proto.CreateAccountRecoveryCodesRequest {
token, err := srv.Auth().createRecoveryToken(ctx, "llama@example.com", UserTokenTypeRecoveryApproved, types.UserTokenUsage_USER_TOKEN_RECOVER_MFA)
require.NoError(t, err)
Expand Down Expand Up @@ -1271,12 +1269,7 @@ func TestCreateAccountRecoveryCodes(t *testing.T) {

// Check token is deleted after success.
_, err = srv.Auth().GetUserToken(ctx, req.TokenID)
switch {
case c.forRecovery:
require.True(t, trace.IsNotFound(err))
default:
require.NoError(t, err)
}
require.True(t, trace.IsNotFound(err))
}
})
}
Expand Down