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

[7.x](backport #26509) [Winlogbeat] ECS 1.9 user.changes.*, user.effective.*, user.target.* #28525

Merged
merged 1 commit into from
Oct 19, 2021
Merged

[7.x](backport #26509) [Winlogbeat] ECS 1.9 user.changes.*, user.effective.*, user.target.* #28525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
*Winlogbeat*

- Tolerate faults when Windows Event Log session is interrupted {issue}27947[27947] {pull}28191[28191]
- Add ECS 1.9 new users fields {pull}26509[26509]

*Functionbeat*

Expand Down
99 changes: 83 additions & 16 deletions x-pack/winlogbeat/module/security/config/winlogbeat-security.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1907,14 +1907,14 @@ var security = (function () {

var copyTargetUser = function(evt) {
var targetUserId = evt.Get("winlog.event_data.TargetUserSid");
if (!targetUserId) targetUserId = evt.Get("winlog.event_data.TargetSid");
if (targetUserId) {
if (evt.Get("user.id")) evt.Put("user.target.id", targetUserId);
else evt.Put("user.id", targetUserId);
}

var targetUserName = evt.Get("winlog.event_data.TargetUserName");
if (targetUserName) {
if (/.@*/.test(targetUserName)) {
if (targetUserName.indexOf('@')>0) {
targetUserName = targetUserName.split('@')[0];
}

Expand All @@ -1930,6 +1930,71 @@ var security = (function () {
}
}

var removeIfEmptyOrHyphen = function(evt, key) {
var val = evt.Get(key);
if (!val || val === "-") {
evt.Delete(key);
return true;
}
return false;
}

var copyTargetUserToEffective = new processor.Chain()
.Convert({
fields: [
{from: "winlog.event_data.TargetUserSid", to: "user.effective.id"},
{from: "winlog.event_data.TargetUserName", to: "user.effective.name"},
{from: "winlog.event_data.TargetDomainName", to: "user.effective.domain"},
],
ignore_missing: true,
})
.Add(function(evt) {
var user = evt.Get("winlog.event_data.TargetUserName");
if (user) {
if (user.indexOf('@')>0) {
user = user.split('@')[0];
evt.Put('user.effective.name', user);
}
}
})
.Add(function(evt) {
if (!removeIfEmptyOrHyphen(evt, "user.effective.name")) {
evt.AppendTo("related.user", evt.Get("user.effective.name"));
}
removeIfEmptyOrHyphen(evt, "user.effective.domain");
removeIfEmptyOrHyphen(evt, "user.effective.id");
})
.Build();

var copyTargetUserToTarget = new processor.Chain()
.Convert({
fields: [
{from: "winlog.event_data.TargetSid", to: "user.target.id"},
{from: "winlog.event_data.TargetUserName", to: "user.target.name"},
{from: "winlog.event_data.TargetDomainName", to: "user.target.domain"},
],
ignore_missing: true,
})
.Add(function(evt) {
var user = evt.Get("winlog.event_data.TargetUserName");
if (user) {
if (user.indexOf('@')>0) {
user = user.split('@')[0];
evt.Put('user.target.name', user);
}
evt.AppendTo('related.user', user);
}
})
.Add(function(evt) {
if (!removeIfEmptyOrHyphen(evt, "user.target.name")) {
evt.AppendTo("related.user", evt.Get("user.target.name"));
}
removeIfEmptyOrHyphen(evt, "user.target.domain");
removeIfEmptyOrHyphen(evt, "user.target.id");
})
.Build();


var copyMemberToUser = function(evt) {
var member = evt.Get("winlog.event_data.MemberName");
if (!member) {
Expand All @@ -1940,6 +2005,11 @@ var security = (function () {

evt.AppendTo("related.user", userName);
evt.Put("user.target.name", userName);

var domainName = member.split(',')[3];
if (domainName) {
evt.Put("user.target.domain", domainName.replace('DC=', '').replace('dc=', ''));
}
}

var copyTargetUserToGroup = new processor.Chain()
Expand Down Expand Up @@ -2130,10 +2200,11 @@ var security = (function () {

// Handles both 4648
var event4648 = new processor.Chain()
.Add(copyTargetUser)
.Add(copySubjectUser)
.Add(copySubjectUserLogonId)
.Add(renameCommonAuthFields)
.Add(addEventFields)
.Add(copyTargetUserToEffective)
.Add(function(evt) {
var user = evt.Get("winlog.event_data.SubjectUserName");
if (user) {
Expand Down Expand Up @@ -2173,16 +2244,8 @@ var security = (function () {
.Add(copySubjectUser)
.Add(copySubjectUserLogonId)
.Add(renameNewProcessFields)
.Add(copyTargetUserToEffective)
.Add(addEventFields)
.Add(function(evt) {
var user = evt.Get("winlog.event_data.TargetUserName");
if (user) {
var res = /^-$/.test(user);
if (!res) {
evt.AppendTo('related.user', user);
}
}
})
.Build();

var event4689 = new processor.Chain()
Expand All @@ -2206,10 +2269,7 @@ var security = (function () {
.Add(renameCommonAuthFields)
.Add(addUACDescription)
.Add(addEventFields)
.Add(function(evt) {
var user = evt.Get("winlog.event_data.TargetUserName");
evt.AppendTo('related.user', user);
})
.Add(copyTargetUserToTarget)
.Build();

var userRenamed = new processor.Chain()
Expand All @@ -2221,6 +2281,12 @@ var security = (function () {
evt.AppendTo('related.user', userNew);
var userOld = evt.Get("winlog.event_data.OldTargetUserName");
evt.AppendTo('related.user', userOld);
if (userOld) {
evt.Put('user.target.name', userOld);
}
if (userNew) {
evt.Put('user.changes.name', userNew);
}
})
.Build();

Expand Down Expand Up @@ -2359,6 +2425,7 @@ var security = (function () {
.Add(copySubjectUserLogonId)
.Add(renameCommonAuthFields)
.Add(addEventFields)
.Add(copyTargetUserToTarget)
.Add(function(evt) {
var oldSd = evt.Get("winlog.event_data.OldSd");
var newSd = evt.Get("winlog.event_data.NewSd");
Expand Down
1 change: 1 addition & 0 deletions x-pack/winlogbeat/module/security/test/testdata/4746.evtx.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"id": "S-1-5-21-1717121054-434620538-60925301-2794",
"name": "at_adm",
"target": {
"domain": "SAAS",
"group": {
"domain": "TEST",
"id": "S-1-5-21-1717121054-434620538-60925301-2903",
Expand Down
1 change: 1 addition & 0 deletions x-pack/winlogbeat/module/security/test/testdata/4747.evtx.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"id": "S-1-5-21-1717121054-434620538-60925301-2794",
"name": "at_adm",
"target": {
"domain": "SAAS",
"group": {
"domain": "TEST",
"id": "S-1-5-21-1717121054-434620538-60925301-2903",
Expand Down
1 change: 1 addition & 0 deletions x-pack/winlogbeat/module/security/test/testdata/4751.evtx.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"id": "S-1-5-21-1717121054-434620538-60925301-2794",
"name": "at_adm",
"target": {
"domain": "SAAS",
"group": {
"domain": "TEST",
"id": "S-1-5-21-1717121054-434620538-60925301-2904",
Expand Down
1 change: 1 addition & 0 deletions x-pack/winlogbeat/module/security/test/testdata/4752.evtx.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"id": "S-1-5-21-1717121054-434620538-60925301-2794",
"name": "at_adm",
"target": {
"domain": "SAAS",
"group": {
"domain": "TEST",
"id": "S-1-5-21-1717121054-434620538-60925301-2904",
Expand Down
1 change: 1 addition & 0 deletions x-pack/winlogbeat/module/security/test/testdata/4761.evtx.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"id": "S-1-5-21-1717121054-434620538-60925301-2794",
"name": "at_adm",
"target": {
"domain": "SAAS",
"group": {
"domain": "TEST",
"id": "S-1-5-21-1717121054-434620538-60925301-2905",
Expand Down
1 change: 1 addition & 0 deletions x-pack/winlogbeat/module/security/test/testdata/4762.evtx.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"id": "S-1-5-21-1717121054-434620538-60925301-2794",
"name": "at_adm",
"target": {
"domain": "SAAS",
"group": {
"domain": "TEST",
"id": "S-1-5-21-1717121054-434620538-60925301-2905",
Expand Down
1 change: 1 addition & 0 deletions x-pack/winlogbeat/module/security/test/testdata/security-windows2012_4768.evtx.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
},
"user": {
"domain": "TEST.SAAS",
"id": "S-1-5-21-1717121054-434620538-60925301-2794",
"name": "at_adm"
},
"winlog": {
Expand Down
1 change: 1 addition & 0 deletions x-pack/winlogbeat/module/security/test/testdata/security-windows2012_4771.evtx.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"port": 53366
},
"user": {
"id": "S-1-5-21-1717121054-434620538-60925301-3057",
"name": "MPUIG"
},
"winlog": {
Expand Down
14 changes: 12 additions & 2 deletions .../module/security/test/testdata/security-windows2016_4720_Account_Created.evtx.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@
"user": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-500",
"name": "Administrator"
"name": "Administrator",
"target": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-1005",
"name": "elastictest1"
}
},
"winlog": {
"activity_id": "{1200ce16-64b6-0000-0ed0-0012b664d501}",
Expand Down Expand Up @@ -126,7 +131,12 @@
"user": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-500",
"name": "Administrator"
"name": "Administrator",
"target": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-1006",
"name": "audittest0609"
}
},
"winlog": {
"activity_id": "{1200ce16-64b6-0000-0ed0-0012b664d501}",
Expand Down
14 changes: 12 additions & 2 deletions .../module/security/test/testdata/security-windows2016_4722_Account_Enabled.evtx.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@
"user": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-500",
"name": "Administrator"
"name": "Administrator",
"target": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-1000",
"name": "audittest"
}
},
"winlog": {
"activity_id": "{1200ce16-64b6-0000-0ed0-0012b664d501}",
Expand Down Expand Up @@ -99,7 +104,12 @@
"user": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-500",
"name": "Administrator"
"name": "Administrator",
"target": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-1006",
"name": "audittest0609"
}
},
"winlog": {
"activity_id": "{1200ce16-64b6-0000-0ed0-0012b664d501}",
Expand Down
14 changes: 12 additions & 2 deletions .../module/security/test/testdata/security-windows2016_4723_Password_Change.evtx.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@
"user": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-500",
"name": "Administrator"
"name": "Administrator",
"target": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-500",
"name": "Administrator"
}
},
"winlog": {
"activity_id": "{1200ce16-64b6-0000-0ed0-0012b664d501}",
Expand Down Expand Up @@ -94,7 +99,12 @@
"user": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-500",
"name": "Administrator"
"name": "Administrator",
"target": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-500",
"name": "Administrator"
}
},
"winlog": {
"activity_id": "{1200ce16-64b6-0000-0ed0-0012b664d501}",
Expand Down
14 changes: 12 additions & 2 deletions ...t/module/security/test/testdata/security-windows2016_4724_Password_Reset.evtx.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@
"user": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-500",
"name": "Administrator"
"name": "Administrator",
"target": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-1005",
"name": "elastictest1"
}
},
"winlog": {
"activity_id": "{1200ce16-64b6-0000-0ed0-0012b664d501}",
Expand Down Expand Up @@ -99,7 +104,12 @@
"user": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-500",
"name": "Administrator"
"name": "Administrator",
"target": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-1006",
"name": "audittest0609"
}
},
"winlog": {
"activity_id": "{1200ce16-64b6-0000-0ed0-0012b664d501}",
Expand Down
14 changes: 12 additions & 2 deletions ...module/security/test/testdata/security-windows2016_4725_Account_Disabled.evtx.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@
"user": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-500",
"name": "Administrator"
"name": "Administrator",
"target": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-1000",
"name": "audittest"
}
},
"winlog": {
"activity_id": "{1200ce16-64b6-0000-0ed0-0012b664d501}",
Expand Down Expand Up @@ -99,7 +104,12 @@
"user": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-500",
"name": "Administrator"
"name": "Administrator",
"target": {
"domain": "WIN-41OB2LO92CR",
"id": "S-1-5-21-101361758-2486510592-3018839910-1006",
"name": "audittest0609"
}
},
"winlog": {
"activity_id": "{1200ce16-64b6-0000-0ed0-0012b664d501}",
Expand Down
Loading