Handle the extensions with processExtensions

joegallo · joegallo · commit 528504f2e66f · 2025-04-01T16:53:34.000-04:00
diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/CefParser.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/CefParser.java
@@ -332,9 +332,6 @@ CEFEvent process(String cefString) {
             }
             processHeaders(headers, event);
             processExtensions(cefString, extensionStart, event);
-            if (event.getExtensions().isEmpty() == false) {
-                event.addCefMapping("extensions", event.getExtensions());
-            }
             return event;
         } else {
             throw new IllegalArgumentException("Invalid CEF format");
@@ -392,6 +389,10 @@ private void processExtensions(String cefString, int extensionStart, CEFEvent ev
                 event.addExtension(entry.getKey(), entry.getValue());
             }
         }
+        // Bang the extensions into the cef mappings
+        if (event.getExtensions().isEmpty() == false) {
+            event.addCefMapping("extensions", event.getExtensions());
+        }
     }
 
     private static Map<String, String> parseExtensions(String extensionString) {

Original file line number	Diff line number	Diff line change
`@@ -332,9 +332,6 @@ CEFEvent process(String cefString) {`
`332`	`332`	`}`
`333`	`333`	`processHeaders(headers, event);`
`334`	`334`	`processExtensions(cefString, extensionStart, event);`
`335`		`- if (event.getExtensions().isEmpty() == false) {`
`336`		`- event.addCefMapping("extensions", event.getExtensions());`
`337`		`- }`
`338`	`335`	`return event;`
`339`	`336`	`} else {`
`340`	`337`	`throw new IllegalArgumentException("Invalid CEF format");`
`@@ -392,6 +389,10 @@ private void processExtensions(String cefString, int extensionStart, CEFEvent ev`
`392`	`389`	`event.addExtension(entry.getKey(), entry.getValue());`
`393`	`390`	`}`
`394`	`391`	`}`
	`392`	`+ // Bang the extensions into the cef mappings`
	`393`	`+ if (event.getExtensions().isEmpty() == false) {`
	`394`	`+ event.addCefMapping("extensions", event.getExtensions());`
	`395`	`+ }`
`395`	`396`	`}`
`396`	`397`
`397`	`398`	`private static Map<String, String> parseExtensions(String extensionString) {`