Replace all the manual HTTP clients with reqwest

Author: sandhose

Cargo.lock

@@ -221,7 +221,7 @@ features = [
 [workspace.dependencies.sentry]
 version = "0.34.0"
 default-features = false
-features = ["backtrace", "contexts", "panic", "tower"]
+features = ["backtrace", "contexts", "panic", "tower", "reqwest"]
 
 # Sentry tower layer
 [workspace.dependencies.sentry-tower]
@@ -273,12 +273,12 @@ features = ["rt"]
 # Tower services
 [workspace.dependencies.tower]
 version = "0.5.1"
-features = ["util", "limit"]
+features = ["util"]
 
 # Tower HTTP layers
 [workspace.dependencies.tower-http]
 version = "0.6.1"
-features = ["cors", "fs", "add-extension", "set-header", "follow-redirect"]
+features = ["cors", "fs", "add-extension", "set-header"]
 
 # Logging and tracing
 [workspace.dependencies.tracing]
@@ -292,7 +292,7 @@ version = "0.24.0"
 features = ["trace", "metrics"]
 [workspace.dependencies.opentelemetry-http]
 version = "0.13.0"
-features = ["hyper"]
+features = ["reqwest"]
 [workspace.dependencies.opentelemetry-semantic-conventions]
 version = "0.16.0"
 [workspace.dependencies.tracing-opentelemetry]

Cargo.toml

@@ -27,6 +27,7 @@ hyper-util.workspace = true
 icu_locid = "1.4.0"
 mime = "0.3.17"
 rand.workspace = true
+reqwest.workspace = true
 sentry.workspace = true
 serde.workspace = true
 serde_with = "3.11.0"

crates/axum-utils/Cargo.toml

@@ -19,7 +19,7 @@ use axum_extra::typed_header::{TypedHeader, TypedHeaderRejectionReason};
 use headers::{authorization::Basic, Authorization};
 use http::{Request, StatusCode};
 use mas_data_model::{Client, JwksOrJwksUri};
-use mas_http::HttpServiceExt;
+use mas_http::RequestBuilderExt;
 use mas_iana::oauth::OAuthClientAuthenticationMethod;
 use mas_jose::{jwk::PublicJsonWebKeySet, jwt::Jwt};
 use mas_keystore::Encrypter;
@@ -28,9 +28,6 @@ use oauth2_types::errors::{ClientError, ClientErrorCode};
 use serde::{de::DeserializeOwned, Deserialize};
 use serde_json::Value;
 use thiserror::Error;
-use tower::{Service, ServiceExt};
-
-use crate::http_client_factory::HttpClientFactory;
 
 static JWT_BEARER_CLIENT_ASSERTION: &str = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer";
 
@@ -104,7 +101,7 @@ impl Credentials {
     #[tracing::instrument(skip_all, err)]
     pub async fn verify(
         &self,
-        http_client_factory: &HttpClientFactory,
+        http_client: &reqwest::Client,
         encrypter: &Encrypter,
         method: &OAuthClientAuthenticationMethod,
         client: &Client,
@@ -146,7 +143,7 @@ impl Credentials {
                     .as_ref()
                     .ok_or(CredentialsVerificationError::InvalidClientConfig)?;
 
-                let jwks = fetch_jwks(http_client_factory, jwks)
+                let jwks = fetch_jwks(http_client, jwks)
                     .await
                     .map_err(|_| CredentialsVerificationError::JwksFetchFailed)?;
 
@@ -181,27 +178,22 @@ impl Credentials {
 }
 
 async fn fetch_jwks(
-    http_client_factory: &HttpClientFactory,
+    http_client: &reqwest::Client,
     jwks: &JwksOrJwksUri,
 ) -> Result<PublicJsonWebKeySet, BoxError> {
     let uri = match jwks {
         JwksOrJwksUri::Jwks(j) => return Ok(j.clone()),
         JwksOrJwksUri::JwksUri(u) => u,
     };
 
-    let request = http::Request::builder()
-        .uri(uri.as_str())
-        .body(mas_http::EmptyBody::new())
-        .unwrap();
-
-    let mut client = http_client_factory
-        .client("client.fetch_jwks")
-        .response_body_to_bytes()
-        .json_response::<PublicJsonWebKeySet>();
-
-    let response = client.ready().await?.call(request).await?;
+    let response = http_client
+        .get(uri.as_str())
+        .send_traced()
+        .await?
+        .json()
+        .await?;
 
-    Ok(response.into_body())
+    Ok(response)
 }
 
 #[derive(Debug, Error)]

crates/axum-utils/src/client_authorization.rs

@@ -12,7 +12,6 @@ pub mod cookies;
 pub mod csrf;
 pub mod error_wrapper;
 pub mod fancy_error;
-pub mod http_client_factory;
 pub mod jwt;
 pub mod language_detection;
 pub mod sentry;

crates/axum-utils/src/http_client_factory.rs

@@ -14,7 +14,7 @@ use ipnetwork::IpNetwork;
 use mas_data_model::SiteConfig;
 use mas_handlers::{
     passwords::PasswordManager, ActivityTracker, BoundActivityTracker, CookieManager, ErrorWrapper,
-    GraphQLSchema, HttpClientFactory, Limiter, MetadataCache, RequesterFingerprint,
+    GraphQLSchema, Limiter, MetadataCache, RequesterFingerprint,
 };
 use mas_i18n::Translator;
 use mas_keystore::{Encrypter, Keystore};
@@ -43,7 +43,6 @@ pub struct AppState {
     pub homeserver_connection: SynapseConnection,
     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,
@@ -170,12 +169,6 @@ impl FromRef<AppState> for UrlBuilder {
     }
 }
 
-impl FromRef<AppState> for HttpClientFactory {
-    fn from_ref(input: &AppState) -> Self {
-        input.http_client_factory.clone()
-    }
-}
-
 impl FromRef<AppState> for reqwest::Client {
     fn from_ref(input: &AppState) -> Self {
         input.http_client.clone()