-
-
Notifications
You must be signed in to change notification settings - Fork 106
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
310 additions
and
0 deletions.
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,310 @@ | ||
# Upgrade Guide | ||
|
||
## Upgrading from 3.x to 4.x | ||
|
||
The 4.0 release includes breaking changes to address several long-standing API issues, along with | ||
a few minor improvements. Consider following the tips below to help ensure a smooth upgrade | ||
process. This document is not exhaustive but covers the breaking changes most likely to affect | ||
typical uses of this crate. | ||
|
||
### Add typestate generic types to `Client` | ||
|
||
Each auth flow depends on one or more server endpoints. For example, the | ||
authorization code flow depends on both an authorization endpoint and a token endpoint, while the | ||
client credentials flow only depends on a token endpoint. Previously, it was possible to instantiate | ||
a `Client` without a token endpoint and then attempt to use an auth flow that required a token | ||
endpoint, leading to errors at runtime. Also, the authorization endpoint was always required, even | ||
for auth flows that do not use it. | ||
|
||
In the 4.0 release, all endpoints are optional. | ||
[Typestates](https://cliffle.com/blog/rust-typestate/) are used to statically track, at compile | ||
time, which endpoints' setters (e.g., `set_auth_uri()`) have been called. Auth flows that depend on | ||
an endpoint cannot be used without first calling the corresponding setter, which is enforced by the | ||
compiler's type checker. This guarantees that certain errors will not arise at runtime. | ||
|
||
When using [OpenID Connect Discovery](https://openid.net/specs/openid-connect-discovery-1_0.html) | ||
(i.e., `Client::from_provider_metadata()`), | ||
each discoverable endpoint is set to a conditional typestate (`EndpointMaybeSet`). This is because | ||
it cannot be determined at compile time whether each of these endpoints will be returned by the | ||
OpenID Provider. When the conditional typestate is set, endpoints can be used via fallible methods | ||
that return `Err(ConfigurationError::MissingUrl(_))` if an endpoint has not been set. | ||
|
||
There are three possible typestates, each implementing the `EndpointState` trait: | ||
* `EndpointNotSet`: the corresponding endpoint has **not** been set and cannot be used. | ||
* `EndpointSet`: the corresponding endpoint **has** been set and is ready to be used. | ||
* `EndpointMaybeSet`: the corresponding endpoint **may have** been set and can be used via fallible | ||
methods that return `Result<_, ConfigurationError>`. | ||
|
||
The following code changes are required to support the new interface: | ||
1. Update calls to | ||
[`Client::new()`](https://docs.rs/openidconnect/latest/openidconnect/struct.Client.html#method.new) | ||
to use the three-argument constructor (which accepts only a `ClientId`, `IssuerUrl`, and | ||
`JsonWebKeySet`). Use the `set_auth_uri()`, `set_token_uri()`, `set_user_info_url()`, and | ||
`set_client_secret()` methods to set the authorization endpoint, token endpoint, user info | ||
endpoint, and client secret, respectively, if applicable to your application's auth flows. | ||
2. If using `Client::from_provider_metadata()`, update call sites that use each auth flow | ||
(e.g., `Client::exchange_code()`) to handle the possibility of a `ConfigurationError` if the | ||
corresponding endpoint was not specified in the provider metadata. | ||
3. If required by your usage of the `Client` or `CoreClient` types (i.e., if you see related | ||
compiler errors), add the following generic parameters: | ||
```rust | ||
HasAuthUrl: EndpointState, | ||
HasDeviceAuthUrl: EndpointState, | ||
HasIntrospectionUrl: EndpointState, | ||
HasRevocationUrl: EndpointState, | ||
HasTokenUrl: EndpointState, | ||
HasUserInfoUrl: EndpointState, | ||
``` | ||
For example, if you store a `CoreClient` within another data type, you may need to annotate it as | ||
`CoreClient<EndpointSet, EndpointNotSet, EndpointNotSet, EndpointNotSet, EndpointSet, EndpointNotSet>` | ||
if it has both an authorization endpoint and a token endpoint set. Compiler error messages will | ||
likely guide you to the appropriate combination of typestates. | ||
|
||
If, instead of using `CoreClient`, you are directly using `Client` with a different set of type | ||
parameters, you will need to append the five generic typestate parameters. For example, replace: | ||
```rust | ||
type SpecialClient = Client< | ||
EmptyAdditionalClaims, | ||
CoreAuthDisplay, | ||
CoreGenderClaim, | ||
CoreJweContentEncryptionAlgorithm, | ||
CoreJwsSigningAlgorithm, | ||
CoreJsonWebKeyType, | ||
CoreJsonWebKeyUse, | ||
CoreJsonWebKey, | ||
CoreAuthPrompt, | ||
StandardErrorResponse<CoreErrorResponseType>, | ||
SpecialTokenResponse, | ||
CoreTokenType, | ||
CoreTokenIntrospectionResponse, | ||
CoreRevocableToken, | ||
CoreRevocationErrorResponse, | ||
>; | ||
``` | ||
with: | ||
```rust | ||
type SpecialClient< | ||
HasAuthUrl = EndpointNotSet, | ||
HasDeviceAuthUrl = EndpointNotSet, | ||
HasIntrospectionUrl = EndpointNotSet, | ||
HasRevocationUrl = EndpointNotSet, | ||
HasTokenUrl = EndpointNotSet, | ||
HasUserInfoUrl = EndpointNotSet, | ||
> = Client< | ||
EmptyAdditionalClaims, | ||
CoreAuthDisplay, | ||
CoreGenderClaim, | ||
CoreJweContentEncryptionAlgorithm, | ||
CoreJsonWebKey, | ||
CoreAuthPrompt, | ||
StandardErrorResponse<CoreErrorResponseType>, | ||
SpecialTokenResponse, | ||
CoreTokenIntrospectionResponse, | ||
CoreRevocableToken, | ||
CoreRevocationErrorResponse, | ||
HasAuthUrl, | ||
HasDeviceAuthUrl, | ||
HasIntrospectionUrl, | ||
HasRevocationUrl, | ||
HasTokenUrl, | ||
HasUserInfoUrl, | ||
>; | ||
``` | ||
The default values (`= EndpointNotSet`) are optional but often helpful since they will allow you | ||
to instantiate a client using `SpecialClient::new()` instead of having to specify | ||
`SpecialClient::<EndpointNotSet, EndpointNotSet, EndpointNotSet, EndpointNotSet, EndpointNotSet, EndpointNotSet>::new()`. | ||
|
||
Also note that the `CoreJwsSigningAlgorithm` (`JS`), `CoreJsonWebKeyType` (`JT`), | ||
`CoreJsonWebKeyUse` (`JU`), and `CoreTokenType` (`TT`) type parameters have been removed (see | ||
below) since they are now implied by the `JsonWebKey` (`K`) and `TokenResponse` | ||
(`TR`)/`TokenIntrospectionResponse` (`TIR`) type parameters. | ||
|
||
### Replace JWT-related generic traits with associated types | ||
|
||
Previously, the `JsonWebKey` trait had the following generic type parameters: | ||
```rust | ||
JS: JwsSigningAlgorithm<JT>, | ||
JT: JsonWebKeyType, | ||
JU: JsonWebKeyUse, | ||
``` | ||
|
||
In the 4.0 release, these generic type parameters have been removed and replaced with two associated | ||
types: | ||
```rust | ||
/// Allowed key usage. | ||
type KeyUse: JsonWebKeyUse; | ||
|
||
/// JSON Web Signature (JWS) algorithm. | ||
type SigningAlgorithm: JwsSigningAlgorithm; | ||
``` | ||
|
||
The `JT` type parameter was similarly removed from the `JwsSigningAlgorithm` trait and replaced | ||
with an associated type: | ||
```rust | ||
/// Key type (e.g., RSA). | ||
type KeyType: JsonWebKeyType; | ||
``` | ||
|
||
Similar changes were made to the lesser-used `PrivateSigningKey` and `JweContentEncryptionAlgorithm` | ||
traits. | ||
|
||
With the conversion to associated types, many generic type parameters throughout this crate became | ||
redundant and were removed in the 4.0 release. For example, the `Client` no longer needs the | ||
`JS`, `JT`, or `JU` parameters, which are implied by the `JsonWebKey` (`K`) type. | ||
|
||
### Rename endpoint getters and setters for consistency | ||
|
||
The 2.0 release aimed to align the naming of each endpoint with the terminology used in the relevant | ||
RFC. For example, [RFC 6749](https://datatracker.ietf.org/doc/html/rfc6749#section-3.1) uses the | ||
term "endpoint URI" to refer to the authorization and token endpoints, while | ||
[RFC 7009](https://datatracker.ietf.org/doc/html/rfc7009#section-2) refers to the | ||
"token revocation endpoint URL," and | ||
[RFC 7662](https://datatracker.ietf.org/doc/html/rfc7662#section-2) uses neither "URI" nor "URL" | ||
to describe the introspection endpoint. However, the renaming in 2.0 was both internally | ||
inconsistent, and inconsistent with the specs. | ||
|
||
In 4.0, the `Client`'s getters and setters for each endpoint are now named as follows: | ||
* Authorization endpoint: `auth_uri()`/`set_auth_uri()` (newly added) | ||
* Token endpoint: `token_uri()`/`set_token_uri()` (newly added) | ||
* Redirect: `redirect_uri()`/`set_redirect_uri()` (no change to setter) | ||
* Revocation endpoint: `revocation_url()`/`set_revocation_url()` | ||
* Introspection endpoint: `introspection_url()`/`set_introspection_url()` | ||
* Device authorization endpoint: `device_authorization_url()`/`set_device_authorization_url()` | ||
* User info: `user_info_url()`/`set_user_info_url()` (newly added) | ||
|
||
### Use stateful HTTP clients | ||
|
||
Previously, the HTTP clients provided by this crate were stateless. For example, the | ||
`openidconnect::reqwest::async_http_client()` method would instantiate a new `reqwest::Client` for | ||
each request. This meant that TCP connections could not be reused across requests, and customizing | ||
HTTP clients (e.g., adding a custom request header to every request) was inconvenient. | ||
|
||
The 4.0 release introduces two new traits: `AsyncHttpClient` and `SyncHttpClient`. Each | ||
`request_async()` and `request()` method now accepts a reference to a type that implements these | ||
traits, respectively, rather than a function type. | ||
|
||
> [!WARNING] | ||
> To prevent | ||
[SSRF](https://cheatsheetseries.owasp.org/cheatsheets/Server_Side_Request_Forgery_Prevention_Cheat_Sheet.html) | ||
vulnerabilities, be sure to configure the HTTP client **not to follow redirects**. For example, use | ||
> [`redirect::Policy::none`](https://docs.rs/reqwest/latest/reqwest/redirect/struct.Policy.html#method.none) | ||
> when using `reqwest`, or | ||
> [`redirects(0)`](https://docs.rs/ureq/latest/ureq/struct.AgentBuilder.html#method.redirects) | ||
> when using `ureq`. | ||
The `AsyncHttpClient` trait is implemented for the following types: | ||
* `reqwest::Client` (when the default `reqwest` feature is enabled) | ||
* Any function type that implements: | ||
```rust | ||
Fn(HttpRequest) -> F | ||
where | ||
E: std::error::Error + 'static, | ||
F: Future<Output = Result<HttpResponse, E>>, | ||
``` | ||
To implement a custom asynchronous HTTP client, either directly implement the `AsyncHttpClient` | ||
trait, or use a function that implements the signature above. | ||
|
||
The `SyncHttpClient` trait is implemented for the following types: | ||
* `reqwest::blocking::Client` (when the `reqwest-blocking` feature is enabled; see below) | ||
* `ureq::Agent` (when the `ureq` feature is enabled) | ||
* `openidconnect::CurlHttpClient` (when the `curl` feature is enabled) | ||
* Any function type that implements: | ||
```rust | ||
Fn(HttpRequest) -> Result<HttpResponse, E> | ||
where | ||
E: std::error::Error + 'static, | ||
``` | ||
To implement a custom synchronous HTTP client, either directly implement the `SyncHttpClient` | ||
trait, or use a function that implements the signature above. | ||
|
||
### Upgrade `http` to 1.0 and `reqwest` to 0.12 | ||
|
||
The 4.0 release of this crate depends on the new stable [`http`](https://docs.rs/http/latest/http/) | ||
1.0 release, which affects various public interfaces. In particular, `reqwest` has been upgraded | ||
to 0.12, which uses `http` 1.0. | ||
|
||
### Enable the `reqwest-blocking` feature to use the synchronous `reqwest` HTTP client | ||
|
||
In 4.0, enabling the (default) `reqwest` feature also enabled `reqwest`'s `blocking` feature. | ||
To reduce dependencies and improve compilation speed, the `reqwest` feature now only enables | ||
`reqwest`'s asynchronous (non-blocking) client. To use the synchronous (blocking) client, enable the | ||
`reqwest-blocking` feature in `Cargo.toml`: | ||
```toml | ||
openidconnect = { version = "4", features = ["reqwest-blocking" ] } | ||
``` | ||
|
||
### Use `http::{Request, Response}` for custom HTTP clients | ||
|
||
The `HttpRequest` and `HttpResponse` structs have been replaced with type aliases to | ||
[`http::Request`](https://docs.rs/http/latest/http/request/struct.Request.html) and | ||
[`http::Response`](https://docs.rs/http/latest/http/response/struct.Response.html), respectively. | ||
Custom HTTP clients will need to be updated to use the `http` types. See the | ||
[`reqwest` client implementations](https://github.com/ramosbugs/oauth2-rs/blob/23b952b23e6069525bc7e4c4f2c4924b8d28ce3a/src/reqwest.rs) | ||
in the underlying `oauth2` crate for an example. | ||
|
||
### Replace `TT` generic type parameter in `OAuth2TokenResponse` with associated type | ||
|
||
Previously, the `TokenResponse`, `OAuth2TokenResponse`, and `TokenIntrospectionResponse` traits had | ||
a generic type parameter `TT: TokenType`. This has been replaced with an associated type called | ||
`TokenType` in `OAuth2TokenResponse` and `TokenIntrospectionResponse`. | ||
Uses of `CoreTokenResponse` and `CoreTokenIntrospectionResponse` should continue to work without | ||
changes, but custom implementations of either trait will need to be updated to replace the type | ||
parameter with an associated type. | ||
|
||
#### Remove `TT` generic type parameter from `Client` and each `*Request` type | ||
|
||
Removing the `TT` generic type parameter from `TokenResponse` (see above) made the `TT` parameters | ||
to `Client` and each `*Request` (e.g., `CodeTokenRequest`) redundant. Consequently, the `TT` | ||
parameter has been removed from each of these types. `CoreClient` should continue to work | ||
without any changes, but code that provides generic types for `Client` or any of the `*Response` | ||
types will need to be updated to remove the `TT` type parameter. | ||
|
||
### Add `Display` to `ErrorResponse` trait | ||
|
||
To improve error messages, the | ||
[`RequestTokenError::ServerResponse`](https://docs.rs/oauth2/latest/oauth2/enum.RequestTokenError.html#variant.ServerResponse) | ||
enum variant now prints a message describing the server response using the `Display` trait. For most | ||
users (i.e., those using the default | ||
[`StandardErrorResponse`](https://docs.rs/oauth2/latest/oauth2/struct.StandardErrorResponse.html)), | ||
this does not require any code changes. However, users providing their own implementations | ||
of the `ErrorResponse` trait must now implement the `Display` trait. See | ||
`oauth2::StandardErrorResponse`'s | ||
[`Display` implementation](https://github.com/ramosbugs/oauth2-rs/blob/9d8f11addf819134f15c6d7f03276adb3d32e80b/src/error.rs#L88-L108) | ||
for an example. | ||
|
||
### Remove the `jwk-alg` feature flag | ||
|
||
The 4.0 release removes the `jwk-alg` feature flag and unconditionally deserializes the optional | ||
`alg` field in `CoreJsonWebKey`. If a key specifies the `alg` field, the key may only be used for | ||
the purposes of verifying signatures using that specific JWS signature algorithm. By comparison, | ||
the 3.0 release ignored the `alg` field unless the `jwk-alg` feature flag was enabled. | ||
|
||
### Enable the `timing-resistant-secret-traits` feature flag to securely compare secrets | ||
|
||
OpenID Connect flows require comparing secrets (e.g., `CsrfToken` and `Nonce`) received from | ||
providers. To do so securely | ||
while avoiding [timing side-channels](https://en.wikipedia.org/wiki/Timing_attack), the | ||
comparison must be done in constant time, either using a constant-time crate such as | ||
[`constant_time_eq`](https://crates.io/crates/constant_time_eq) (which could break if a future | ||
compiler version decides to be overly smart | ||
about its optimizations), or by first computing a cryptographically-secure hash (e.g., SHA-256) | ||
of both values and then comparing the hashes using `==`. | ||
|
||
The `timing-resistant-secret-traits` feature flag adds a safe (but comparatively expensive) | ||
`PartialEq` implementation to the secret types. Timing side-channels are why `PartialEq` is | ||
not auto-derived for this crate's secret types, and the lack of `PartialEq` is intended to | ||
prompt users to think more carefully about these comparisons. | ||
|
||
In the 3.0 release, the `Nonce` type implemented `PartialEq` by default, which also allowed the | ||
`IdToken`, `IdTokenClaims`, and `IdTokenFields` types to implement `PartialEq`. In 4.0, these | ||
types implement `PartialEq` only if the `timing-resistant-secret-traits` feature flag is enabled. | ||
|
||
### Move `hash_bytes()` method from `JwsSignatureAlgorithm` trait to `JsonWebKey` | ||
|
||
Certain JWS signature algorithms (e.g., `EdDSA`) require information from the corresponding public | ||
key (e.g., the `crv` value) to determine which hash function to use for computing the `at_hash` and | ||
`c_hash` ID token claims. To accommodate this requirement, the 4.0 release moves the `hash_bytes()` | ||
method from the `JwsSignatureAlgorithm` trait to the `JsonWebKey` trait. | ||
|
||
The `AccessTokenHash::from_token()` and `AuthorizationCodeHash::from_code()` methods now require | ||
a `JsonWebKey` as an argument. |