Percent decode paths in scopes (#166)

emmett-framework · Jan 3, 2024 · f3acfc6 · f3acfc6
1 parent 1d66ef2
commit f3acfc6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,6 +37,7 @@ hyper = { version = "=0.14", features = ["http1", "http2", "server", "stream", "
 log = "0.4"
 mimalloc = { version = "0.1.34", default-features = false, features = ["local_dynamic_tls"] }
 once_cell = "1.5"
+percent-encoding = "=2.3"
 pin-project = "1.0"
 pyo3 = { version = "=0.20", features = ["extension-module", "generate-import-lib"] }
 pyo3-asyncio = { version = "=0.20", features = ["tokio-runtime"], git = "https://github.com/gi0baro/pyo3-asyncio.git", rev = "6e3a309" }

diff --git a/src/asgi/types.rs b/src/asgi/types.rs
@@ -1,5 +1,6 @@
 use hyper::{header::HeaderMap, Uri, Version};
 use once_cell::sync::OnceCell;
+use percent_encoding::percent_decode_str;
 use pyo3::prelude::*;
 use pyo3::types::{PyBytes, PyDict, PyList, PyString};
 use std::net::{IpAddr, SocketAddr};
@@ -114,7 +115,7 @@ impl ASGIScope {
                 .path_and_query()
                 .map_or_else(|| ("", ""), |pq| (pq.path(), pq.query().unwrap_or("")));
             (
-                path,
+                percent_decode_str(path).decode_utf8().unwrap(),
                 query_string,
                 self.py_proto(),
                 self.py_http_version(),
@@ -152,10 +153,10 @@ impl ASGIScope {
         dict.set_item(pyo3::intern!(py, "scheme"), scheme)?;
         dict.set_item(pyo3::intern!(py, "method"), method)?;
         dict.set_item(pyo3::intern!(py, "root_path"), url_path_prefix)?;
-        dict.set_item(pyo3::intern!(py, "path"), path)?;
+        dict.set_item(pyo3::intern!(py, "path"), &path)?;
         dict.set_item(
             pyo3::intern!(py, "raw_path"),
-            PyString::new(py, path).call_method1(pyo3::intern!(py, "encode"), (pyo3::intern!(py, "ascii"),))?,
+            PyString::new(py, &path).call_method1(pyo3::intern!(py, "encode"), (pyo3::intern!(py, "ascii"),))?,
         )?;
         dict.set_item(
             pyo3::intern!(py, "query_string"),

diff --git a/src/rsgi/types.rs b/src/rsgi/types.rs
@@ -3,6 +3,7 @@ use hyper::{
     header::{HeaderMap, HeaderName, HeaderValue, SERVER as HK_SERVER},
     Body, Uri, Version,
 };
+use percent_encoding::percent_decode_str;
 use pyo3::prelude::*;
 use pyo3::types::PyString;
 use std::{borrow::Cow, net::SocketAddr};
@@ -128,8 +129,8 @@ impl RSGIScope {
     }
 
     #[getter(path)]
-    fn get_path(&self) -> &str {
-        self.uri.path()
+    fn get_path(&self) -> Cow<str> {
+        percent_decode_str(self.uri.path()).decode_utf8().unwrap()
     }
 
     #[getter(query_string)]

diff --git a/src/wsgi/types.rs b/src/wsgi/types.rs
@@ -4,6 +4,7 @@ use hyper::{
     header::{HeaderMap, CONTENT_LENGTH, CONTENT_TYPE},
     Body, Method, Request, Uri, Version,
 };
+use percent_encoding::percent_decode_str;
 use pyo3::types::{PyBytes, PyDict, PyList};
 use pyo3::{prelude::*, types::IntoPyDict};
 use std::{
@@ -166,7 +167,7 @@ impl WSGIScope {
             }
 
             (
-                path,
+                percent_decode_str(path).decode_utf8().unwrap(),
                 query_string,
                 self.py_http_version(),
                 (self.server_ip.to_string(), self.server_port),