Merge pull request #262 from Security-Onion-Solutions/fix/event_fields

Fix event fields
Security-Onion-Solutions · Jul 21, 2023 · a7ba2ba · a7ba2ba
2 parents b18ad24 + d9d6f95
commit a7ba2ba
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/html/js/routes/hunt.js b/html/js/routes/hunt.js
@@ -1020,6 +1020,11 @@ const huntComponent = {
     filterVisibleFields(eventModule, eventDataset, fields) {
       if (this.eventFields) {
         var filteredFields = null;
+        if (eventDataset) {
+          if(eventDataset.indexOf('.') !== -1) {
+            eventDataset = eventDataset.substring(eventDataset.indexOf('.') + 1);
+          }
+        }
         if (eventModule && eventDataset) {
           filteredFields = this.eventFields[":" + eventModule + ":" + eventDataset];
         }

diff --git a/html/js/routes/hunt.test.js b/html/js/routes/hunt.test.js
@@ -910,3 +910,17 @@ test('huntBetween', () => {
     }
   }
 });
+
+test('filterVisibleFields', () => {
+  comp.eventFields = {
+    ':module:dataset': 'a',
+    '::dataset': 'b',
+    ':module:': 'c',
+    'default': 'default',
+  };
+
+  expect(comp.filterVisibleFields('module', 'module.dataset', [])).toEqual('a');
+  expect(comp.filterVisibleFields('', 'module.dataset', [])).toEqual('b');
+  expect(comp.filterVisibleFields('module', 'otherData', [])).toEqual('c');
+  expect(comp.filterVisibleFields('A', 'B', [])).toEqual('default');
+});