Skip to content

Ignore 'egg' fragment in HTML Simple API response #11340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charliermarsh merged 1 commit into from
Feb 8, 2025
Merged

Ignore 'egg' fragment in HTML Simple API response #11340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 68 additions & 4 deletions crates/uv-client/src/html.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,15 @@ impl SimpleHtml {
debug!("{err}");
Hashes::default()
}
Err(err @ HashError::UnsupportedHashAlgorithm(..)) => {
// If the URL references a hash, but it's unsupported, error.
return Err(err.into());
Err(HashError::UnsupportedHashAlgorithm(fragment)) => {
if fragment == "egg" {
// If the URL references an egg hash, ignore it.
debug!("{}", HashError::UnsupportedHashAlgorithm(fragment));
Hashes::default()
} else {
// If the URL references a hash, but it's unsupported, error.
return Err(HashError::UnsupportedHashAlgorithm(fragment).into());
}
}
}
},
Expand Down Expand Up @@ -247,7 +253,7 @@ pub enum Error {
MissingHash(String),

#[error(transparent)]
FragmentParse(#[from] uv_pypi_types::HashError),
FragmentParse(#[from] HashError),

#[error("Invalid `requires-python` specifier: {0}")]
Pep440(#[source] uv_pep440::VersionSpecifiersParseError),
Expand Down Expand Up @@ -908,6 +914,64 @@ mod tests {
"###);
}

#[test]
fn parse_egg_fragment() {
let text = r#"
<!DOCTYPE html>
<html>
<body>
<h1>Links for jinja2</h1>
<a href="/whl/Jinja2-3.1.2-py3-none-any.whl#main">Jinja2-3.1.2-py3-none-any.whl#egg=public-hello-0.1</a><br/>
</body>
</html>
<!--TIMESTAMP 1703347410-->
"#;
let base = Url::parse("https://download.pytorch.org/whl/jinja2/").unwrap();
let result = SimpleHtml::parse(text, &base);
insta::assert_debug_snapshot!(result, @r###"
Ok(
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 {
core_metadata: None,
dist_info_metadata: None,
data_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#main",
yanked: None,
},
],
},
)
"###);
}

#[test]
fn parse_unknown_hash() {
let text = r#"
Expand Down