From 4bd2a987d605a5c72cb67623c5443dddd79c88ab Mon Sep 17 00:00:00 2001
From: Marius Iversen <marius.iversen@elastic.co>
Date: Tue, 5 Sep 2023 14:59:06 +0200
Subject: [PATCH] [Filebeat][Crowdstrike] Adding fix to ingest pipeline for
 command line array handling (#36496)

* [Filebeat][Crowdstrike] Adding fix to ingest pipeline for command line args array handling

* changelog PR link update

* adding missing semicolon

* adding testdata to test the process commandline arg being an empty string
---
 CHANGELOG.next.asciidoc                               |  1 +
 .../module/crowdstrike/falcon/ingest/pipeline.yml     |  2 +-
 .../module/crowdstrike/falcon/test/falcon-events.log  |  2 +-
 .../falcon/test/falcon-events.log-expected.json       | 11 ++++++-----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index d95e5fbb5479..8e38ea153add 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -102,6 +102,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - Fix Filebeat Cisco module with missing escape character {issue}36325[36325] {pull}36326[36326]
 - Fix panic when redact option is not provided to CEL input. {issue}36387[36387] {pull}36388[36388]
 - Remove 'onFilteredOut' and 'onDroppedOnPublish' callback logs {issue}36299[36299] {pull}36399[36399]
+- Added a fix for Crowdstrike pipeline handling process arrays {pull}36496[36496]
 
 *Heartbeat*
 
diff --git a/x-pack/filebeat/module/crowdstrike/falcon/ingest/pipeline.yml b/x-pack/filebeat/module/crowdstrike/falcon/ingest/pipeline.yml
index 9aeb653b4888..94d312d7e116 100644
--- a/x-pack/filebeat/module/crowdstrike/falcon/ingest/pipeline.yml
+++ b/x-pack/filebeat/module/crowdstrike/falcon/ingest/pipeline.yml
@@ -281,7 +281,7 @@ processors:
           commandLine = commandLine.trim();
 
           if (commandLine != "") {
-            def args = Arrays.asList(/ /.split(commandLine));
+            def args = new ArrayList(Arrays.asList(/ /.split(commandLine)));
             args.removeIf(arg -> arg == "");
 
             ctx['process'] = new HashMap();
diff --git a/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-events.log b/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-events.log
index 0980bf0fb601..f7cb78602c8f 100644
--- a/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-events.log
+++ b/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-events.log
@@ -19,7 +19,7 @@
         "SeverityName": "High",
         "FileName": "explorer.exe",
         "FilePath": "\\Device\\HarddiskVolume1\\Windows",
-        "CommandLine": "C:\\Windows\\Explorer.EXE",
+        "CommandLine": "C:\\Windows\\Explorer.EXE  --test",
         "SHA256String": "6a671b92a69755de6fd063fcbe4ba926d83b49f78c42dbaeed8cdb6bbc57576a",
         "MD5String": "ac4c51eb24aa95b77f705ab159189e24",
         "MachineDomain": "CORP-DOMAIN",
diff --git a/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-events.log-expected.json b/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-events.log-expected.json
index 0756dfac4772..9ed507981435 100644
--- a/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-events.log-expected.json
+++ b/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-events.log-expected.json
@@ -1,6 +1,6 @@
 [
     {
-        "crowdstrike.event.CommandLine": "C:\\Windows\\Explorer.EXE",
+        "crowdstrike.event.CommandLine": "C:\\Windows\\Explorer.EXE  --test",
         "crowdstrike.event.ComputerName": "alice-laptop",
         "crowdstrike.event.DetectDescription": "Terminated a process related to the deletion of backups, which is often indicative of ransomware activity.",
         "crowdstrike.event.DetectId": "ldt:ec86abd353824e96765ecbe18eb4f0b4:38655257584",
@@ -67,9 +67,10 @@
         "log.offset": 0,
         "message": "Terminated a process related to the deletion of backups, which is often indicative of ransomware activity.",
         "process.args": [
-            "C:\\Windows\\Explorer.EXE"
+            "C:\\Windows\\Explorer.EXE",
+            "--test"
         ],
-        "process.command_line": "C:\\Windows\\Explorer.EXE",
+        "process.command_line": "C:\\Windows\\Explorer.EXE  --test",
         "process.executable": "C:\\Windows\\Explorer.EXE",
         "process.name": "explorer.exe",
         "process.pid": 38684386611,
@@ -126,7 +127,7 @@
         "log.flags": [
             "multiline"
         ],
-        "log.offset": 2063,
+        "log.offset": 2071,
         "message": "Incident score 1.2",
         "service.type": "crowdstrike",
         "tags": [
@@ -169,7 +170,7 @@
         "log.flags": [
             "multiline"
         ],
-        "log.offset": 2579,
+        "log.offset": 2587,
         "message": "quarantined_file_update",
         "related.user": [
             "Crowdstrike"