Skip to content

fix(platform): prefer client_secret_post for OIDC token exchange #582

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

Open
kulterryan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(platform): prefer client_secret_post for OIDC token exchange #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions platform/packages/api/src/auth/oidc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,12 @@ export class PlatformOidcProvider {
try {
const params = oauth.validateAuthResponse(server, client, input.callback, input.state);
const methods = server.token_endpoint_auth_methods_supported ?? ['client_secret_basic'];
const auth = methods.includes('client_secret_basic')
? oauth.ClientSecretBasic(input.clientSecret)
: methods.includes('client_secret_post')
? oauth.ClientSecretPost(input.clientSecret)
// Prefer the form body: Basic credentials are form-encoded first (RFC 6749 §2.3.1), which
// escapes `-`, `.` and `_`, and providers such as Google compare them without decoding.
const auth = methods.includes('client_secret_post')
? oauth.ClientSecretPost(input.clientSecret)
: methods.includes('client_secret_basic')
? oauth.ClientSecretBasic(input.clientSecret)
: null;
if (!auth) {
throw new Error('The identity provider must support client-secret authentication.');
Expand Down
20 changes: 20 additions & 0 deletions platform/packages/api/test/unit/platform-oidc.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,26 @@ describe('platform OIDC', () => {
expect((await accepted.exchange()).subject).toBe('person-123');
});

it('sends client credentials unescaped in the form body when the provider supports it', async () => {
const clientId = '761060634857-abc_def.apps.googleusercontent.com';
const server = fixture({
configuration: {
id: 'google',
kind: 'google',
issuer: 'https://accounts.google.com',
clientId,
},
metadata: {
token_endpoint_auth_methods_supported: ['client_secret_post', 'client_secret_basic'],
},
});
await server.start();
await server.exchange();
const [, init] = server.request.mock.calls.find(([url]) => url.endsWith('/token'))!;
expect((init.body as URLSearchParams).get('client_id')).toBe(clientId);
expect(new Headers(init.headers).has('authorization')).toBe(false);
});

it('names each login failure with a short code', async () => {
await expect(
fixture({ metadata: { issuer: 'https://other.example.com' } }).start(),
Expand Down