mirror of
https://github.com/coder/coder.git
synced 2026-10-31 02:43:21 +08:00
The token endpoint accepted any non-empty `code_verifier`, so a one-character verifier was enough to authenticate. RFC 7636 §4.1 requires 43 to 128 characters from the unreserved set. That fix plus the related gaps review surfaced in the same path: - Enforce the length and charset floor on the verifier before the S256 comparison runs. - Validate the challenge at the authorize endpoint too. It was only checked for non-emptiness, so a malformed challenge was stored and then failed late at token exchange, blaming the wrong parameter. - A malformed verifier now returns `invalid_request` (RFC 6749 §5.2); a well-formed but wrong one still returns `invalid_grant` (RFC 7636 §4.6). Both looked identical before, so a client had no way to tell a syntax error from a hash mismatch and would retry the same bad verifier forever. - Revoke the authorization code when a PKCE check fails. Without that, a leaked code could be replayed with unlimited verifier guesses for its remaining lifetime, and RFC 6749 §10.5 requires codes to be single use. - Fix verifier generation in `scripts/oauth2/*.sh` and the docs example. They deleted reserved base64 characters instead of translating them to the URL-safe alphabet, so most runs produced verifiers under the new floor. Also carries #28041, which merged into this branch: public clients may register bare custom schemes such as `vscode://` again, with `mailto`, `tel`, and `sms` rejected. Split out of #27873 (public OAuth2 client support). PKCE is already mandatory for every client, so this stands on its own. <details> <summary>Manual verification</summary> Ran against a local dev server on this branch, using a session token and a throwaway app from `scripts/oauth2/setup-test-app.sh`. 1. Happy path unchanged: HTTP 200, verifier length 43. 2. `code_verifier=short`, and a 43-character verifier ending in `!`: both HTTP 400 `invalid_request`, so charset is enforced and not just length. 3. `code_challenge=tooshort` at authorize: HTTP 400 `invalid_request`, no code issued. An empty challenge still hits the older "required and cannot be empty" message. 4. Well-formed but wrong verifier: HTTP 400 `invalid_grant`, distinct from the cases above. 5. Retrying that same code with the correct verifier: HTTP 400, code already revoked by the failed check. 6. `generate-pkce.sh` produces a 43-character verifier (20 out of 20 runs); the docs example produces 128. 7. `scripts/oauth2/test-mcp-oauth2.sh` passes end to end. The two bearer-token failures in its output are a pre-existing script bug (`09c50559f3`, July 2025) that reuses a resource-scoped token against the real API, not a regression here. </details>
478 lines
15 KiB
Go
478 lines
15 KiB
Go
package oauth2provider
|
|
|
|
import (
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/coder/coder/v2/codersdk"
|
|
)
|
|
|
|
// parseScopes parses a space-delimited scope string into a slice of scopes
|
|
// per RFC 6749.
|
|
func parseScopes(scope string) []string {
|
|
return strings.Fields(strings.TrimSpace(scope))
|
|
}
|
|
|
|
// TestExtractTokenParams_Scopes tests OAuth2 scope parameter parsing
|
|
// to ensure RFC 6749 compliance where scopes are space-delimited
|
|
func TestExtractTokenParams_Scopes(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
testCases := []struct {
|
|
name string
|
|
scopeParam string // Raw query param value (before URL encoding)
|
|
expectedScopes []string // Expected parsed scope slice
|
|
description string // Test case description
|
|
}{
|
|
{
|
|
name: "SpaceSeparatedTwoScopes",
|
|
scopeParam: "coder:workspace.create coder:workspace.operate",
|
|
expectedScopes: []string{"coder:workspace.create", "coder:workspace.operate"},
|
|
description: "RFC 6749 compliant: space-separated scopes",
|
|
},
|
|
{
|
|
name: "SpaceSeparatedThreeScopes",
|
|
scopeParam: "scope1 scope2 scope3",
|
|
expectedScopes: []string{"scope1", "scope2", "scope3"},
|
|
description: "Multiple space-separated scopes",
|
|
},
|
|
{
|
|
name: "SingleScope",
|
|
scopeParam: "coder:workspace.create",
|
|
expectedScopes: []string{"coder:workspace.create"},
|
|
description: "Single scope without spaces",
|
|
},
|
|
{
|
|
name: "EmptyScope",
|
|
scopeParam: "",
|
|
expectedScopes: []string{},
|
|
description: "Empty scope parameter",
|
|
},
|
|
{
|
|
name: "MultipleSpaces",
|
|
scopeParam: "scope1 scope2 scope3",
|
|
expectedScopes: []string{"scope1", "scope2", "scope3"},
|
|
description: "Multiple consecutive spaces should be handled gracefully",
|
|
},
|
|
{
|
|
name: "LeadingAndTrailingSpaces",
|
|
scopeParam: " scope1 scope2 ",
|
|
expectedScopes: []string{"scope1", "scope2"},
|
|
description: "Leading and trailing spaces should be trimmed",
|
|
},
|
|
{
|
|
name: "ColonInScope",
|
|
scopeParam: "coder:workspace:read coder:workspace:write",
|
|
expectedScopes: []string{"coder:workspace:read", "coder:workspace:write"},
|
|
description: "Scopes with colons (common pattern)",
|
|
},
|
|
{
|
|
name: "DotInScope",
|
|
scopeParam: "workspace.create workspace.delete",
|
|
expectedScopes: []string{"workspace.create", "workspace.delete"},
|
|
description: "Scopes with dots (common pattern)",
|
|
},
|
|
{
|
|
name: "HyphenInScope",
|
|
scopeParam: "workspace-read workspace-write",
|
|
expectedScopes: []string{"workspace-read", "workspace-write"},
|
|
description: "Scopes with hyphens",
|
|
},
|
|
{
|
|
name: "UnderscoreInScope",
|
|
scopeParam: "workspace_create workspace_delete",
|
|
expectedScopes: []string{"workspace_create", "workspace_delete"},
|
|
description: "Scopes with underscores",
|
|
},
|
|
{
|
|
name: "OpenIDScopes",
|
|
scopeParam: "openid profile email",
|
|
expectedScopes: []string{"openid", "profile", "email"},
|
|
description: "Common OpenID Connect scopes",
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
// Create a mock request with the scope parameter
|
|
callbackURL, err := url.Parse("http://localhost:3000/callback")
|
|
require.NoError(t, err)
|
|
|
|
// Build form values (simulating POST request body)
|
|
form := url.Values{}
|
|
form.Set("grant_type", "authorization_code")
|
|
form.Set("client_id", "test-client")
|
|
form.Set("client_secret", "test-secret")
|
|
form.Set("code", "test-code")
|
|
// This test only exercises scope parsing, but code_verifier is
|
|
// validated unconditionally for this grant type, so use a value
|
|
// that satisfies the RFC 7636 §4.1 length floor.
|
|
form.Set("code_verifier", strings.Repeat("a", 43))
|
|
if tc.scopeParam != "" {
|
|
form.Set("scope", tc.scopeParam)
|
|
}
|
|
|
|
// Create request with form data already parsed
|
|
// Set PostForm and Form directly to bypass the need for a request body
|
|
req := &http.Request{
|
|
Method: http.MethodPost,
|
|
PostForm: form,
|
|
Form: form, // Form is the combination of PostForm and URL query
|
|
}
|
|
|
|
// Extract token request
|
|
tokenReq, validationErrs, err := extractTokenRequest(req, callbackURL)
|
|
|
|
// Verify no errors occurred
|
|
require.NoError(t, err, "extractTokenRequest should not return error for: %s", tc.description)
|
|
require.Empty(t, validationErrs, "should have no validation errors for: %s", tc.description)
|
|
|
|
// Verify scopes match expected
|
|
require.Equal(t, tc.expectedScopes, parseScopes(tokenReq.Scope), "scope parsing failed for: %s", tc.description)
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestExtractTokenParams_ScopesURLEncoded tests that URL-encoded space-separated
|
|
// scopes are correctly decoded and parsed
|
|
func TestExtractTokenParams_ScopesURLEncoded(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
testCases := []struct {
|
|
name string
|
|
rawQuery string // Raw query string with URL encoding
|
|
expectedScopes []string // Expected parsed scope slice
|
|
}{
|
|
{
|
|
name: "PlusEncodedSpaces",
|
|
rawQuery: "grant_type=authorization_code&client_id=test&client_secret=secret&code=code&code_verifier=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&scope=scope1+scope2+scope3",
|
|
expectedScopes: []string{"scope1", "scope2", "scope3"},
|
|
},
|
|
{
|
|
name: "PercentEncodedSpaces",
|
|
rawQuery: "grant_type=authorization_code&client_id=test&client_secret=secret&code=code&code_verifier=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&scope=scope1%20scope2%20scope3",
|
|
expectedScopes: []string{"scope1", "scope2", "scope3"},
|
|
},
|
|
{
|
|
name: "MixedEncoding",
|
|
rawQuery: "grant_type=authorization_code&client_id=test&client_secret=secret&code=code&code_verifier=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&scope=scope1+scope2%20scope3",
|
|
expectedScopes: []string{"scope1", "scope2", "scope3"},
|
|
},
|
|
{
|
|
name: "ColonEncodedInScope",
|
|
rawQuery: "grant_type=authorization_code&client_id=test&client_secret=secret&code=code&code_verifier=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&scope=coder%3Aworkspace.create+coder%3Aworkspace.operate",
|
|
expectedScopes: []string{"coder:workspace.create", "coder:workspace.operate"},
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
callbackURL, err := url.Parse("http://localhost:3000/callback")
|
|
require.NoError(t, err)
|
|
|
|
// Parse the raw query string
|
|
values, err := url.ParseQuery(tc.rawQuery)
|
|
require.NoError(t, err)
|
|
|
|
// Create request with form data already parsed
|
|
req := &http.Request{
|
|
Method: http.MethodPost,
|
|
PostForm: values,
|
|
Form: values,
|
|
}
|
|
|
|
// Extract token request
|
|
tokenReq, validationErrs, err := extractTokenRequest(req, callbackURL)
|
|
|
|
// Verify no errors
|
|
require.NoError(t, err)
|
|
require.Empty(t, validationErrs)
|
|
|
|
// Verify scopes
|
|
require.Equal(t, tc.expectedScopes, parseScopes(tokenReq.Scope))
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestExtractTokenParams_ScopesEdgeCases tests edge cases in scope parsing
|
|
func TestExtractTokenParams_ScopesEdgeCases(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
testCases := []struct {
|
|
name string
|
|
setupForm func() url.Values
|
|
expectedScopes []string
|
|
description string
|
|
}{
|
|
{
|
|
name: "NoScopeParameter",
|
|
setupForm: func() url.Values {
|
|
form := url.Values{}
|
|
form.Set("grant_type", "authorization_code")
|
|
form.Set("client_id", "test-client")
|
|
form.Set("client_secret", "test-secret")
|
|
form.Set("code", "test-code")
|
|
form.Set("code_verifier", strings.Repeat("a", 43))
|
|
return form
|
|
},
|
|
expectedScopes: []string{},
|
|
description: "Missing scope parameter should default to empty slice",
|
|
},
|
|
{
|
|
name: "OnlySpaces",
|
|
setupForm: func() url.Values {
|
|
form := url.Values{}
|
|
form.Set("grant_type", "authorization_code")
|
|
form.Set("client_id", "test-client")
|
|
form.Set("client_secret", "test-secret")
|
|
form.Set("code", "test-code")
|
|
form.Set("code_verifier", strings.Repeat("a", 43))
|
|
form.Set("scope", " ")
|
|
return form
|
|
},
|
|
expectedScopes: []string{},
|
|
description: "Scope with only spaces should result in empty slice",
|
|
},
|
|
{
|
|
name: "VeryLongScopeName",
|
|
setupForm: func() url.Values {
|
|
longScope := "coder:workspace:project:resource:action:create:read:write:delete:admin"
|
|
form := url.Values{}
|
|
form.Set("grant_type", "authorization_code")
|
|
form.Set("client_id", "test-client")
|
|
form.Set("client_secret", "test-secret")
|
|
form.Set("code", "test-code")
|
|
form.Set("code_verifier", strings.Repeat("a", 43))
|
|
form.Set("scope", longScope)
|
|
return form
|
|
},
|
|
expectedScopes: []string{"coder:workspace:project:resource:action:create:read:write:delete:admin"},
|
|
description: "Very long scope names should be handled",
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
callbackURL, err := url.Parse("http://localhost:3000/callback")
|
|
require.NoError(t, err)
|
|
|
|
form := tc.setupForm()
|
|
req := &http.Request{
|
|
Method: http.MethodPost,
|
|
PostForm: form,
|
|
Form: form,
|
|
}
|
|
|
|
tokenReq, validationErrs, err := extractTokenRequest(req, callbackURL)
|
|
|
|
require.NoError(t, err, "extractTokenRequest should not error for: %s", tc.description)
|
|
require.Empty(t, validationErrs)
|
|
require.Equal(t, tc.expectedScopes, parseScopes(tokenReq.Scope), "scope mismatch for: %s", tc.description)
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestExtractAuthorizeParams_Scopes tests scope parsing in the authorization endpoint
|
|
func TestExtractAuthorizeParams_Scopes(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
testCases := []struct {
|
|
name string
|
|
scopeParam string
|
|
expectedScopes []string
|
|
}{
|
|
{
|
|
name: "SpaceSeparated",
|
|
scopeParam: "openid profile email",
|
|
expectedScopes: []string{"openid", "profile", "email"},
|
|
},
|
|
{
|
|
name: "SingleScope",
|
|
scopeParam: "openid",
|
|
expectedScopes: []string{"openid"},
|
|
},
|
|
{
|
|
name: "EmptyScope",
|
|
scopeParam: "",
|
|
expectedScopes: []string{},
|
|
},
|
|
{
|
|
name: "CoderScopes",
|
|
scopeParam: "coder:workspace.create coder:workspace.read coder:workspace.delete",
|
|
expectedScopes: []string{"coder:workspace.create", "coder:workspace.read", "coder:workspace.delete"},
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
callbackURL, err := url.Parse("http://localhost:3000/callback")
|
|
require.NoError(t, err)
|
|
|
|
// Build query parameters for GET request
|
|
query := url.Values{}
|
|
query.Set("response_type", "code")
|
|
query.Set("client_id", "test-client")
|
|
query.Set("redirect_uri", "http://localhost:3000/callback")
|
|
// This test only exercises scope parsing, but code_challenge is
|
|
// still required for response_type=code and must satisfy the
|
|
// RFC 7636 §4.1 length floor, so use a valid-length value.
|
|
query.Set("code_challenge", strings.Repeat("a", 43))
|
|
if tc.scopeParam != "" {
|
|
query.Set("scope", tc.scopeParam)
|
|
}
|
|
|
|
// Create request with query parameters
|
|
reqURL, err := url.Parse("http://localhost:8080/oauth2/authorize?" + query.Encode())
|
|
require.NoError(t, err)
|
|
|
|
req := &http.Request{
|
|
Method: http.MethodGet,
|
|
URL: reqURL,
|
|
}
|
|
|
|
// Extract authorize params
|
|
params, validationErrs, err := extractAuthorizeParams(req, callbackURL)
|
|
|
|
require.NoError(t, err)
|
|
require.Empty(t, validationErrs)
|
|
require.Equal(t, tc.expectedScopes, params.scope)
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestExtractAuthorizeParams_CodeChallengeFormat ensures a code_challenge is
|
|
// rejected at the authorization request (RFC 7636 §4.4.1) when it does not
|
|
// meet the same length and character bounds as a code_verifier, rather than
|
|
// being stored and failing later at token exchange.
|
|
func TestExtractAuthorizeParams_CodeChallengeFormat(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
testCases := []struct {
|
|
name string
|
|
codeChallenge string
|
|
expectValid bool
|
|
}{
|
|
{
|
|
name: "ValidLength",
|
|
codeChallenge: strings.Repeat("a", 43),
|
|
expectValid: true,
|
|
},
|
|
{
|
|
name: "TooShort",
|
|
codeChallenge: strings.Repeat("a", 42),
|
|
expectValid: false,
|
|
},
|
|
{
|
|
name: "TooLong",
|
|
codeChallenge: strings.Repeat("a", 129),
|
|
expectValid: false,
|
|
},
|
|
{
|
|
name: "DisallowedCharacter",
|
|
codeChallenge: strings.Repeat("a", 42) + "+",
|
|
expectValid: false,
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
callbackURL, err := url.Parse("http://localhost:3000/callback")
|
|
require.NoError(t, err)
|
|
|
|
query := url.Values{}
|
|
query.Set("response_type", "code")
|
|
query.Set("client_id", "test-client")
|
|
query.Set("redirect_uri", "http://localhost:3000/callback")
|
|
query.Set("code_challenge", tc.codeChallenge)
|
|
|
|
reqURL, err := url.Parse("http://localhost:8080/oauth2/authorize?" + query.Encode())
|
|
require.NoError(t, err)
|
|
|
|
req := &http.Request{
|
|
Method: http.MethodGet,
|
|
URL: reqURL,
|
|
}
|
|
|
|
_, validationErrs, err := extractAuthorizeParams(req, callbackURL)
|
|
if tc.expectValid {
|
|
require.NoError(t, err)
|
|
require.Empty(t, validationErrs)
|
|
} else {
|
|
require.Error(t, err)
|
|
require.Len(t, validationErrs, 1)
|
|
require.Equal(t, "code_challenge", validationErrs[0].Field)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestExtractAuthorizeParams_TokenResponseTypeDoesNotRequirePKCE ensures
|
|
// response_type=token is parsed without requiring PKCE fields so callers can
|
|
// return unsupported_response_type instead of invalid_request.
|
|
func TestExtractAuthorizeParams_TokenResponseTypeDoesNotRequirePKCE(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
callbackURL, err := url.Parse("http://localhost:3000/callback")
|
|
require.NoError(t, err)
|
|
|
|
query := url.Values{}
|
|
query.Set("response_type", string(codersdk.OAuth2ProviderResponseTypeToken))
|
|
query.Set("client_id", "test-client")
|
|
query.Set("redirect_uri", "http://localhost:3000/callback")
|
|
|
|
reqURL, err := url.Parse("http://localhost:8080/oauth2/authorize?" + query.Encode())
|
|
require.NoError(t, err)
|
|
|
|
req := &http.Request{
|
|
Method: http.MethodGet,
|
|
URL: reqURL,
|
|
}
|
|
|
|
params, validationErrs, err := extractAuthorizeParams(req, callbackURL)
|
|
require.NoError(t, err)
|
|
require.Empty(t, validationErrs)
|
|
require.Equal(t, codersdk.OAuth2ProviderResponseTypeToken, params.responseType)
|
|
}
|
|
|
|
// TestRefreshTokenGrant_Scopes tests that scopes can be requested during refresh
|
|
func TestRefreshTokenGrant_Scopes(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
// Test that refresh token requests can include scope parameter
|
|
// per RFC 6749 Section 6
|
|
form := url.Values{}
|
|
form.Set("grant_type", "refresh_token")
|
|
form.Set("refresh_token", "test-refresh-token")
|
|
form.Set("scope", "reduced:scope subset:scope")
|
|
|
|
callbackURL, err := url.Parse("http://localhost:3000/callback")
|
|
require.NoError(t, err)
|
|
|
|
req := &http.Request{
|
|
Method: http.MethodPost,
|
|
PostForm: form,
|
|
Form: form,
|
|
}
|
|
|
|
tokenReq, validationErrs, err := extractTokenRequest(req, callbackURL)
|
|
|
|
require.NoError(t, err)
|
|
require.Empty(t, validationErrs)
|
|
require.Equal(t, codersdk.OAuth2ProviderGrantTypeRefreshToken, tokenReq.GrantType)
|
|
require.Equal(t, []string{"reduced:scope", "subset:scope"}, parseScopes(tokenReq.Scope))
|
|
}
|