Make Zip Slip guard CodeQL-visible for cs/zipslip - #39
Merged
Conversation
Inline the cs/zipslip recommended GetFullPath + StartsWith check in ExtractAllContents, and align ArchivePath.GetSafeExtractPath with the same pattern so CodeQL can clear the open alert. Co-authored-by: Michael <Narehood@users.noreply.github.com>
|
Caution Review failedThe pull request is closed. ℹ️ Recent review info⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (3)
📝 WalkthroughWalkthroughArchive extraction now canonicalizes destination paths and rejects traversal attempts. File creation uses the validated path. The path traversal test data removes the Windows-style case. ChangesArchive path security
Estimated code review effort: 2 (Simple) | ~10 minutes Sequence Diagram(s)sequenceDiagram
participant ArchiveIterator
participant ArchivePath
participant FileSystem
ArchiveIterator->>ArchivePath: Validate canonical entry path
ArchivePath-->>ArchiveIterator: Return validated path or InvalidDataException
ArchiveIterator->>FileSystem: Create file at validated path
Suggested reviewers: ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The Zip Slip CodeQL alert (
cs/zipslip#1) stayed open after PR #38 because the customArchivePathhelper was not recognized as a sanitizer.Change
Align extraction with the CodeQL-recommended pattern:
Path.GetFullPath(Path.Combine(dest, entryName))Path.GetFullPath(dest + DirectorySeparatorChar)StartsWithguard before anyDirectory.CreateDirectory/File.CreateApplied inline in
ArchiveIterator.ExtractAllContents(dominates the filesystem sinks) and mirrored inArchivePath.GetSafeExtractPath.Validation
dotnet test … --filter ArchivePathTests— 8 passedFollow-up
After merge + CodeQL on
development, confirm alert #1 closes, then publish the shell release.Summary by CodeRabbit