mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-10-03 15:24:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use the strongest hash in the lockfile (#5167)

Browse source 
## Summary

We only need to store one hash -- it should be the "strongest" hash. In
practice, most registries (like PyPI) only serve one, and we only
compute a SHA256 hash for direct URLs.

Part of: https://github.com/astral-sh/uv/issues/4924

## Test Plan

I verified that changing:

```diff
diff --git a/crates/distribution-types/src/hash.rs b/crates/distribution-types/src/hash.rs
index 553a74f55..d36c62286 100644
--- a/crates/distribution-types/src/hash.rs
+++ b/crates/distribution-types/src/hash.rs
@@ -31,7 +31,7 @@ impl<'a> HashPolicy<'a> {
     pub fn algorithms(&self) -> Vec<HashAlgorithm> {
         match self {
             Self::None => vec![],
-            Self::Generate => vec![HashAlgorithm::Sha256],
+            Self::Generate => vec![HashAlgorithm::Sha256, HashAlgorithm::Sha512],
             Self::Validate(hashes) => {
                 let mut algorithms = hashes.iter().map(HashDigest::algorithm).collect::<Vec<_>>();
                 algorithms.sort();
```

Then running `uv lock` with a URL gave me:

```toml
[[distribution]]
name = "iniconfig"
version = "2.0.0"
source = { url = "62565a6e1c/iniconfig-2.0.0-py3-none-any.whl" }
wheels = [
    { url = "62565a6e1c/iniconfig-2.0.0-py3-none-any.whl", hash = "sha512:44cc53a6c8dd7cf4d6d52bded308bcc4b4f85fff2ed081f60f7d4beaa86a7cde6d099e3976331232d4cbd472ad5d1781064725b0999c7cd3a2a4d42df687ee81" },
]
```
This commit is contained in:
Charlie Marsh 2024-07-17 16:38:33 -04:00 • committed by GitHub
parent eb24717a9b
commit ba4e2e3d2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/uv-resolver/src/lock.rs
View file

@ -1736,7 +1736,7 @@ impl SourceDist {
.to_url() .to_url()
.map_err(LockErrorKind::InvalidFileUrl) .map_err(LockErrorKind::InvalidFileUrl)
.map_err(LockError::from)?; .map_err(LockError::from)?;
let hash = reg_dist.file.hashes.first().cloned().map(Hash::from); let hash = reg_dist.file.hashes.iter().max().cloned().map(Hash::from);
let size = reg_dist.file.size; let size = reg_dist.file.size;
Ok(SourceDist::Url { Ok(SourceDist::Url {
url, url,
@ -1749,7 +1749,7 @@ impl SourceDist {
direct_dist: &DirectUrlSourceDist, direct_dist: &DirectUrlSourceDist,
hashes: &[HashDigest], hashes: &[HashDigest],
) -> Result<SourceDist, LockError> { ) -> Result<SourceDist, LockError> {
let Some(hash) = hashes.first().cloned().map(Hash::from) else { let Some(hash) = hashes.iter().max().cloned().map(Hash::from) else {
let kind = LockErrorKind::Hash { let kind = LockErrorKind::Hash {
id: id.clone(), id: id.clone(),
artifact_type: "direct URL source distribution", artifact_type: "direct URL source distribution",
@ -1920,7 +1920,7 @@ impl Wheel {
.to_url_string() .to_url_string()
.map_err(LockErrorKind::InvalidFileUrl) .map_err(LockErrorKind::InvalidFileUrl)
.map_err(LockError::from)?; .map_err(LockError::from)?;
let hash = wheel.file.hashes.first().cloned().map(Hash::from); let hash = wheel.file.hashes.iter().max().cloned().map(Hash::from);
let size = wheel.file.size; let size = wheel.file.size;
Ok(Wheel { Ok(Wheel {
url, url,
@ -1933,7 +1933,7 @@ impl Wheel {
fn from_direct_dist(direct_dist: &DirectUrlBuiltDist, hashes: &[HashDigest]) -> Wheel { fn from_direct_dist(direct_dist: &DirectUrlBuiltDist, hashes: &[HashDigest]) -> Wheel {
Wheel { Wheel {
url: direct_dist.url.to_url().into(), url: direct_dist.url.to_url().into(),
hash: hashes.first().cloned().map(Hash::from), hash: hashes.iter().max().cloned().map(Hash::from),
size: None, size: None,
filename: direct_dist.filename.clone(), filename: direct_dist.filename.clone(),
} }
@ -1942,7 +1942,7 @@ impl Wheel {
fn from_path_dist(path_dist: &PathBuiltDist, hashes: &[HashDigest]) -> Wheel { fn from_path_dist(path_dist: &PathBuiltDist, hashes: &[HashDigest]) -> Wheel {
Wheel { Wheel {
url: path_dist.url.to_url().into(), url: path_dist.url.to_url().into(),
hash: hashes.first().cloned().map(Hash::from), hash: hashes.iter().max().cloned().map(Hash::from),
size: None, size: None,
filename: path_dist.filename.clone(), filename: path_dist.filename.clone(),
} }