FEATURES (and FIXES): - support OAuth 2.0 Token Revocation [RFC 7009](https://datatracker.ietf.org/doc/html/rfc7009) - handle request object using `request` parameter [OIDC Core 1.0 Request Object](https://openid.net/specs/openid-connect-core-1_0.html#RequestObject) - handle response mode - added some information to the discovery endpoint: - revocation_endpoint (added with token revocation) - revocation_endpoint_auth_methods_supported (added with token revocation) - revocation_endpoint_auth_signing_alg_values_supported (added with token revocation) - token_endpoint_auth_signing_alg_values_supported (was missing) - introspection_endpoint_auth_signing_alg_values_supported (was missing) - request_object_signing_alg_values_supported (added with request object) - request_parameter_supported (added with request object) - fixed `removeUserinfoScopes ` now returns the scopes without "userinfo" scopes (profile, email, phone, addedd) [source diff](https://github.com/caos/oidc/pull/130/files#diff-fad50c8c0f065d4dbc49d6c6a38f09c992c8f5d651a479ba00e31b500543559eL170-R171) - improved error handling (pkg/oidc/error.go) and fixed some wrong OAuth errors (e.g. `invalid_grant` instead of `invalid_request`) - improved MarshalJSON and added MarshalJSONWithStatus - removed deprecated PEM decryption from `BytesToPrivateKey` [source diff](https://github.com/caos/oidc/pull/130/files#diff-fe246e428e399ccff599627c71764de51387b60b4df84c67de3febd0954e859bL11-L19) - NewAccessTokenVerifier now uses correct (internal) `accessTokenVerifier` [source diff](https://github.com/caos/oidc/pull/130/files#diff-3a01c7500ead8f35448456ef231c7c22f8d291710936cac91de5edeef52ffc72L52-R52) BREAKING CHANGE: - move functions from `utils` package into separate packages - added various methods to the (OP) `Configuration` interface [source diff](https://github.com/caos/oidc/pull/130/files#diff-2538e0dfc772fdc37f057aecd6fcc2943f516c24e8be794cce0e368a26d20a82R19-R32) - added revocationEndpoint to `WithCustomEndpoints ` [source diff](https://github.com/caos/oidc/pull/130/files#diff-19ae13a743eb7cebbb96492798b1bec556673eb6236b1387e38d722900bae1c3L355-R391) - remove unnecessary context parameter from JWTProfileExchange [source diff](https://github.com/caos/oidc/pull/130/files#diff-4ed8f6affa4a9631fa8a034b3d5752fbb6a819107141aae00029014e950f7b4cL14)
252 lines
5.4 KiB
Go
252 lines
5.4 KiB
Go
package op_test
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/golang/mock/gomock"
|
|
"github.com/stretchr/testify/require"
|
|
"gopkg.in/square/go-jose.v2"
|
|
|
|
"github.com/caos/oidc/pkg/oidc"
|
|
"github.com/caos/oidc/pkg/op"
|
|
"github.com/caos/oidc/pkg/op/mock"
|
|
)
|
|
|
|
func TestDiscover(t *testing.T) {
|
|
type args struct {
|
|
w http.ResponseWriter
|
|
config *oidc.DiscoveryConfiguration
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
}{
|
|
{
|
|
"OK",
|
|
args{
|
|
httptest.NewRecorder(),
|
|
&oidc.DiscoveryConfiguration{Issuer: "https://issuer.com"},
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
op.Discover(tt.args.w, tt.args.config)
|
|
rec := tt.args.w.(*httptest.ResponseRecorder)
|
|
require.Equal(t, http.StatusOK, rec.Code)
|
|
require.Equal(t,
|
|
`{"issuer":"https://issuer.com","request_uri_parameter_supported":false}
|
|
`,
|
|
rec.Body.String())
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestCreateDiscoveryConfig(t *testing.T) {
|
|
type args struct {
|
|
c op.Configuration
|
|
s op.Signer
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
want *oidc.DiscoveryConfiguration
|
|
}{
|
|
// TODO: Add test cases.
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if got := op.CreateDiscoveryConfig(tt.args.c, tt.args.s); !reflect.DeepEqual(got, tt.want) {
|
|
t.Errorf("CreateDiscoveryConfig() = %v, want %v", got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func Test_scopes(t *testing.T) {
|
|
type args struct {
|
|
c op.Configuration
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
want []string
|
|
}{
|
|
{
|
|
"default Scopes",
|
|
args{},
|
|
op.DefaultSupportedScopes,
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if got := op.Scopes(tt.args.c); !reflect.DeepEqual(got, tt.want) {
|
|
t.Errorf("scopes() = %v, want %v", got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func Test_ResponseTypes(t *testing.T) {
|
|
type args struct {
|
|
c op.Configuration
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
want []string
|
|
}{
|
|
// TODO: Add test cases.
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if got := op.ResponseTypes(tt.args.c); !reflect.DeepEqual(got, tt.want) {
|
|
t.Errorf("responseTypes() = %v, want %v", got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func Test_GrantTypes(t *testing.T) {
|
|
type args struct {
|
|
c op.Configuration
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
want []string
|
|
}{
|
|
// TODO: Add test cases.
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if got := op.GrantTypes(tt.args.c); !reflect.DeepEqual(got, tt.want) {
|
|
t.Errorf("grantTypes() = %v, want %v", got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestSupportedClaims(t *testing.T) {
|
|
type args struct {
|
|
c op.Configuration
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
want []string
|
|
}{
|
|
// TODO: Add test cases.
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if got := op.SupportedClaims(tt.args.c); !reflect.DeepEqual(got, tt.want) {
|
|
t.Errorf("SupportedClaims() = %v, want %v", got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func Test_SigAlgorithms(t *testing.T) {
|
|
m := mock.NewMockSigner(gomock.NewController(t))
|
|
type args struct {
|
|
s op.Signer
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
want []string
|
|
}{
|
|
{
|
|
"",
|
|
args{func() op.Signer {
|
|
m.EXPECT().SignatureAlgorithm().Return(jose.RS256)
|
|
return m
|
|
}()},
|
|
[]string{"RS256"},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if got := op.SigAlgorithms(tt.args.s); !reflect.DeepEqual(got, tt.want) {
|
|
t.Errorf("sigAlgorithms() = %v, want %v", got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func Test_SubjectTypes(t *testing.T) {
|
|
type args struct {
|
|
c op.Configuration
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
want []string
|
|
}{
|
|
{
|
|
"none",
|
|
args{},
|
|
[]string{"public"},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if got := op.SubjectTypes(tt.args.c); !reflect.DeepEqual(got, tt.want) {
|
|
t.Errorf("subjectTypes() = %v, want %v", got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func Test_AuthMethodsTokenEndpoint(t *testing.T) {
|
|
type args struct {
|
|
c op.Configuration
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
want []oidc.AuthMethod
|
|
}{
|
|
{
|
|
"none and basic",
|
|
args{func() op.Configuration {
|
|
m := mock.NewMockConfiguration(gomock.NewController(t))
|
|
m.EXPECT().AuthMethodPostSupported().Return(false)
|
|
m.EXPECT().AuthMethodPrivateKeyJWTSupported().Return(false)
|
|
return m
|
|
}()},
|
|
[]oidc.AuthMethod{oidc.AuthMethodNone, oidc.AuthMethodBasic},
|
|
},
|
|
{
|
|
"none, basic and post",
|
|
args{func() op.Configuration {
|
|
m := mock.NewMockConfiguration(gomock.NewController(t))
|
|
m.EXPECT().AuthMethodPostSupported().Return(true)
|
|
m.EXPECT().AuthMethodPrivateKeyJWTSupported().Return(false)
|
|
return m
|
|
}()},
|
|
[]oidc.AuthMethod{oidc.AuthMethodNone, oidc.AuthMethodBasic, oidc.AuthMethodPost},
|
|
},
|
|
{
|
|
"none, basic, post and private_key_jwt",
|
|
args{func() op.Configuration {
|
|
m := mock.NewMockConfiguration(gomock.NewController(t))
|
|
m.EXPECT().AuthMethodPostSupported().Return(true)
|
|
m.EXPECT().AuthMethodPrivateKeyJWTSupported().Return(true)
|
|
return m
|
|
}()},
|
|
[]oidc.AuthMethod{oidc.AuthMethodNone, oidc.AuthMethodBasic, oidc.AuthMethodPost, oidc.AuthMethodPrivateKeyJWT},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if got := op.AuthMethodsTokenEndpoint(tt.args.c); !reflect.DeepEqual(got, tt.want) {
|
|
t.Errorf("authMethods() = %v, want %v", got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|