fix: percent-encode page URLs built from file paths
A file named Müsli.html was indexed with the URL /Müsli.html, which only resolves if the host happens to serve the same byte sequence the index was built from. Encode the URL that build_url derives from the file path using the URL spec's path percent-encode set, leaving / and % alone so path separators and already-encoded filenames are unaffected. URLs supplied by the caller (data-pagefind-meta="url:...", addCustomRecord) do not go through build_url and are untouched. Fixes #619
This commit is contained in:
1 parent
3d8f53f964
commit
128a5c945a
3 files changed
+41
-1
No files matched your search
Generated
+1
@@ -2303,6 +2303,7 @@ dependencies = [
|
|||||||
"minifier",
|
"minifier",
|
||||||
"pagefind_stem 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"pagefind_stem 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"path-slash",
|
"path-slash",
|
||||||
|
"percent-encoding",
|
||||||
"portpicker",
|
"portpicker",
|
||||||
"rayon",
|
"rayon",
|
||||||
"regex",
|
"regex",
|
||||||
|
|||||||
@@ -90,6 +90,7 @@ actix-web = { version = "4", optional = true }
|
|||||||
actix-files = { version = "0.7", optional = true }
|
actix-files = { version = "0.7", optional = true }
|
||||||
lexical-core = "1.0.0"
|
lexical-core = "1.0.0"
|
||||||
path-slash = "0.2"
|
path-slash = "0.2"
|
||||||
|
percent-encoding = "2"
|
||||||
rayon = "1.10"
|
rayon = "1.10"
|
||||||
rust-patch = "0.1.3"
|
rust-patch = "0.1.3"
|
||||||
typed-builder = "0.23.2"
|
typed-builder = "0.23.2"
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ use hashbrown::HashMap;
|
|||||||
use lazy_static::lazy_static;
|
use lazy_static::lazy_static;
|
||||||
use pagefind_stem::{Algorithm, Stemmer};
|
use pagefind_stem::{Algorithm, Stemmer};
|
||||||
use path_slash::PathExt as _;
|
use path_slash::PathExt as _;
|
||||||
|
use percent_encoding::{utf8_percent_encode, AsciiSet, CONTROLS};
|
||||||
use regex::Regex;
|
use regex::Regex;
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
use std::io::BufRead;
|
use std::io::BufRead;
|
||||||
@@ -589,6 +590,20 @@ impl Fossicker {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The URL spec's path percent-encode set, minus `/` so that the separators
|
||||||
|
/// between the path segments survive. `%` is deliberately left alone, so a file
|
||||||
|
/// that is already named in encoded form keeps the URL it has today.
|
||||||
|
const PATH_ENCODE_SET: &AsciiSet = &CONTROLS
|
||||||
|
.add(b' ')
|
||||||
|
.add(b'"')
|
||||||
|
.add(b'#')
|
||||||
|
.add(b'<')
|
||||||
|
.add(b'>')
|
||||||
|
.add(b'?')
|
||||||
|
.add(b'`')
|
||||||
|
.add(b'{')
|
||||||
|
.add(b'}');
|
||||||
|
|
||||||
fn strip_index_html(url: &str) -> &str {
|
fn strip_index_html(url: &str) -> &str {
|
||||||
if url.ends_with("/index.html") {
|
if url.ends_with("/index.html") {
|
||||||
&url[..url.len() - 10]
|
&url[..url.len() - 10]
|
||||||
@@ -621,7 +636,7 @@ fn build_url(page_url: &Path, relative_to: Option<&Path>, options: &SearchOption
|
|||||||
url.to_slash_lossy().to_owned().to_string()
|
url.to_slash_lossy().to_owned().to_string()
|
||||||
};
|
};
|
||||||
|
|
||||||
format!("/{}", final_url)
|
format!("/{}", utf8_percent_encode(&final_url, PATH_ENCODE_SET))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn normalize_content(content: &str) -> String {
|
fn normalize_content(content: &str) -> String {
|
||||||
@@ -1247,6 +1262,29 @@ mod tests {
|
|||||||
assert_eq!(&build_url(&p, Some(&root), &opts), "/world/");
|
assert_eq!(&build_url(&p, Some(&root), &opts), "/world/");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(not(target_os = "windows"))]
|
||||||
|
#[test]
|
||||||
|
fn building_urls_with_characters_that_need_encoding() {
|
||||||
|
std::env::set_var("PAGEFIND_SITE", "hello/world");
|
||||||
|
let config =
|
||||||
|
PagefindInboundConfig::with_layers(&[Layer::Env(Some("PAGEFIND_".into()))]).unwrap();
|
||||||
|
let opts = SearchOptions::load(config).unwrap();
|
||||||
|
|
||||||
|
let cwd = std::env::current_dir().unwrap();
|
||||||
|
|
||||||
|
let p: PathBuf = cwd.join::<PathBuf>("hello/world/Müsli.html".into());
|
||||||
|
assert_eq!(&build_url(&p, None, &opts), "/M%C3%BCsli.html");
|
||||||
|
|
||||||
|
let p: PathBuf = cwd.join::<PathBuf>("hello/world/Müsli/index.html".into());
|
||||||
|
assert_eq!(&build_url(&p, None, &opts), "/M%C3%BCsli/");
|
||||||
|
|
||||||
|
let p: PathBuf = cwd.join::<PathBuf>("hello/world/a b/c#d?e.html".into());
|
||||||
|
assert_eq!(&build_url(&p, None, &opts), "/a%20b/c%23d%3Fe.html");
|
||||||
|
|
||||||
|
let p: PathBuf = cwd.join::<PathBuf>("hello/world/M%C3%BCsli.html".into());
|
||||||
|
assert_eq!(&build_url(&p, None, &opts), "/M%C3%BCsli.html");
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
#[test]
|
#[test]
|
||||||
fn building_windows_urls() {
|
fn building_windows_urls() {
|
||||||
|
|||||||
Reference in new issue
Block a user