From bf518a90220d3938c91bfb62ab799a24f3da3183 Mon Sep 17 00:00:00 2001 From: Arun Date: Sat, 19 Jul 2025 20:37:56 +0530 Subject: [PATCH] Add WHITE_OUT flag for whiteout files instead of IGNORED_WHITEOUT --- scanpipe/pipes/docker.py | 4 ++-- scanpipe/pipes/flag.py | 2 ++ scanpipe/tests/pipes/test_docker.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scanpipe/pipes/docker.py b/scanpipe/pipes/docker.py index 075500d465..dc1b859f2c 100644 --- a/scanpipe/pipes/docker.py +++ b/scanpipe/pipes/docker.py @@ -268,13 +268,13 @@ def scan_image_for_system_packages(project, image): def flag_whiteout_codebase_resources(project): """ - Tag overlayfs/AUFS whiteout special files CodebaseResource as "ignored-whiteout". + Tag overlayfs/AUFS whiteout special files CodebaseResource as "white-out". See https://github.com/opencontainers/image-spec/blob/master/layer.md#whiteouts for details. """ whiteout_prefix = ".wh." qs = project.codebaseresources.no_status() - qs.filter(name__startswith=whiteout_prefix).update(status=flag.IGNORED_WHITEOUT) + qs.filter(name__startswith=whiteout_prefix).update(status=flag.WHITE_OUT) layer_fields = [ diff --git a/scanpipe/pipes/flag.py b/scanpipe/pipes/flag.py index e8a983d40d..a0b620ec82 100644 --- a/scanpipe/pipes/flag.py +++ b/scanpipe/pipes/flag.py @@ -36,6 +36,8 @@ RESOURCE_READ_ERROR = "resource-read-error" +WHITE_OUT = "white-out" + IGNORED_WHITEOUT = "ignored-whiteout" IGNORED_EMPTY_FILE = "ignored-empty-file" IGNORED_WHITESPACE_FILE = "ignored-whitespace-file" diff --git a/scanpipe/tests/pipes/test_docker.py b/scanpipe/tests/pipes/test_docker.py index 92b3d7fa9e..c5af37065e 100644 --- a/scanpipe/tests/pipes/test_docker.py +++ b/scanpipe/tests/pipes/test_docker.py @@ -90,7 +90,7 @@ def test_pipes_docker_flag_whiteout_codebase_resources(self): resource1.refresh_from_db() resource2.refresh_from_db() self.assertEqual("", resource1.status) - self.assertEqual("ignored-whiteout", resource2.status) + self.assertEqual("white-out", resource2.status) def test_pipes_docker_extract_image_from_tarball_with_broken_symlinks( self,