Merge remote-tracking branch 'upstream' into guided-remediation/resolve

Author: michaelkedar

artifact/image/layerscanning/image/image.go

@@ -434,7 +434,9 @@ func fillChainLayerWithFilesFromTar(img *Image, tarReader *tar.Reader, originLay
 				break
 			}
 		}
-		if !required {
+		// If the header represents a directory, then it should be required in order to capture the
+		// directory information, even if its filepath is not required.
+		if !required && (header.Typeflag != tar.TypeDir) {
 			continue
 		}
 

binary/proto/proto.go

@@ -37,6 +37,7 @@ import (
 	"github.com/google/osv-scalibr/extractor/filesystem/language/java/javalockfile"
 	"github.com/google/osv-scalibr/extractor/filesystem/language/javascript/packagejson"
 	"github.com/google/osv-scalibr/extractor/filesystem/language/python/requirements"
+	"github.com/google/osv-scalibr/extractor/filesystem/language/python/setup"
 	"github.com/google/osv-scalibr/extractor/filesystem/language/python/wheelegg"
 	"github.com/google/osv-scalibr/extractor/filesystem/os/apk"
 	"github.com/google/osv-scalibr/extractor/filesystem/os/cos"
@@ -491,6 +492,12 @@ func setProtoMetadata(meta any, i *spb.Inventory) {
 				VersionComparator:      m.VersionComparator,
 			},
 		}
+	case *setup.Metadata:
+		i.Metadata = &spb.Inventory_PythonSetupMetadata{
+			PythonSetupMetadata: &spb.PythonSetupMetadata{
+				VersionComparator: m.VersionComparator,
+			},
+		}
 	case *winmetadata.OSVersion:
 		i.Metadata = &spb.Inventory_WindowsOsVersionMetadata{
 			WindowsOsVersionMetadata: &spb.WindowsOSVersion{

binary/proto/scan_result.proto

@@ -97,6 +97,7 @@ message Inventory {
     PortagePackageMetadata portage_metadata = 41;
     OSVPackageMetadata osv_metadata = 16;
     PythonRequirementsMetadata python_requirements_metadata = 21;
+    PythonSetupMetadata python_setup_metadata = 44;
     ContainerdContainerMetadata containerd_container_metadata = 22;
     SNAPPackageMetadata snap_metadata = 23;
     FlatpakPackageMetadata flatpak_metadata = 24;
@@ -433,6 +434,10 @@ message PythonRequirementsMetadata {
   string version_comparator = 2;
 }
 
+message PythonSetupMetadata {
+  string version_comparator = 2;
+}
+
 message ContainerdContainerMetadata {
   string namespace_name = 1;
   string image_name = 2;