Merge pull request #3383 from CVEProject/int

12/18 int to main merge

Author: alinh-mitre

src/assets/data/CNAsList.json

@@ -24744,7 +24744,7 @@
   {
     "shortName": "CEP",
     "cnaID": "CNA-2024-0087",
-    "organizationName": "CEPHEID",
+    "organizationName": "Cepheid",
     "scope": "Cepheid products",
     "contact": [
       {

src/assets/data/news.json

@@ -30,36 +30,36 @@
       "description": [
         {
           "contentnewsType": "paragraph",
-          "content": "<a href='/PartnerInformation/ListofPartners/partner/S21sec'>CS21sec Cyber Solutions by Thales</a> is now a <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCNA'>CVE Numbering Authority (CNA)</a> for vulnerabilities discovered by S21sec that are not within another CNA’s scope."
+          "content": "<a href='/PartnerInformation/ListofPartners/partner/S21sec'>S21sec Cyber Solutions by Thales</a> is now a <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCNA'>CVE Numbering Authority (CNA)</a> for vulnerabilities discovered by S21sec that are not within another CNA’s scope."
         },
         {
           "contentnewsType": "paragraph",
-          "content": "To date, <a href='/PartnerInformation/ListofPartners'>431 CNAs</a> (429 CNAs and 2 CNA-LRs) from <a href='/ProgramOrganization/CNAs'>40 countries</a> and 1 no country affiliation have partnered with the CVE Program. CNAs are organizations from around the world that are authorized to assign <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCVEID'>CVE Identifiers (CVE IDs)</a> and publish <a href='/ResourcesSupport/Glossary?activeTerm=glossaryRecord'>CVE Records</a> for vulnerabilities affecting products within their distinct, agreed-upon scope, for inclusion in first-time public announcements of new vulnerabilities. CS21sec is the 7th CNA from Spain."
+          "content": "To date, <a href='/PartnerInformation/ListofPartners'>431 CNAs</a> (429 CNAs and 2 CNA-LRs) from <a href='/ProgramOrganization/CNAs'>40 countries</a> and 1 no country affiliation have partnered with the CVE Program. CNAs are organizations from around the world that are authorized to assign <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCVEID'>CVE Identifiers (CVE IDs)</a> and publish <a href='/ResourcesSupport/Glossary?activeTerm=glossaryRecord'>CVE Records</a> for vulnerabilities affecting products within their distinct, agreed-upon scope, for inclusion in first-time public announcements of new vulnerabilities. S21sec is the 7th CNA from Spain."
         },
         {
           "contentnewsType": "paragraph",
-          "content": "CS21sec’s Root is the <a href='/PartnerInformation/ListofPartners/partner/mitre'>MITRE Top-Level Root</a>."
+          "content": "S21sec’s Root is the <a href='/PartnerInformation/ListofPartners/partner/mitre'>MITRE Top-Level Root</a>."
         }
       ]
     },
     {
       "id": 458,
       "newsType": "news",
-      "title": "CEPHEID Added as CVE Numbering Authority (CNA)",
+      "title": "Cepheid Added as CVE Numbering Authority (CNA)",
       "urlKeywords": "CEPHEID Added as CNA",
       "date": "2024-12-17",
       "description": [
         {
           "contentnewsType": "paragraph",
-          "content": "<a href='/PartnerInformation/ListofPartners/partner/CEP'>CEPHEID</a> is now a <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCNA'>CVE Numbering Authority (CNA)</a> for Cepheid products."
+          "content": "<a href='/PartnerInformation/ListofPartners/partner/CEP'>Cepheid</a> is now a <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCNA'>CVE Numbering Authority (CNA)</a> for Cepheid products."
         },
         {
           "contentnewsType": "paragraph",
-          "content": "To date, <a href='/PartnerInformation/ListofPartners'>430 CNAs</a> (428 CNAs and 2 CNA-LRs) from <a href='/ProgramOrganization/CNAs'>40 countries</a> and 1 no country affiliation have partnered with the CVE Program. CNAs are organizations from around the world that are authorized to assign <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCVEID'>CVE Identifiers (CVE IDs)</a> and publish <a href='/ResourcesSupport/Glossary?activeTerm=glossaryRecord'>CVE Records</a> for vulnerabilities affecting products within their distinct, agreed-upon scope, for inclusion in first-time public announcements of new vulnerabilities. CEPHEID is the 233rd CNA from USA."
+          "content": "To date, <a href='/PartnerInformation/ListofPartners'>430 CNAs</a> (428 CNAs and 2 CNA-LRs) from <a href='/ProgramOrganization/CNAs'>40 countries</a> and 1 no country affiliation have partnered with the CVE Program. CNAs are organizations from around the world that are authorized to assign <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCVEID'>CVE Identifiers (CVE IDs)</a> and publish <a href='/ResourcesSupport/Glossary?activeTerm=glossaryRecord'>CVE Records</a> for vulnerabilities affecting products within their distinct, agreed-upon scope, for inclusion in first-time public announcements of new vulnerabilities. Cepheid is the 233rd CNA from USA."
         },
         {
           "contentnewsType": "paragraph",
-          "content": "CEPHEID’s Root is the <a href='/PartnerInformation/ListofPartners/partner/icscert'>Cybersecurity and Infrastructure Security Agency (CISA) Industrial Control Systems (ICS) Root</a>."
+          "content": "Cepheid’s Root is the <a href='/PartnerInformation/ListofPartners/partner/icscert'>Cybersecurity and Infrastructure Security Agency (CISA) Industrial Control Systems (ICS) Root</a>."
         }
       ]
     },

src/components/PrimaryNavigation.vue

@@ -126,11 +126,33 @@
           </div>
           <div class="navbar-item cve-secondary-navbar-item cve-keyword-search">
             <div v-if="searchType">
-              <span class="icon-text mr-2" style="font-size: 14px">
-                <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve" class="cve-dark-blue-text">
-                  Access Search Tips
+            <p>
+              <span class="icon-text cve-dark-blue-text" style="font-size: 14px">
+                <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve" class="cve-dark-blue-text" style="font-size: 14px">
+                  Search tips
                 </router-link>
+                <span class="icon">
+                  <p id="lightBulbIcon" class="is-hidden">
+                    lightbulb
+                  </p>
+                  <font-awesome-icon :icon="['fas', 'lightbulb']" aria-labelledby="lightBulbIcon" aria-hidden="false"/>
+                </span>
+              </span>
+              <span class="has-text-black ml-2 mr-2">|</span>
+              <span class="icon-text cve-dark-blue-text" style="font-size: 14px">
+                <span>
+                  <a href="https://forms.office.com/g/qmmTaYnr5y" target="_blank" class="cve-dark-blue-text" style="font-size: 14px">
+                    Provide feedback
+                  </a>
+                  <span class="icon cve-icon-xxs">
+                    <p id="externalSurveyLink" class="is-hidden">
+                      Survey opens in a new tab or window depending on browser settings
+                    </p>
+                    <font-awesome-icon icon="external-link-alt" aria-labelledby="extenalSurveyLink" aria-hidden="false"/>
+                  </span>
+                </span>
               </span>
+            </p>
             </div>
           </div>
         </div>

src/components/SearchTable.vue

@@ -1,82 +1,82 @@
 <template>
   <div ref="tableRef" class="table-container">
-    <table aria-live="polite" class="table cve-border-dark-blue is-striped is-hoverable" >
+    <table aria-live="polite" class="table cve-border-dark-blue is-striped is-hoverable">
       <thead>
         <tr>
-          <th v-for="(header, index) in tableHeaders" :key="index">{{header}}</th>
+          <th v-for="(header, index) in tableHeaders" :key="index">{{ header }}</th>
         </tr>
       </thead>
       <tbody>
-        <tr v-for="(entry, index) in tableData" :key="index"
+        <tr
+          v-for="(entry, index) in tableData"
+          :key="index"
           :id="entry.id"
           :ref="entry.id"
           v-on:click="selectRow(entry.id)"
-          
-          v-bind:class="{'cve-term-active': selectedRow === entry.id}">
+          v-bind:class="{ 'cve-term-active': selectedRow === entry.id }"
+        >
           <td class="table-column-width">
-              <a :href="entry.termLink" v-bind:class="{'selectTermLink': selectedRow === entry.id}" class="has-text-weight-bold termLink"> {{ entry.term }} </a>
+            <router-link
+              :to="'#' + entry.id"
+              v-bind:class="{ selectTermLink: selectedRow === entry.id }"
+              class="has-text-weight-bold termLink"
+            >
+              {{ entry.term }}
+            </router-link>
           </td>
-          <td v-if="renderAsHTML" class="cve-term-definition" v-html="entry.definition"> </td>
-          <td v-else class="cve-term-definition">{{ entry.definition }} </td>
+          <td
+            v-if="renderAsHTML"
+            class="cve-term-definition"
+            v-html="entry.definition"
+          ></td>
+          <td v-else class="cve-term-definition">{{ entry.definition }}</td>
         </tr>
       </tbody>
     </table>
   </div>
-  </template>
-  
-  <script>
+</template>
 
-  export default {
-    name: "SearchTable",
-    props: {
-      tableData: {
-        type: Array,
-        required: true,
-      },
-      tableHeaders: {
-        type: Array,
-        required: true,
-      },
-      renderAsHTML: {
-        type: Boolean,
-        default: false,
-        required: false,
-      }
+<script>
+export default {
+  name: "SearchTable",
+  props: {
+    tableData: {
+      type: Array,
+      required: true,
     },
-    data() {
-      return {
-       selectedRow: null 
-      };
+    tableHeaders: {
+      type: Array,
+      required: true,
     },
-    mounted() {
-      let term = null;
-
-        // Add active term as a hash to scroll to it then select it
-      if (this.$route.query.activeTerm) {
-            term = this.$route.query.activeTerm;
-            this.$router.push({hash: "#" + term })
-            this.selectRow(term)
-      }
-      // If route already has a hash, just select the term
-      else if (this.$route.hash) {
-            term = this.$route.hash.slice(1);
-            this.selectRow(term)
-      }
+    renderAsHTML: {
+      type: Boolean,
+      default: false,
+      required: false,
     },
-    methods: {
-      selectRow(rowId) {
-        
-          this.selectedRow = (rowId === this.selectedRow ? null : rowId)
-      }
+  },
+  data() {
+    return {
+      selectedRow: null,
+    };
+  },
+  mounted() {
+    let term = null;
+
+    if (this.$route.hash) {
+      term = this.$route.hash.slice(1);
+      this.selectRow(term);
+    }
+  },
+  methods: {
+    selectRow(rowId) {
+      this.selectedRow = rowId;
     },
-  };
-  </script>
-  
-  <!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped lang="scss">
-  
-@import '@/assets/style/routerLink.scss';
+  },
+};
+</script>
 
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
 @media only screen and (min-width: $desktop) {
   .table-column-width {
     width: 30% !important;
@@ -85,18 +85,18 @@
 
 .cve-term-active {
   background-color: $theme-color-accent-cool-light !important;
-  color: black ;
-  padding-left: 8px; 
+  color: black;
+  padding-left: 8px;
   padding-top: 5px;
   padding-bottom: 5px;
 }
-  
+
 .termLink {
   color: $theme-color-primary;
+  background: unset;
 }
 
 .selectTermLink {
   color: black;
 }
 </style>
-   

src/main.ts

@@ -17,16 +17,16 @@ import { library } from '@fortawesome/fontawesome-svg-core';
 import { fab } from '@fortawesome/free-brands-svg-icons';
 import {
   faAngleDoubleLeft, faAngleDoubleRight, faAngleLeft, faAngleRight, faArrowRight, faBlog, faBook, faCaretDown, faCaretUp, faInfoCircle, faCheckCircle,
-  faExclamationCircle, faFileCode, faTriangleExclamation, faUpRightFromSquare, faLink, faMinus, faPassport, faPlus, faPodcast, faIdCard, faSearch,
-  faHandshake, faUsersCog, faLaptopCode, faPoll, faTimes, faToolbox, faSitemap, faUser, faUserShield, faBullhorn, faWindowMaximize,
+  faExclamationCircle, faFileCode, faTriangleExclamation, faUpRightFromSquare, faLightbulb, faLink, faMinus, faPassport, faPlus, faPodcast, faIdCard, 
+  faSearch, faHandshake, faUsersCog, faLaptopCode, faPoll, faTimes, faToolbox, faSitemap, faUser, faUserShield, faBullhorn, faWindowMaximize,
 } from '@fortawesome/free-solid-svg-icons';
 import { faArrowAltCircleRight, faClipboard, faNewspaper } from '@fortawesome/free-regular-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
 library.add(
   faAngleDoubleLeft, faAngleDoubleRight, faAngleLeft, faAngleRight, faArrowRight, faBlog, faBook, faCaretDown, faCaretUp, faInfoCircle, faCheckCircle,
-  faExclamationCircle, faFileCode, faTriangleExclamation, faUpRightFromSquare, faLink, faMinus, faPassport, faPlus, faPodcast, faIdCard, faSearch,
-  faHandshake, faUsersCog, faLaptopCode, faPoll, faTimes, faToolbox, faSitemap, faUser, faUserShield, faBullhorn,  faWindowMaximize,
+  faExclamationCircle, faFileCode, faTriangleExclamation, faUpRightFromSquare, faLightbulb, faLink, faMinus, faPassport, faPlus, faPodcast, faIdCard,
+  faSearch, faHandshake, faUsersCog, faLaptopCode, faPoll, faTimes, faToolbox, faSitemap, faUser, faUserShield, faBullhorn,  faWindowMaximize,
   faArrowAltCircleRight, faClipboard, faNewspaper, fab,);
 
 

src/router/index.js

@@ -45,16 +45,24 @@ import NotFound from '@/views/NotFound.vue';
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
-  scrollBehavior(to) {
-    if (to.hash) {
-      return {
-        el: to.hash,
-        top: 55
-      };
-    }
-    return {
-      top: 0
-    };
+  scrollBehavior(to) {  
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        if (to.hash) {
+          resolve({
+            el: to.hash,
+            top: 55,
+            behavior: "instant"
+          });
+        }
+        resolve({
+          top: 0
+        });
+      }, 0)
+    
+    })
+
+   
   },
   routes: [
     {
@@ -213,6 +221,12 @@ const router = createRouter({
       meta: {
         title: 'Glossary | CVE',
       },
+      beforeEnter: (to) => {
+        if (!to.hash) {
+          const term = to.query.activeTerm;
+          to.hash = '#' + term
+        }
+      },
     },
     {
       path: '/ResourcesSupport/FAQs',

src/views/About/Metrics.vue

@@ -293,6 +293,9 @@
                   their last published CVE Record. For more information about vulnerability information types like CVSS and CWE, see the
                   <router-link to="/CVERecord/UserGuide">CVE Record User Guide</router-link>.
                 </p>
+                <p>
+                  <span class="is-italic">NOTE: The next update of the “CNA Enrichment Recognition List” will be on January 13, 2025.</span>
+                </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>December 16, 2024</time><br/>