Add image name in container filter

deepfence · Dec 13, 2024 · c17863d · c17863d
1 parent aa0cdb0
commit c17863d
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/deepfence_agent/tools/apache/scope/probe/cri/reporter.go b/deepfence_agent/tools/apache/scope/probe/cri/reporter.go
@@ -83,16 +83,23 @@ func (r *Reporter) getNode(c *client.Container, imageMetadataMap map[string]Imag
 	if report.SkipReportContainerState[containerState] {
 		return nil
 	}
-	imageMetadata, ok := imageMetadataMap[c.ImageRef]
-	var imageID, imageName, imageTag string
-	if ok {
-		imageID = imageMetadata.ImageID
+
+	imageID := trimImageID(c.Image.GetImage())
+	var imageName, imageTag string
+
+	if imageMetadata, ok := imageMetadataMap[imageID]; ok {
 		imageName = imageMetadata.ImageName
 		imageTag = imageMetadata.ImageTag
 	} else {
-		imageID = trimImageID(c.Image.GetImage())
-		imageName, imageTag = docker.ParseImageDigest(c.ImageRef)
+		imageMetadata, ok = imageMetadataMap[c.ImageRef]
+		if ok {
+			imageName = imageMetadata.ImageName
+			imageTag = imageMetadata.ImageTag
+		} else {
+			imageName, imageTag = docker.ParseImageDigest(c.ImageRef)
+		}
 	}
+
 	var dockerLabels string
 	dockerLabelsJson, err := json.Marshal(c.Labels)
 	if err == nil {
@@ -182,6 +189,9 @@ func (r *Reporter) containerImageTopology() (report.Topology, map[string]ImageMe
 		if imageNode == nil {
 			continue
 		}
+		if imageMetadata.ImageID != "" {
+			imageMetadataMap[imageMetadata.ImageID] = *imageMetadata
+		}
 		if imageMetadata.ImageRef != "" {
 			imageMetadataMap[imageMetadata.ImageRef] = *imageMetadata
 		}