-
Notifications
You must be signed in to change notification settings - Fork 102
fix: aes was not copied correctly in raw copy methods #417
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Summary of Changes
Hello @im7mortal, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!
This pull request addresses an issue where AES encryption metadata was not correctly handled during raw file copying operations within zip archives. The changes ensure that when an AES-encrypted entry is copied without re-encryption, its encryption flags and associated metadata are accurately preserved, maintaining spec compliance and data integrity. This improves the reliability of copying encrypted files within the library.
Highlights
- AES Metadata Preservation: Ensure AES encryption metadata is correctly preserved during raw file copying operations, preventing data loss or corruption.
- ZipFile Options Update: ZipFile::options() now includes AES metadata, ensuring proper header generation for subsequent writes.
- Encrypted Flag Correction: The 'encrypted' flag in ZipFileData is now correctly set based on the presence of AES mode.
- FileOptions Extension: FileOptions struct has been extended to carry AES mode information.
- ZipWriter Enhancement: The start_entry function in ZipWriter now correctly writes the AES extra field (0x9901) and sets the compression method to 99 for raw copies of AES entries.
- New Test Case: A new test case raw_copy_from_aes_zip has been added to validate the integrity of raw-copied AES files.
Using Gemini Code Assist
The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.
Invoking Gemini
You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.
| Feature | Command | Description |
|---|---|---|
| Code Review | /gemini review |
Performs a code review for the current pull request in its current state. |
| Pull Request Summary | /gemini summary |
Provides a summary of the current pull request in its current state. |
| Comment | @gemini-code-assist | Responds in comments when explicitly tagged, both in issue comments and review comments. |
| Help | /gemini help |
Displays a list of available commands. |
Customization
To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.
Limitations & Feedback
Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.
You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.
Footnotes
-
Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
This pull request correctly addresses an issue where AES encryption metadata was lost during raw copy operations. The changes ensure that AES metadata is preserved in FileOptions and used by the writer to generate spec-compliant headers for copied entries. The logic is sound, and the addition of a new test case, raw_copy_from_aes_zip, is excellent as it thoroughly validates the fix. I have one suggestion to improve the readability of the logic for setting the encrypted flag.
5587931 to
28c06e5
Compare
|
Thanks! This will be merged if all tests pass. |
Head branch was pushed to by a user without write access
28c06e5 to
9ef2d2b
Compare
|
@Pr0methean the test cases without I reverted it to the original version. Please restart tests |
* fix: aes encrypted files raw copy * fix: preserve aes header data for raw copy
Summary
Fixes loss of AES encryption metadata when copying entries without a password and ensures AES headers/flags are spec-compliant.
ZipFile::options()now carries AES metadata so downstream writes produce correct headers.Key Changes
write.rs:
start_entry: write AES extra field (0x9901) usingaes_mode, set method=99.raw_copy_file_rename_internal: no password required; relies on options() metadata.types.rs: encrypted flag set when
aes_modepresent.read.rs:
options()preserves AES metadata for copied entries.Impact