cveRecordSearchModule: add normalizeSearchString(); cveRecord: add isErrorMessage

Author: rlxdev

src/components/cveRecordSearchModule.vue

@@ -65,7 +65,6 @@ import { usecveRecordStore, useErrorMessageStore } from '@/stores/cveRecord';
 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;
 
 // 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
@@ -85,7 +84,6 @@ const searchOptionLabel = 'Search CVE List';
 
 let prevSearchValue = ref('');
 let queryString = ref('');
-let errorMessage = ref('');
 
 let cveGenericGlobalsStore = useGenericGlobalsStore();
 let cveRecordStore = usecveRecordStore();
@@ -119,7 +117,7 @@ watch(
         && !cveGenericGlobalsStore.isProductionWebsite)
         searchType.value = legacyOptionLabel;
       else if (route.query?.query) {
-          queryString.value = route.query.query.trim();
+          queryString.value = route.query.query;
           validate();
       }
     }
@@ -200,23 +198,17 @@ function validateQueryString() {
   }
 
   if (isSearch) {
+    if (!errorMessageStore.isErrorMessage) {
 
-    // Search: if the query string isn't a CVE ID and it doesn't just consist
-    // of "typical" words (alphanumeric phrases), then it's an error.
-
-    if (!cveIdMatch && !wordRegex.test(searchValue)) {
-      errorMessageStore.setErrorMessage(contentMessage);
-    } else if (!errorMessage.value) {
-
-      // The provided search string is good.
+      // The search can proceed with the provided string.
       cveListSearchStore.isSearchButtonDisabled = false;
     }
   } else if (cveIdValid) {
 
     // Legacy Find by CVE ID and it's in the correct format.
     cveListSearchStore.isSearchButtonDisabled = false;
 
-  } else if (!errorMessage.value) {
+  } else if (!errorMessageStore.isErrorMessage) {
 
     // Legacy Find by CVE ID but the query string is not a CVE ID.
     errorMessageStore.cveIdFormatMessage();
@@ -225,6 +217,25 @@ function validateQueryString() {
   return !cveListSearchStore.isSearchButtonDisabled;
 }
 
+function normalizeSearchString() {
+
+  if (!searchTypeBoolean.value)
+    return
+
+  // Each search string is "normalized" by removing excess spaces (both at
+  // the beginning and end of the string, as well as compressing multiple
+  // spaces separating "words" to a single space).  Dashes (em-, en-) that
+  // may have been pasted in from elsewhere (e.g., Word) are converted to
+  // the minus (hyphen) character.
+
+  let normalizedString = queryString.value.trim().replace(/\s+/g, ' ');
+
+  normalizedString = normalizedString.replace(/\p{Pd}/g, '-');
+
+  if (normalizedString !== queryString.value)
+    queryString.value = normalizedString;
+}
+
 function onInputChange() {
   // This function is called when the search string changes.  The only purpose
   // is to clear the way for the search if there's a value (it's not empty)
@@ -261,6 +272,8 @@ function validate() {
   //
   // Provided the search string is valid, the search is started.
 
+  normalizeSearchString();
+
   if (validateQueryString()) {
     try {
       cveListSearchStore.isSearchButtonDisabled = true;

src/stores/cveRecord.ts

@@ -82,6 +82,9 @@ export const useErrorMessageStore = defineStore('errorMessage', {
       showErrorMessage: false
     }
   },
+  getters: {
+    isErrorMessage: (state) => state.errorMessage.length > 0,
+  },
   actions: {
     cveIdFormatMessage() {
       const formatMessage = 'Required CVE ID format: CVE-YYYY-NNNN';