Replace HTTP client in oidc-client with reqwest

Author: sandhose

Cargo.lock

@@ -273,12 +273,12 @@ features = ["rt"]
 # Tower services
 [workspace.dependencies.tower]
 version = "0.5.1"
-features = ["util"]
+features = ["util", "limit"]
 
 # Tower HTTP layers
 [workspace.dependencies.tower-http]
 version = "0.6.1"
-features = ["cors", "fs", "add-extension"]
+features = ["cors", "fs", "add-extension", "set-header", "follow-redirect"]
 
 # Logging and tracing
 [workspace.dependencies.tracing]

Cargo.toml

@@ -5,6 +5,8 @@ disallowed-methods = [
     { path = "chrono::Utc::now", reason = "source the current time from the clock instead" },
     { path = "ulid::Ulid::from_datetime", reason = "use Ulid::from_datetime_with_source instead" },
     { path = "ulid::Ulid::new", reason = "use Ulid::from_datetime_with_source instead" },
+    { path = "reqwest::Client::new", reason = "use mas_http::reqwest_client instead" },
+    { path = "reqwest::RequestBuilder::send", reason = "use send_traced instead" },
 ]
 
 disallowed-types = [

clippy.toml

@@ -41,7 +41,7 @@ ulid.workspace = true
 
 oauth2-types.workspace = true
 mas-data-model.workspace = true
-mas-http = { workspace = true, features = ["client"] }
+mas-http.workspace = true
 mas-iana.workspace = true
 mas-jose.workspace = true
 mas-keystore.workspace = true

crates/axum-utils/Cargo.toml

@@ -31,6 +31,7 @@ itertools = "0.13.0"
 listenfd = "1.0.1"
 rand.workspace = true
 rand_chacha = "0.3.1"
+reqwest.workspace = true
 rustls.workspace = true
 serde_json.workspace = true
 serde_yaml = "0.9.34"
@@ -71,8 +72,8 @@ sentry-tower.workspace = true
 mas-config.workspace = true
 mas-data-model.workspace = true
 mas-email.workspace = true
-mas-handlers = { workspace = true }
-mas-http = { workspace = true, features = ["client"] }
+mas-handlers.workspace = true
+mas-http.workspace = true
 mas-i18n.workspace = true
 mas-iana.workspace = true
 mas-keystore.workspace = true

crates/cli/Cargo.toml

@@ -44,6 +44,7 @@ pub struct AppState {
     pub policy_factory: Arc<PolicyFactory>,
     pub graphql_schema: GraphQLSchema,
     pub http_client_factory: HttpClientFactory,
+    pub http_client: reqwest::Client,
     pub password_manager: PasswordManager,
     pub metadata_cache: MetadataCache,
     pub site_config: SiteConfig,
@@ -116,13 +117,9 @@ impl AppState {
 
         let mut repo = PgRepository::from_conn(conn);
 
-        let http_service = self
-            .http_client_factory
-            .http_service("upstream_oauth2.metadata");
-
         self.metadata_cache
             .warm_up_and_run(
-                http_service,
+                &self.http_client,
                 std::time::Duration::from_secs(60 * 15),
                 &mut repo,
             )
@@ -179,6 +176,12 @@ impl FromRef<AppState> for HttpClientFactory {
     }
 }
 
+impl FromRef<AppState> for reqwest::Client {
+    fn from_ref(input: &AppState) -> Self {
+        input.http_client.clone()
+    }
+}
+
 impl FromRef<AppState> for PasswordManager {
     fn from_ref(input: &AppState) -> Self {
         input.password_manager.clone()

crates/cli/src/app_state.rs

@@ -150,6 +150,8 @@ impl Options {
 
         let http_client_factory = HttpClientFactory::new();
 
+        let http_client = mas_http::reqwest_client();
+
         let homeserver_connection = SynapseConnection::new(
             config.matrix.homeserver.clone(),
             config.matrix.endpoint.clone(),
@@ -242,6 +244,7 @@ impl Options {
                 policy_factory,
                 graphql_schema,
                 http_client_factory,
+                http_client,
                 password_manager,
                 metadata_cache,
                 site_config,

crates/cli/src/commands/server.rs

@@ -9,9 +9,7 @@ use axum::{
     response::{IntoResponse, Redirect},
 };
 use hyper::StatusCode;
-use mas_axum_utils::{
-    cookies::CookieJar, http_client_factory::HttpClientFactory, sentry::SentryEventID,
-};
+use mas_axum_utils::{cookies::CookieJar, sentry::SentryEventID};
 use mas_data_model::UpstreamOAuthProvider;
 use mas_oidc_client::requests::authorization_code::AuthorizationRequestData;
 use mas_router::UrlBuilder;

crates/handlers/src/upstream_oauth2/authorize.rs

@@ -9,9 +9,7 @@ use axum::{
     response::IntoResponse,
 };
 use hyper::StatusCode;
-use mas_axum_utils::{
-    cookies::CookieJar, http_client_factory::HttpClientFactory, sentry::SentryEventID,
-};
+use mas_axum_utils::{cookies::CookieJar, sentry::SentryEventID};
 use mas_data_model::UpstreamOAuthProvider;
 use mas_keystore::{Encrypter, Keystore};
 use mas_oidc_client::requests::{
@@ -128,7 +126,6 @@ impl IntoResponse for RouteError {
 pub(crate) async fn get(
     mut rng: BoxRng,
     clock: BoxClock,
-    State(http_client_factory): State<HttpClientFactory>,
     State(metadata_cache): State<MetadataCache>,
     mut repo: BoxRepository,
     State(url_builder): State<UrlBuilder>,

crates/handlers/src/upstream_oauth2/callback.rs

@@ -21,12 +21,12 @@ http-body.workspace = true
 http-body-util.workspace = true
 hyper.workspace = true
 hyper-util.workspace = true
-hyper-rustls = { workspace = true, optional = true }
+hyper-rustls.workspace = true
 opentelemetry.workspace = true
 opentelemetry-http.workspace = true
 opentelemetry-semantic-conventions.workspace = true
-rustls = { workspace = true, optional = true }
-rustls-platform-verifier = { workspace = true, optional = true }
+rustls.workspace = true
+rustls-platform-verifier.workspace = true
 pin-project-lite = "0.2.14"
 reqwest.workspace = true
 serde.workspace = true
@@ -38,20 +38,8 @@ tower-http.workspace = true
 tracing.workspace = true
 tracing-opentelemetry.workspace = true
 
-mas-tower = { workspace = true, optional = true }
+mas-tower.workspace = true
 
 [dev-dependencies]
 anyhow.workspace = true
 tokio.workspace = true
-
-[features]
-client = [
-    "dep:mas-tower",
-    "dep:rustls",
-    "dep:hyper-rustls",
-    "dep:rustls-platform-verifier",
-    "tower/limit",
-    "tower-http/timeout",
-    "tower-http/follow-redirect",
-    "tower-http/set-header",
-]