Skip to content

[Client] Add client credentials, private_key_jwt and cross-app access - #669

Draft
chr-hertel wants to merge 5 commits into
modelcontextprotocol:mainfrom
chr-hertel:client-auth-machine-grants
Draft

chr-hertel wants to merge 5 commits into
modelcontextprotocol:mainfrom
chr-hertel:client-auth-machine-grants

Conversation

@chr-hertel

Copy link
Copy Markdown
Member

Closes #324 & #325 - last slice of the client authorization in chr-hertel#53. Builds on #668, so please only look at the last commit until that one is merged.

$auth = OAuth::forServiceAccount('Acme Report Job', 'my-client-id', 'my-client-secret')->build();

Compared to the prototype, a client with only a key no longer falls back to Basic with an empty secret, a service account needs a secret or a key, and the identity provider's token endpoint has to be https or loopback.

make conformance-* doesn't run these extension scenarios, so I ran auth/client-credentials-jwt, auth/client-credentials-basic & auth/enterprise-managed-authorization by hand - all pass.

The HTTP client gets decorated, so the transport keeps speaking plain PSR-18:
AuthenticatingHttpClient authenticates every request and retries the ones the
authenticator can act on. BearerToken sends a token you already have.

A 401 or 403 now fails with an AuthorizationException that names the challenge,
which connect() wraps in a ConnectionException without a retry.
Finds and validates the documents that say who guards an MCP server: protected
resource metadata (RFC 9728) and authorization server metadata (RFC 8414 and
OpenID Connect), plus the WWW-Authenticate challenge that points at them.

All of it is @internal, since nothing uses it until the authenticator lands.
Endpoints have to pass SecureUrl, and a document naming another issuer than it
was fetched for is discarded.
Pass OAuth::forApplication('My App')->build() as `auth` and a client answers a
401 with discovery, client registration, the authorization code flow with PKCE
and a retry. It refreshes tokens, handles step-up challenges and refuses what a
hostile server could send.

Client id metadata documents, the console handler, client credentials,
private_key_jwt and cross-app access follow in their own changes, so their
conformance scenarios stay in the baselines.
… handler

setClientMetadataUrl() uses a published document as the client id where the
authorization server supports it, and otherwise registers as before. The URL has
to be https with a path.

ConsoleAuthorizationHandler prints the authorization URL and reads back the
redirected URL, for a shell without a browser. It refuses a bare code, which
would skip the state and iss checks.
forServiceAccount() runs without a user, setPrivateKeyJwt() replaces the shared
secret with a signed assertion and setCrossAppAccess() exchanges an enterprise
identity token for a grant.
@chr-hertel chr-hertel added Client Issues & PRs related to the Client component auth Issues and PRs related to Authentication / OAuth labels Nov 5, 2026
@chr-hertel chr-hertel added this to the 1.0.0 milestone Nov 5, 2026

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auth Issues and PRs related to Authentication / OAuth Client Issues & PRs related to the Client component

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Client] Implement client_credentials grant (client_secret_basic + private_key_jwt)

1 participant