Merge pull request #684 from onekey-sec/683-fix-sparse-tar

qkaiser · web-flow · commit ad769492a16c · 2023-12-16T14:10:20.000+01:00
improve tar handler to support sparse archives.
diff --git a/tests/integration/archive/tar/__input__/sparse.tar b/tests/integration/archive/tar/__input__/sparse.tar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:217eb921a851ca38185b7585a554160f2f88f76c3b123c1930468a2cc4d80e46
+size 10240
diff --git a/tests/integration/archive/tar/__output__/sparse.tar_extract/dummy1 b/tests/integration/archive/tar/__output__/sparse.tar_extract/dummy1
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16fa66a7dc98d93f2a4c5d20baf5177f59c4c37fc62face65690c11c15fe6ff9
+size 51200
diff --git a/tests/integration/archive/tar/__output__/sparse.tar_extract/dummy2 b/tests/integration/archive/tar/__output__/sparse.tar_extract/dummy2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16fa66a7dc98d93f2a4c5d20baf5177f59c4c37fc62face65690c11c15fe6ff9
+size 51200
diff --git a/tests/integration/archive/tar/__output__/sparse.tar_extract/file1 b/tests/integration/archive/tar/__output__/sparse.tar_extract/file1
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed68b430af3630fde9b598ea74340a7be809408e493f3adff7aadbd6cfeef931
+size 45
diff --git a/tests/integration/archive/tar/__output__/sparse.tar_extract/file2 b/tests/integration/archive/tar/__output__/sparse.tar_extract/file2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed68b430af3630fde9b598ea74340a7be809408e493f3adff7aadbd6cfeef931
+size 45
diff --git a/unblob/handlers/archive/tar.py b/unblob/handlers/archive/tar.py
@@ -59,8 +59,7 @@ def _get_end_of_last_tar_entry(file) -> int:
     if last_member is None:
         return -1
 
-    last_file_size = round_up(last_member.size, BLOCK_SIZE)
-    end_of_last_tar_entry = last_member.offset_data + last_file_size
+    end_of_last_tar_entry = tf.offset
     try:
         file.seek(end_of_last_tar_entry)
     except SeekError:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:217eb921a851ca38185b7585a554160f2f88f76c3b123c1930468a2cc4d80e46`
	`3`	`+size 10240`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:16fa66a7dc98d93f2a4c5d20baf5177f59c4c37fc62face65690c11c15fe6ff9`
	`3`	`+size 51200`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:ed68b430af3630fde9b598ea74340a7be809408e493f3adff7aadbd6cfeef931`
	`3`	`+size 45`