cim/zitadel-oidc
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

handle client credentials in VerifyClient

Browse source
This commit is contained in:
Tim Möhlmann 2023-09-25 12:06:25 +03:00
parent d27be590c4
commit b7cbe15ced
2 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
pkg/op/server_http_routes_test.go
View file

@ -145,22 +145,18 @@ func TestServerRoutes(t *testing.T) {
`","issued_token_type":"urn:ietf:params:oauth:token-type:refresh_token","token_type":"Bearer","expires_in":299,"scope":"openid offline_access","refresh_token":"`, `","issued_token_type":"urn:ietf:params:oauth:token-type:refresh_token","token_type":"Bearer","expires_in":299,"scope":"openid offline_access","refresh_token":"`,
}, },
}, },
{
/* name: "Client credentials exchange",
{ method: http.MethodGet,
name: "Client credentials exchange", path: testProvider.TokenEndpoint().Relative(),
method: http.MethodGet, basicAuth: &basicAuth{"sid1", "verysecret"},
path: testProvider.TokenEndpoint().Relative(), values: map[string]string{
basicAuth: &basicAuth{"web", "secret"}, "grant_type": string(oidc.GrantTypeClientCredentials),
values: map[string]string{ "scope": oidc.SpaceDelimitedArray{oidc.ScopeOpenID, oidc.ScopeOfflineAccess}.String(),
"grant_type": string(oidc.GrantTypeClientCredentials),
"scope": oidc.SpaceDelimitedArray{oidc.ScopeOpenID, oidc.ScopeOfflineAccess}.String(),
},
wantCode: http.StatusOK,
contains: []string{`{"access_token":"`, `","token_type":"Bearer","expires_in":299}`},
}, },
*/ wantCode: http.StatusOK,
contains: []string{`{"access_token":"`, `","token_type":"Bearer","expires_in":299}`},
},
{ {
// This call will fail. A successfull test is already // This call will fail. A successfull test is already
// part of device_test.go // part of device_test.go

8
pkg/op/server_legacy.go
View file

@ -105,6 +105,14 @@ func (s *LegacyServer) DeviceAuthorization(ctx context.Context, r *ClientRequest
} }
func (s *LegacyServer) VerifyClient(ctx context.Context, r *Request[ClientCredentials]) (Client, error) { func (s *LegacyServer) VerifyClient(ctx context.Context, r *Request[ClientCredentials]) (Client, error) {
if oidc.GrantType(r.Form.Get("grant_type")) == oidc.GrantTypeClientCredentials {
storage, ok := s.provider.Storage().(ClientCredentialsStorage)
if !ok {
return nil, oidc.ErrUnsupportedGrantType().WithDescription("client_credentials grant not supported")
}
return storage.ClientCredentials(ctx, r.Data.ClientID, r.Data.ClientSecret)
}
if r.Data.ClientAssertionType == oidc.ClientAssertionTypeJWTAssertion { if r.Data.ClientAssertionType == oidc.ClientAssertionTypeJWTAssertion {
jwtExchanger, ok := s.provider.(JWTAuthorizationGrantExchanger) jwtExchanger, ok := s.provider.(JWTAuthorizationGrantExchanger)
if !ok || !s.provider.AuthMethodPrivateKeyJWTSupported() { if !ok || !s.provider.AuthMethodPrivateKeyJWTSupported() {