Skip to content

Commit fd1cb4b

Browse files
rlxdevjdaigneau5athu-tranrroberge
authored
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>
1 parent 976017c commit fd1cb4b

File tree

12 files changed

+412
-29
lines changed

12 files changed

+412
-29
lines changed

‎package-lock.json‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"axios": "^1.6.5",
2525
"bulma": "^0.9.4",
2626
"bulma-timeline": "^3.0.5",
27+
"leaflet": "^1.9.4",
2728
"lodash": "^4.17.21",
2829
"node-sass": "^9.0.0",
2930
"pinia": "^2.1.7",
@@ -50,4 +51,4 @@
5051
"vite": "^5.0.10",
5152
"vue-tsc": "^1.8.25"
5253
}
53-
}
54+
}

‎public/images/news/CnaEnrichmentRecognitionList.png‎

771 KB
Loading

‎src/assets/data/countries.json‎

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎src/assets/data/faqs.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@
7575
"questionId": "who_owns_cve",
7676
"questionText": "Who owns CVE",
7777
"questionResponseParagraphs": [
78-
"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."
78+
"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."
7979
]
8080
},
8181
{
8282
"questionId": "MITRE_role_in_cve",
8383
"questionText": "What is MITRE’s role",
8484
"questionResponseParagraphs": [
85-
"<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."
85+
"<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."
8686
]
8787
},
8888
{

‎src/assets/data/news.json‎

Lines changed: 142 additions & 4 deletions
Large diffs are not rendered by default.

‎src/stores/partners.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ export const usePartnerStore = defineStore('partner', {
66
state: () => {
77
return {
88
partnerCounts: {},
9-
partnerShortLongNameMap: {}
9+
partnerShortLongNameMap: {},
10+
selectedPartnerCountry: "",
11+
selectedCountryInternalChange: true, //Used to track if a country was selected from the PartnerMap or the CNAs.vue list
1012
}
1113
},
1214
actions: {
@@ -72,5 +74,5 @@ export const usePartnerStore = defineStore('partner', {
7274
throw new Error(`Error fetching ${import.meta.env.VITE_API_BASE_URL}cve-partner-name-map.json`);
7375
}
7476
}
75-
}
77+
},
7678
});

‎src/views/About/Metrics.vue‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@
295295
</p>
296296
</div>
297297
<h3 class="title">CNA Enrichment Recognition List</h3>
298-
<p class="cve-help-text"><span class="has-text-weight-bold">Last Updated: </span><time>January 13, 2025</time><br/>
299-
<span class="has-text-weight-bold">Total CNAs: </span>236</p>
298+
<p class="cve-help-text"><span class="has-text-weight-bold">Last Updated: </span><time>January 27, 2025</time><br/>
299+
<span class="has-text-weight-bold">Total CNAs: </span>242</p>
300300
<div>
301301
<ul>
302302
<li>9front Systems</li>
@@ -312,6 +312,7 @@
312312
<li>ARC Informatique</li>
313313
<li>Asea Brown Boveri Ltd.</li>
314314
<li>ASR Microelectronics Co., Ltd.</li>
315+
<li>ASUSTeK Computer Incorporation</li>
315316
<li>Autodesk</li>
316317
<li>Automotive Security Research Group (ASRG)</li>
317318
<li>Avaya Inc.</li>
@@ -340,8 +341,10 @@
340341
<li>ClickHouse, Inc.</li>
341342
<li>Cloudflare, Inc.</li>
342343
<li>Concrete CMS</li>
344+
<li>Crafter CMS</li>
343345
<li>CyberArk Labs</li>
344346
<li>CyberDanube</li>
347+
<li>Cybersecurity and Infrastructure Security Agency (CISA) U.S. Civilian Government</li>
345348
<li>Dassault Systèmes</li>
346349
<li>Delinea, Inc.</li>
347350
<li>Dell EMC</li>
@@ -353,7 +356,6 @@
353356
<li>Dutch Institute for Vulnerability Disclosure (DIVD)</li>
354357
<li>Eaton</li>
355358
<li>Eclipse Foundation</li>
356-
<li>ELAN Microelectronics Corp.</li>
357359
<li>Elastic</li>
358360
<li>EnterpriseDB Corporation</li>
359361
<li>Environmental Systems Research Institute, Inc. (Esri)</li>
@@ -394,6 +396,7 @@
394396
<li>HP Inc.</li>
395397
<li>Huawei Technologies</li>
396398
<li>HYPR Corp</li>
399+
<li>IBM Corporation</li>
397400
<li>ICS-CERT</li>
398401
<li>Indian Computer Emergency Response Team (CERT-In)</li>
399402
<li>Intel Corporation</li>
@@ -429,14 +432,14 @@
429432
<li>National Cyber Security Centre Finland</li>
430433
<li>National Cyber Security Centre SK-CERT</li>
431434
<li>National Instruments</li>
432-
<li>NEC Corporation</li>
433435
<li>Netflix, Inc.</li>
434436
<li>Netskope</li>
435437
<li>NLnet Labs</li>
436438
<li>NortonLifeLock Inc</li>
437439
<li>Nozomi Networks Inc.</li>
438440
<li>Octopus Deploy</li>
439441
<li>Okta</li>
442+
<li>OMRON Corporation</li>
440443
<li>ONEKEY GmbH</li>
441444
<li>Open Design Alliance</li>
442445
<li>Open-Xchange</li>
@@ -456,6 +459,7 @@
456459
<li>Pegasystems</li>
457460
<li>Pentraze Cybersecurity</li>
458461
<li>Perforce</li>
462+
<li>Phoenix Technologies, Inc.</li>
459463
<li>PHP Group</li>
460464
<li>Ping Identity Corporation</li>
461465
<li>PlexTrac, Inc.</li>
@@ -470,7 +474,9 @@
470474
<li>rami.io GmbH</li>
471475
<li>Rapid7, Inc.</li>
472476
<li>Real-Time Innovations, Inc.</li>
477+
<li>Red Hat, Inc.</li>
473478
<li>Robert Bosch GmbH</li>
479+
<li>Roche Diagnostics</li>
474480
<li>SailPoint Technologies</li>
475481
<li>Samsung TV & Appliance</li>
476482
<li>SAP SE</li>
@@ -515,7 +521,7 @@
515521
<li>TWCERT/CC</li>
516522
<li>TXOne Networks, Inc.</li>
517523
<li>upKeeper Solutions</li>
518-
<li>Vivo Mobile Communication Technology Co.,LTD.</li>
524+
<li>Vivo Mobile Communication Technology Co., LTD.</li>
519525
<li>VulDB</li>
520526
<li>VulnCheck</li>
521527
<li>VULSec Labs</li>

‎src/views/ProgramOrganization/CNAs.vue‎

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,16 @@
3232
and {{ usePartnerStoreInstance.countries['No country affiliation'] }} no country affiliation participating in the CVE Program.
3333
</p>
3434
<h3 class="title mt-5" id="map">CNA Partners By Country</h3>
35-
<figure class="image">
36-
<img src="@/assets/images/cvePartnersMap.png" alt="map of world highlighting countries
37-
of membership which is fully described in lists below">
38-
<figcaption>
39-
<div class="columns" style="text-align: left; font-style">
40-
<div class="column" v-for="chunk in chunkedCountries" :key="chunk.index">
41-
<ul v-for="[country, count ] in chunk" :key="country.index" class="mt-2 mb-2">
42-
<li style="list-style-type: none">{{country}}: {{count}}</li>
43-
</ul>
44-
</div>
45-
</div>
46-
</figcaption>
47-
</figure>
35+
<partner-map></partner-map>
36+
<div class="columns" style="text-align: left; font-style">
37+
<div class="column" v-for="chunk in chunkedCountries" :key="chunk.index">
38+
<ul v-for="[country, count ] in chunk" :key="country.index" class="mt-2 mb-2">
39+
<li @click="selectCountry(country)" class="cve-country-list" :class="{'cve-selected-country': selectedCountry == country}" style="list-style-type: none">
40+
{{country}}: {{count}}
41+
</li>
42+
</ul>
43+
</div>
44+
</div>
4845
</div> <!-- end content -->
4946
</main>
5047
<SurveyLinkComponent/>
@@ -58,12 +55,14 @@
5855

5956
<script>
6057
import NavigationSidebar from '@/components/NavigationSidebar.vue';
58+
import PartnerMap from '@/views/ProgramOrganization/PartnerMap.vue'
6159
import { usePartnerStore } from '@/stores/partners';
6260
6361
export default {
6462
name: 'CNAs',
6563
components: {
6664
NavigationSidebar,
65+
PartnerMap
6766
},
6867
props: {
6968
cvenavs: {
@@ -93,11 +92,18 @@ export default {
9392
cnalrCount() {
9493
return usePartnerStore().partnerCounts.role['CNA-LR'];
9594
},
95+
selectedCountry() {
96+
return usePartnerStore().selectedPartnerCountry;
97+
},
9698
},
9799
methods: {
98100
sortJson(orignalJson) {
99101
return Object.entries(orignalJson).sort((a, b) => a[0].localeCompare(b[0]));
100102
},
103+
selectCountry(country) {
104+
usePartnerStore().selectedCountryInternalChange = false;
105+
usePartnerStore().selectedPartnerCountry = country;
106+
}
101107
},
102108
};
103109
</script>
@@ -117,4 +123,14 @@ figcaption {
117123
margin-left: unset !important;
118124
margin-right: unset !important;
119125
}
126+
127+
.cve-country-list:hover {
128+
background-color: #97d4ea5e;
129+
cursor: pointer;
130+
}
131+
132+
.cve-selected-country {
133+
background-color: $theme-color-accent-cool-light !important;
134+
}
135+
120136
</style>

0 commit comments

Comments
 (0)