xenofem/transbeam
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Wiki Activity

zip: go back to saying we're unix, we just forgot to include unix permissions in the external file attributes

Browse source
This commit is contained in:
xenofem 2022-04-27 12:47:43 -04:00
parent 527f184944
commit f10ee6aa2a
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/zip.rs
View file

@ -136,24 +136,13 @@ impl UploadedFile {
fn central_directory_header(&self, local_header_offset: usize, hash: u32) -> Vec<u8> { fn central_directory_header(&self, local_header_offset: usize, hash: u32) -> Vec<u8> {
let mut header = vec![ let mut header = vec![
// Central directory file header signature 0x50, 0x4b, 0x01, 0x02, // Central directory file header signature
0x50, 0x4b, 0x01, 0x02, 45, 3, // Made by a Unix system supporting version 4.5
// Made by a "DOS" system supporting version 4.5 - if we
// say it's made by a Unix system, then unzip will expect
// it to have embedded Unix permission information, and
// will set all the files to mode 000 when that's not
// present :/
45, 0,
]; ];
header.append(&mut self.shared_header_fields(Some(hash))); header.append(&mut self.shared_header_fields(Some(hash)));
header.append(&mut vec![ append_0(&mut header, 8); // Comment length, disk number, internal attributes, DOS external attributes
0, 0, // File comment length: 0 append_value(&mut header, 0o100644, 2); // Unix external file attributes: -rw-r--r--
0, 0, // Disk number where file starts: 0 append_ff(&mut header, 4); // Relative offset of local file header: placeholder, see ZIP64 data
0, 0, // Internal file attributes: nothing
0, 0, 0, 0, // External file attributes: nothing
0xff, 0xff, 0xff,
0xff, // Relative offset of local file header: placeholder, see ZIP64 data
]);
header.append(&mut self.name.clone().into_bytes()); header.append(&mut self.name.clone().into_bytes());
header.append(&mut self.extra_field(local_header_offset)); header.append(&mut self.extra_field(local_header_offset));
header header
@ -179,7 +168,7 @@ fn end_of_central_directory(files: &[UploadedFile]) -> Vec<u8> {
]; ];
append_0(&mut eocd, 7); // pad out the rest of the size field append_0(&mut eocd, 7); // pad out the rest of the size field
eocd.append(&mut vec![ eocd.append(&mut vec![
45, 0, // Made by a "DOS" system supporting version 4.5, see above 45, 3, // Made by a Unix system supporting version 4.5
45, 0, // Minimum version 4.5 to extract 45, 0, // Minimum version 4.5 to extract
]); ]);
append_0(&mut eocd, 8); // Two 4-byte disk numbers, both 0 append_0(&mut eocd, 8); // Two 4-byte disk numbers, both 0