-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update Zeek DNS pipeline with ECS DNS fields (#13324)
This adds ECS DNS fields to the Zeek DNS fileset (but does not change or remove any existing ones). Use event.original Add registered_domain Add dns.resolved_ip Relates #13320
- Loading branch information
1 parent
fa17a55
commit 3a69204
Showing
9 changed files
with
379 additions
and
126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package net | ||
|
|
||
| import ( | ||
| "net" | ||
|
|
||
| "github.com/dop251/goja" | ||
| "github.com/dop251/goja_nodejs/require" | ||
| ) | ||
|
|
||
| // Require registers the net module that provides utilities for working with IP | ||
| // addresses. It can be accessed using: | ||
| // | ||
| // // javascript | ||
| // var net = require('net'); | ||
| // | ||
| func Require(vm *goja.Runtime, module *goja.Object) { | ||
| o := module.Get("exports").(*goja.Object) | ||
| o.Set("isIP", isIP) | ||
| o.Set("isIPv4", isIPv4) | ||
| o.Set("isIPv6", isIPv6) | ||
| } | ||
|
|
||
| func isIP(input string) int32 { | ||
| ip := net.ParseIP(input) | ||
| if ip == nil { | ||
| return 0 | ||
| } | ||
|
|
||
| if ip.To4() != nil { | ||
| return 4 | ||
| } | ||
|
|
||
| return 6 | ||
| } | ||
|
|
||
| func isIPv4(input string) bool { | ||
| return 4 == isIP(input) | ||
| } | ||
|
|
||
| func isIPv6(input string) bool { | ||
| return 6 == isIP(input) | ||
| } | ||
|
|
||
| // Enable adds net to the given runtime. | ||
| func Enable(runtime *goja.Runtime) { | ||
| runtime.Set("net", require.Require(runtime, "net")) | ||
| } | ||
|
|
||
| func init() { | ||
| require.RegisterNativeModule("net", Require) | ||
| } |
98 changes: 98 additions & 0 deletions
98
libbeat/processors/script/javascript/module/net/net_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package net_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
|
|
||
| "github.com/elastic/beats/libbeat/beat" | ||
| "github.com/elastic/beats/libbeat/common" | ||
| "github.com/elastic/beats/libbeat/processors/script/javascript" | ||
|
|
||
| _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/net" | ||
| _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/require" | ||
| ) | ||
|
|
||
| func TestNetIsIP(t *testing.T) { | ||
| const script = ` | ||
| var net = require('net'); | ||
| function process(evt) { | ||
| var ip = evt.Get("ip"); | ||
| var ipType = net.isIP(ip); | ||
| switch (ipType) { | ||
| case 4: | ||
| evt.Put("network.type", "ipv4"); | ||
| break | ||
| case 6: | ||
| evt.Put("network.type", "ipv6"); | ||
| break | ||
| } | ||
| } | ||
| ` | ||
|
|
||
| p, err := javascript.NewFromConfig(javascript.Config{Source: script}, nil) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| for ip, typ := range map[string]interface{}{ | ||
| "192.168.0.1": "ipv4", | ||
| "::ffff:192.168.0.1": "ipv4", | ||
| "2001:0db8:0000:0000:0000:ff00:0042:8329": "ipv6", | ||
| "2001:db8:0:0:0:ff00:42:8329": "ipv6", | ||
| "2001:db8::ff00:42:8329": "ipv6", | ||
| "www.elastic.co": nil, | ||
| } { | ||
| evt, err := p.Run(&beat.Event{Fields: common.MapStr{"ip": ip}}) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| fields := evt.Fields.Flatten() | ||
| assert.Equal(t, typ, fields["network.type"]) | ||
| } | ||
| } | ||
|
|
||
| func TestNetIsIPvN(t *testing.T) { | ||
| const script = ` | ||
| var net = require('net'); | ||
| function process(evt) { | ||
| if (net.isIPv4("192.168.0.1") !== true) { | ||
| throw "isIPv4 failed"; | ||
| } | ||
| if (net.isIPv6("2001:db8::ff00:42:8329") !== true) { | ||
| throw "isIPv6 failed"; | ||
| } | ||
| } | ||
| ` | ||
|
|
||
| p, err := javascript.NewFromConfig(javascript.Config{Source: script}, nil) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| _, err = p.Run(&beat.Event{Fields: common.MapStr{}}) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.