Merge pull request #3544 from sniok/search-expressions

frontend: Use simple-eval for advanced search

Author: k8s-ci-robot

frontend/package-lock.json

@@ -90,6 +90,7 @@
     "react-window": "^1.8.11",
     "recharts": "^2.1.4",
     "semver": "^7.3.5",
+    "simple-eval": "^2.0.0",
     "spacetime": "^7.4.0",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",

frontend/package.json

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import jsep from 'jsep';
+import evaluate from 'simple-eval';
 import { getTopLevelKeys } from './getTopLevelKeys';
 
 /**
@@ -32,24 +34,26 @@ export async function searchWithQuery<T extends { jsonData: any }>(
   const searchTimeStart = performance.now();
   const results: any[] = [];
 
-  const topLevelKeys = getTopLevelKeys(items.map(it => it.jsonData));
-
-  let queryFn: any;
+  let filterExpression: any;
   const functionBody = query;
   try {
-    queryFn = eval(`({ ${topLevelKeys.join(', ')} }) => { return ${functionBody}; }`);
+    filterExpression = jsep(functionBody);
   } catch (e) {}
 
-  if (!queryFn) return { results: [], searchTimeMs: 0 };
+  if (!filterExpression) return { results: [], searchTimeMs: 0 };
 
   const batchSize = 5000;
 
+  // Create object that contains all keys of all objects
+  const dummyObject: any = {};
+  getTopLevelKeys(items.map(it => it.jsonData)).forEach(key => (dummyObject[key] = undefined));
+
   for (let i = 0; i < items.length; i++) {
     const resource = items[i];
     const data = resource.jsonData;
 
     try {
-      const res = queryFn(data);
+      const res = evaluate(filterExpression, { ...dummyObject, ...data });
       if (res === true) {
         results.push(resource);
       }

frontend/src/components/advancedSearch/utils/searchWithQuery.tsx

@@ -122,6 +122,7 @@
     "resize-observer-polyfill": "^1.5.1",
     "semver": "^7.3.5",
     "shx": "^0.3.4",
+    "simple-eval": "^2.0.0",
     "spacetime": "^7.4.0",
     "storybook": "^8.5.6",
     "stream-browserify": "^3.0.0",