-
Notifications
You must be signed in to change notification settings - Fork 384
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.
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
MSC2965: OAuth 2.0 Authorization Server Metadata discovery #2965
Open
sandhose
wants to merge
30
commits into
matrix-org:main
Choose a base branch
from
sandhose:msc/sandhose/oidc-discovery
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+198
−0
Open
Changes from all commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
ef474ee
OIDC discovery MSC
sandhose 4d9345c
Add `account` field
hughns 4a24cf6
Add id_token_hint to account management URL
hughns f5b54bf
Add reference to MSC3861
hughns 1cc4976
Add missing heading
hughns 6455b1f
Fix reference to MSC3861
hughns 2a242bb
Update proposals/2965-oidc-discovery.md
hughns ae920ad
Fix typo
hughns d9d56f3
Update 2965-oidc-discovery.md
hughns 74b29e0
Update proposals/2965-oidc-discovery.md
hughns 610c22c
Update proposals/2965-oidc-discovery.md
hughns eed9e60
OIDC Provider -> OpenID Provider
hughns fdcde60
Define account management URL params
hughns c0b2565
Link for account management URLs
hughns e9e3ee1
MSC2965: move from well-known discovery to a dedicated C-S endpoint
sandhose a36c44a
MSC2965: add a note about why the well-known alternative has been dis…
sandhose 7642a60
MSC2965: move the account management URL to the provider metadata
sandhose a0218df
MSC2965: line breaks
sandhose e852963
MSC2965: update note about the account endpoint metadata
sandhose 1bb6dde
Move the /auth_issuer endpoint to the v1 prefix
sandhose e70cd3d
Add the `org.matrix.cross_signing_reset` action
sandhose 754b290
Typo
sandhose 56949de
Merge branch 'matrix-org:main' into msc/sandhose/oidc-discovery
sandhose 45e9063
Rename MSC
sandhose 27bb308
Remove account-related URLs
sandhose acabca8
Mention RFC8414 as alternative
sandhose 61fc092
Outline another alternative: publish the metadata through a C-S API
sandhose 331ac79
Fix the alternative flow
sandhose 76dfb12
Publish the auth server metadata through a new C-S API endpoint
sandhose abd969a
renamed 2965-oidc-discovery.md -> 2965-auth-metadata.md
sandhose File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,198 @@ | ||
# MSC2965: OAuth 2.0 Authorization Server Metadata discovery | ||
|
||
This proposal is part of the broader [MSC3861: Next-generation auth for Matrix, based on OAuth 2.0/OIDC][MSC3861]. | ||
|
||
To be able to initiate an OAuth 2.0 login flow to use a Matrix server, the client needs to know the authorization server metadata, as defined in [RFC8414]. | ||
|
||
## Proposal | ||
|
||
This introduces a new Client-Server API endpoint to discover the authorization server metadata used by the homeserver. | ||
|
||
### `GET /auth_metadata` | ||
|
||
A request on this endpoint should return a JSON object containing the authorization server metadata as defined in [RFC8414]. | ||
|
||
For example: | ||
|
||
```http | ||
GET /_matrix/client/v1/auth_metadata | ||
Host: example.com | ||
Accept: application/json | ||
``` | ||
|
||
```http | ||
HTTP/1.1 200 OK | ||
Content-Type: application/json | ||
Cache-Control: public, max-age=3600 | ||
``` | ||
|
||
```json | ||
{ | ||
"authorization_endpoint": "https://account.example.com/oauth2/auth", | ||
"token_endpoint": "https://account.example.com/oauth2/token", | ||
"registration_endpoint": "https://account.example.com/oauth2/clients/register", | ||
"revocation_endpoint": "https://account.example.com/oauth2/revoke", | ||
"jwks_uri": "https://account.example.com/oauth2/keys", | ||
"response_types_supported": ["code"], | ||
"grant_types_supported": ["authorization_code", "refresh_token"], | ||
"response_modes_supported": ["query", "fragment"], | ||
"code_challenge_methods_supported": ["S256"], | ||
"...": "some fields omitted" | ||
} | ||
``` | ||
|
||
**Note**: The fields required for the main flow outlined by [MSC3861] and its sub-proposals are: | ||
|
||
- `authorization_endpoint` | ||
- `token_endpoint` | ||
- `revocation_endpoint` | ||
- `response_types_supported` including the value `code` | ||
- `grant_types_supported` including the values `authorization_code` and `refresh_token` | ||
- `response_modes_supported` including the values `query` and `fragment` | ||
- `code_challenge_methods_supported` including the value `S256` | ||
|
||
See individual proposals for more details on each field. | ||
|
||
## Potential issues | ||
|
||
The authorization server metadata is relatively large and may change over time. The client should: | ||
|
||
- Cache the metadata appropriately based on HTTP caching headers | ||
- Refetch the metadata if it is stale | ||
|
||
## Alternatives | ||
|
||
### Discovery via OpenID Connect Discovery | ||
|
||
Instead of directly exposing the metadata through a Client-Server API endpoint, the homeserver could expose only the issuer URL and let clients discover the metadata using OpenID Connect Discovery. | ||
|
||
In this approach, a new endpoint `/_matrix/client/v1/auth_issuer` would return just the issuer URL: | ||
|
||
```http | ||
GET /_matrix/client/v1/auth_issuer | ||
Host: example.com | ||
Accept: application/json | ||
``` | ||
|
||
```http | ||
HTTP/1.1 200 OK | ||
Content-Type: application/json | ||
``` | ||
|
||
```json | ||
{ | ||
"issuer": "https://account.example.com/" | ||
} | ||
``` | ||
|
||
The Matrix client would then discover the OpenID Connect Provider configuration by using [OpenID Connect Discovery]. | ||
|
||
The downside of this approach is that it requires an extra roundtrip to get the metadata. | ||
It also introduces a dependency on an OpenID Connect specification: [MSC3861] proposals tries to build on OAuth 2.0/IETF standards as much as possible. | ||
|
||
### Discovery via [RFC8414] well-known endpoint | ||
|
||
[RFC8414] OAuth 2.0 Authorization Server Metadata already defines a standard well-known endpoint, under `.well-known/oauth-authorization-server`. | ||
However, the RFC states that an application leveraging this standard should define its own application-specific endpoint, e.g. `/.well-known/matrix-authorization-server`, and *not* use the `.well-known/oauth-authorization-server` endpoint. | ||
To avoid confusion with the existing `.well-known/matrix/*` documents, this proposal suggests defining a new C-S API endpoint instead. | ||
|
||
### Discovery via the well-known client discovery | ||
|
||
A previous version of this proposal suggested using the well-known client discovery mechanism to discover the authentication server. | ||
Clients already discover the homeserver when doing a server discovery via the well-known document. | ||
|
||
A new `m.authentication` field is added to this document to support OpenID Connect Provider (OP) discovery. | ||
It is an object containing two fields: | ||
|
||
- REQUIRED `issuer` - the OpenID Connect Provider that is trusted by the homeserver | ||
- OPTIONAL `account` - the URL where the user is able to access the account management capabilities of the OpenID Connect Provider | ||
|
||
For example: | ||
|
||
```http | ||
GET /.well-known/matrix/client | ||
Host: example.com | ||
Accept: application/json | ||
``` | ||
|
||
```http | ||
HTTP/1.1 200 OK | ||
Content-Type: application/json | ||
``` | ||
|
||
```json | ||
{ | ||
"m.homeserver": { | ||
"base_url": "https://matrix-client.example.com" | ||
}, | ||
"m.identity_server": { | ||
"base_url": "https://identity.example.com" | ||
}, | ||
"m.authentication": { | ||
"issuer": "https://account.example.com", | ||
"account": "https://account.example.com/myaccount" | ||
} | ||
} | ||
``` | ||
|
||
This proposal, although implemented in some clients and in Synapse, has the downside of making the well-known discovery mandatory. | ||
When implemented in clients, in many circumstances it was hard to go back and use well-known discovery, as they may already know the homeserver URL. | ||
Since the authentication server is always tightly coupled to the homeserver (as opposed to the identity server), it makes sense to discover it via a Client-Server API endpoint. | ||
|
||
The account management URL was also part of this proposal, but it was moved to the OpenID Connect Provider metadata because it makes more sense for the provider to advertise it, and not the homeserver. | ||
|
||
### Discovery via the `m.login.oauth2` authentication method | ||
|
||
The spec already defines a `m.login.oauth2` authentication method, but it was never implemented. | ||
The downside of this approach is that the plan is to deprecate the old login mechanism and it does not make sense to keep it just to discover the issuer. | ||
|
||
### Discovery via WebFinger | ||
|
||
OIDC already has a standard way to discover OP from an identifier: WebFinger. | ||
This is already adopted by Mastodon, and might help solve logging in via 3PIDs like emails. | ||
|
||
Sample exchange: | ||
|
||
``` | ||
GET /.well-known/webfinger? | ||
resource= mxid:@john:example.com & | ||
rel= http://openid.net/specs/connect/1.0/issuer | ||
Host: example.com | ||
``` | ||
|
||
```json | ||
{ | ||
"subject": "mxid:@john:matrix.org", | ||
"links": [ | ||
{ | ||
"rel": "http://openid.net/specs/connect/1.0/issuer", | ||
"href": "https://account.example.com" | ||
} | ||
] | ||
} | ||
``` | ||
|
||
The `mxid` scheme is a bit arbitrary here. | ||
The parameters in the URL should be percent-encoded, this was left unencoded for clarity. | ||
|
||
The benefits of this approach are that it is standard and decouples the authentication server from the Matrix server: | ||
different authentication servers could be used by different accounts on the server. | ||
|
||
The downsides of this approach are: | ||
|
||
- the `.well-known/webfinger` resource is dynamic, which can be harder to host/delegate & might conflict with other services leveraging it like Mastodon | ||
- this does not cover discovering the authentication server for user registration | ||
|
||
## Security considerations | ||
|
||
None relevant. | ||
|
||
## Unstable prefix | ||
|
||
While this MSC is not in a released version of the specification, | ||
clients should use the `org.matrix.msc2965` unstable prefix for the endpoint, | ||
e.g. `GET /_matrix/client/unstable/org.matrix.msc2965/auth_metadata`. | ||
|
||
[RFC8414]: https://tools.ietf.org/html/rfc8414 | ||
[MSC3861]: https://github.com/matrix-org/matrix-spec-proposals/pull/3861 | ||
[OpenID Connect Discovery]: https://openid.net/specs/openid-connect-discovery-1_0.html |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could this endpoint also redirect to the
/.well-known/oauth-authorization-server
document on the issuer?