Avoid recovered output basename collisions#2
Open
sickn33 wants to merge 2 commits into
Open
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates the recovery output layout to prevent recovered files from overwriting each other when multiple encrypted inputs share the same basename within a KEK group, and adds a CSV manifest to map each source file to its recovered output and status.
Changes:
- Add stable basename disambiguation per KEK group by suffixing duplicates with a source-path hash.
- Write
manifest.csvcontaining source/output/status (and related metadata) for each attempted recovery. - Save recovered outputs via an atomic temp-file +
os.replace()flow, and add tests for output-path stability + manifest header behavior.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 5 comments.
| File | Description |
|---|---|
lockbit-rescue.py |
Adds collision-safe output naming, manifest writing, and atomic save behavior; updates resume/group logic to use the new output-path mapping. |
README.md |
Documents duplicate-basename handling and the new manifest.csv output. |
tests/test_output_paths.py |
Adds tests validating stable unique output paths for duplicates and manifest header/rows. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Author
|
Addressed Copilot's review in 2a0bf93:
Tests:
|
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
Tests