fix os handling when trivy sets pkgType on properties

Signed-off-by: Marlon Pina Tojal <[email protected]>
DependencyTrack · May 17, 2024 · f254ebc · f254ebc
1 parent 51108cf
commit f254ebc
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/main/java/org/dependencytrack/tasks/scanners/TrivyAnalysisTask.java b/src/main/java/org/dependencytrack/tasks/scanners/TrivyAnalysisTask.java
@@ -259,6 +259,13 @@ public void analyze(final List<Component> components) {
                                 srcVersion = property.getPropertyValue();
                             } else if (property.getPropertyName().equals("trivy:SrcRelease")) {
                                 srcRelease = property.getPropertyValue();
+                            } else if (property.getPropertyName().equals("trivy:PkgType")) {
+                                pkgType = property.getPropertyValue();
+                                String distro = component.getPurl().getQualifiers().get("distro");
+
+                                if (distro != null) {
+                                    pkgType += "-" + distro;
+                                }
                             }
                         }
 
@@ -292,6 +299,7 @@ public void analyze(final List<Component> components) {
         pkgs.forEach((key, value) -> {
             var info = new BlobInfo();
             info.setPackageInfos(new PackageInfo[]{value});
+            LOGGER.debug("looking for os %s".formatted(key));
             if (os.get(key) != null) {
                 info.setOS(os.get(key));
             }