Skip to content

Fix flaky test TestServer_Authenticate_headless #23578

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
Joerger merged 2 commits into from
Mar 25, 2023
Merged

Fix flaky test TestServer_Authenticate_headless #23578

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
0ab1388
Remove race condition on headless authentication expires field when
Joerger Mar 23, 2023
68ee939
Merge branch 'master' into joerger/fix-flaky-test-TestServer_Authenti…
Joerger Mar 24, 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
12 changes: 4 additions & 8 deletions lib/auth/auth_login_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,6 @@ func TestServer_Authenticate_headless(t *testing.T) {

ctx := context.Background()
headlessID := services.NewHeadlessAuthenticationID([]byte(sshPubKey))
const timeout = time.Millisecond * 200

type updateHeadlessAuthnFn func(*types.HeadlessAuthentication, *types.MFADevice)
updateHeadlessAuthnInGoroutine := func(ctx context.Context, srv *TestTLSServer, mfa *types.MFADevice, update updateHeadlessAuthnFn) chan error {
Expand Down Expand Up @@ -784,7 +783,7 @@ func TestServer_Authenticate_headless(t *testing.T) {
mfa := configureForMFA(t, srv)
username := mfa.User

// Fail a login attempt so have a non-empty list of attempts.
// Fail a login attempt so we have a non-empty list of attempts.
_, err = proxyClient.AuthenticateSSHUser(ctx, AuthenticateSSHRequest{
AuthenticateUserRequest: AuthenticateUserRequest{
Username: username,
Expand All @@ -793,16 +792,12 @@ func TestServer_Authenticate_headless(t *testing.T) {
},
TTL: 24 * time.Hour,
})
require.True(t, trace.IsAccessDenied(err), "got err = %v, want AccessDenied")
require.True(t, trace.IsAccessDenied(err), "got err = %v, want AccessDenied", err)
attempts, err := srv.Auth().GetUserLoginAttempts(username)
require.NoError(t, err)
require.NotEmpty(t, attempts, "Want at least one failed login attempt")

t.Cleanup(func() {
srv.Auth().DeleteHeadlessAuthentication(ctx, headlessID)
})

ctx, cancel := context.WithTimeout(ctx, timeout)
ctx, cancel := context.WithTimeout(ctx, 2*time.Second)
defer cancel()

errC := updateHeadlessAuthnInGoroutine(ctx, srv, mfa.WebDev.MFA, tc.update)
Expand All @@ -821,6 +816,7 @@ func TestServer_Authenticate_headless(t *testing.T) {
TTL: defaults.CallbackTimeout,
})
require.NoError(t, <-errC)

if tc.expectErr {
require.Error(t, err)
// Verify login attempts unchanged. This is a proxy for various other user
Expand Down
9 changes: 4 additions & 5 deletions lib/services/local/headlessauthn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package local

import (
"context"
"time"

"github.com/gravitational/trace"

Expand All @@ -31,7 +30,8 @@ import (

// CreateHeadlessAuthenticationStub creates a headless authentication stub in the backend.
func (s *IdentityService) CreateHeadlessAuthenticationStub(ctx context.Context, name string) (*types.HeadlessAuthentication, error) {
headlessAuthn, err := types.NewHeadlessAuthenticationStub(name, s.Clock().Now().Add(defaults.CallbackTimeout))
expires := s.Clock().Now().Add(defaults.CallbackTimeout)
headlessAuthn, err := types.NewHeadlessAuthenticationStub(name, expires)
if err != nil {
return nil, trace.Wrap(err)
}
Expand Down Expand Up @@ -115,6 +115,7 @@ func (s *IdentityService) DeleteHeadlessAuthentication(ctx context.Context, name
return trace.Wrap(err)
}

// MarshalHeadlessAuthenticationToItem marshals a headless authentication to a backend.Item.
func MarshalHeadlessAuthenticationToItem(headlessAuthn *types.HeadlessAuthentication) (*backend.Item, error) {
if err := headlessAuthn.CheckAndSetDefaults(); err != nil {
return nil, trace.Wrap(err)
Expand All @@ -132,15 +133,13 @@ func MarshalHeadlessAuthenticationToItem(headlessAuthn *types.HeadlessAuthentica
}, nil
}

// unmarshalHeadlessAuthenticationFromItem unmarshals a headless authentication from a backend.Item.
func unmarshalHeadlessAuthenticationFromItem(item *backend.Item) (*types.HeadlessAuthentication, error) {
var headlessAuthn types.HeadlessAuthentication
if err := utils.FastUnmarshal(item.Value, &headlessAuthn); err != nil {
return nil, trace.Wrap(err, "error unmarshalling headless authentication from storage")
}

// Copy item.Expires without pointer to avoid race conditions with memory backend.
headlessAuthn.Metadata.Expires = new(time.Time)
*headlessAuthn.Metadata.Expires = item.Expires
if err := headlessAuthn.CheckAndSetDefaults(); err != nil {
return nil, trace.Wrap(err)
}
Expand Down