Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Respect `UV_INSECURE_NO_ZIP_VALIDATION=1` in duplicate header errors (#15912) 

## Summary

This was just an oversight on these specific returns.

Closes https://github.com/astral-sh/uv/issues/15871.
This commit is contained in:
Charlie Marsh 2025-09-17 10:34:49 -04:00 committed by GitHub
parent dea1700945
commit 2a14edf75c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/uv-extract/src/stream.rs
View File

@ -206,10 +206,12 @@ pub async fn unzip<R: tokio::io::AsyncRead + Unpin>(
// Verify that the existing file contents match the expected contents. // Verify that the existing file contents match the expected contents.
if existing_contents != expected_contents { if existing_contents != expected_contents {
if !skip_validation {
return Err(Error::DuplicateLocalFileHeader { return Err(Error::DuplicateLocalFileHeader {
path: relpath.clone(), path: relpath.clone(),
}); });
} }
}
(bytes_read as u64, entry_reader) (bytes_read as u64, entry_reader)
} }
@ -455,12 +457,14 @@ pub async fn unzip<R: tokio::io::AsyncRead + Unpin>(
} }
std::collections::hash_map::Entry::Occupied(entry) => { std::collections::hash_map::Entry::Occupied(entry) => {
if mode != *entry.get() { if mode != *entry.get() {
if !skip_validation {
return Err(Error::DuplicateExecutableFileHeader { return Err(Error::DuplicateExecutableFileHeader {
path: relpath.clone(), path: relpath.clone(),
}); });
} }
} }
} }
}
// The executable bit is the only permission we preserve, otherwise we use the OS defaults. // The executable bit is the only permission we preserve, otherwise we use the OS defaults.
// https://github.com/pypa/pip/blob/3898741e29b7279e7bffe044ecfbe20f6a438b1e/src/pip/_internal/utils/unpacking.py#L88-L100 // https://github.com/pypa/pip/blob/3898741e29b7279e7bffe044ecfbe20f6a438b1e/src/pip/_internal/utils/unpacking.py#L88-L100