1/28/25 Release: INT to MAIN (#3435)

* #1082 first attempt at creating a dynamic map * #1082 selected country text now highlights when selected from the map * #1082 added selected country styling that persists after mouseout, added legend * #1082 only countries with CNAs are interactable * #1082 added two way binding on CNA partner map * #1082 Added selected country color to legend * #1082 added Singapore geojson * #1082 updated USA geojson * #1082 sorted geojson data so popups appear on the largest part of the country * #1082 updated map attribution * #1082 minified country geoJson * #1082 changed selected country legend opacity * #1082 addressed small code quality issues * 1/27/25 release branch (#3432) * #3424 Update FAQs * #3420 Update CVE Services page for the v2.5.1 release * #3421 CNA Enrichment Recognition List for 01/27/25 * #3422 Add CPE Quick Start Guide PDF + Announcement Blog --------- Co-authored-by: Daigneau, Jeremy T <jdaigneau@mitre.org> Co-authored-by: athu-tran <63068972+athu-tran@users.noreply.github.com> Co-authored-by: Robert Roberge <rroberge@mitre.org>
CVEProject · Jan 28, 2025 · fd1cb4b · fd1cb4b
1 parent 976017c
commit fd1cb4b
Show file tree

Hide file tree

Showing 12 changed files with 412 additions and 29 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
     "axios": "^1.6.5",
     "bulma": "^0.9.4",
     "bulma-timeline": "^3.0.5",
+    "leaflet": "^1.9.4",
     "lodash": "^4.17.21",
     "node-sass": "^9.0.0",
     "pinia": "^2.1.7",
@@ -50,4 +51,4 @@
     "vite": "^5.0.10",
     "vue-tsc": "^1.8.25"
   }
-}
+}
diff --git a/public/images/news/CnaEnrichmentRecognitionList.png b/public/images/news/CnaEnrichmentRecognitionList.png
diff --git a/src/assets/data/countries.json b/src/assets/data/countries.json
diff --git a/src/assets/data/faqs.json b/src/assets/data/faqs.json
@@ -75,14 +75,14 @@
 				"questionId": "who_owns_cve",
 				"questionText": "Who owns CVE",
 				"questionResponseParagraphs": [
-					"Copyright © 1999-2024, <a href='http://www.mitre.org/'>The MITRE Corporation</a>. CVE and the CVE logo are registered trademarks of The MITRE Corporation. CVE is sponsored by <a href='https://www.dhs.gov/' target='_blank'>U.S. Department of Homeland Security</a> (DHS) <a href='https://www.cisa.gov/about/divisions-offices/cybersecurity-division'>Cybersecurity and Infrastructure Security Agency</a> (CISA). CISA funds the <a href='https://www.dhs.gov/science-and-technology/hssedi'>Homeland Security Systems Engineering and Development Institute (HSSEDI)</a>, a DHS Federally Funded Research and Development Center (FFRDC) operated by The MITRE Corporation, to operate the CVE Program in cooperation with industry, government, and academic stakeholders under a public/private partnership."
+					"Copyright © 1999-2025, <a href='http://www.mitre.org/'>The MITRE Corporation</a>. CVE and the CVE logo are registered trademarks of The MITRE Corporation. CVE is sponsored by <a href='https://www.dhs.gov/' target='_blank'>U.S. Department of Homeland Security</a> (DHS) <a href='https://www.cisa.gov/about/divisions-offices/cybersecurity-division'>Cybersecurity and Infrastructure Security Agency</a> (CISA). CISA funds the <a href='https://www.dhs.gov/science-and-technology/hssedi'>Homeland Security Systems Engineering and Development Institute (HSSEDI)</a>, a DHS Federally Funded Research and Development Center (FFRDC) operated by The MITRE Corporation, to operate the CVE Program in cooperation with industry, government, and academic stakeholders under a public/private partnership."
 				]
 			},
 			{
 				"questionId": "MITRE_role_in_cve",
 				"questionText": "What is MITRE’s role",
 				"questionResponseParagraphs": [
-					"<a href='https://www.dhs.gov/science-and-technology/hssedi' target='_blank'>HSSEDI</a>, a DHS FFRDC operated by <a href='http://www.mitre.org/' target='_blank'>The MITRE Corporation</a>, executes the CVE Program <a href='/ResourcesSupport/Glossary?activeTerm=glossarySecretariat'>Secretariat</a>, MITRE <a href='/ResourcesSupport/Glossary?activeTerm=glossaryTLRoot'>Top-Level Root (TL-Root)</a>, and <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCNALR'>CNA of Last Resort (CNA-LR)</a> functions within the MITRE TL-Root. The MITRE Corporation owns the Copyright © 1999-2024 and the registered CVE trademark and the registered CVE logo trademark to ensure the program remains free for public use."
+					"<a href='https://www.dhs.gov/science-and-technology/hssedi' target='_blank'>HSSEDI</a>, a DHS FFRDC operated by <a href='http://www.mitre.org/' target='_blank'>The MITRE Corporation</a>, executes the CVE Program <a href='/ResourcesSupport/Glossary?activeTerm=glossarySecretariat'>Secretariat</a>, MITRE <a href='/ResourcesSupport/Glossary?activeTerm=glossaryTLRoot'>Top-Level Root (TL-Root)</a>, and <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCNALR'>CNA of Last Resort (CNA-LR)</a> functions within the MITRE TL-Root. The MITRE Corporation owns the Copyright © 1999-2025 and the registered CVE trademark and the registered CVE logo trademark to ensure the program remains free for public use."
 				]
 			},
 			{

diff --git a/src/assets/data/news.json b/src/assets/data/news.json
diff --git a/src/stores/partners.js b/src/stores/partners.js
@@ -6,7 +6,9 @@ export const usePartnerStore = defineStore('partner', {
   state: () => { 
     return {
       partnerCounts: {},
-      partnerShortLongNameMap: {}
+      partnerShortLongNameMap: {},
+      selectedPartnerCountry: "",
+      selectedCountryInternalChange: true, //Used to track if a country was selected from the PartnerMap or the CNAs.vue list
     }
   },
   actions: {
@@ -72,5 +74,5 @@ export const usePartnerStore = defineStore('partner', {
         throw new Error(`Error fetching ${import.meta.env.VITE_API_BASE_URL}cve-partner-name-map.json`);
       }
     }
-  }
+  },
 });
diff --git a/src/views/About/Metrics.vue b/src/views/About/Metrics.vue
@@ -295,8 +295,8 @@
                 </p>
               </div>
               <h3 class="title">CNA Enrichment Recognition List</h3>
-              <p class="cve-help-text"><span class="has-text-weight-bold">Last Updated: </span><time>January 13, 2025</time><br/>
-              <span class="has-text-weight-bold">Total CNAs: </span>236</p>
+              <p class="cve-help-text"><span class="has-text-weight-bold">Last Updated: </span><time>January 27, 2025</time><br/>
+              <span class="has-text-weight-bold">Total CNAs: </span>242</p>
               <div>
                 <ul>
                   <li>9front Systems</li>
@@ -312,6 +312,7 @@
                   <li>ARC Informatique</li>
                   <li>Asea Brown Boveri Ltd.</li>
                   <li>ASR Microelectronics Co., Ltd.</li>
+                  <li>ASUSTeK Computer Incorporation</li>
                   <li>Autodesk</li>
                   <li>Automotive Security Research Group (ASRG)</li>
                   <li>Avaya Inc.</li>
@@ -340,8 +341,10 @@
                   <li>ClickHouse, Inc.</li>
                   <li>Cloudflare, Inc.</li>
                   <li>Concrete CMS</li>
+                  <li>Crafter CMS</li>
                   <li>CyberArk Labs</li>
                   <li>CyberDanube</li>
+                  <li>Cybersecurity and Infrastructure Security Agency (CISA) U.S. Civilian Government</li>
                   <li>Dassault Systèmes</li>
                   <li>Delinea, Inc.</li>
                   <li>Dell EMC</li>
@@ -353,7 +356,6 @@
                   <li>Dutch Institute for Vulnerability Disclosure (DIVD)</li>
                   <li>Eaton</li>
                   <li>Eclipse Foundation</li>
-                  <li>ELAN Microelectronics Corp.</li>
                   <li>Elastic</li>
                   <li>EnterpriseDB Corporation</li>
                   <li>Environmental Systems Research Institute, Inc. (Esri)</li>
@@ -394,6 +396,7 @@
                   <li>HP Inc.</li>
                   <li>Huawei Technologies</li>
                   <li>HYPR Corp</li>
+                  <li>IBM Corporation</li>
                   <li>ICS-CERT</li>
                   <li>Indian Computer Emergency Response Team (CERT-In)</li>
                   <li>Intel Corporation</li>
@@ -429,14 +432,14 @@
                   <li>National Cyber Security Centre Finland</li>
                   <li>National Cyber Security Centre SK-CERT</li>
                   <li>National Instruments</li>
-                  <li>NEC Corporation</li>
                   <li>Netflix, Inc.</li>
                   <li>Netskope</li>
                   <li>NLnet Labs</li>
                   <li>NortonLifeLock Inc</li>
                   <li>Nozomi Networks Inc.</li>
                   <li>Octopus Deploy</li>
                   <li>Okta</li>
+                  <li>OMRON Corporation</li>
                   <li>ONEKEY GmbH</li>
                   <li>Open Design Alliance</li>
                   <li>Open-Xchange</li>
@@ -456,6 +459,7 @@
                   <li>Pegasystems</li>
                   <li>Pentraze Cybersecurity</li>
                   <li>Perforce</li>
+                  <li>Phoenix Technologies, Inc.</li>
                   <li>PHP Group</li>
                   <li>Ping Identity Corporation</li>
                   <li>PlexTrac, Inc.</li>
@@ -470,7 +474,9 @@
                   <li>rami.io GmbH</li>
                   <li>Rapid7, Inc.</li>
                   <li>Real-Time Innovations, Inc.</li>
+                  <li>Red Hat, Inc.</li>
                   <li>Robert Bosch GmbH</li>
+                  <li>Roche Diagnostics</li>
                   <li>SailPoint Technologies</li>
                   <li>Samsung TV & Appliance</li>
                   <li>SAP SE</li>
@@ -515,7 +521,7 @@
                   <li>TWCERT/CC</li>
                   <li>TXOne Networks, Inc.</li>
                   <li>upKeeper Solutions</li>
-                  <li>Vivo Mobile Communication Technology Co.,LTD.</li>
+                  <li>Vivo Mobile Communication Technology Co., LTD.</li>
                   <li>VulDB</li>
                   <li>VulnCheck</li>
                   <li>VULSec Labs</li>

diff --git a/src/views/ProgramOrganization/CNAs.vue b/src/views/ProgramOrganization/CNAs.vue
@@ -32,19 +32,16 @@
                and {{ usePartnerStoreInstance.countries['No country affiliation'] }} no country affiliation participating in the CVE Program.
             </p>
             <h3 class="title mt-5" id="map">CNA Partners By Country</h3>
-            <figure class="image">
-              <img src="@/assets/images/cvePartnersMap.png" alt="map of world highlighting countries
-                of membership which is fully  described in lists below">
-                <figcaption>
-                  <div class="columns" style="text-align: left; font-style">
-                    <div class="column" v-for="chunk in chunkedCountries" :key="chunk.index">
-                      <ul v-for="[country, count ] in chunk" :key="country.index" class="mt-2 mb-2">
-                        <li style="list-style-type: none">{{country}}: {{count}}</li>
-                      </ul>
-                    </div>
-                  </div>
-                </figcaption>
-            </figure>
+            <partner-map></partner-map>
+            <div class="columns" style="text-align: left; font-style">
+              <div class="column" v-for="chunk in chunkedCountries" :key="chunk.index">
+                <ul v-for="[country, count ] in chunk" :key="country.index" class="mt-2 mb-2">
+                  <li @click="selectCountry(country)" class="cve-country-list" :class="{'cve-selected-country': selectedCountry == country}" style="list-style-type: none">
+                  {{country}}: {{count}}
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div> <!-- end content -->
         </main>
         <SurveyLinkComponent/>
@@ -58,12 +55,14 @@
 
 <script>
 import NavigationSidebar from '@/components/NavigationSidebar.vue';
+import PartnerMap from '@/views/ProgramOrganization/PartnerMap.vue'
 import { usePartnerStore } from '@/stores/partners';
 
 export default {
   name: 'CNAs',
   components: {
     NavigationSidebar,
+    PartnerMap
   },
   props: {
     cvenavs: {
@@ -93,11 +92,18 @@ export default {
     cnalrCount() {
       return usePartnerStore().partnerCounts.role['CNA-LR'];
     },
+    selectedCountry() {
+      return usePartnerStore().selectedPartnerCountry;
+    },
   },
   methods: {
     sortJson(orignalJson) {
       return Object.entries(orignalJson).sort((a, b) => a[0].localeCompare(b[0]));
     },
+    selectCountry(country) {
+      usePartnerStore().selectedCountryInternalChange = false;
+      usePartnerStore().selectedPartnerCountry = country;
+    }
   },
 };
 </script>
@@ -117,4 +123,14 @@ figcaption {
     margin-left: unset !important;
     margin-right: unset !important;
 }
+
+.cve-country-list:hover {
+  background-color: #97d4ea5e;
+  cursor: pointer;
+}
+
+.cve-selected-country {
+  background-color: $theme-color-accent-cool-light !important;
+}
+
 </style>