2019-04-19 20:53:49 +00:00
|
|
|
//! `Middleware` to normalize request's URI
|
2019-11-21 08:52:33 +00:00
|
|
|
use std::task::{Context, Poll};
|
2019-04-19 20:53:49 +00:00
|
|
|
|
2019-12-05 17:35:43 +00:00
|
|
|
use actix_http::http::{PathAndQuery, Uri};
|
2019-04-19 20:53:49 +00:00
|
|
|
use actix_service::{Service, Transform};
|
2019-05-01 19:40:56 +00:00
|
|
|
use bytes::Bytes;
|
2019-11-21 08:52:33 +00:00
|
|
|
use futures::future::{ok, Ready};
|
2019-04-20 00:23:17 +00:00
|
|
|
use regex::Regex;
|
2019-04-19 20:53:49 +00:00
|
|
|
|
|
|
|
use crate::service::{ServiceRequest, ServiceResponse};
|
2019-04-25 18:14:32 +00:00
|
|
|
use crate::Error;
|
2019-04-19 20:53:49 +00:00
|
|
|
|
|
|
|
#[derive(Default, Clone, Copy)]
|
|
|
|
/// `Middleware` to normalize request's URI in place
|
|
|
|
///
|
|
|
|
/// Performs following:
|
|
|
|
///
|
|
|
|
/// - Merges multiple slashes into one.
|
2019-05-01 18:47:51 +00:00
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// use actix_web::{web, http, middleware, App, HttpResponse};
|
|
|
|
///
|
2019-11-21 08:52:33 +00:00
|
|
|
/// # fn main() {
|
|
|
|
/// let app = App::new()
|
|
|
|
/// .wrap(middleware::NormalizePath)
|
|
|
|
/// .service(
|
|
|
|
/// web::resource("/test")
|
|
|
|
/// .route(web::get().to(|| HttpResponse::Ok()))
|
|
|
|
/// .route(web::method(http::Method::HEAD).to(|| HttpResponse::MethodNotAllowed()))
|
|
|
|
/// );
|
|
|
|
/// # }
|
2019-05-01 18:47:51 +00:00
|
|
|
/// ```
|
|
|
|
|
2019-04-19 20:53:49 +00:00
|
|
|
pub struct NormalizePath;
|
|
|
|
|
2019-05-01 18:47:51 +00:00
|
|
|
impl<S, B> Transform<S> for NormalizePath
|
2019-04-19 20:53:49 +00:00
|
|
|
where
|
2019-05-01 18:47:51 +00:00
|
|
|
S: Service<Request = ServiceRequest, Response = ServiceResponse<B>, Error = Error>,
|
|
|
|
S::Future: 'static,
|
2019-04-19 20:53:49 +00:00
|
|
|
{
|
|
|
|
type Request = ServiceRequest;
|
2019-05-01 18:47:51 +00:00
|
|
|
type Response = ServiceResponse<B>;
|
2019-04-25 18:14:32 +00:00
|
|
|
type Error = Error;
|
2019-04-19 20:53:49 +00:00
|
|
|
type InitError = ();
|
|
|
|
type Transform = NormalizePathNormalization<S>;
|
2019-11-21 08:52:33 +00:00
|
|
|
type Future = Ready<Result<Self::Transform, Self::InitError>>;
|
2019-04-19 20:53:49 +00:00
|
|
|
|
|
|
|
fn new_transform(&self, service: S) -> Self::Future {
|
2019-11-21 08:52:33 +00:00
|
|
|
ok(NormalizePathNormalization {
|
2019-04-19 20:53:49 +00:00
|
|
|
service,
|
2019-04-20 00:23:17 +00:00
|
|
|
merge_slash: Regex::new("//+").unwrap(),
|
2019-04-19 20:53:49 +00:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct NormalizePathNormalization<S> {
|
|
|
|
service: S,
|
|
|
|
merge_slash: Regex,
|
|
|
|
}
|
|
|
|
|
2019-05-01 18:47:51 +00:00
|
|
|
impl<S, B> Service for NormalizePathNormalization<S>
|
2019-04-19 20:53:49 +00:00
|
|
|
where
|
2019-05-01 18:47:51 +00:00
|
|
|
S: Service<Request = ServiceRequest, Response = ServiceResponse<B>, Error = Error>,
|
|
|
|
S::Future: 'static,
|
2019-04-19 20:53:49 +00:00
|
|
|
{
|
|
|
|
type Request = ServiceRequest;
|
2019-05-01 18:47:51 +00:00
|
|
|
type Response = ServiceResponse<B>;
|
2019-04-25 18:14:32 +00:00
|
|
|
type Error = Error;
|
2019-04-19 20:53:49 +00:00
|
|
|
type Future = S::Future;
|
|
|
|
|
2019-11-21 08:52:33 +00:00
|
|
|
fn poll_ready(&mut self, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
|
|
|
|
self.service.poll_ready(cx)
|
2019-04-19 20:53:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn call(&mut self, mut req: ServiceRequest) -> Self::Future {
|
|
|
|
let head = req.head_mut();
|
|
|
|
let path = head.uri.path();
|
|
|
|
let original_len = path.len();
|
|
|
|
let path = self.merge_slash.replace_all(path, "/");
|
|
|
|
|
|
|
|
if original_len != path.len() {
|
2019-05-01 19:40:56 +00:00
|
|
|
let mut parts = head.uri.clone().into_parts();
|
|
|
|
let pq = parts.path_and_query.as_ref().unwrap();
|
|
|
|
|
|
|
|
let path = if let Some(q) = pq.query() {
|
|
|
|
Bytes::from(format!("{}?{}", path, q))
|
|
|
|
} else {
|
2019-12-05 17:35:43 +00:00
|
|
|
Bytes::copy_from_slice(path.as_bytes())
|
2019-05-01 19:40:56 +00:00
|
|
|
};
|
2019-12-05 17:35:43 +00:00
|
|
|
parts.path_and_query = Some(PathAndQuery::from_maybe_shared(path).unwrap());
|
|
|
|
drop(head);
|
2019-05-01 19:40:56 +00:00
|
|
|
|
|
|
|
let uri = Uri::from_parts(parts).unwrap();
|
|
|
|
req.match_info_mut().get_mut().update(&uri);
|
|
|
|
req.head_mut().uri = uri;
|
2019-04-19 20:53:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
self.service.call(req)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2019-05-12 15:34:51 +00:00
|
|
|
use actix_service::IntoService;
|
2019-04-19 20:53:49 +00:00
|
|
|
|
|
|
|
use super::*;
|
|
|
|
use crate::dev::ServiceRequest;
|
2019-11-26 05:25:50 +00:00
|
|
|
use crate::test::{call_service, init_service, TestRequest};
|
2019-05-01 19:40:56 +00:00
|
|
|
use crate::{web, App, HttpResponse};
|
|
|
|
|
2019-11-26 05:25:50 +00:00
|
|
|
#[actix_rt::test]
|
|
|
|
async fn test_wrap() {
|
|
|
|
let mut app = init_service(
|
|
|
|
App::new()
|
|
|
|
.wrap(NormalizePath::default())
|
|
|
|
.service(web::resource("/v1/something/").to(|| HttpResponse::Ok())),
|
|
|
|
)
|
|
|
|
.await;
|
|
|
|
|
|
|
|
let req = TestRequest::with_uri("/v1//something////").to_request();
|
|
|
|
let res = call_service(&mut app, req).await;
|
|
|
|
assert!(res.status().is_success());
|
2019-05-01 19:40:56 +00:00
|
|
|
}
|
2019-04-19 20:53:49 +00:00
|
|
|
|
2019-11-26 05:25:50 +00:00
|
|
|
#[actix_rt::test]
|
|
|
|
async fn test_in_place_normalization() {
|
|
|
|
let srv = |req: ServiceRequest| {
|
|
|
|
assert_eq!("/v1/something/", req.path());
|
|
|
|
ok(req.into_response(HttpResponse::Ok().finish()))
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut normalize = NormalizePath
|
|
|
|
.new_transform(srv.into_service())
|
|
|
|
.await
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
let req = TestRequest::with_uri("/v1//something////").to_srv_request();
|
|
|
|
let res = normalize.call(req).await.unwrap();
|
|
|
|
assert!(res.status().is_success());
|
2019-04-19 20:53:49 +00:00
|
|
|
}
|
|
|
|
|
2019-11-26 05:25:50 +00:00
|
|
|
#[actix_rt::test]
|
|
|
|
async fn should_normalize_nothing() {
|
|
|
|
const URI: &str = "/v1/something/";
|
2019-04-19 20:53:49 +00:00
|
|
|
|
2019-11-26 05:25:50 +00:00
|
|
|
let srv = |req: ServiceRequest| {
|
|
|
|
assert_eq!(URI, req.path());
|
|
|
|
ok(req.into_response(HttpResponse::Ok().finish()))
|
|
|
|
};
|
2019-04-19 20:53:49 +00:00
|
|
|
|
2019-11-26 05:25:50 +00:00
|
|
|
let mut normalize = NormalizePath
|
|
|
|
.new_transform(srv.into_service())
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2019-04-19 20:53:49 +00:00
|
|
|
|
2019-11-26 05:25:50 +00:00
|
|
|
let req = TestRequest::with_uri(URI).to_srv_request();
|
|
|
|
let res = normalize.call(req).await.unwrap();
|
|
|
|
assert!(res.status().is_success());
|
2019-04-19 20:53:49 +00:00
|
|
|
}
|
|
|
|
}
|