@@ -344,30 +344,8 @@ public void testEqualsInMessage() {
344344 source .put ("message" , message );
345345 document = new IngestDocument ("index" , "id" , 1L , null , null , source );
346346 CefProcessor processor = new CefProcessor ("tag" , "description" , "message" , "cef" , false , true , null );
347- processor .execute (document );
348- assertMapsEqual (
349- document .getSource (),
350- Map .ofEntries (
351- entry (
352- "cef" ,
353- Map .ofEntries (
354- entry ("version" , "0" ),
355- entry (
356- "device" ,
357- Map .of ("vendor" , "security" , "product" , "threatmanager" , "version" , "1.0" , "event_class_id" , "100" )
358- ),
359- entry ("name" , "trojan successfully stopped" ),
360- entry ("severity" , "10" ),
361- entry ("extensions" , Map .of ("moo" , "this =has = equals=" ))
362- )
363- ),
364- entry ("event" , Map .of ("code" , "100" )),
365- entry ("observer" , Map .of ("product" , "threatmanager" , "vendor" , "security" , "version" , "1.0" )),
366- entry ("destination" , Map .of ("ip" , "12.121.122.82" )),
367- entry ("source" , Map .of ("port" , 1232 )),
368- entry ("message" , message )
369- )
370- );
347+ Exception e = expectThrows (IllegalArgumentException .class , () -> processor .execute (document ));
348+ assertThat (e .getMessage (), equalTo ("CEF extensions contain unescaped equals sign" ));
371349 }
372350
373351 public void testEscapesInExtension () {
@@ -408,34 +386,8 @@ public void testMalformedExtensionEscape() {
408386 source .put ("message" , message );
409387 document = new IngestDocument ("index" , "id" , 1L , null , null , source );
410388 CefProcessor processor = new CefProcessor ("tag" , "description" , "message" , "cef" , false , true , null );
411- processor .execute (document );
412- assertMapsEqual (
413- document .getSource (),
414- Map .ofEntries (
415- entry (
416- "cef" ,
417- Map .ofEntries (
418- entry ("version" , "0" ),
419- entry (
420- "device" ,
421- Map .of ("vendor" , "FooBar" , "product" , "Web Gateway" , "version" , "1.2.3.45.67" , "event_class_id" , "200" )
422- ),
423- entry ("name" , "Success" ),
424- entry ("severity" , "2" ),
425- entry ("extensions" , Map .of ("deviceCustomString1Label" , "Foo Bar" , "deviceEventCategory" , "Access Log" ))
426- )
427- ),
428- entry ("event" , Map .of ("code" , "200" )),
429- entry ("observer" , Map .of ("product" , "Web Gateway" , "vendor" , "FooBar" , "version" , "1.2.3.45.67" )),
430- entry ("@timestamp" , ZonedDateTime .parse ("2018-09-07T14:50:39Z" )),
431- entry ("destination" , Map .of ("ip" , "1.1.1.1" , "domain" , "foo.example.com" )),
432- entry ("source" , Map .of ("ip" , "2.2.2.2" , "user" , Map .of ("name" , "redacted" ))),
433- entry ("http" , Map .of ("request" , Map .of ("method" , "POST" ))),
434- entry ("url" , Map .of ("original" , "'https://foo.example.com/bar/bingo/1'" )),
435- entry (
"user_agent" ,
Map .
of (
"original" ,
"'Foo-Bar/2018.1.7; =Email:[email protected] ; Guid:test='" )),
436- entry ("message" , message )
437- )
438- );
389+ Exception e = expectThrows (IllegalArgumentException .class , () -> processor .execute (document ));
390+ assertThat (e .getMessage (), equalTo ("CEF extensions contain unescaped equals sign" ));
439391 }
440392
441393 public void testMultipleMalformedExtensionValues () {
@@ -445,28 +397,8 @@ public void testMultipleMalformedExtensionValues() {
445397 source .put ("message" , message );
446398 document = new IngestDocument ("index" , "id" , 1L , null , null , source );
447399 CefProcessor processor = new CefProcessor ("tag" , "description" , "message" , "cef" , false , true , null );
448- processor .execute (document );
449- assertMapsEqual (
450- document .getSource (),
451- Map .ofEntries (
452- entry (
453- "cef" ,
454- Map .ofEntries (
455- entry ("version" , "0" ),
456- entry (
457- "device" ,
458- Map .of ("vendor" , "vendor" , "product" , "product" , "version" , "version" , "event_class_id" , "event_id" )
459- ),
460- entry ("name" , "name" ),
461- entry ("severity" , "Very-High" ),
462- entry ("extensions" , Map .of ("id" , "=old_id" , "user" , "root" , "angle" , "106.7<=180" , "error" , "Failed because" ))
463- )
464- ),
465- entry ("event" , Map .of ("code" , "event_id" )),
466- entry ("observer" , Map .of ("product" , "product" , "vendor" , "vendor" , "version" , "version" )),
467- entry ("message" , "Hello World" )
468- )
469- );
400+ Exception e = expectThrows (IllegalArgumentException .class , () -> processor .execute (document ));
401+ assertThat (e .getMessage (), equalTo ("CEF extensions contain unescaped equals sign" ));
470402 }
471403
472404 public void testPaddedMessage () {
0 commit comments