Merge branch 'DependencyTrack:main' into fix/frontend-accessibility-1614

ralliartse · web-flow · commit e2b0ec16c79f · 2026-06-22T08:59:10.000-04:00
diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM nginxinc/nginx-unprivileged:1.31.1-alpine@sha256:cc300bd2e8776708a8c2c8686a74f06eadf221c5ce01e85d0e821955d7a730ab
+FROM nginxinc/nginx-unprivileged:1.31.2-alpine@sha256:26b5d4920434bc4d8c17a68201488cf4b3d2391f0d25305cdfe66ccdc6d18aa4
 
 # Arguments that can be passed at build time
 ARG COMMIT_SHA=unknown
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "codemirror": "6.0.2",
     "core-js": "3.36.1",
     "css-vars-ponyfill": "2.4.9",
-    "dompurify": "3.4.9",
+    "dompurify": "3.4.11",
     "flexver": "1.1.1",
     "font-awesome": "4.7.0",
     "imurmurhash": "0.1.4",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
@@ -820,6 +820,7 @@
     "owasp_rr_threat_size_dev_sa": "Dev/Sysadmin",
     "owasp_rr_threat_size_intranet": "Intranet",
     "owasp_rr_threat_size_partners": "Partner",
+    "owasp_rr_vector": null,
     "owasp_rr_vulnerability_factor": "Verletzlichkeitsfaktor",
     "package_url": "Paket-URL (PURL)",
     "package_url_full": "Paket-URL (PURL)",
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
@@ -820,6 +820,7 @@
     "owasp_rr_threat_size_dev_sa": "Dev/Sysadmin",
     "owasp_rr_threat_size_intranet": "Intranet",
     "owasp_rr_threat_size_partners": "Partners",
+    "owasp_rr_vector": "OWASP RR Vector",
     "owasp_rr_vulnerability_factor": "Vulnerability Factor",
     "package_url": "Package URL (PURL)",
     "package_url_full": "Package URL (PURL)",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
@@ -820,6 +820,7 @@
     "owasp_rr_threat_size_dev_sa": "Desarrollador/Administrador de sistemas",
     "owasp_rr_threat_size_intranet": "Intranet",
     "owasp_rr_threat_size_partners": "Socios",
+    "owasp_rr_vector": null,
     "owasp_rr_vulnerability_factor": "Factor de vulnerabilidad",
     "package_url": "URL del paquete (PURL)",
     "package_url_full": "URL del paquete (PURL)",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
@@ -820,6 +820,7 @@
     "owasp_rr_threat_size_dev_sa": "Dev/Administrateur système",
     "owasp_rr_threat_size_intranet": "Intranet",
     "owasp_rr_threat_size_partners": "Partenaires",
+    "owasp_rr_vector": null,
     "owasp_rr_vulnerability_factor": "Facteur de vulnérabilité",
     "package_url": "PackageURL (PURL)",
     "package_url_full": "URL du package au format PackageURL (PURL)",
diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json
@@ -820,6 +820,7 @@
     "owasp_rr_threat_size_dev_sa": "डेव/सिसएडमिन",
     "owasp_rr_threat_size_intranet": "इंट्रानेट",
     "owasp_rr_threat_size_partners": "साझेदार",
+    "owasp_rr_vector": null,
     "owasp_rr_vulnerability_factor": "भेद्यता कारक",
     "package_url": "पैकेज यूआरएल (PURL)",
     "package_url_full": "पैकेज यूआरएल (PURL)",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
@@ -820,6 +820,7 @@
     "owasp_rr_threat_size_dev_sa": "Sviluppatore/Amministratore di sistema",
     "owasp_rr_threat_size_intranet": "Intranet",
     "owasp_rr_threat_size_partners": "Partner",
+    "owasp_rr_vector": null,
     "owasp_rr_vulnerability_factor": "Fattore di vulnerabilità",
     "package_url": "URL del pacchetto (PURL)",
     "package_url_full": "URL del pacchetto (PURL)",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
@@ -820,6 +820,7 @@
     "owasp_rr_threat_size_dev_sa": "開発/システム管理者",
     "owasp_rr_threat_size_intranet": "イントラネット",
     "owasp_rr_threat_size_partners": "パートナー",
+    "owasp_rr_vector": null,
     "owasp_rr_vulnerability_factor": "脆弱性の要素",
     "package_url": "パッケージ URL (PURL)",
     "package_url_full": "パッケージ URL (PURL)",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
@@ -820,6 +820,7 @@
     "owasp_rr_threat_size_dev_sa": "Dev/Sysadmin",
     "owasp_rr_threat_size_intranet": "Intranet",
     "owasp_rr_threat_size_partners": "Partnerzy",
+    "owasp_rr_vector": null,
     "owasp_rr_vulnerability_factor": "Czynnik podatności",
     "package_url": "Adres URL pakietu (PURL)",
     "package_url_full": "Adres URL pakietu (PURL)",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
@@ -820,6 +820,7 @@
     "owasp_rr_threat_size_dev_sa": "Desenvolvedor/Administrador de Sistemas",
     "owasp_rr_threat_size_intranet": "Intranet",
     "owasp_rr_threat_size_partners": "Parceiros",
+    "owasp_rr_vector": null,
     "owasp_rr_vulnerability_factor": "Fator de Vulnerabilidade",
     "package_url": "URL do pacote (PURL)",
     "package_url_full": "URL do pacote (PURL)",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
@@ -820,6 +820,7 @@
     "owasp_rr_threat_size_dev_sa": "Desenvolvedor/Administrador de Sistemas",
     "owasp_rr_threat_size_intranet": "Intranet",
     "owasp_rr_threat_size_partners": "Parceiros",
+    "owasp_rr_vector": null,
     "owasp_rr_vulnerability_factor": "Fator de Vulnerabilidade",
     "package_url": "URL do pacote (PURL)",
     "package_url_full": "URL do pacote (PURL)",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
@@ -820,6 +820,7 @@
     "owasp_rr_threat_size_dev_sa": "Разработчики/администраторы",
     "owasp_rr_threat_size_intranet": "Интранет",
     "owasp_rr_threat_size_partners": "Партнеры",
+    "owasp_rr_vector": null,
     "owasp_rr_vulnerability_factor": "Фактор уязвимости",
     "package_url": "URL пакета (PURL)",
     "package_url_full": "Полный URL пакета (PURL)",
diff --git a/src/i18n/locales/uk-UA.json b/src/i18n/locales/uk-UA.json
@@ -820,6 +820,7 @@
     "owasp_rr_threat_size_dev_sa": "Розробники/Сисадміни",
     "owasp_rr_threat_size_intranet": "Інтранет",
     "owasp_rr_threat_size_partners": "Партнери",
+    "owasp_rr_vector": null,
     "owasp_rr_vulnerability_factor": "Фактор уразливості",
     "package_url": "URL пакета (PURL)",
     "package_url_full": "URL пакета (PURL)",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
@@ -820,6 +820,7 @@
     "owasp_rr_threat_size_dev_sa": "開發/系統管理員",
     "owasp_rr_threat_size_intranet": "內部網路",
     "owasp_rr_threat_size_partners": "合作夥伴",
+    "owasp_rr_vector": null,
     "owasp_rr_vulnerability_factor": "脆弱性因素",
     "package_url": "套件 URL (PURL)",
     "package_url_full": "套件 URL (PURL)",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
@@ -820,6 +820,7 @@
     "owasp_rr_threat_size_dev_sa": "开发/系统管理员",
     "owasp_rr_threat_size_intranet": "内网用户",
     "owasp_rr_threat_size_partners": "合作伙伴",
+    "owasp_rr_vector": null,
     "owasp_rr_vulnerability_factor": "漏洞因素",
     "package_url": "Package URL (PURL)",
     "package_url_full": "Package URL (PURL)",
diff --git a/src/views/portfolio/projects/FindingAudit.vue b/src/views/portfolio/projects/FindingAudit.vue
@@ -126,6 +126,20 @@
           trim
         />
       </b-form-group>
+      <b-form-group
+        v-if="owaspVector"
+        id="fieldset-owasp-vector"
+        :label="this.$t('message.owasp_rr_vector')"
+        label-for="input-owasp-vector"
+      >
+        <b-form-input
+          id="input-owasp-vector"
+          :value="owaspVector"
+          class="form-control disabled"
+          readonly
+          trim
+        />
+      </b-form-group>
     </b-col>
     <b-col sm="6">
       <b-form-group
@@ -365,6 +379,7 @@ export default {
       analysisJustification: null,
       analysisResponse: null,
       analysisDetails: null,
+      owaspVector: null,
     };
   },
   watch: {
@@ -447,6 +462,11 @@ export default {
       } else {
         this.isSuppressed = false;
       }
+      if (Object.prototype.hasOwnProperty.call(analysis, 'owaspVector')) {
+        this.owaspVector = analysis.owaspVector;
+      } else {
+        this.owaspVector = null;
+      }
     },
     makeAnalysis: function () {
       this.callRestEndpoint(
diff --git a/src/views/portfolio/projects/ProjectList.vue b/src/views/portfolio/projects/ProjectList.vue
@@ -162,21 +162,36 @@ export default {
           });
         }
         this.$refs.table.getData().forEach((project) => {
-          if (project.fetchedChildren || project.checkedHasChildren) {
+          // Expander is rendered natively by treegrid when children are
+          // already loaded. No extra logic needed.
+          if (project.fetchedChildren) {
+            return;
+          }
+
+          const renderExpander = () => {
+            this.$refs.table.$table
+              .find('tbody')
+              .find('tr.treegrid-' + project.id.toString())
+              .addClass('treegrid-collapsed')
+              .treegrid('renderExpander');
+          };
+
+          // Pre-flight result already known to be positive. Just render
+          // the expander, since the tbody was just rebuilt and dropped it.
+          if (project.matchesChildSearch) {
+            renderExpander();
+            return;
+          }
+
+          if (project.checkedHasChildren) {
             return;
           }
           project.checkedHasChildren = true;
 
           this.hasMatchingChildren(project).then((doesHaveMatchingChildren) => {
+            project.matchesChildSearch = doesHaveMatchingChildren;
             if (doesHaveMatchingChildren) {
-              this.$refs.table.$table
-                .find('tbody')
-                .find('tr.treegrid-' + project.id.toString())
-                .addClass('treegrid-collapsed');
-              this.$refs.table.$table
-                .find('tbody')
-                .find('tr.treegrid-' + project.id.toString())
-                .treegrid('renderExpander');
+              renderExpander();
             }
           });
         });
@@ -207,7 +222,7 @@ export default {
     },
     hasMatchingChildren: function (project) {
       if (!project.hasChildren) {
-        return new Promise(() => false);
+        return Promise.resolve(false);
       }
 
       // Perform a pre-flight search if there is at least one

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM nginxinc/nginx-unprivileged:1.31.1-alpine@sha256:cc300bd2e8776708a8c2c8686a74f06eadf221c5ce01e85d0e821955d7a730ab`
	`1`	`+FROM nginxinc/nginx-unprivileged:1.31.2-alpine@sha256:26b5d4920434bc4d8c17a68201488cf4b3d2391f0d25305cdfe66ccdc6d18aa4`
`2`	`2`
`3`	`3`	`# Arguments that can be passed at build time`
`4`	`4`	`ARG COMMIT_SHA=unknown`