matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-08-07 17:03:01 +03:00
Code Activity

Make the ServerLayer work properly with axum

Browse Source
This commit is contained in:
Quentin Gliech
2022-03-25 10:09:01 +01:00
parent 7c8f8722cd
commit 9b5ecd5bc4
5 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/http/Cargo.toml
View File

@@ -15,6 +15,7 @@ hyper-rustls = { version = "0.23.0", features = ["http1", "http2"] }
opentelemetry = "0.17.0"
opentelemetry-http = "0.6.0"
opentelemetry-semantic-conventions = "0.9.0"
pin-project-lite = "0.2.8"
rustls = "0.20.4"
serde = "1.0.136"
serde_json = "1.0.79"

31
crates/http/src/layers/server.rs
View File

@@ -12,45 +12,34 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use std::{marker::PhantomData, time::Duration};
use std::marker::PhantomData;
use http::{Request, Response};
use http_body::combinators::BoxBody;
use tower::{
timeout::TimeoutLayer, util::BoxCloneService, Layer, Service, ServiceBuilder, ServiceExt,
};
use tower_http::compression::{CompressionBody, CompressionLayer};
use tower::{util::BoxCloneService, Layer, Service, ServiceBuilder, ServiceExt};
use tower_http::{compression::CompressionBody, ServiceBuilderExt};
use super::otel::TraceLayer;
use crate::BoxError;
#[derive(Debug, Default)]
pub struct ServerLayer<ReqBody> {
_t: PhantomData<ReqBody>,
}
impl<ReqBody, ResBody, S, E> Layer<S> for ServerLayer<ReqBody>
impl<ReqBody, ResBody, S> Layer<S> for ServerLayer<ReqBody>
where
S: Service<Request<ReqBody>, Response = Response<ResBody>, Error = E> + Clone + Send + 'static,
ReqBody: http_body::Body + 'static,
ResBody: http_body::Body + Sync + Send + 'static,
ResBody::Error: std::fmt::Display + 'static,
S: Service<Request<ReqBody>, Response = Response<ResBody>> + Clone + Send + 'static,
S::Future: Send + 'static,
E: std::error::Error + Into<BoxError>,
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<BoxBody<ResBody::Data, ResBody::Error>>>,
BoxError,
>;
type Service = BoxCloneService<Request<ReqBody>, Response<CompressionBody<ResBody>>, S::Error>;
fn layer(&self, inner: S) -> Self::Service {
ServiceBuilder::new()
.layer(CompressionLayer::new())
.compression()
.layer(TraceLayer::http_server())
.map_response(|r: Response<_>| r.map(BoxBody::new))
.layer(TimeoutLayer::new(Duration::from_secs(10)))
.service(inner)
.boxed_clone()
}