DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bug fix: disable file encryption in abort_file

Browse source
This commit is contained in:
Chris Hennick 2023-05-21 12:16:48 -07:00
parent 4e3ecb9252
commit 710695219f
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/write.rs
View file

@ -713,6 +713,7 @@ impl<W: Write + Seek> ZipWriter<W> {
.inner .inner
.prepare_next_writer(CompressionMethod::Stored, None)?; .prepare_next_writer(CompressionMethod::Stored, None)?;
self.inner.switch_to(make_plain_writer)?; self.inner.switch_to(make_plain_writer)?;
self.switch_to_non_encrypting_writer()?;
// Make sure this is the last file, and that no shallow copies of it remain; otherwise we'd // Make sure this is the last file, and that no shallow copies of it remain; otherwise we'd
// overwrite a valid file and corrupt the archive // overwrite a valid file and corrupt the archive
@ -1803,8 +1804,23 @@ mod test {
assert_eq!(RT_TEST_TEXT.as_bytes(), contents); assert_eq!(RT_TEST_TEXT.as_bytes(), contents);
Ok(()) Ok(())
} }
#[test]
fn remove_encrypted_file() -> ZipResult<()> {
let mut writer = ZipWriter::new(io::Cursor::new(Vec::new()));
let first_file_options = FileOptions::default()
.with_alignment(65535)
.with_deprecated_encryption(b"Password");
writer.start_file("", first_file_options).unwrap();
writer.abort_file().unwrap();
let zip = writer.finish().unwrap();
let mut writer = ZipWriter::new(zip);
writer.start_file("", FileOptions::default()).unwrap();
Ok(())
}
} }
#[cfg(not(feature = "unreserved"))] #[cfg(not(feature = "unreserved"))]
const EXTRA_FIELD_MAPPING: [u16; 49] = [ const EXTRA_FIELD_MAPPING: [u16; 49] = [
0x0001, 0x0007, 0x0008, 0x0009, 0x000a, 0x000c, 0x000d, 0x000e, 0x000f, 0x0014, 0x0015, 0x0016, 0x0001, 0x0007, 0x0008, 0x0009, 0x000a, 0x000c, 0x000d, 0x000e, 0x000f, 0x0014, 0x0015, 0x0016,