-
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6 from plabayo/sync/tower-http-0.4.2
port tower-http 0.4.3 to tower-async-http (came from 0.4.1)
- Loading branch information
Showing
20 changed files
with
477 additions
and
388 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ description = """ | |
| Tower Async middleware and utilities for HTTP clients and servers. | ||
| An "Async Trait" fork from the original Tower Library. | ||
| """ | ||
| version = "0.1.1" | ||
| version = "0.1.2" | ||
| authors = ["Glen De Cauwsemaecker <[email protected]>"] | ||
| edition = "2021" | ||
| license = "MIT" | ||
|
|
@@ -25,7 +25,7 @@ tower-async-layer = { version = "0.1", path = "../tower-async-layer" } | |
| tower-async-service = { version = "0.1", path = "../tower-async-service" } | ||
|
|
||
| # optional dependencies | ||
| async-compression = { version = "0.3", optional = true, features = ["tokio"] } | ||
| async-compression = { version = "0.4", optional = true, features = ["tokio"] } | ||
| base64 = { version = "0.21", optional = true } | ||
| http-range-header = "0.3.0" | ||
| iri-string = { version = "0.7.0", optional = true } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,196 @@ | ||
| use std::{fmt, sync::Arc}; | ||
|
|
||
| use http::{ | ||
| header::{HeaderName, HeaderValue}, | ||
| request::Parts as RequestParts, | ||
| }; | ||
|
|
||
| /// Holds configuration for how to set the [`Access-Control-Allow-Private-Network`][wicg] header. | ||
| /// | ||
| /// See [`CorsLayer::allow_private_network`] for more details. | ||
| /// | ||
| /// [wicg]: https://wicg.github.io/private-network-access/ | ||
| /// [`CorsLayer::allow_private_network`]: super::CorsLayer::allow_private_network | ||
| #[derive(Clone, Default)] | ||
| #[must_use] | ||
| pub struct AllowPrivateNetwork(AllowPrivateNetworkInner); | ||
|
|
||
| static TRUE: HeaderValue = HeaderValue::from_static("true"); | ||
|
|
||
| impl AllowPrivateNetwork { | ||
| /// Allow requests via a more private network than the one used to access the origin | ||
| /// | ||
| /// See [`CorsLayer::allow_private_network`] for more details. | ||
| /// | ||
| /// [`CorsLayer::allow_private_network`]: super::CorsLayer::allow_private_network | ||
| pub fn yes() -> Self { | ||
| Self(AllowPrivateNetworkInner::Yes) | ||
| } | ||
|
|
||
| /// Allow requests via private network for some requests, based on a given predicate | ||
| /// | ||
| /// The first argument to the predicate is the request origin. | ||
| /// | ||
| /// See [`CorsLayer::allow_private_network`] for more details. | ||
| /// | ||
| /// [`CorsLayer::allow_private_network`]: super::CorsLayer::allow_private_network | ||
| pub fn predicate<F>(f: F) -> Self | ||
| where | ||
| F: Fn(&HeaderValue, &RequestParts) -> bool + Send + Sync + 'static, | ||
| { | ||
| Self(AllowPrivateNetworkInner::Predicate(Arc::new(f))) | ||
| } | ||
|
|
||
| pub(super) fn to_header( | ||
| &self, | ||
| origin: Option<&HeaderValue>, | ||
| parts: &RequestParts, | ||
| ) -> Option<(HeaderName, HeaderValue)> { | ||
| #[allow(clippy::declare_interior_mutable_const)] | ||
| const REQUEST_PRIVATE_NETWORK: HeaderName = | ||
| HeaderName::from_static("access-control-request-private-network"); | ||
|
|
||
| #[allow(clippy::declare_interior_mutable_const)] | ||
| const ALLOW_PRIVATE_NETWORK: HeaderName = | ||
| HeaderName::from_static("access-control-allow-private-network"); | ||
|
|
||
| // Cheapest fallback: allow_private_network hasn't been set | ||
| if let AllowPrivateNetworkInner::No = &self.0 { | ||
| return None; | ||
| } | ||
|
|
||
| // Access-Control-Allow-Private-Network is only relevant if the request | ||
| // has the Access-Control-Request-Private-Network header set, else skip | ||
| if parts.headers.get(REQUEST_PRIVATE_NETWORK) != Some(&TRUE) { | ||
| return None; | ||
| } | ||
|
|
||
| let allow_private_network = match &self.0 { | ||
| AllowPrivateNetworkInner::Yes => true, | ||
| AllowPrivateNetworkInner::No => false, // unreachable, but not harmful | ||
| AllowPrivateNetworkInner::Predicate(c) => c(origin?, parts), | ||
| }; | ||
|
|
||
| allow_private_network.then(|| (ALLOW_PRIVATE_NETWORK, TRUE.clone())) | ||
| } | ||
| } | ||
|
|
||
| impl From<bool> for AllowPrivateNetwork { | ||
| fn from(v: bool) -> Self { | ||
| match v { | ||
| true => Self(AllowPrivateNetworkInner::Yes), | ||
| false => Self(AllowPrivateNetworkInner::No), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl fmt::Debug for AllowPrivateNetwork { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| match self.0 { | ||
| AllowPrivateNetworkInner::Yes => f.debug_tuple("Yes").finish(), | ||
| AllowPrivateNetworkInner::No => f.debug_tuple("No").finish(), | ||
| AllowPrivateNetworkInner::Predicate(_) => f.debug_tuple("Predicate").finish(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[derive(Clone)] | ||
| enum AllowPrivateNetworkInner { | ||
| Yes, | ||
| No, | ||
| Predicate( | ||
| Arc<dyn for<'a> Fn(&'a HeaderValue, &'a RequestParts) -> bool + Send + Sync + 'static>, | ||
| ), | ||
| } | ||
|
|
||
| impl Default for AllowPrivateNetworkInner { | ||
| fn default() -> Self { | ||
| Self::No | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::AllowPrivateNetwork; | ||
| use crate::cors::CorsLayer; | ||
|
|
||
| use http::{header::ORIGIN, request::Parts, HeaderName, HeaderValue, Request, Response}; | ||
| use hyper::Body; | ||
| use tower_async::{BoxError, ServiceBuilder}; | ||
| use tower_async_service::Service; | ||
|
|
||
| const REQUEST_PRIVATE_NETWORK: HeaderName = | ||
| HeaderName::from_static("access-control-request-private-network"); | ||
|
|
||
| const ALLOW_PRIVATE_NETWORK: HeaderName = | ||
| HeaderName::from_static("access-control-allow-private-network"); | ||
|
|
||
| const TRUE: HeaderValue = HeaderValue::from_static("true"); | ||
|
|
||
| #[tokio::test] | ||
| async fn cors_private_network_header_is_added_correctly() { | ||
| let mut service = ServiceBuilder::new() | ||
| .layer(CorsLayer::new().allow_private_network(true)) | ||
| .service_fn(echo); | ||
|
|
||
| let req = Request::builder() | ||
| .header(REQUEST_PRIVATE_NETWORK, TRUE) | ||
| .body(Body::empty()) | ||
| .unwrap(); | ||
| let res = service.call(req).await.unwrap(); | ||
|
|
||
| assert_eq!(res.headers().get(ALLOW_PRIVATE_NETWORK).unwrap(), TRUE); | ||
|
|
||
| let req = Request::builder().body(Body::empty()).unwrap(); | ||
| let res = service.call(req).await.unwrap(); | ||
|
|
||
| assert!(res.headers().get(ALLOW_PRIVATE_NETWORK).is_none()); | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn cors_private_network_header_is_added_correctly_with_predicate() { | ||
| let allow_private_network = | ||
| AllowPrivateNetwork::predicate(|origin: &HeaderValue, parts: &Parts| { | ||
| parts.uri.path() == "/allow-private" && origin == "localhost" | ||
| }); | ||
| let mut service = ServiceBuilder::new() | ||
| .layer(CorsLayer::new().allow_private_network(allow_private_network)) | ||
| .service_fn(echo); | ||
|
|
||
| let req = Request::builder() | ||
| .header(ORIGIN, "localhost") | ||
| .header(REQUEST_PRIVATE_NETWORK, TRUE) | ||
| .uri("/allow-private") | ||
| .body(Body::empty()) | ||
| .unwrap(); | ||
|
|
||
| let res = service.call(req).await.unwrap(); | ||
| assert_eq!(res.headers().get(ALLOW_PRIVATE_NETWORK).unwrap(), TRUE); | ||
|
|
||
| let req = Request::builder() | ||
| .header(ORIGIN, "localhost") | ||
| .header(REQUEST_PRIVATE_NETWORK, TRUE) | ||
| .uri("/other") | ||
| .body(Body::empty()) | ||
| .unwrap(); | ||
|
|
||
| let res = service.call(req).await.unwrap(); | ||
|
|
||
| assert!(res.headers().get(ALLOW_PRIVATE_NETWORK).is_none()); | ||
|
|
||
| let req = Request::builder() | ||
| .header(ORIGIN, "not-localhost") | ||
| .header(REQUEST_PRIVATE_NETWORK, TRUE) | ||
| .uri("/allow-private") | ||
| .body(Body::empty()) | ||
| .unwrap(); | ||
|
|
||
| let res = service.call(req).await.unwrap(); | ||
|
|
||
| assert!(res.headers().get(ALLOW_PRIVATE_NETWORK).is_none()); | ||
| } | ||
|
|
||
| async fn echo(req: Request<Body>) -> Result<Response<Body>, BoxError> { | ||
| Ok(Response::new(req.into_body())) | ||
| } | ||
| } |
Oops, something went wrong.