mirror of https://github.com/fafhrd91/actix-web
Compare commits
4 Commits
6e680afce6
...
f0df1c73ae
Author | SHA1 | Date |
---|---|---|
|
f0df1c73ae | |
|
3f9d88f859 | |
|
2eb801cb59 | |
|
1c703ac1d4 |
|
@ -49,7 +49,7 @@ jobs:
|
|||
toolchain: ${{ matrix.version.version }}
|
||||
|
||||
- name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
|
||||
uses: taiki-e/install-action@v2.54.0
|
||||
uses: taiki-e/install-action@v2.54.3
|
||||
with:
|
||||
tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
|
||||
|
||||
|
@ -83,7 +83,7 @@ jobs:
|
|||
uses: actions-rust-lang/setup-rust-toolchain@v1.13.0
|
||||
|
||||
- name: Install just, cargo-hack
|
||||
uses: taiki-e/install-action@v2.54.0
|
||||
uses: taiki-e/install-action@v2.54.3
|
||||
with:
|
||||
tool: just,cargo-hack
|
||||
|
||||
|
|
|
@ -64,7 +64,7 @@ jobs:
|
|||
toolchain: ${{ matrix.version.version }}
|
||||
|
||||
- name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
|
||||
uses: taiki-e/install-action@v2.54.0
|
||||
uses: taiki-e/install-action@v2.54.3
|
||||
with:
|
||||
tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
|
||||
|
||||
|
@ -113,7 +113,7 @@ jobs:
|
|||
toolchain: nightly
|
||||
|
||||
- name: Install just
|
||||
uses: taiki-e/install-action@v2.54.0
|
||||
uses: taiki-e/install-action@v2.54.3
|
||||
with:
|
||||
tool: just
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ jobs:
|
|||
components: llvm-tools
|
||||
|
||||
- name: Install just, cargo-llvm-cov, cargo-nextest
|
||||
uses: taiki-e/install-action@v2.54.0
|
||||
uses: taiki-e/install-action@v2.54.3
|
||||
with:
|
||||
tool: just,cargo-llvm-cov,cargo-nextest
|
||||
|
||||
|
|
|
@ -77,12 +77,12 @@ jobs:
|
|||
toolchain: ${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
|
||||
|
||||
- name: Install just
|
||||
uses: taiki-e/install-action@v2.54.0
|
||||
uses: taiki-e/install-action@v2.54.3
|
||||
with:
|
||||
tool: just
|
||||
|
||||
- name: Install cargo-check-external-types
|
||||
uses: taiki-e/cache-cargo-install-action@v2.1.2
|
||||
uses: taiki-e/cache-cargo-install-action@v2.2.0
|
||||
with:
|
||||
tool: cargo-check-external-types
|
||||
|
||||
|
|
|
@ -191,6 +191,7 @@
|
|||
- Add `Route::wrap()` to allow individual routes to use middleware. [#2725]
|
||||
- Add `ServiceConfig::default_service()`. [#2338] [#2743]
|
||||
- Implement `ResponseError` for `std::convert::Infallible`
|
||||
- Add `Condition::from_option()` to allow creating a conditional middleware from an `Option`. [#2623]
|
||||
|
||||
### Changed
|
||||
|
||||
|
|
|
@ -26,18 +26,31 @@ use crate::{
|
|||
/// let app = App::new()
|
||||
/// .wrap(Condition::new(enable_normalize, NormalizePath::default()));
|
||||
/// ```
|
||||
/// Or you can use an `Option` to create a new instance:
|
||||
/// ```
|
||||
/// use actix_web::middleware::{Condition, NormalizePath};
|
||||
/// use actix_web::App;
|
||||
///
|
||||
/// let app = App::new()
|
||||
/// .wrap(Condition::from_option(Some(NormalizePath::default())));
|
||||
/// ```
|
||||
pub struct Condition<T> {
|
||||
transformer: T,
|
||||
enable: bool,
|
||||
transformer: Option<T>,
|
||||
}
|
||||
|
||||
impl<T> Condition<T> {
|
||||
pub fn new(enable: bool, transformer: T) -> Self {
|
||||
Self {
|
||||
transformer,
|
||||
enable,
|
||||
transformer: match enable {
|
||||
true => Some(transformer),
|
||||
false => None,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_option(transformer: Option<T>) -> Self {
|
||||
Self { transformer }
|
||||
}
|
||||
}
|
||||
|
||||
impl<S, T, Req, BE, BD, Err> Transform<S, Req> for Condition<T>
|
||||
|
@ -55,8 +68,8 @@ where
|
|||
type Future = LocalBoxFuture<'static, Result<Self::Transform, Self::InitError>>;
|
||||
|
||||
fn new_transform(&self, service: S) -> Self::Future {
|
||||
if self.enable {
|
||||
let fut = self.transformer.new_transform(service);
|
||||
if let Some(transformer) = &self.transformer {
|
||||
let fut = transformer.new_transform(service);
|
||||
async move {
|
||||
let wrapped_svc = fut.await?;
|
||||
Ok(ConditionMiddleware::Enable(wrapped_svc))
|
||||
|
@ -131,6 +144,7 @@ where
|
|||
#[cfg(test)]
|
||||
mod tests {
|
||||
use actix_service::IntoService as _;
|
||||
use futures_util::future::ok;
|
||||
|
||||
use super::*;
|
||||
use crate::{
|
||||
|
@ -167,6 +181,18 @@ mod tests {
|
|||
let _ = Condition::new(true, middleware::ErrorHandlers::<Bytes>::new());
|
||||
}
|
||||
|
||||
fn create_optional_mw<B>(enabled: bool) -> Option<ErrorHandlers<B>>
|
||||
where
|
||||
B: 'static,
|
||||
{
|
||||
match enabled {
|
||||
true => Some(
|
||||
ErrorHandlers::new().handler(StatusCode::INTERNAL_SERVER_ERROR, render_500),
|
||||
),
|
||||
false => None,
|
||||
}
|
||||
}
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn test_handler_enabled() {
|
||||
let srv = |req: ServiceRequest| async move {
|
||||
|
@ -204,4 +230,33 @@ mod tests {
|
|||
test::call_service(&mw, TestRequest::default().to_srv_request()).await;
|
||||
assert_eq!(resp.headers().get(CONTENT_TYPE), None);
|
||||
}
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn test_handler_some() {
|
||||
let srv = |req: ServiceRequest| {
|
||||
ok(req.into_response(HttpResponse::InternalServerError().finish()))
|
||||
};
|
||||
|
||||
let mw = Condition::from_option(create_optional_mw(true))
|
||||
.new_transform(srv.into_service())
|
||||
.await
|
||||
.unwrap();
|
||||
let resp = test::call_service(&mw, TestRequest::default().to_srv_request()).await;
|
||||
assert_eq!(resp.headers().get(CONTENT_TYPE).unwrap(), "0001");
|
||||
}
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn test_handler_none() {
|
||||
let srv = |req: ServiceRequest| {
|
||||
ok(req.into_response(HttpResponse::InternalServerError().finish()))
|
||||
};
|
||||
|
||||
let mw = Condition::from_option(create_optional_mw(false))
|
||||
.new_transform(srv.into_service())
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let resp = test::call_service(&mw, TestRequest::default().to_srv_request()).await;
|
||||
assert_eq!(resp.headers().get(CONTENT_TYPE), None);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue