Skip to content

fix(fs): duplicate entries handling in FileSystem API. #756

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.

Sign up for GitHub

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 1 commit into from
Mar 25, 2024
Merged

fix(fs): duplicate entries handling in FileSystem API. #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions tests/integration/archive/cpio/cpio_binary/__input__/duplicate_entries.cpio
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions ...ntegration/archive/cpio/cpio_binary/__output__/duplicate_entries.cpio_extract/colors/blue
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions ...ration/archive/cpio/cpio_binary/__output__/duplicate_entries.cpio_extract/colors/blue.txt
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions ...tion/archive/cpio/cpio_binary/__output__/duplicate_entries.cpio_extract/colors/orange.txt
View file
Open in desktop
Git LFS file not shown
1 change: 1 addition & 0 deletions ...egration/archive/cpio/cpio_binary/__output__/duplicate_entries.cpio_extract/colors/purple
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
purple.txt
3 changes: 3 additions & 0 deletions ...tion/archive/cpio/cpio_binary/__output__/duplicate_entries.cpio_extract/colors/purple.txt
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion unblob/file_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ def open( # noqa: A003

def unlink(self, path):
"""Delete file within extraction path."""
logger.debug("unlink file", file_path=path)
logger.debug("unlink file", file_path=path, _verbosity=3)
safe_path = self._get_extraction_path(path, "unlink")

safe_path.unlink(missing_ok=True)
5 changes: 5 additions & 0 deletions unblob/handlers/archive/cpio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,11 @@ def dump_entries(self, fs: FileSystem):
if entry.path.name in ("", "."):
continue

# There are cases where CPIO archives have duplicated entries
# We then unlink the files to overwrite them and avoid an error.
if not stat.S_ISDIR(entry.mode):
fs.unlink(entry.path)

if stat.S_ISREG(entry.mode):
fs.carve(entry.path, self.file, entry.start_offset, entry.size)
elif stat.S_ISDIR(entry.mode):
Expand Down