feat(handler/cpio): add new item to C_STICKY_BITS

Mücahid KIR · Mücahid KIR · commit 6db0ce530ff7 · 2022-12-01T14:18:11.000+01:00
We recently observed a partial extraction result on a CPIO archive which contains
an undefined sticky_bit(0o06000).

We noticed that this undefined sticky_bit is actually a combination of C_ISUID and C_ISGID.

(0o2000 | 0o4000) = 0o06000
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__input__/test.newc.cpio.06000.sticky b/tests/integration/archive/cpio/cpio_portable_ascii/__input__/test.newc.cpio.06000.sticky
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3833b874aad61be59ed573a61516c3940c09b3b524fc4c2bfc580302e0670fb
+size 2560
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test0 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test0
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b68ab3847feda7d6c62c1fbcbeebfa35eab7351ed5e78f4ddadea5df64b8015
+size 1
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test00 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test00
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b68ab3847feda7d6c62c1fbcbeebfa35eab7351ed5e78f4ddadea5df64b8015
+size 1
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test000 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test000
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b68ab3847feda7d6c62c1fbcbeebfa35eab7351ed5e78f4ddadea5df64b8015
+size 1
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test0000 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test0000
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b68ab3847feda7d6c62c1fbcbeebfa35eab7351ed5e78f4ddadea5df64b8015
+size 1
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test0001 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test0001
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ecc76c19c9f3c5108773d6c3a18a6c25c9bf1131c4e250b71213274e3b2b5d08
+size 2
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test0002 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test0002
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b38b8f5877f2395b4361c1f68c059078ee9c0c8b0cbb22c97d2906e011e40a3
+size 3
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test0003 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test0003
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b346904f63cc07f1d8cc2d88d7dae08a3f088a0e4159d5214c27a6571a51eb4
+size 4
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test001 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test001
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ecc76c19c9f3c5108773d6c3a18a6c25c9bf1131c4e250b71213274e3b2b5d08
+size 2
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test002 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test002
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b38b8f5877f2395b4361c1f68c059078ee9c0c8b0cbb22c97d2906e011e40a3
+size 3
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test003 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test003
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b346904f63cc07f1d8cc2d88d7dae08a3f088a0e4159d5214c27a6571a51eb4
+size 4
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test01 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test01
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ecc76c19c9f3c5108773d6c3a18a6c25c9bf1131c4e250b71213274e3b2b5d08
+size 2
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test02 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test02
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b38b8f5877f2395b4361c1f68c059078ee9c0c8b0cbb22c97d2906e011e40a3
+size 3
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test03 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test03
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b346904f63cc07f1d8cc2d88d7dae08a3f088a0e4159d5214c27a6571a51eb4
+size 4
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test1 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test1
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ecc76c19c9f3c5108773d6c3a18a6c25c9bf1131c4e250b71213274e3b2b5d08
+size 2
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test2 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b38b8f5877f2395b4361c1f68c059078ee9c0c8b0cbb22c97d2906e011e40a3
+size 3
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test3 b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/test.newc.cpio.06000.sticky_extract/test3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b346904f63cc07f1d8cc2d88d7dae08a3f088a0e4159d5214c27a6571a51eb4
+size 4
diff --git a/unblob/handlers/archive/cpio.py b/unblob/handlers/archive/cpio.py
@@ -36,8 +36,9 @@
 C_ISUID = 0o04000
 C_ISGID = 0o02000
 C_ISVTX = 0o01000
+C_ISUID_ISGID = 0o06000
 
-C_STICKY_BITS = (C_NONE, C_ISUID, C_ISGID, C_ISVTX)
+C_STICKY_BITS = (C_NONE, C_ISUID, C_ISGID, C_ISVTX, C_ISUID_ISGID)
 
 
 class _CPIOHandlerBase(StructHandler):

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:a3833b874aad61be59ed573a61516c3940c09b3b524fc4c2bfc580302e0670fb`
	`3`	`+size 2560`
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:4b68ab3847feda7d6c62c1fbcbeebfa35eab7351ed5e78f4ddadea5df64b8015`
	`3`	`+size 1`
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:ecc76c19c9f3c5108773d6c3a18a6c25c9bf1131c4e250b71213274e3b2b5d08`
	`3`	`+size 2`
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:9b38b8f5877f2395b4361c1f68c059078ee9c0c8b0cbb22c97d2906e011e40a3`
	`3`	`+size 3`
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:7b346904f63cc07f1d8cc2d88d7dae08a3f088a0e4159d5214c27a6571a51eb4`
	`3`	`+size 4`