mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-09-30 22:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Strip query string when parsing filename from HTML index (#2961)

Browse source 
## Summary

Closes https://github.com/astral-sh/uv/issues/2958.
This commit is contained in:
Charlie Marsh 2024-04-10 10:25:29 -04:00 • committed by GitHub
parent c345a79b9b
commit 38ab39c439
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 57 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

57
crates/uv-client/src/html.rs
View file

@ -164,6 +164,9 @@ impl SimpleHtml {
.last() .last()
.ok_or_else(|| Error::MissingFilename(href.to_string()))?; .ok_or_else(|| Error::MissingFilename(href.to_string()))?;
// Strip any query string from the filename.
let filename = filename.split('?').next().unwrap_or(filename);
// Unquote the filename. // Unquote the filename.
let filename = urlencoding::decode(filename) let filename = urlencoding::decode(filename)
.map_err(|_| Error::UnsupportedFilename(filename.to_string()))?; .map_err(|_| Error::UnsupportedFilename(filename.to_string()))?;
@ -681,6 +684,60 @@ mod tests {
"###); "###);
} }
#[test]
fn parse_query_string() {
let text = r#"
<!DOCTYPE html>
<html>
<body>
<h1>Links for jinja2</h1>
<a href="/whl/Jinja2-3.1.2-py3-none-any.whl?project=legacy">Jinja2-3.1.2-py3-none-any.whl</a><br/>
</body>
</html>
<!--TIMESTAMP 1703347410-->
"#;
let base = Url::parse("https://download.pytorch.org/whl/jinja2/").unwrap();
let result = SimpleHtml::parse(text, &base).unwrap();
insta::assert_debug_snapshot!(result, @r###"
SimpleHtml {
base: BaseUrl(
Url {
scheme: "https",
cannot_be_a_base: false,
username: "",
password: None,
host: Some(
Domain(
"download.pytorch.org",
),
),
port: None,
path: "/whl/jinja2/",
query: None,
fragment: None,
},
),
files: [
File {
dist_info_metadata: None,
filename: "Jinja2-3.1.2-py3-none-any.whl",
hashes: Hashes {
md5: None,
sha256: None,
sha384: None,
sha512: None,
},
requires_python: None,
size: None,
upload_time: None,
url: "/whl/Jinja2-3.1.2-py3-none-any.whl?project=legacy",
yanked: None,
},
],
}
"###);
}
#[test] #[test]
fn parse_missing_hash_value() { fn parse_missing_hash_value() {
let text = r#" let text = r#"