diff --git a/crates/distribution-types/src/lib.rs b/crates/distribution-types/src/lib.rs index 3dfe6a91a..4e5075963 100644 --- a/crates/distribution-types/src/lib.rs +++ b/crates/distribution-types/src/lib.rs @@ -678,7 +678,7 @@ impl Identifier for Url { impl Identifier for File { fn distribution_id(&self) -> DistributionId { - if let Some(hash) = &self.hashes.sha256 { + if let Some(hash) = self.hashes.as_str() { DistributionId::new(hash) } else { self.url.distribution_id() @@ -686,7 +686,7 @@ impl Identifier for File { } fn resource_id(&self) -> ResourceId { - if let Some(hash) = &self.hashes.sha256 { + if let Some(hash) = self.hashes.as_str() { ResourceId::new(hash) } else { self.url.resource_id() diff --git a/crates/pypi-types/src/simple_json.rs b/crates/pypi-types/src/simple_json.rs index 7e326907a..39b59261d 100644 --- a/crates/pypi-types/src/simple_json.rs +++ b/crates/pypi-types/src/simple_json.rs @@ -136,16 +136,21 @@ impl Default for Yanked { #[archive(check_bytes)] #[archive_attr(derive(Debug))] pub struct Hashes { + pub md5: Option, pub sha256: Option, } impl Hashes { /// Format as `:`. - /// - /// Currently limited to SHA256. pub fn to_string(&self) -> Option { self.sha256 .as_ref() .map(|sha256| format!("sha256:{sha256}")) + .or_else(|| self.md5.as_ref().map(|md5| format!("md5:{md5}"))) + } + + /// Return the hash digest. + pub fn as_str(&self) -> Option<&str> { + self.sha256.as_deref().or(self.md5.as_deref()) } } diff --git a/crates/uv-client/src/flat_index.rs b/crates/uv-client/src/flat_index.rs index 4797b0027..4c69c7c51 100644 --- a/crates/uv-client/src/flat_index.rs +++ b/crates/uv-client/src/flat_index.rs @@ -228,7 +228,7 @@ impl<'a> FlatIndexClient<'a> { let file = File { dist_info_metadata: None, filename: filename.to_string(), - hashes: Hashes { sha256: None }, + hashes: Hashes::default(), requires_python: None, size: None, upload_time_utc_ms: None, diff --git a/crates/uv-client/src/html.rs b/crates/uv-client/src/html.rs index 5547d31bb..d641b01c9 100644 --- a/crates/uv-client/src/html.rs +++ b/crates/uv-client/src/html.rs @@ -86,16 +86,25 @@ impl SimpleHtml { return Err(Error::FragmentParse(fragment.to_string())); } - // TODO(charlie): Support all hash algorithms. - if name != "sha256" { - return Err(Error::UnsupportedHashAlgorithm(fragment.to_string())); + match name { + "md5" => { + let md5 = std::str::from_utf8(value.as_bytes())?; + let md5 = md5.to_string(); + Ok(Hashes { + md5: Some(md5), + sha256: None, + }) + } + "sha256" => { + let sha256 = std::str::from_utf8(value.as_bytes())?; + let sha256 = sha256.to_string(); + Ok(Hashes { + md5: None, + sha256: Some(sha256), + }) + } + _ => Err(Error::UnsupportedHashAlgorithm(fragment.to_string())), } - - let sha256 = std::str::from_utf8(value.as_bytes())?; - let sha256 = sha256.to_string(); - Ok(Hashes { - sha256: Some(sha256), - }) } /// Parse a [`File`] from an `` tag. @@ -224,7 +233,7 @@ mod tests { use super::*; #[test] - fn parse_file() { + fn parse_sha256() { let text = r#" @@ -261,6 +270,7 @@ mod tests { dist_info_metadata: None, filename: "Jinja2-3.1.2-py3-none-any.whl", hashes: Hashes { + md5: None, sha256: Some( "6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61", ), @@ -276,6 +286,60 @@ mod tests { "###); } + #[test] + fn parse_md5() { + let text = r#" + + + +

Links for jinja2

+ Jinja2-3.1.2-py3-none-any.whl
+ + + + "#; + 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: Some( + "6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61", + ), + sha256: None, + }, + requires_python: None, + size: None, + upload_time: None, + url: "/whl/Jinja2-3.1.2-py3-none-any.whl#md5=6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61", + yanked: None, + }, + ], + } + "###); + } + #[test] fn parse_base() { let text = r#" @@ -317,6 +381,7 @@ mod tests { dist_info_metadata: None, filename: "Jinja2-3.1.2-py3-none-any.whl", hashes: Hashes { + md5: None, sha256: Some( "6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61", ), @@ -370,6 +435,7 @@ mod tests { dist_info_metadata: None, filename: "Jinja2-3.1.2+233fca715f49-py3-none-any.whl", hashes: Hashes { + md5: None, sha256: Some( "6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61", ), @@ -423,6 +489,7 @@ mod tests { dist_info_metadata: None, filename: "torchtext-0.17.0+cpu-cp39-cp39-win_amd64.whl", hashes: Hashes { + md5: None, sha256: None, }, requires_python: None, @@ -474,6 +541,7 @@ mod tests { dist_info_metadata: None, filename: "Jinja2-3.1.2-py3-none-any.whl", hashes: Hashes { + md5: None, sha256: None, }, requires_python: None, @@ -559,6 +627,7 @@ mod tests { dist_info_metadata: None, filename: "Jinja2-3.1.2-py3-none-any.whl", hashes: Hashes { + md5: None, sha256: None, }, requires_python: None, @@ -645,6 +714,7 @@ mod tests { dist_info_metadata: None, filename: "jaxlib-0.1.52+cuda100-cp36-none-manylinux2010_x86_64.whl", hashes: Hashes { + md5: None, sha256: None, }, requires_python: None, @@ -657,6 +727,7 @@ mod tests { dist_info_metadata: None, filename: "jaxlib-0.1.52+cuda100-cp37-none-manylinux2010_x86_64.whl", hashes: Hashes { + md5: None, sha256: None, }, requires_python: None, @@ -718,6 +789,7 @@ mod tests { dist_info_metadata: None, filename: "Flask-0.1.tar.gz", hashes: Hashes { + md5: None, sha256: Some( "9da884457e910bf0847d396cb4b778ad9f3c3d17db1c5997cb861937bd284237", ), @@ -732,6 +804,7 @@ mod tests { dist_info_metadata: None, filename: "Flask-0.10.1.tar.gz", hashes: Hashes { + md5: None, sha256: Some( "4c83829ff83d408b5e1d4995472265411d2c414112298f2eb4b359d9e4563373", ), @@ -746,6 +819,7 @@ mod tests { dist_info_metadata: None, filename: "flask-3.0.1.tar.gz", hashes: Hashes { + md5: None, sha256: Some( "6489f51bb3666def6f314e15f19d50a1869a19ae0e8c9a3641ffe66c77d42403", ), @@ -809,6 +883,7 @@ mod tests { dist_info_metadata: None, filename: "Jinja2-3.1.2-py3-none-any.whl", hashes: Hashes { + md5: None, sha256: Some( "6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61", ),