Skip to content

o365: Fix the handling of duplicated field QueryTime #11499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 24, 2024
Merged

o365: Fix the handling of duplicated field QueryTime #11499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e94249
Fix the handling of duplicated field QueryTime
chemamartinez Oct 23, 2024
4c836ca
Update changelog
chemamartinez Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/o365/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "2.6.5"
changes:
- description: Fix the processing of duplicated QueryTime in Data field.
type: bugfix
link: https://github.com/elastic/integrations/pull/11499
- version: "2.6.4"
changes:
- description: Remove in-program template snippets and format CEL code.
Expand Down
43 changes: 43 additions & 0 deletions ...ages/o365/data_stream/audit/_dev/test/pipeline/test-data-duplicated-querytime-events.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"events": [
{
"event": {
"original": "{\"AlertEntityId\":\"[email protected]\",\"AlertId\":\"5ba6e029-8b6e-13bd-b800-08d7b180173c\",\"AlertLinks\":[{\"AlertLinkHref\":\"http://example.net/alert\"},{\"AlertLinkHref\":\"http://example.net/info\"}],\"AlertType\":\"System\",\"Category\":\"AccessGovernance\",\"Comments\":\"New alert\",\"CreationTime\":\"2020-02-14T19:00:00\",\"Data\":\"{\\\"etype\\\":\\\"User\\\",\\\"eid\\\":\\\"[email protected]\\\",\\\"tid\\\":\\\"b86ab9d4-fcf1-4b11-8a06-7a8f91b47fbd\\\",\\\"ts\\\":\\\"2020-02-14T18:54:45.0000000Z\\\",\\\"te\\\":\\\"2020-02-14T18:54:45.0000000Z\\\",\\\"op\\\":\\\"GrantAdminPermission\\\",\\\"tdc\\\":\\\"1\\\",\\\"suid\\\":\\\"[email protected]\\\",\\\"ut\\\":\\\"Admin\\\",\\\"lon\\\":\\\"GrantAdminPermission\\\",\\\"Entities\\\":[{\\\"QueryTime\\\":\\\"2024-09-30T06:16:41.7320497Z\\\",\\\"QueryTime\":\\\"9/30/2024 6:16:41 AM\\\"}]}\",\"EntityType\":\"User\",\"Id\":\"448854d7-81f6-4a06-d31a-08d7b1c1fb2f\",\"Name\":\"Elevation of Exchange admin privilege\",\"ObjectId\":\"[email protected]\",\"Operation\":\"AlertEntityGenerated\",\"OrganizationId\":\"b86ab9d4-fcf1-4b11-8a06-7a8f91b47fbd\",\"PolicyId\":\"17d51759-88e1-40c1-8df3-20bcf2e43057\",\"RecordType\":64,\"ResultStatus\":\"Succeeded\",\"Severity\":\"Low\",\"Source\":\"Office 365 Security \\u0026 Compliance\",\"Status\":\"Active\",\"UserId\":\"SecurityComplianceAlerts\",\"UserKey\":\"SecurityComplianceAlerts\",\"UserType\":4,\"Version\":1,\"Workload\":\"SecurityComplianceCenter\"}"
},
"o365audit": {
"AlertEntityId": "[email protected]",
"AlertId": "5ba6e029-8b6e-13bd-b800-08d7b180173c",
"AlertLinks": [
{
"AlertLinkHref": "http://example.net/alert"
},
{
"AlertLinkHref": "http://example.net/info"
}
],
"AlertType": "System",
"Category": "AccessGovernance",
"Comments": "New alert",
"CreationTime": "2020-02-14T19:00:00",
"Data": "{\"etype\":\"User\",\"eid\":\"[email protected]\",\"tid\":\"b86ab9d4-fcf1-4b11-8a06-7a8f91b47fbd\",\"ts\":\"2020-02-14T18:54:45.0000000Z\",\"te\":\"2020-02-14T18:54:45.0000000Z\",\"op\":\"GrantAdminPermission\",\"tdc\":\"1\",\"suid\":\"[email protected]\",\"ut\":\"Admin\",\"lon\":\"GrantAdminPermission\",\"Entities\":[{\"QueryTime\":\"2024-09-30T06:16:41.7320497Z\",\"QueryTime\":\"9/30/2024 6:16:41 AM\"}]}",
"EntityType": "User",
"Id": "448854d7-81f6-4a06-d31a-08d7b1c1fb2f",
"Name": "Elevation of Exchange admin privilege",
"ObjectId": "[email protected]",
"Operation": "AlertEntityGenerated",
"OrganizationId": "b86ab9d4-fcf1-4b11-8a06-7a8f91b47fbd",
"PolicyId": "17d51759-88e1-40c1-8df3-20bcf2e43057",
"RecordType": 64,
"ResultStatus": "Succeeded",
"Severity": "Low",
"Source": "Office 365 Security \u0026 Compliance",
"Status": "Active",
"UserId": "SecurityComplianceAlerts",
"UserKey": "SecurityComplianceAlerts",
"UserType": 4,
"Version": 1,
"Workload": "SecurityComplianceCenter"
}
}
]
}
100 changes: 100 additions & 0 deletions ..._stream/audit/_dev/test/pipeline/test-data-duplicated-querytime-events.json-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
{
"expected": [
{
"@timestamp": "2020-02-14T19:00:00.000Z",
"ecs": {
"version": "8.11.0"
},
"event": {
"action": "AlertEntityGenerated",
"category": [
"web"
],
"code": "AirInvestigation",
"id": "448854d7-81f6-4a06-d31a-08d7b1c1fb2f",
"kind": "event",
"original": "{\"AlertEntityId\":\"[email protected]\",\"AlertId\":\"5ba6e029-8b6e-13bd-b800-08d7b180173c\",\"AlertLinks\":[{\"AlertLinkHref\":\"http://example.net/alert\"},{\"AlertLinkHref\":\"http://example.net/info\"}],\"AlertType\":\"System\",\"Category\":\"AccessGovernance\",\"Comments\":\"New alert\",\"CreationTime\":\"2020-02-14T19:00:00\",\"Data\":\"{\\\"etype\\\":\\\"User\\\",\\\"eid\\\":\\\"[email protected]\\\",\\\"tid\\\":\\\"b86ab9d4-fcf1-4b11-8a06-7a8f91b47fbd\\\",\\\"ts\\\":\\\"2020-02-14T18:54:45.0000000Z\\\",\\\"te\\\":\\\"2020-02-14T18:54:45.0000000Z\\\",\\\"op\\\":\\\"GrantAdminPermission\\\",\\\"tdc\\\":\\\"1\\\",\\\"suid\\\":\\\"[email protected]\\\",\\\"ut\\\":\\\"Admin\\\",\\\"lon\\\":\\\"GrantAdminPermission\\\",\\\"Entities\\\":[{\\\"QueryTime\\\":\\\"2024-09-30T06:16:41.7320497Z\\\",\\\"QueryTime\":\\\"9/30/2024 6:16:41 AM\\\"}]}\",\"EntityType\":\"User\",\"Id\":\"448854d7-81f6-4a06-d31a-08d7b1c1fb2f\",\"Name\":\"Elevation of Exchange admin privilege\",\"ObjectId\":\"[email protected]\",\"Operation\":\"AlertEntityGenerated\",\"OrganizationId\":\"b86ab9d4-fcf1-4b11-8a06-7a8f91b47fbd\",\"PolicyId\":\"17d51759-88e1-40c1-8df3-20bcf2e43057\",\"RecordType\":64,\"ResultStatus\":\"Succeeded\",\"Severity\":\"Low\",\"Source\":\"Office 365 Security \\u0026 Compliance\",\"Status\":\"Active\",\"UserId\":\"SecurityComplianceAlerts\",\"UserKey\":\"SecurityComplianceAlerts\",\"UserType\":4,\"Version\":1,\"Workload\":\"SecurityComplianceCenter\"}",
"outcome": "success",
"provider": "SecurityComplianceCenter",
"type": [
"info"
]
},
"host": {
"id": "b86ab9d4-fcf1-4b11-8a06-7a8f91b47fbd",
"name": "mytenant.onmicrosoft.com"
},
"o365": {
"audit": {
"AlertEntityId": "[email protected]",
"AlertId": "5ba6e029-8b6e-13bd-b800-08d7b180173c",
"AlertLinks": [
"http://example.net/alert",
"http://example.net/info"
],
"AlertType": "System",
"Category": "AccessGovernance",
"Comments": "New alert",
"CreationTime": "2020-02-14T19:00:00",
"Data": {
"eid": "[email protected]",
"etype": "User",
"flattened": {
"Entities": [
{
"QueryTime": "2024-09-30T06:16:41.7320497Z"
}
],
"eid": "[email protected]",
"etype": "User",
"lon": "GrantAdminPermission",
"op": "GrantAdminPermission",
"suid": "[email protected]",
"tdc": "1",
"te": "2020-02-14T18:54:45.0000000Z",
"tid": "b86ab9d4-fcf1-4b11-8a06-7a8f91b47fbd",
"ts": "2020-02-14T18:54:45.0000000Z",
"ut": "Admin"
},
"lon": "GrantAdminPermission",
"op": "GrantAdminPermission",
"suid": "[email protected]",
"tdc": "1",
"te": "2020-02-14T18:54:45.000Z",
"tid": "b86ab9d4-fcf1-4b11-8a06-7a8f91b47fbd",
"ts": "2020-02-14T18:54:45.000Z",
"ut": "Admin"
},
"EntityType": "User",
"Name": "Elevation of Exchange admin privilege",
"ObjectId": "[email protected]",
"PolicyId": "17d51759-88e1-40c1-8df3-20bcf2e43057",
"RecordType": "64",
"ResultStatus": "Succeeded",
"Severity": "Low",
"Source": "Office 365 Security & Compliance",
"Status": "Active",
"UserId": "SecurityComplianceAlerts",
"UserKey": "SecurityComplianceAlerts",
"UserType": "4",
"Version": "1"
}
},
"organization": {
"id": "b86ab9d4-fcf1-4b11-8a06-7a8f91b47fbd",
"name": "mytenant.onmicrosoft.com"
},
"related": {
"user": [
"[email protected]"
]
},
"tags": [
"preserve_original_event"
],
"user": {
"id": "SecurityComplianceAlerts"
}
}
]
}
11 changes: 11 additions & 0 deletions packages/o365/data_stream/audit/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,9 +1154,20 @@ processors:
field: o365audit.YammerNetworkId
type: string
ignore_missing: true
- gsub:
field: o365audit.Data
pattern: ',\"QueryTime\":\"[0-9\/]+\s[0-9]+:[0-9]+:[0-9]+\s[AP]M\"|\"QueryTime\":\"[0-9\/]+\s[0-9]+:[0-9]+:[0-9]+\s[AP]M\",'
replacement: ""
if: ctx.o365audit?.containsKey('Data') == true && ctx.o365audit?.RecordType == '64'
tag: gsub_remove_duplicated_querytime
- json:
field: o365audit.Data
if: ctx.o365audit?.containsKey('Data') == true
on_failure:
- remove:
field: o365audit.Data
ignore_missing: true
description: remove_malformed_data
- rename:
field: o365audit.Data
target_field: o365audit.Data.flattened
Expand Down
2 changes: 1 addition & 1 deletion packages/o365/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: o365
title: Microsoft Office 365
version: "2.6.4"
version: "2.6.5"
description: Collect logs from Microsoft Office 365 with Elastic Agent.
type: integration
format_version: "3.0.2"
Expand Down