Merge pull request #10 from jtgeibel/remove-url-normalization

Remove url path normalization logic

Author: jtgeibel

src/adaptor.rs

@@ -11,7 +11,6 @@
 
 use std::io::{Cursor, Read};
 use std::net::SocketAddr;
-use std::path::{Component, Path, PathBuf};
 
 use conduit::{Extensions, HeaderMap, Host, Method, RequestExt, Scheme, Version};
 use http::request::Parts as HttpParts;
@@ -63,30 +62,6 @@ impl ConduitRequest {
     pub(crate) fn new(info: &mut RequestInfo, remote_addr: SocketAddr) -> Self {
         let (parts, body) = info.take();
         let path = parts.0.uri.path().to_string();
-        let path = Path::new(&path);
-        let path = path
-            .components()
-            // Normalize path (needed by crates.io)
-            // TODO: Make this optional?
-            .fold(PathBuf::new(), |mut result, p| match p {
-                Component::Normal(x) => {
-                    if x != "" {
-                        result.push(x)
-                    };
-                    result
-                }
-                Component::ParentDir => {
-                    result.pop();
-                    result
-                }
-                Component::RootDir => {
-                    result.push(Component::RootDir);
-                    result
-                }
-                _ => result,
-            })
-            .to_string_lossy()
-            .to_string(); // non-Unicode is replaced with U+FFFD REPLACEMENT CHARACTER
 
         Self {
             parts,

src/tests.rs

@@ -125,24 +125,6 @@ async fn recover_from_panic() {
     assert_generic_err(simulate_request(Panic).await).await;
 }
 
-#[tokio::test]
-async fn normalize_path() {
-    let mut service = make_service(AssertPathNormalized);
-    let req = hyper::Request::put("//removed/.././.././normalized")
-        .body(hyper::Body::default())
-        .unwrap();
-    let resp = service.call(req).await.unwrap();
-    assert_eq!(resp.status(), StatusCode::OK);
-    assert_eq!(resp.headers().len(), 1);
-
-    let req = hyper::Request::put("//normalized")
-        .body(hyper::Body::default())
-        .unwrap();
-    let resp = service.call(req).await.unwrap();
-    assert_eq!(resp.status(), StatusCode::OK);
-    assert_eq!(resp.headers().len(), 1);
-}
-
 #[tokio::test]
 async fn sleeping_doesnt_block_another_request() {
     let mut service = make_service(Sleep);