1
0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-29 22:01:14 +03:00

Remove the ServerLayer from mas-http

This commit is contained in:
Quentin Gliech
2022-11-23 13:51:17 +01:00
parent 4227fa7a83
commit e8c8d0bf8a
7 changed files with 37 additions and 91 deletions

View File

@ -24,7 +24,7 @@ serde_json = "1.0.89"
serde_yaml = "0.9.14"
tokio = { version = "1.22.0", features = ["full"] }
tower = { version = "0.4.13", features = ["full"] }
tower-http = { version = "0.3.5", features = ["fs"] }
tower-http = { version = "0.3.5", features = ["fs", "compression-full"] }
url = "2.3.1"
watchman_client = "0.8.0"

View File

@ -21,7 +21,6 @@ use itertools::Itertools;
use mas_config::RootConfig;
use mas_email::Mailer;
use mas_handlers::{AppState, HttpClientFactory, MatrixHomeserver};
use mas_http::ServerLayer;
use mas_listener::{server::Server, shutdown::ShutdownStream};
use mas_policy::PolicyFactory;
use mas_router::UrlBuilder;
@ -29,7 +28,6 @@ use mas_storage::MIGRATOR;
use mas_tasks::TaskQueue;
use mas_templates::Templates;
use tokio::signal::unix::SignalKind;
use tower::Layer;
use tracing::{error, info, log::warn};
#[derive(Parser, Debug, Default)]
@ -220,8 +218,11 @@ impl Options {
};
// and build the router
let router = crate::server::build_router(state.clone(), &config.resources);
let router = ServerLayer::new(config.name.clone()).layer(router);
let router = crate::server::build_router(
state.clone(),
&config.resources,
config.name.as_deref(),
);
// Display some informations about where we'll be serving connections
let is_tls = config.tls.is_some();

View File

@ -24,16 +24,22 @@ use hyper::StatusCode;
use listenfd::ListenFd;
use mas_config::{HttpBindConfig, HttpResource, HttpTlsConfig, UnixOrTcp};
use mas_handlers::AppState;
use mas_http::otel::TraceLayer;
use mas_listener::{unix_or_tcp::UnixOrTcpListener, ConnectionInfo};
use mas_router::Route;
use mas_spa::ViteManifestService;
use mas_templates::Templates;
use opentelemetry::KeyValue;
use rustls::ServerConfig;
use tower::Layer;
use tower_http::services::ServeDir;
use tower_http::{compression::CompressionLayer, services::ServeDir};
#[allow(clippy::trait_duplication_in_bounds)]
pub fn build_router<B>(state: AppState, resources: &[HttpResource]) -> Router<(), B>
pub fn build_router<B>(
state: AppState,
resources: &[HttpResource],
name: Option<&str>,
) -> Router<(), B>
where
B: HttpBody + Send + 'static,
<B as HttpBody>::Data: Into<axum::body::Bytes> + Send,
@ -106,7 +112,16 @@ where
}
}
router.with_state(state)
let mut trace_layer = TraceLayer::axum();
if let Some(name) = name {
trace_layer = trace_layer.with_static_attribute(KeyValue::new("listener", name.to_owned()));
}
router
.layer(trace_layer)
.layer(CompressionLayer::new())
.with_state(state)
}
pub fn build_tls_server_config(config: &HttpTlsConfig) -> Result<ServerConfig, anyhow::Error> {

View File

@ -27,8 +27,8 @@ serde_json = "1.0.89"
serde_urlencoded = "0.7.1"
thiserror = "1.0.37"
tokio = { version = "1.22.0", features = ["sync", "parking_lot"], optional = true }
tower = { version = "0.4.13", features = ["limit"] }
tower-http = { version = "0.3.5", features = ["timeout", "follow-redirect", "decompression-full", "set-header", "compression-full", "cors", "util"] }
tower = { version = "0.4.13", features = [] }
tower-http = { version = "0.3.5", features = ["cors"] }
tracing = "0.1.37"
tracing-opentelemetry = "0.18.0"
webpki = { version = "0.22.0", optional = true }
@ -51,4 +51,8 @@ client = [
"dep:hyper-rustls",
"dep:tokio",
"dep:webpki",
"tower/limit",
"tower-http/timeout",
"tower-http/follow-redirect",
"tower-http/set-header",
]

View File

@ -20,5 +20,5 @@ pub mod json_request;
pub mod json_response;
pub mod otel;
#[cfg(feature = "client")]
pub(crate) mod client;
pub(crate) mod server;

View File

@ -1,75 +0,0 @@
// Copyright 2022 The Matrix.org Foundation C.I.C.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
use std::marker::PhantomData;
use http::{Request, Response};
use opentelemetry::KeyValue;
use tower::{util::BoxCloneService, Layer, Service, ServiceExt};
use tower_http::compression::{CompressionBody, CompressionLayer};
use super::otel::TraceLayer;
#[derive(Debug, Default)]
pub struct ServerLayer<ReqBody> {
listener_name: Option<String>,
_t: PhantomData<ReqBody>,
}
impl<B> Clone for ServerLayer<B> {
fn clone(&self) -> Self {
Self {
listener_name: self.listener_name.clone(),
_t: PhantomData,
}
}
}
impl<B> ServerLayer<B> {
#[must_use]
pub fn new(listener_name: Option<String>) -> Self {
Self {
listener_name,
_t: PhantomData,
}
}
}
impl<ReqBody, ResBody, S> Layer<S> for ServerLayer<ReqBody>
where
S: Service<Request<ReqBody>, Response = Response<ResBody>> + Clone + Send + 'static,
S::Future: Send + 'static,
S::Error: std::fmt::Display,
ReqBody: http_body::Body + 'static,
ResBody: http_body::Body + Send + 'static,
{
#[allow(clippy::type_complexity)]
type Service = BoxCloneService<Request<ReqBody>, Response<CompressionBody<ResBody>>, S::Error>;
fn layer(&self, inner: S) -> Self::Service {
let compression = CompressionLayer::new();
#[cfg(feature = "axum")]
let mut trace = TraceLayer::axum();
#[cfg(not(feature = "axum"))]
let mut trace = TraceLayer::http_server();
if let Some(name) = &self.listener_name {
trace = trace.with_static_attribute(KeyValue::new("listener", name.clone()));
}
(compression, trace).layer(inner).boxed_clone()
}
}

View File

@ -31,9 +31,12 @@ mod layers;
mod service;
#[cfg(feature = "client")]
pub use self::client::{
make_traced_client, make_traced_connector, make_untraced_client, ClientInitError, TracedClient,
TracedConnector, UntracedClient, UntracedConnector,
pub use self::{
client::{
make_traced_client, make_traced_connector, make_untraced_client, ClientInitError,
TracedClient, TracedConnector, UntracedClient, UntracedConnector,
},
layers::client::{ClientLayer, ClientService},
};
pub use self::{
ext::{set_propagator, CorsLayerExt, ServiceExt as HttpServiceExt},
@ -41,12 +44,10 @@ pub use self::{
body_to_bytes_response::{self, BodyToBytesResponse, BodyToBytesResponseLayer},
bytes_to_body_request::{self, BytesToBodyRequest, BytesToBodyRequestLayer},
catch_http_codes::{self, CatchHttpCodes, CatchHttpCodesLayer},
client::{ClientLayer, ClientService},
form_urlencoded_request::{self, FormUrlencodedRequest, FormUrlencodedRequestLayer},
json_request::{self, JsonRequest, JsonRequestLayer},
json_response::{self, JsonResponse, JsonResponseLayer},
otel,
server::ServerLayer,
},
service::{BoxCloneSyncService, HttpService},
};