mirror of
https://github.com/LemmyNet/activitypub-federation-rust.git
synced 2024-05-18 17:08:04 +00:00
d9f1a4414f
* Fix formatting for nightly rustfmt
https://github.com/LemmyNet/lemmy/issues/3467
* Fix regex error when actix-web feature not enabled
If the crate is built with only the axum feature, compiling the
webfinger account regex will fail with an error "Unicode-aware case
insensitivity matching is not available..." because of the missing
unicode-case feature. This doesn't happen if actix is installed because
it pulls in the regex crate with all features (via [actix-router][0]).
The failure can be demonstrated by reverting this commit's change to
Cargo.toml and running:
cargo test --no-default-features --features=axum --doc extract_webfinger_name
Resolve this by adding the unicode-case feature to the regex dependency.
[0]: 0e8ed50e3a/actix-router/Cargo.toml (L25)
77 lines
2.1 KiB
Rust
77 lines
2.1 KiB
Rust
use crate::config::{Data, FederationConfig, FederationMiddleware};
|
|
use actix_web::{
|
|
dev::{forward_ready, Payload, Service, ServiceRequest, ServiceResponse, Transform},
|
|
Error,
|
|
FromRequest,
|
|
HttpMessage,
|
|
HttpRequest,
|
|
};
|
|
use std::future::{ready, Ready};
|
|
|
|
impl<S, B, T> Transform<S, ServiceRequest> for FederationMiddleware<T>
|
|
where
|
|
S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error>,
|
|
S::Future: 'static,
|
|
B: 'static,
|
|
T: Clone + Sync + 'static,
|
|
{
|
|
type Response = ServiceResponse<B>;
|
|
type Error = Error;
|
|
type Transform = FederationService<S, T>;
|
|
type InitError = ();
|
|
type Future = Ready<Result<Self::Transform, Self::InitError>>;
|
|
|
|
fn new_transform(&self, service: S) -> Self::Future {
|
|
ready(Ok(FederationService {
|
|
service,
|
|
config: self.0.clone(),
|
|
}))
|
|
}
|
|
}
|
|
|
|
/// Passes [FederationConfig] to HTTP handlers, converting it to [Data] in the process
|
|
#[doc(hidden)]
|
|
pub struct FederationService<S, T: Clone>
|
|
where
|
|
S: Service<ServiceRequest, Error = Error>,
|
|
S::Future: 'static,
|
|
T: Sync,
|
|
{
|
|
service: S,
|
|
config: FederationConfig<T>,
|
|
}
|
|
|
|
impl<S, B, T> Service<ServiceRequest> for FederationService<S, T>
|
|
where
|
|
S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error>,
|
|
S::Future: 'static,
|
|
B: 'static,
|
|
T: Clone + Sync + 'static,
|
|
{
|
|
type Response = ServiceResponse<B>;
|
|
type Error = Error;
|
|
type Future = S::Future;
|
|
|
|
forward_ready!(service);
|
|
|
|
fn call(&self, req: ServiceRequest) -> Self::Future {
|
|
req.extensions_mut().insert(self.config.clone());
|
|
|
|
self.service.call(req)
|
|
}
|
|
}
|
|
|
|
impl<T: Clone + 'static> FromRequest for Data<T> {
|
|
type Error = Error;
|
|
type Future = Ready<Result<Self, Self::Error>>;
|
|
|
|
fn from_request(req: &HttpRequest, _payload: &mut Payload) -> Self::Future {
|
|
ready(match req.extensions().get::<FederationConfig<T>>() {
|
|
Some(c) => Ok(c.to_request_data()),
|
|
None => Err(actix_web::error::ErrorBadRequest(
|
|
"Missing extension, did you register FederationMiddleware?",
|
|
)),
|
|
})
|
|
}
|
|
}
|