genericGlobals: add isProductionWebsite; use production services for search results

Author: rlxdev

src/components/cveRecordSearchModule.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="mt-1">
-    <div v-if="!isProductionWebsite" role="alert" class="notification is-warning is-light">
+    <div v-if="!cveGenericGlobalsStore.isProductionWebsite" role="alert"
+      class="notification is-warning is-light">
       <div class="is-flex is-align-items-flex-start mt-1" style="max-width: 820px; column-gap: 1rem;">
         <div class="pl-3">
           <p id="alertIconVariousFormts" class="is-hidden">alert</p>
@@ -18,7 +19,8 @@
     </div>
     <div class="field has-addons mt-1">
       <p class="control">
-        <span v-if="!isProductionWebsite" class="select cve-search-selector">
+        <span v-if="!cveGenericGlobalsStore.isProductionWebsite"
+          class="select cve-search-selector">
           <select v-model="searchType">
             <option>{{ searchOptionLabel }}</option>
             <option>{{ legacyOptionLabel }}</option>
@@ -65,8 +67,6 @@ import { useGenericGlobalsStore } from '@/stores/genericGlobals';
 const cveIdRegex = /^CVE\p{Pd}(?<year>\d{4})\p{Pd}(?<id>\d{4,})$/iu;
 const wordRegex = /^[a-z0-9 ]+$/i;
 
-const isProductionWebsite = import.meta.env.VITE_WEBSITE_ENVIRONMENT === 'prd';
-
 // This is the current maximum supported length of the "suffix" portion of
 // the CVE ID.  The schema defines a suffix length up to 19, but code in
 // other modules only supports what's defined here.
@@ -115,7 +115,8 @@ watch(
       // find than the normal search (cveawg). In this case, we need to switch
       // the search type to "legacy".  (issue #3426)
 
-      if (route?.name === cveRecordRouteName && !isProductionWebsite)
+      if (route?.name === cveRecordRouteName
+        && !cveGenericGlobalsStore.isProductionWebsite)
         searchType.value = legacyOptionLabel;
       else if (route.query?.query) {
           queryString.value = route.query.query.trim();
@@ -156,9 +157,7 @@ function startSearch() {
       } else
         cveListSearchStore.search();
   } else {
-    const lookupPath = `/CVERecord?id=${cveId}`;
-
-    router.push({path: lookupPath, query: {id: cveId}})
+    router.push({name: cveRecordRouteName, query: {id: cveId}})
   }
 }
 

src/stores/genericGlobals.ts

@@ -6,6 +6,7 @@ export const useGenericGlobalsStore = defineStore('genericGlobals', {
     const storedUseSearch = sessionStorage.getItem('useSearch');
     const storedCurrentServicesUrl = sessionStorage.getItem('currentServicesUrl');
     return {
+      isProductionWebsite: import.meta.env.VITE_WEBSITE_ENVIRONMENT === 'prd',
       useSearch: storedUseSearch ? JSON.parse(storedUseSearch) : true, 
       currentServicesUrl: storedCurrentServicesUrl ? JSON.parse(storedCurrentServicesUrl)
                           : cveServicesBaseUrlFromEnv,

src/views/CVERecord/CVERecord.vue

@@ -21,7 +21,7 @@
     </div>
     <div v-else>
       <div v-if="usecveRecordStore.isIdOrRecordFound">
-        <div v-if="websiteEnv !== 'prd'" class="notification is-warning is-light" role="alert">
+        <div v-if="!genericGlobalsStore.isProductionWebsite" class="notification is-warning is-light" role="alert">
           <div class="is-flex" style="justify-content: center;">
             <p id="alertIconCveRecordsRequestErrored" class="is-hidden">alert</p>
             <font-awesome-icon style="flex: 0 0 40px;" size="1x"  icon="triangle-exclamation" role="img"
@@ -103,7 +103,9 @@ export default {
         : this.GenericGlobalsStore.cveServiceTestBaseUrl,
       usecveRecordStore: usecveRecordStore(),
       cveId: usecveRecordStore().cveId,
+      cveServicesUrl: undefined,
       errorMessageStore: useErrorMessageStore(),
+      genericGlobalsStore: useGenericGlobalsStore(),
       showHelpText: false,
       disabled: true,
       getIdStatusCode: undefined,
@@ -122,12 +124,15 @@ export default {
     }
   },
   created() {
-    const fullPathArr = this.$route.fullPath.split('id=');
-    if (fullPathArr.length === 2) {
-      const cveId = fullPathArr[1];
+    const cveId = this.$route.query?.id;
+    if (cveId) {
       this.cveId = this.cveIdToUpperCase(cveId);
       this.validateCveId();
       if (!this.disabled) {
+        if (this.$route.query?.prod ?? 'false' === 'true')
+          this.currentServicesUrl = this.genericGlobalsStore.cveServicesBaseUrl;
+        else
+          this.currentServicesUrl = this.genericGlobalsStore.currentServicesUrl;
         this.startLookup();
       } else {
         usecveRecordStore().showHelpText = true;
@@ -138,10 +143,15 @@ export default {
   },
   watch: {
     $route(to) {
-      if (Object.prototype.hasOwnProperty.call(to.query, 'id')) {
-        this.cveId = this.cveIdToUpperCase(to.query.id);
+      const cveId = to.query?.id;
+      if (cveId) {
+        this.cveId = this.cveIdToUpperCase(cveId);
         this.validateCveId();
         if (!this.disabled) {
+          if (this.$route.query?.prod ?? 'false' === 'true')
+            this.currentServicesUrl = this.genericGlobalsStore.cveServicesBaseUrl;
+          else
+            this.currentServicesUrl = this.genericGlobalsStore.currentServicesUrl;
           this.startLookup();
         } else {
           this.resetStates();
@@ -203,7 +213,7 @@ export default {
 
       const getIdUrl = `/api/cve-id/${usecveRecordStore().cveId}`;
       try {
-        axios.defaults.baseURL = this.GenericGlobalsStore.currentServicesUrl;
+        axios.defaults.baseURL = this.currentServicesUrl;
         const idData = await axios.get(getIdUrl);
         this.getIdStatusCode = 200;
         if (idData.status === 200 && idData?.data?.error === undefined) {
@@ -239,7 +249,7 @@ export default {
       }
     },
     async getRecordData() {
-      const getRecordUrl = `${useGenericGlobalsStore().currentServicesUrl}/api/cve/${usecveRecordStore().cveId}`;
+      const getRecordUrl = `${this.currentServicesUrl}/api/cve/${usecveRecordStore().cveId}`;
       if (this.GenericGlobalsStore.useSearch) {
         this.isResultFromProd = true;
       } else {

src/views/CVERecord/SearchResults.vue

@@ -50,11 +50,11 @@
                         <div class="columns cve-columns">
                           <div class="column cve-column">
                             <router-link v-if="hasRecordData"
-                              :to="`/CVERecord?id=${cveListSearchStore.recordData.cveId}`" target="_blank">
+                              :to="cveRecordRoute(cveListSearchStore.recordData.cveId)" target="_blank">
                               {{ cveListSearchStore.recordData.cveId }}
                             </router-link>
                             <router-link v-if="hasIdData"
-                              :to="`/CVERecord?id=${cveListSearchStore.idData.cve_id}`" target="_blank">
+                              :to="cveRecordRoute(cveListSearchStore.idData.cve_id)" target="_blank">
                               {{ cveListSearchStore.idData.cve_id}}
                             </router-link>
                           </div>
@@ -160,7 +160,7 @@
                             </div>
                             <div class="columns cve-columns">
                               <div class="column cve-column">
-                                <router-link :to="`/CVERecord?id=${result.cveId}`" target="_blank">{{ result.cveId }}</router-link>
+                                <router-link :to="cveRecordRoute(result.cveId)" target="_blank">{{ result.cveId }}</router-link>
                               </div>
                               <div class="column cve-column">
                                 <p>
@@ -287,10 +287,11 @@ import { useRouter } from 'vue-router';
 import ServiceUnavailable from '@/components/ServiceUnavailable.vue'
 
 const cveListSearchStore = useCveListSearchStore();
+const generalGlobalsStore = useGenericGlobalsStore();
 const partnerStore = usePartnerStore();
 const router = useRouter();
 const app = createApp({});
-const resultUrl = ref(useGenericGlobalsStore().cveServicesBaseUrl);
+const resultUrl = ref(generalGlobalsStore.cveServicesBaseUrl);
 
 app.component('ServiceUnavailable', ServiceUnavailable);
 
@@ -310,6 +311,15 @@ function backToTop() {
   });
 }
 
+function cveRecordRoute(cveId) {
+  let recordRoute = `/CVERecord?id=${cveId}`;
+
+  if (!generalGlobalsStore.isProductionWebsite)
+    recordRoute += '&prod=true';
+
+  return recordRoute
+}
+
 const websiteEnv = computed(() => {
   return import.meta.env.VITE_WEBSITE_ENVIRONMENT;
 });