Skip to content

Commit 9c367fc

Browse files
committed
Merge pull request #3338 from 'origin/int' into main
2 parents 9202deb + 927d394 commit 9c367fc

37 files changed

Lines changed: 1524 additions & 705 deletions
58.3 KB
Loading

src/App.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import PrimaryNavigation from './components/PrimaryNavigation.vue';
1919
import NotificationBannerModule from './components/NotificationBannerModule.vue';
2020
import FoooterModule from './components/FooterModule.vue';
2121
import NotFound from './views/NotFound.vue';
22+
import { usePartnerStore } from '@/stores/partners';
2223
2324
export default {
2425
components: {
@@ -31,6 +32,9 @@ export default {
3132
return {
3233
NavigationItems
3334
}
35+
},
36+
beforeMount() {
37+
usePartnerStore().populatePartnerShortLongNameMap();
3438
}
3539
}
3640
</script>
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
2-
"shouldDisplay":false,
3-
"publishCount": 6,
2+
"shouldDisplay":true,
3+
"publishCount": 7,
44
"collapsed": false,
55
"notificationContents": [
66
{
77
"contentType": "paragraph",
8-
"content": "<strong>NOTICE: </strong>"
8+
"content": "<strong>Notice: </strong>"
99
},
1010
{
1111
"contentType": "paragraph",
12-
"content": "On December 4, 2024, CVE Services will be unavailable from 1:00 – 3:00 PM EST, UTC-5, to undergo maintenance and deployment of "
12+
"content": "Keyword searching of CVE Records is now available in the search box above. Keywords may include a CVE ID (e.g., CVE-2024-1234), or one or more keywords separated by a space (e.g., authorization, SQL Injection, cross site scripting, etc.). Learn more "
1313
},
1414
{
15-
"contentType": "externalLink",
16-
"link": "https://github.com/CVEProject/cve-schema/releases/tag/v5.1.1-rc2",
17-
"linkText": "CVE Record Format Version 5.1.1"
15+
"contentType": "internalLink",
16+
"link": "/Media/News/item/blog/2024/12/11/CVE-List-Keyword-Search-Now-Available",
17+
"linkText": "here"
1818
},
1919
{
2020
"contentType": "paragraph",
21-
"content": ", which adds new features for CVE Numbering Authorities (CNAs). The CVE ID Lookup on this website will also be unavailable during this timeframe."
21+
"content": "."
2222
}
2323
]
2424
}

src/assets/data/faqs.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@
271271
"questionId": "search_cve",
272272
"questionText": "How do I search the CVE List",
273273
"questionResponseParagraphs": [
274-
"<strong>Keyword(s) Search of All CVE Records</strong>",
275-
"<ul><li>Search by keyword(s) across <a href='https://github.com/CVEProject/cvelistV5' target='_blank'>ALL FIELDS of all CVE Records</a> in the cvelistV5 downloads repository using the main search box on GitHub.com.</li><li>Search by keyword(s) in the <a href='https://cve.mitre.org/cve/search_cve_list.html' target='_blank'>Description fields ONLY of all CVE Records</a> using the legacy search page on cve.mitre.org.</li></ul>"
274+
"<b><i>Search Tips<i></b>",
275+
"<ul><li>By CVE ID<ul><li>Must include only one CVE ID per search.</li><li>CVE ID must include all letters, numbers, and hyphens associated with the CVE ID, e.g., CVE-2024-12345678.</li><li>“CVE” may be entered as “cve”, “CVE”, or as a combination of uppercase and lowercase, as casing is ignored during search.</li></ul></li><li>By other keyword(s)<ul><li>Must contain only alphanumeric characters, e.g., letters or numbers.</li><li>May contain one or more keywords, separated by a space.</li><li>Keywords may be entered in lowercase, uppercase, or a combination of both. Casing is ignored during search, e.g., Vulnerabilities, vulnerabilities, VULNERABILITIES.</li></ul></li></ul>"
276276
]
277277
},
278278
{

src/assets/data/news.json

Lines changed: 94 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,99 @@
11
{
22
"currentNews": [
3+
{
4+
"id": 452,
5+
"displayOnHomepageOrder": 1,
6+
"newsType": "blog",
7+
"title": "“CVE List Keyword Search” Now Available on CVE.ORG Website",
8+
"urlKeywords": "CVE List Keyword Search Now Available",
9+
"date": "2024-12-11",
10+
"author": {
11+
"name": "CVE Program",
12+
"organization": {
13+
"name": "CVE Program",
14+
"url": ""
15+
},
16+
"title": "",
17+
"bio": ""
18+
},
19+
"description": [
20+
{
21+
"contentnewsType": "paragraph",
22+
"content": "The ability to search <a href='/ResourcesSupport/Glossary?activeTerm=glossaryRecord'>CVE Records</a> by keyword is now available on <a href='/'>CVE.ORG</a>. Keywords may include a <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCVEID'>CVE ID</a> (e.g., CVE-2024-1234), or one or more keywords separated by a space (e.g., authorization, SQL Injection, cross site scripting, etc.)."
23+
},
24+
{
25+
"contentnewsType": "paragraph",
26+
"content": "The new <a href='/'>CVE List Keyword Search</a> box—shown below—is located at the top of every page of the website. Please try the new CVE List keyword search and provide your feedback <a href='https://forms.office.com/g/qmmTaYnr5y' target='_blank'>here</a>."
27+
},
28+
{
29+
"contentnewsType": "image",
30+
"imageWidth": "",
31+
"href": "/news/CVEListSearchBox.png",
32+
"altText": "CVE List Keyword Search box",
33+
"captionText": "<a href='https://www.cve.org/' target='_blank'>CVE List Keyword Search box</a>"
34+
},
35+
{
36+
"contentnewsType": "paragraph",
37+
"content": "Please note that this search is for the CVE List only. It will only search CVE Records. To search the overall website, use the “Site Search” located to the right of the CVE List search box."
38+
},
39+
{
40+
"contentnewsType": "paragraph",
41+
"content": "<h3>Continuous Improvement</h3>"
42+
},
43+
{
44+
"contentnewsType": "paragraph",
45+
"content": "While Phase 1 brought CVE ID lookup to the new CVE.ORG website, Phase 2 of our search deployment brings keyword searching of the CVE List."
46+
},
47+
{
48+
"contentnewsType": "paragraph",
49+
"content": "Users can now search by keywords with letters or numbers (e.g., vendor name, product name and version, vulnerability type, etc.), or by a CVE ID that must include all letters, numbers, and hyphens associated with the CVE ID, (e.g., CVE-2024-12345). Future phases will include adding the ability to search by special characters (e.g., dot (.), forward slash (/), etc. ), and other enhancements suggested by the community."
50+
},
51+
{
52+
"contentnewsType": "paragraph",
53+
"content": "Community input is integral for our ability to continuously improve the search capability, so please provide your valuable feedback <a href='https://forms.office.com/g/qmmTaYnr5y' target='_blank'>here</a>."
54+
},
55+
{
56+
"contentnewsType": "paragraph",
57+
"content": "It is important to note that the new keyword search capability may be temporarily unavailable when enhancements are added. During these times, the <a href='https://cve.mitre.org/cve/search_cve_list.html' target='_blank'>CVE List legacy search</a> on CVE.MITRE.ORG will remain available for use as a fallback."
58+
},
59+
{
60+
"contentnewsType": "paragraph",
61+
"content": "<h3>Search Tips</h3>"
62+
},
63+
{
64+
"contentnewsType": "paragraph",
65+
"content": "Enter keywords in the new keyword search box following the guidelines provided below."
66+
},
67+
{
68+
"contentnewsType": "paragraph",
69+
"content": "<h4>By CVE ID:</h4>"
70+
},
71+
{
72+
"contentnewsType": "paragraph",
73+
"content": "<ul><li>Must include only one CVE ID per search.</li><li>CVE ID must include all letters, numbers, and hyphens associated with the CVE ID, e.g., CVE-2024-12345678.</li><li>“CVE” may be entered as “cve”, “CVE”, or as a combination of uppercase and lowercase, as casing is ignored during search.</li></ul>"
74+
},
75+
{
76+
"contentnewsType": "paragraph",
77+
"content": "<h4>By Other Keyword(s):</h4>"
78+
},
79+
{
80+
"contentnewsType": "paragraph",
81+
"content": "<ul><li>Must contain only alphanumeric characters, e.g., letters or numbers.</li><li>May contain one or more keywords, separated by a space.</li><li>Keywords may be entered in lowercase, uppercase, or a combination of both. Casing is ignored during search, e.g., the following variations are treated the same and would return the same results: Vulnerabilities, vulnerabilities, VULNERABILITIES.</li></ul>"
82+
},
83+
{
84+
"contentnewsType": "paragraph",
85+
"content": "<strong>Note:</strong> Newly published CVE Records are generally available to search within 30 minutes of publication."
86+
},
87+
{
88+
"contentnewsType": "paragraph",
89+
"content": "<h3>Requesting Feedback</h3>"
90+
},
91+
{
92+
"contentnewsType": "paragraph",
93+
"content": "Thank you in advance for using the “CVE List Keyword Search” and providing your feedback, which will help us improve the capability for the community over time. The feedback form is available <a href='https://forms.office.com/g/qmmTaYnr5y' target='_blank'>here</a>."
94+
}
95+
]
96+
},
397
{
498
"id": 451,
599
"newsType": "news",
@@ -780,7 +874,6 @@
780874
},
781875
{
782876
"id": 429,
783-
"displayOnHomepageOrder": 1,
784877
"newsType": "blog",
785878
"title": "CVE Program Celebrates 25 Years of Impact!",
786879
"urlKeywords": "CVE Program Celebrates 25 Years",

src/components/AdpVulnerabilityEnrichment.vue

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
<slot></slot>
66
<button class="button message-header-button"
77
:style="{'background-color': '#162e51 !important', 'color': 'white !important'}"
8-
:aria-expanded="useCveRecordLookupStore.accordionState[organizationId] ? 'true' : 'false'"
8+
:aria-expanded="usecveRecordStore.accordionState[organizationId] ? 'true' : 'false'"
99
:aria-controls="`${organizationId}-panel`"
1010
>
1111
<span class="icon is-small">
1212
<p :id="`expandCollapseAltText-${organizationId}`" class="is-hidden">
13-
{{useCveRecordLookupStore.accordionState[organizationId] ? 'expand' : 'collapse'}}
13+
{{usecveRecordStore.accordionState[organizationId] ? 'expand' : 'collapse'}}
1414
</p>
15-
<font-awesome-icon :icon="useCveRecordLookupStore.accordionState[organizationId] ? 'minus' : 'plus'"
15+
<font-awesome-icon :icon="usecveRecordStore.accordionState[organizationId] ? 'minus' : 'plus'"
1616
aria-hidden="false" focusable="true" :aria-labelledby="`expandCollapseAltText-${organizationId}`"
1717
/>
1818
</span>
1919
</button>
2020
</button>
2121
<!-- Panel content is conditionally determined by role -->
22-
<div :id="`${organizationId}-panel`" v-if="useCveRecordLookupStore.accordionState[organizationId]"
22+
<div :id="`${organizationId}-panel`" v-if="usecveRecordStore.accordionState[organizationId]"
2323
class="pl-3 pr-3 pt-2 pb-5 cve-container-accordion-panel"
2424
>
2525
<div>
@@ -210,7 +210,8 @@
210210
</template>
211211

212212
<script>
213-
import { useCveRecordLookupStore } from '@/stores/cveRecordLookup.ts';
213+
import { usecveRecordStore } from '@/stores/cveRecord.ts';
214+
import { useGenericGlobalsStore } from '@/stores/genericGlobals';
214215
import ProductStatus from '@/components/ProductStatus.vue';
215216
import CveRecordReferences from './CveRecordReferences.vue';
216217
@@ -255,13 +256,13 @@ export default {
255256
//to do
256257
adpShortName: this.containerObject.providerMetadata.shortName,
257258
dateUpdated: '',
258-
cveServicesBaseUrl: import.meta.env.VITE_CVE_SERVICES_BASE_URL,
259-
useCveRecordLookupStore: useCveRecordLookupStore(),
259+
cveServicesBaseUrl: useGenericGlobalsStore().currentServicesUrl,
260+
usecveRecordStore: usecveRecordStore(),
260261
}
261262
},
262263
methods: {
263264
togglePanel(){
264-
useCveRecordLookupStore().accordionState[this.organizationId] = !useCveRecordLookupStore().accordionState[this.organizationId];
265+
usecveRecordStore().accordionState[this.organizationId] = !usecveRecordStore().accordionState[this.organizationId];
265266
},
266267
hasEnrichmentData(){
267268
if (this.cwes.length > 0 || this.cvsss.length > 0 || this.kevs.length > 0 || this.ssvcs.length > 0) {
@@ -406,8 +407,8 @@ export default {
406407
}
407408
},
408409
getCveProgramReferences(){
409-
if (this.containerObject.providerMetadata.shortName?.toLowerCase() !== useCveRecordLookupStore().cveProgramShortName) return;
410-
this.cveProgramReferences = useCveRecordLookupStore().getReferences(this.containerObject.references);
410+
if (this.containerObject.providerMetadata.shortName?.toLowerCase() !== usecveRecordStore().cveProgramShortName) return;
411+
this.cveProgramReferences = usecveRecordStore().getReferences(this.containerObject.references);
411412
},
412413
getUpdatedDate() {
413414
if(this.containerObject.providerMetadata?.dateUpdated) {

src/components/HelloWorld.vue

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/components/PrimaryNavigation.vue

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,16 @@
122122
<div class="navbar-start" style="flex-grow: 1 !important; align-items: center !important; justify-content: center !important;
123123
flex-direction: column !important">
124124
<div class="navbar-item cve-secondary-navbar-item">
125-
<cveRecordLookup/>
125+
<cveRecordSearch/>
126126
</div>
127127
<div class="navbar-item cve-secondary-navbar-item cve-keyword-search">
128-
<span class="icon-text mr-2" style="font-size: 14px">
129-
<router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve" class="cve-dark-blue-text">
130-
Find CVE Records by keyword on cve.mitre.org.
131-
</router-link>
132-
</span>
128+
<div v-if="searchType">
129+
<span class="icon-text mr-2" style="font-size: 14px">
130+
<router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve" class="cve-dark-blue-text">
131+
Access Search Tips
132+
</router-link>
133+
</span>
134+
</div>
133135
</div>
134136
</div>
135137
<div class="navbar-end is-hidden-touch">
@@ -150,16 +152,21 @@
150152
</template>
151153

152154
<script>
153-
import cveRecordLookup from './cveRecordLookupModule.vue';
155+
import cveRecordSearch from '@/components/cveRecordSearchModule.vue';
156+
import { useCveListSearchStore } from '@/stores/cveListSearch';
157+
import { mapState } from 'pinia'
154158
155159
export default {
156-
components: { cveRecordLookup },
160+
components: { cveRecordSearch },
157161
props: {
158162
cvenavs: {
159163
type: Object,
160164
required: true,
161165
},
162166
},
167+
computed: {
168+
...mapState(useCveListSearchStore, ['searchType'])
169+
},
163170
data() {
164171
return {
165172
isOpen: false,
@@ -184,8 +191,6 @@ export default {
184191
} else {
185192
this.selectedTouchScreenMenu.push(menuOption);
186193
}
187-
188-
console.log('this.selectedTouchScreenMenu ', this.selectedTouchScreenMenu)
189194
},
190195
toggleTouchScreenBurgerMenu() {
191196
this.isOpen = !this.isOpen;

src/components/ProductStatus.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<h4 class="title is-size-5 mb-0">Product Status</h4>
44
<router-link to="/CVERecord/UserGuide/#cve-product-status" class="cve-learn-more-link">Learn more</router-link>
55
<div class="mt-4">
6-
<div v-if="useCveRecordLookupStore.emptyProductStatus[role]">
6+
<div v-if="usecveRecordStore.emptyProductStatus[role]">
77
<p class="is-italic cve-help-text">Information not provided</p>
88
</div>
99
<div v-else>
@@ -88,7 +88,7 @@
8888
</template>
8989

9090
<script>
91-
import { useCveRecordLookupStore } from '@/stores/cveRecordLookup.ts';
91+
import { usecveRecordStore } from '@/stores/cveRecord.ts';
9292
9393
export default {
9494
props: {
@@ -103,7 +103,7 @@ export default {
103103
},
104104
data() {
105105
return {
106-
useCveRecordLookupStore: useCveRecordLookupStore()
106+
usecveRecordStore: usecveRecordStore()
107107
108108
}
109109
},
@@ -126,9 +126,9 @@ export default {
126126
}
127127
128128
if (isVendorNa && isProductNa && isVersionNa && isDefaultStausNa) {
129-
useCveRecordLookupStore().emptyProductStatus[this.role] = true;
129+
usecveRecordStore().emptyProductStatus[this.role] = true;
130130
} else {
131-
useCveRecordLookupStore().emptyProductStatus[this.role] = false;
131+
usecveRecordStore().emptyProductStatus[this.role] = false;
132132
}
133133
}
134134
},

0 commit comments

Comments
 (0)