Skip to content
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

Jump to bottom

fix: double-decoding of client credentials in request body #434

Merged
merged 5 commits into from
May 23, 2020
Merged

fix: double-decoding of client credentials in request body #434

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
692b038
PR 434: test only
pjcdawkins May 22, 2020
e0ea266
fix: double-decoding of client credentials in request body
pjcdawkins May 22, 2020
69d9646
Add more special characters in test client secret
pjcdawkins May 22, 2020
525e655
And confirm basic auth works with special characters too
pjcdawkins May 22, 2020
07cfae8
Refactor basic auth header in test for readability
pjcdawkins May 22, 2020
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
6 changes: 0 additions & 6 deletions client_authentication.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,5 @@ func clientCredentialsFromRequestBody(form url.Values, forceID bool) (clientID,
return "", "", errors.WithStack(ErrInvalidRequest.WithHint("Client credentials missing or malformed in both HTTP Authorization header and HTTP POST body."))
}

if clientID, err = url.QueryUnescape(clientID); err != nil {
return "", "", errors.WithStack(ErrInvalidRequest.WithHint(`The client id in the HTTP authorization header could not be decoded from "application/x-www-form-urlencoded".`).WithDebug(err.Error()))
} else if clientSecret, err = url.QueryUnescape(clientSecret); err != nil {
return "", "", errors.WithStack(ErrInvalidRequest.WithHint(`The client secret in the HTTP authorization header could not be decoded from "application/x-www-form-urlencoded".`).WithDebug(err.Error()))
}

return clientID, clientSecret, nil
}
10 changes: 10 additions & 0 deletions client_authentication_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ func TestAuthenticateClient(t *testing.T) {
barSecret, err := hasher.Hash(context.TODO(), []byte("bar"))
require.NoError(t, err)

// a secret containing literal characters that would be affected by double-URL-decoding.
percentSecret, err := hasher.Hash(context.TODO(), []byte("%66%6F%6F"))
pjcdawkins marked this conversation as resolved.
Show resolved Hide resolved
require.NoError(t, err)

key := internal.MustRSAKey()
jwks := &jose.JSONWebKeySet{
Keys: []jose.JSONWebKey{
Expand Down Expand Up @@ -127,6 +131,12 @@ func TestAuthenticateClient(t *testing.T) {
form: url.Values{"client_id": []string{"foo"}},
r: new(http.Request),
},
{
d: "should pass with client ID and secret containing literal % characters",
client: &DefaultOpenIDConnectClient{DefaultClient: &DefaultClient{ID: "foo%20bar", Secret: percentSecret}, TokenEndpointAuthMethod: "client_secret_post"},
form: url.Values{"client_id": []string{"foo%20bar"}, "client_secret": []string{"%66%6F%6F"}},
r: new(http.Request),
},
{
d: "should fail because auth method is not none",
client: &DefaultOpenIDConnectClient{DefaultClient: &DefaultClient{ID: "foo", Public: true}, TokenEndpointAuthMethod: "client_secret_basic"},
Expand Down