emelie/zola
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Percent decode paths on zola serve

Browse source
This commit is contained in:
Vincent Prouillet 2021-01-07 19:16:31 +01:00
parent 1a36c20bd2
commit ccad454922
4 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -21,6 +21,7 @@ content
- Remove `zola serve --watch-only`: since we build the HTML in memory and not on disk, it doesn't make sense anymore - Remove `zola serve --watch-only`: since we build the HTML in memory and not on disk, it doesn't make sense anymore
- Update clojure syntax - Update clojure syntax
- Prefer extra syntaxes to the default ones if we have a match for language - Prefer extra syntaxes to the default ones if we have a match for language
- Fix `zola serve` having issues with non-ascii paths
## 0.12.2 (2020-09-28) ## 0.12.2 (2020-09-28)

1
Cargo.lock generated
View file

@ -3263,6 +3263,7 @@ dependencies = [
"lazy_static", "lazy_static",
"notify", "notify",
"open", "open",
"percent-encoding",
"relative-path", "relative-path",
"serde_json", "serde_json",
"site", "site",

1
Cargo.toml
View file

@ -29,6 +29,7 @@ url = "2"
# Below is for the serve cmd # Below is for the serve cmd
hyper = { version = "0.14.1", default-features = false, features = ["runtime", "server", "http2", "http1"] } hyper = { version = "0.14.1", default-features = false, features = ["runtime", "server", "http2", "http1"] }
tokio = { version = "1.0.1", default-features = false, features = ["rt", "fs"] } tokio = { version = "1.0.1", default-features = false, features = ["rt", "fs"] }
percent-encoding = "2"
notify = "4" notify = "4"
ws = "0.9" ws = "0.9"
ctrlc = "3" ctrlc = "3"

7
src/cmd/serve.rs
View file

@ -72,8 +72,13 @@ const LIVE_RELOAD: &str = include_str!("livereload.js");
async fn handle_request(req: Request<Body>, mut root: PathBuf) -> Result<Response<Body>> { async fn handle_request(req: Request<Body>, mut root: PathBuf) -> Result<Response<Body>> {
let mut path = RelativePathBuf::new(); let mut path = RelativePathBuf::new();
// https://zola.discourse.group/t/percent-encoding-for-slugs/736
let decoded = match percent_encoding::percent_decode_str(req.uri().path()).decode_utf8() {
Ok(d) => d,
Err(_) => return Ok(not_found()),
};
for c in req.uri().path().split('/') { for c in decoded.split('/') {
path.push(c); path.push(c);
} }