Skip to content
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

[Filebeat] Fix date parsing in GSuite/Google Workspace modules #24696

Merged
merged 2 commits into from
Mar 23, 2021
Merged

[Filebeat] Fix date parsing in GSuite/Google Workspace modules #24696

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
8f5b173
Fix date parsing in GSuite/login fileset
andrewkroh Mar 22, 2021
a3f22c0
Apply fix to google_workspace
andrewkroh Mar 23, 2021
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
4 changes: 1 addition & 3 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,15 +373,13 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix Cisco ASA parser for message 722051. {pull}24410[24410]
- Fix `google_workspace` pagination. {pull}24668[24668]
- Fix Cisco ASA parser for message 302022. {issue}24405[24405] {pull}24697[24697]
- Fix date parsing in GSuite/login fileset. {issue}24694[24694]

*Heartbeat*

- Fixed excessive memory usage introduced in 7.5 due to over-allocating memory for HTTP checks. {pull}15639[15639]
- Fixed TCP TLS checks to properly validate hostnames, this broke in 7.x and only worked for IP SANs. {pull}17549[17549]

*Heartbeat*


*Journalbeat*


Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/module/google_workspace/login/config/pipeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ var login = (function () {
// this is a timestamp in microseconds
case "timestamp":
var millis = p.intValue / 1000;
evt.Put("event.start", new Date(millis).toUTCString());
evt.Put("event.start", new Date(millis));
break;
case "challenge_status":
if (p.value === "Challenge Passed") {
Expand Down
225 changes: 225 additions & 0 deletions x-pack/filebeat/module/google_workspace/login/test/login-test.json.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,174 @@
"user.target.email": "[email protected]",
"user.target.name": "foo"
},
{
"@timestamp": "2020-10-02T15:00:00.000Z",
"event.action": "suspicious_login",
"event.category": [
"authentication"
],
"event.dataset": "google_workspace.login",
"event.id": "1",
"event.module": "google_workspace",
"event.original": "{\"kind\":\"admin#reports#activity\",\"id\":{\"time\":\"2020-10-02T15:00:00Z\",\"uniqueQualifier\":1,\"applicationName\":\"login\",\"customerId\":\"1\"},\"actor\":{\"callerType\":\"USER\",\"email\":\"[email protected]\",\"profileId\":1},\"ownerDomain\":\"elastic.com\",\"ipAddress\":\"98.235.162.24\",\"events\":{\"type\":\"account_warning\",\"name\":\"suspicious_login\",\"parameters\":[{\"name\":\"affected_email_address\",\"value\":\"[email protected]\"},{\"name\":\"login_timestamp\",\"intValue\":1593695305123456}]}}",
"event.provider": "login",
"event.start": "2020-07-02T13:08:25.123Z",
"event.type": [
"info"
],
"fileset.name": "login",
"google_workspace.actor.type": "USER",
"google_workspace.event.type": "account_warning",
"google_workspace.kind": "admin#reports#activity",
"google_workspace.login.affected_email_address": "[email protected]",
"google_workspace.organization.domain": "elastic.com",
"input.type": "log",
"log.offset": 406,
"organization.id": "1",
"related.ip": [
"98.235.162.24"
],
"related.user": [
"foo"
],
"service.type": "google_workspace",
"source.as.number": 7922,
"source.as.organization.name": "Comcast Cable Communications, LLC",
"source.geo.city_name": "State College",
"source.geo.continent_name": "North America",
"source.geo.country_iso_code": "US",
"source.geo.country_name": "United States",
"source.geo.location.lat": 40.7957,
"source.geo.location.lon": -77.8618,
"source.geo.region_iso_code": "US-PA",
"source.geo.region_name": "Pennsylvania",
"source.ip": "98.235.162.24",
"source.user.domain": "bar.com",
"source.user.email": "[email protected]",
"source.user.id": "1",
"source.user.name": "foo",
"tags": [
"forwarded"
],
"user.domain": "bar.com",
"user.id": "1",
"user.name": "foo",
"user.target.domain": "elastic.co",
"user.target.email": "[email protected]",
"user.target.name": "foo"
},
{
"@timestamp": "2020-10-02T15:00:00.000Z",
"event.action": "suspicious_login_less_secure_app",
"event.category": [
"authentication"
],
"event.dataset": "google_workspace.login",
"event.id": "1",
"event.module": "google_workspace",
"event.original": "{\"kind\":\"admin#reports#activity\",\"id\":{\"time\":\"2020-10-02T15:00:00Z\",\"uniqueQualifier\":1,\"applicationName\":\"login\",\"customerId\":\"1\"},\"actor\":{\"callerType\":\"USER\",\"email\":\"[email protected]\",\"profileId\":1},\"ownerDomain\":\"elastic.com\",\"ipAddress\":\"98.235.162.24\",\"events\":{\"type\":\"account_warning\",\"name\":\"suspicious_login_less_secure_app\",\"parameters\":[{\"name\":\"affected_email_address\",\"value\":\"[email protected]\"},{\"name\":\"login_timestamp\",\"intValue\":1593695305123456}]}}",
"event.provider": "login",
"event.start": "2020-07-02T13:08:25.123Z",
"event.type": [
"info"
],
"fileset.name": "login",
"google_workspace.actor.type": "USER",
"google_workspace.event.type": "account_warning",
"google_workspace.kind": "admin#reports#activity",
"google_workspace.login.affected_email_address": "[email protected]",
"google_workspace.organization.domain": "elastic.com",
"input.type": "log",
"log.offset": 853,
"organization.id": "1",
"related.ip": [
"98.235.162.24"
],
"related.user": [
"foo"
],
"service.type": "google_workspace",
"source.as.number": 7922,
"source.as.organization.name": "Comcast Cable Communications, LLC",
"source.geo.city_name": "State College",
"source.geo.continent_name": "North America",
"source.geo.country_iso_code": "US",
"source.geo.country_name": "United States",
"source.geo.location.lat": 40.7957,
"source.geo.location.lon": -77.8618,
"source.geo.region_iso_code": "US-PA",
"source.geo.region_name": "Pennsylvania",
"source.ip": "98.235.162.24",
"source.user.domain": "bar.com",
"source.user.email": "[email protected]",
"source.user.id": "1",
"source.user.name": "foo",
"tags": [
"forwarded"
],
"user.domain": "bar.com",
"user.id": "1",
"user.name": "foo",
"user.target.domain": "elastic.co",
"user.target.email": "[email protected]",
"user.target.name": "foo"
},
{
"@timestamp": "2020-10-02T15:00:00.000Z",
"event.action": "suspicious_programmatic_login",
"event.category": [
"authentication"
],
"event.dataset": "google_workspace.login",
"event.id": "1",
"event.module": "google_workspace",
"event.original": "{\"kind\":\"admin#reports#activity\",\"id\":{\"time\":\"2020-10-02T15:00:00Z\",\"uniqueQualifier\":1,\"applicationName\":\"login\",\"customerId\":\"1\"},\"actor\":{\"callerType\":\"USER\",\"email\":\"[email protected]\",\"profileId\":1},\"ownerDomain\":\"elastic.com\",\"ipAddress\":\"98.235.162.24\",\"events\":{\"type\":\"account_warning\",\"name\":\"suspicious_programmatic_login\",\"parameters\":[{\"name\":\"affected_email_address\",\"value\":\"[email protected]\"},{\"name\":\"login_timestamp\",\"intValue\":1593695305123456}]}}",
"event.provider": "login",
"event.start": "2020-07-02T13:08:25.123Z",
"event.type": [
"info"
],
"fileset.name": "login",
"google_workspace.actor.type": "USER",
"google_workspace.event.type": "account_warning",
"google_workspace.kind": "admin#reports#activity",
"google_workspace.login.affected_email_address": "[email protected]",
"google_workspace.organization.domain": "elastic.com",
"input.type": "log",
"log.offset": 1316,
"organization.id": "1",
"related.ip": [
"98.235.162.24"
],
"related.user": [
"foo"
],
"service.type": "google_workspace",
"source.as.number": 7922,
"source.as.organization.name": "Comcast Cable Communications, LLC",
"source.geo.city_name": "State College",
"source.geo.continent_name": "North America",
"source.geo.country_iso_code": "US",
"source.geo.country_name": "United States",
"source.geo.location.lat": 40.7957,
"source.geo.location.lon": -77.8618,
"source.geo.region_iso_code": "US-PA",
"source.geo.region_name": "Pennsylvania",
"source.ip": "98.235.162.24",
"source.user.domain": "bar.com",
"source.user.email": "[email protected]",
"source.user.id": "1",
"source.user.name": "foo",
"tags": [
"forwarded"
],
"user.domain": "bar.com",
"user.id": "1",
"user.name": "foo",
"user.target.domain": "elastic.co",
"user.target.email": "[email protected]",
"user.target.name": "foo"
},
{
"@timestamp": "2020-10-02T15:00:00.000Z",
"event.action": "account_disabled_generic",
Expand Down Expand Up @@ -223,6 +391,63 @@
"user.target.email": "[email protected]",
"user.target.name": "foo"
},
{
"@timestamp": "2020-10-02T15:00:00.000Z",
"event.action": "account_disabled_hijacked",
"event.category": [
"authentication"
],
"event.dataset": "google_workspace.login",
"event.id": "1",
"event.module": "google_workspace",
"event.original": "{\"kind\":\"admin#reports#activity\",\"id\":{\"time\":\"2020-10-02T15:00:00Z\",\"uniqueQualifier\":1,\"applicationName\":\"login\",\"customerId\":\"1\"},\"actor\":{\"callerType\":\"USER\",\"email\":\"[email protected]\",\"profileId\":1},\"ownerDomain\":\"elastic.com\",\"ipAddress\":\"98.235.162.24\",\"events\":{\"type\":\"account_warning\",\"name\":\"account_disabled_hijacked\",\"parameters\":[{\"name\":\"affected_email_address\",\"value\":\"[email protected]\"},{\"name\":\"login_timestamp\",\"intValue\":1593695305123456}]}}",
"event.provider": "login",
"event.start": "2020-07-02T13:08:25.123Z",
"event.type": [
"user",
"change"
],
"fileset.name": "login",
"google_workspace.actor.type": "USER",
"google_workspace.event.type": "account_warning",
"google_workspace.kind": "admin#reports#activity",
"google_workspace.login.affected_email_address": "[email protected]",
"google_workspace.organization.domain": "elastic.com",
"input.type": "log",
"log.offset": 2992,
"organization.id": "1",
"related.ip": [
"98.235.162.24"
],
"related.user": [
"foo"
],
"service.type": "google_workspace",
"source.as.number": 7922,
"source.as.organization.name": "Comcast Cable Communications, LLC",
"source.geo.city_name": "State College",
"source.geo.continent_name": "North America",
"source.geo.country_iso_code": "US",
"source.geo.country_name": "United States",
"source.geo.location.lat": 40.7957,
"source.geo.location.lon": -77.8618,
"source.geo.region_iso_code": "US-PA",
"source.geo.region_name": "Pennsylvania",
"source.ip": "98.235.162.24",
"source.user.domain": "bar.com",
"source.user.email": "[email protected]",
"source.user.id": "1",
"source.user.name": "foo",
"tags": [
"forwarded"
],
"user.domain": "bar.com",
"user.id": "1",
"user.name": "foo",
"user.target.domain": "elastic.co",
"user.target.email": "[email protected]",
"user.target.name": "foo"
},
{
"@timestamp": "2020-10-02T15:00:00.000Z",
"event.action": "gov_attack_warning",
Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/module/gsuite/login/config/pipeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ var login = (function () {
// this is a timestamp in microseconds
case "timestamp":
var millis = p.intValue / 1000;
evt.Put("event.start", new Date(millis).toUTCString());
evt.Put("event.start", new Date(millis));
break;
case "challenge_status":
if (p.value === "Challenge Passed") {
Expand Down
Loading