Fix : Context timeout error handler changes (#6493)
* context timeout error handler changes * changes updated * oidc test case added
This commit is contained in:
1 parent
147dcaafb7
commit
5347d17c24
5 files changed
+72
-3
No files matched your search
@@ -269,6 +269,11 @@ func (s Service) authenticateOidcCallback(ctx context.Context, req *pbs.Authenti
|
||||
attrs.GetState(),
|
||||
attrs.GetCode())
|
||||
if err != nil {
|
||||
// Check if the error is due to context timeout.
|
||||
// This typically happens when the OIDC provider takes too long to respond
|
||||
if errors.Is(err, context.DeadlineExceeded) {
|
||||
return nil, handlers.ApiErrorWithCodeAndMessage(codes.DeadlineExceeded, "The identity provider took too long to respond. Please try again.")
|
||||
}
|
||||
return errResponse(errors.New(ctx, errors.InvalidParameter, op, "Callback validation failed.", errors.WithWrap(err)))
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,9 @@ import (
|
||||
"net/http/httptest"
|
||||
"net/url"
|
||||
"regexp"
|
||||
"runtime/debug"
|
||||
"sort"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
@@ -2048,3 +2050,45 @@ func TestAuthenticate_OIDC_Callback_ErrorRedirect(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestAuthenticate_OIDC_Callback_DeadlineExceeded(t *testing.T) {
|
||||
s := getSetup(t)
|
||||
|
||||
oidcRepoFn := func() (*oidc.Repository, error) {
|
||||
if strings.Contains(string(debug.Stack()), "internal/auth/oidc.Callback") {
|
||||
return nil, context.DeadlineExceeded
|
||||
}
|
||||
|
||||
return s.oidcRepoFn()
|
||||
}
|
||||
|
||||
tested, err := authmethods.NewService(
|
||||
s.ctx,
|
||||
s.kmsCache,
|
||||
s.pwRepoFn,
|
||||
oidcRepoFn,
|
||||
s.iamRepoFn,
|
||||
s.atRepoFn,
|
||||
s.ldapRepoFn,
|
||||
s.authMethodRepoFn,
|
||||
uint(s.maxPageSize),
|
||||
)
|
||||
require.NoError(t, err)
|
||||
|
||||
_, err = tested.Authenticate(auth.DisabledAuthTestContext(s.iamRepoFn, s.org.GetPublicId()),
|
||||
&pbs.AuthenticateRequest{
|
||||
AuthMethodId: s.authMethod.GetPublicId(),
|
||||
Command: "callback",
|
||||
Attrs: &pbs.AuthenticateRequest_OidcAuthMethodAuthenticateCallbackRequest{
|
||||
OidcAuthMethodAuthenticateCallbackRequest: &pb.OidcAuthMethodAuthenticateCallbackRequest{
|
||||
Code: "code",
|
||||
State: "state",
|
||||
},
|
||||
},
|
||||
},
|
||||
)
|
||||
|
||||
require.Error(t, err)
|
||||
assert.True(t, errors.Is(err, handlers.ApiErrorWithCode(codes.DeadlineExceeded)))
|
||||
assert.Equal(t, "The identity provider took too long to respond. Please try again.", handlers.ToApiError(err).GetMessage())
|
||||
}
|
||||
Reference in new issue
Block a user