Skip to content

Commit

Permalink
fix(cpio): Fix dupplicated CPIO entries by overwriting them.
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyuware
nyuware committed Mar 21, 2024
1 parent 29b6636 commit 52af630
Show file tree
Hide file tree
Showing 43 changed files with 52 additions and 1 deletion.
3 changes: 3 additions & 0 deletions tests/integration/archive/cpio/cpio_binary/__input__/dupplicate_entries.cpio
View file
Git LFS file not shown
3 changes: 3 additions & 0 deletions ...gration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/7zDec
View file
Git LFS file not shown
1 change: 1 addition & 0 deletions ...integration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/[
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...ntegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/[[
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...ation/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/bunzip2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...gration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/bzcat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...gration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/clear
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...tegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/cut
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...ntegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/du
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...tegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/env
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...egration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/expr
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...egration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/find
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...egration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/free
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...ion/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/gdbserver
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../mnt/application/gdbserver
1 change: 1 addition & 0 deletions ...egration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/head
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...ntegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/id
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...ation/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/killall
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
3 changes: 3 additions & 0 deletions ...tegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/lrz
View file
Git LFS file not shown
3 changes: 3 additions & 0 deletions ...tegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/lsz
View file
Git LFS file not shown
1 change: 1 addition & 0 deletions ...ration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/md5sum
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...ration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/mkfifo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...ration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/passwd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...ntegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lrz
1 change: 1 addition & 0 deletions ...gration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/reset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...ntegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/rx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lrz
1 change: 1 addition & 0 deletions ...ntegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/rz
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lrz
1 change: 1 addition & 0 deletions ...ntegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/sb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lsz
1 change: 1 addition & 0 deletions ...egration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/sort
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...ntegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/sx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lsz
1 change: 1 addition & 0 deletions ...ntegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/sz
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lsz
1 change: 1 addition & 0 deletions ...egration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/tail
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...egration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/test
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...egration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/tftp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...tegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/top
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...on/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/traceroute
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...ration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/uptime
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...ntegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/wc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...gration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/which
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...gration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/xargs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...tegration/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/bin/yes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
1 change: 1 addition & 0 deletions ...ation/archive/cpio/cpio_binary/__output__/dupplicate_entries.cpio_extract/usr/sbin/chroot
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../bin/busybox
2 changes: 1 addition & 1 deletion unblob/file_utils.py
View file
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)
2 changes: 2 additions & 0 deletions unblob/handlers/archive/cpio.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ def dump_entries(self, fs: FileSystem):
continue

if stat.S_ISREG(entry.mode):
fs.unlink(entry.path)
fs.carve(entry.path, self.file, entry.start_offset, entry.size)
elif stat.S_ISDIR(entry.mode):
fs.mkdir(
Expand All @@ -222,6 +223,7 @@ def dump_entries(self, fs: FileSystem):
self.file[entry.start_offset : entry.start_offset + entry.size]
).decode("utf-8")
)
fs.unlink(entry.path)
fs.create_symlink(src=link_path, dst=entry.path)
elif (
stat.S_ISCHR(entry.mode)
Expand Down

0 comments on commit 52af630

Please sign in to comment.