From c3f009db580d016271dfad77042440c4a71e27a1 Mon Sep 17 00:00:00 2001
From: Pavel Nakonechnyi <pavel.nakonechnyi@netcetera.com>
Date: Mon, 6 May 2024 08:57:48 +0200
Subject: [PATCH] t

---
 dojo/tools/neuvector/parser.py | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/dojo/tools/neuvector/parser.py b/dojo/tools/neuvector/parser.py
index 0585e9306c..12a664d2b2 100644
--- a/dojo/tools/neuvector/parser.py
+++ b/dojo/tools/neuvector/parser.py
@@ -127,33 +127,34 @@ def get_item(vulnerability, test):
 
 
 def get_asset_item(vulnerability, test):
-    # there is nothing like short description, short name or title
-    title = vulnerability.get("name").upper()
-
     severity = (
         convert_severity(vulnerability.get("severity"))
         if "severity" in vulnerability
         else "Info"
     )
 
-    description = vulnerability.get("description", "")
+    description = vulnerability.get("description", "").strip()
 
     mitigation = ""
 
+    package_names = []
+
     packages = vulnerability.get("packages", {})
     if len(packages.values()) > 0:
-        mitigation += "update the affected packages to the following:\n"
-        description += "\nThe following packages are affected:\n"
+        mitigation += "<p>update the affected packages to the following versions:</p>"
+        description += "<p>The following packages are affected:</p>"
 
         for package_name, package_versions in packages.items():
-            mitigation += "{name}:\n".format(name=package_name)
+            package_names.append(package_name.split('/')[0])
+
+            mitigation += "<p>{name}:</p>".format(name=package_name)
 
-            description += "{name}:\n".format(name=package_name)
+            description += "<p>{name}:</p>".format(name=package_name)
             for versions in package_versions:
-                mitigation += "  {fixed}\n".format(fixed=versions.get("fixed_version", "unknown"))
+                mitigation += "<p>  {fixed}</p>".format(fixed=versions.get("fixed_version", "unknown"))
 
-                description += "  installed version: {installed}\n".format(installed=versions.get("package_version", "unknown"))
-                description += "  fixed version: {fixed}\n".format(fixed=versions.get("fixed_version", "unknown"))
+                description += "<p>  installed version: {installed}</p>".format(installed=versions.get("package_version", "unknown"))
+                description += "<p>  fixed version: {fixed}</p>".format(fixed=versions.get("fixed_version", "unknown"))
 
     link = vulnerability.get("link") if "link" in vulnerability else ""
 
@@ -165,6 +166,13 @@ def get_asset_item(vulnerability, test):
 
     vulnerability_id = vulnerability.get("name")
 
+    # there is nothing like short description, short name or title
+    package_names_combined = ','.join(sorted(set(package_names), key=str))
+    if len(package_names_combined) > 32:
+        package_names_combined = package_names_combined[-32:]
+
+    title = "{packages}: ({vuln})".format(packages=package_names_combined, vuln=vulnerability.get("name").upper())
+
     # create the finding object
     finding = Finding(
         title=title,