Skip to content

Reapply encrypted RAR header rescan fix to release - #1432

Merged
adamhathcock merged 2 commits into
releasefrom
rebuild/release-03-rar-header-rescan
Oct 9, 2026
Merged

adamhathcock merged 2 commits into
releasefrom
rebuild/release-03-rar-header-rescan

Conversation

@adamhathcock

Copy link
Copy Markdown
Owner

Summary

Reapplies #1427 to the clean release history after the accidental master merge was removed.

Reset scan-specific encryption state in synchronous and asynchronous header readers while preserving the KDF cache. Restore encrypted-header rescan regression coverage and the solid RAR5 fixture.

Review and merge order

Recovery PR 2 of 5. Depends on #1431. Merge that PR first.

All recovery PRs target release. These branches are stacked, so this diff includes earlier recovery changes until the preceding PRs land. Review the replayed commit above for this PR's specific change. Merge in sequence using merge commits or fast-forward semantics to preserve shared ancestry; squash/rebase merging would require restacking the later branches.

The RAR comment test correction (e5c3ec6a) is already present in the clean base, so its checkpoint branch needs no separate PR. No master-only commits were replayed.

Validation

Validated the completed recovery stack on .NET 10:

  • Targeted regression suite: 247 tests passed.
  • Full test suite: 2,017 tests passed.
  • dotnet csharpier check . passed.
  • Working tree clean after formatting.

Validation was performed on the final stack, not separately on every intermediate branch.

NotAFlightRisk and others added 2 commits October 9, 2026 11:56
Reset scan-specific encryption state in sync and async header readers while retaining the KDF cache. Add RAR4/RAR5 rescan and solid encrypted extraction regression coverage.

Fixes #1422
Copilot AI balanced review requested due to automatic review settings October 9, 2026 13:30

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

The state reset is correctly mirrored across sync and async paths with focused regression coverage; #1431 must still merge first.

0 open findings

What changed in this PR

Reapplies the encrypted RAR header rescan fix to the clean release history.

Changes:

  • Resets sync and async scan-specific encryption state while retaining the RAR5 KDF cache.
  • Adds RAR4/RAR5 rescan and solid encrypted extraction regression coverage.
  • Includes the stacked uppercase split-ZIP prerequisite from #1431.
File Description
src/​SharpCompress/​Common/​Rar/​Headers/​RarHeaderFactory.cs Resets encryption state before synchronous scans.
src/​SharpCompress/​Common/​Rar/​Headers/​RarHeaderFactory.Async.cs Applies the reset to asynchronous scans.
tests/​SharpCompress.Test/​Rar/​RarEncryptedHeaderScanTests.cs Covers rescans and solid extraction paths.
tests/​TestArchives/​Archives/​Rar5.solid.encrypted_headers.rar Provides the solid encrypted-header fixture.
src/​SharpCompress/​Archives/​Zip/​ZipArchiveVolumeFactory.cs Normalizes uppercase ZIP extensions for split-part lookup.
tests/​SharpCompress.Test/​Zip/​ZipArchiveTests.cs Tests uppercase ZIP split-part discovery.

🧠 Review effort: Balanced


💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@adamhathcock
adamhathcock merged commit bc58792 into release Oct 9, 2026
3 of 4 checks passed
@adamhathcock
adamhathcock deleted the rebuild/release-03-rar-header-rescan branch October 9, 2026 13:50
This was referenced Oct 9, 2026
This was referenced Oct 12, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants