feat(oidc): return defined error when discovery failed
This commit is contained in:
parent
b555396744
commit
aadfd3017f
3 changed files with 18 additions and 5 deletions
|
@ -42,7 +42,7 @@ func Discover(ctx context.Context, issuer string, httpClient *http.Client, wellK
|
||||||
discoveryConfig := new(oidc.DiscoveryConfiguration)
|
discoveryConfig := new(oidc.DiscoveryConfiguration)
|
||||||
err = httphelper.HttpRequest(httpClient, req, &discoveryConfig)
|
err = httphelper.HttpRequest(httpClient, req, &discoveryConfig)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, fmt.Errorf("%w: %w", oidc.ErrDiscoveryFailed, err)
|
||||||
}
|
}
|
||||||
if logger, ok := logging.FromContext(ctx); ok {
|
if logger, ok := logging.FromContext(ctx); ok {
|
||||||
logger.Debug("discover", "config", discoveryConfig)
|
logger.Debug("discover", "config", discoveryConfig)
|
||||||
|
|
|
@ -7,6 +7,7 @@ import (
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
"github.com/zitadel/oidc/v3/pkg/oidc"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestDiscover(t *testing.T) {
|
func TestDiscover(t *testing.T) {
|
||||||
|
@ -22,7 +23,7 @@ func TestDiscover(t *testing.T) {
|
||||||
name string
|
name string
|
||||||
args args
|
args args
|
||||||
wantFields *wantFields
|
wantFields *wantFields
|
||||||
wantErr bool
|
wantErr error
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "spotify", // https://github.com/zitadel/oidc/issues/406
|
name: "spotify", // https://github.com/zitadel/oidc/issues/406
|
||||||
|
@ -32,16 +33,27 @@ func TestDiscover(t *testing.T) {
|
||||||
wantFields: &wantFields{
|
wantFields: &wantFields{
|
||||||
UILocalesSupported: true,
|
UILocalesSupported: true,
|
||||||
},
|
},
|
||||||
wantErr: false,
|
wantErr: nil,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "discovery failed",
|
||||||
|
args: args{
|
||||||
|
issuer: "https://example.com",
|
||||||
|
},
|
||||||
|
wantFields: &wantFields{
|
||||||
|
UILocalesSupported: true,
|
||||||
|
},
|
||||||
|
wantErr: oidc.ErrDiscoveryFailed,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
got, err := Discover(context.Background(), tt.args.issuer, http.DefaultClient, tt.args.wellKnownUrl...)
|
got, err := Discover(context.Background(), tt.args.issuer, http.DefaultClient, tt.args.wellKnownUrl...)
|
||||||
if tt.wantErr {
|
if tt.wantErr != nil {
|
||||||
assert.Error(t, err)
|
assert.ErrorIs(t, err, tt.wantErr)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
if tt.wantFields == nil {
|
if tt.wantFields == nil {
|
||||||
return
|
return
|
||||||
|
|
|
@ -40,6 +40,7 @@ type IDClaims interface {
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrParse = errors.New("parsing of request failed")
|
ErrParse = errors.New("parsing of request failed")
|
||||||
|
ErrDiscoveryFailed = errors.New("OpenID Provider Configuration Discovery is failed")
|
||||||
ErrIssuerInvalid = errors.New("issuer does not match")
|
ErrIssuerInvalid = errors.New("issuer does not match")
|
||||||
ErrSubjectMissing = errors.New("subject missing")
|
ErrSubjectMissing = errors.New("subject missing")
|
||||||
ErrAudience = errors.New("audience is not valid")
|
ErrAudience = errors.New("audience is not valid")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue