-
Notifications
You must be signed in to change notification settings - Fork 509
Fix ArchiveFactory.Open double-wrapping causing "Cannot determine compressed stream type" on Linux #997
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
Merged
Merged
Fix ArchiveFactory.Open double-wrapping causing "Cannot determine compressed stream type" on Linux #997
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ad5c655
Initial plan
Copilot df59c5c
Plan: Fix potential ZipArchive.IsZipFile failure on Linux
Copilot db98e5f
Fix ArchiveFactory.Open to avoid double-wrapping SharpCompressStream
Copilot ea77666
Final verification: All tests pass, no security issues
Copilot ee84d97
Merge remote-tracking branch 'origin/master' into copilot/fix-ziparch…
adamhathcock File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -622,4 +622,36 @@ await entry.WriteToDirectoryAsync( | |
| VerifyFiles(); | ||
| } | ||
| } | ||
|
|
||
| [Fact] | ||
| public void ArchiveFactory_Open_WithPreWrappedStream() | ||
| { | ||
| // Test that ArchiveFactory.Open works correctly with a stream that's already wrapped | ||
| // This addresses the issue where ZIP files fail to open on Linux | ||
| var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "Zip.bzip2.noEmptyDirs.zip"); | ||
|
|
||
| // Open with a pre-wrapped stream | ||
| using (var fileStream = File.OpenRead(testArchive)) | ||
| using (var wrappedStream = SharpCompressStream.Create(fileStream, bufferSize: 32768)) | ||
| using (var archive = ArchiveFactory.Open(wrappedStream)) | ||
| { | ||
| Assert.Equal(ArchiveType.Zip, archive.Type); | ||
| Assert.Equal(3, archive.Entries.Count()); | ||
| } | ||
| } | ||
|
|
||
| [Fact] | ||
| public void ArchiveFactory_Open_WithRawFileStream() | ||
| { | ||
| // Test that ArchiveFactory.Open works correctly with a raw FileStream | ||
| // This is the common use case reported in the issue | ||
| var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "Zip.bzip2.noEmptyDirs.zip"); | ||
|
||
|
|
||
| using (var stream = File.OpenRead(testArchive)) | ||
| using (var archive = ArchiveFactory.Open(stream)) | ||
| { | ||
| Assert.Equal(ArchiveType.Zip, archive.Type); | ||
| Assert.Equal(3, archive.Entries.Count()); | ||
| } | ||
| } | ||
| } | ||
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.
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.
Call to 'System.IO.Path.Combine'.