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

Cherry-pick #18436 to 7.x: Don't set dns.resolved_ip with invalid IP addresses #18468

Merged
merged 1 commit into from
May 13, 2020
Merged

Cherry-pick #18436 to 7.x: Don't set dns.resolved_ip with invalid IP addresses #18468

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 @@ -230,6 +230,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

*Winlogbeat*

- Fix invalid IP addresses in DNS query results from Sysmon data. {issue}18432[18432] {pull}18436{18436}

*Functionbeat*

Expand Down
21 changes: 12 additions & 9 deletions x-pack/winlogbeat/module/sysmon/config/winlogbeat-sysmon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ var sysmon = (function () {
var path = require("path");
var processor = require("processor");
var winlogbeat = require("winlogbeat");
var net = require("net");

// Windows error codes for DNS. This list was generated using
// 'go run gen_dns_error_codes.go'.
Expand Down Expand Up @@ -432,17 +433,19 @@ var sysmon = (function () {
} else {
// Convert V4MAPPED addresses.
answer = answer.replace("::ffff:", "");
ips.push(answer);
if (net.isIP(answer)) {
ips.push(answer);

// Synthesize record type based on IP address type.
var type = "A";
if (answer.indexOf(":") !== -1) {
type = "AAAA";
// Synthesize record type based on IP address type.
var type = "A";
if (answer.indexOf(":") !== -1) {
type = "AAAA";
}
answers.push({
type: type,
data: answer,
});
}
answers.push({
type: type,
data: answer,
});
}
}

Expand Down
7 changes: 1 addition & 6 deletions x-pack/winlogbeat/module/sysmon/test/testdata/sysmon-10.2-dns.evtx.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13341,10 +13341,6 @@
{
"data": "2001:502:7094::30",
"type": "AAAA"
},
{
"data": "192.5",
"type": "A"
}
],
"question": {
Expand Down Expand Up @@ -13403,8 +13399,7 @@
"192.43.172.30",
"2001:503:39c1::30",
"192.48.79.30",
"2001:502:7094::30",
"192.5"
"2001:502:7094::30"
]
},
"event": {
Expand Down