Skip to content

use dnstap info if sockaddr #15

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

Open
alanhlam wants to merge 4 commits into
base: 2.0
Choose a base branch
from
Open

use dnstap info if sockaddr #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
949166b
use dnstap info if sockaddr
alanhlam Oct 31, 2018
306d8f0
output the whole map
alanhlam Oct 31, 2018
ef6e797
add dnsinfo to result earlier
alanhlam Oct 31, 2018
48ac2ed
turn value into an array
alanhlam Oct 31, 2018
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
13 changes: 9 additions & 4 deletions lib/parsers/goAuditParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ module.exports = function (message) {
}

var uidMap = data['uid_map'] || {}

var dnstap = data['dnstap'] || {}

result.data = {
timestamp: new Date(data.timestamp * 1000),
sequence: data.sequence,
Expand Down Expand Up @@ -56,7 +57,7 @@ module.exports = function (message) {
parseCwd(msgs, result)
break
case constants.types.sockaddr:
parseSockaddr(msgs, result)
parseSockaddr(msgs, result, dnstap)
break
case constants.types.proctitle:
parseProctitle(msgs, result)
Expand Down Expand Up @@ -220,11 +221,15 @@ var parseCwd = function (msgs, result) {
result.data.cwd = convertValue(data.cwd || '', true)
}

var parseSockaddr = function (msgs, result) {
var parseSockaddr = function (msgs, result, dnstap) {
var msg = msgs.join(' '),
data = splitFields(msg)

addr = parseAddr(data.saddr)
result.data.socket_address = addr
result.data.dnstap = {}
result.data.dnstap[addr.ip] = Array(dnstap[addr.ip])

result.data.socket_address = parseAddr(data.saddr)
}

var parseProctitle = function (msgs, result) {
Expand Down
23 changes: 23 additions & 0 deletions test/parsers/goAuditParser.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,29 @@ describe('goAuditParser', function () {
result.data.execve.command.should.eql("stuff=")
})

it('Should get dnstap info', function () {
var data = {
"sequence": 4734103,
"timestamp": "1541004016.778",
"messages": [
{"type": 1306, "data": "saddr=02000050ACD91D8E0000000000000000"},
],
"dnstap": {
"172.217.29.142": "google.com"
}
}

assertParserResult(
StreamStash.parsers.goAuditParser.raw,
JSON.stringify(data),
{"timestamp":new Date('1541004016.778' * 1000),"sequence":4734103,"unknown":[],"socket_address":{"family":"inet","port":80,"ip":"172.217.29.142","unknown":"0000000000000000"},"message":"",
"dnstap": {
"172.217.29.142": ["google.com"]
}
}
)
})

it('Should parse a sockaddr', function () {
var data = {"sequence":10453717,"timestamp":"1462897538.564","messages":[{"type":1306,"data":"saddr=0200270F000000000000000000000000"}]},
result = StreamStash.parsers.goAuditParser.raw(JSON.stringify(data))
Expand Down