TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

plugin/dnstap: support FQDN TCP endpoint (#5377)

Browse source 
* plugin/dnstap: support FQDN TCP endpoint

Signed-off-by: lob <pengyu@pingcap.com>

* plugin/dnstap: remove unused variable

Signed-off-by: lob <pengyu@pingcap.com>
This commit is contained in:
lobshunter 2022-05-13 02:13:26 +08:00 • committed by GitHub
parent 092c144491
commit dbb8a12394
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugin/dnstap/README.md
View file

@ -41,6 +41,12 @@ Log to a remote endpoint.
dnstap tcp://127.0.0.1:6000 full dnstap tcp://127.0.0.1:6000 full
~~~ ~~~
Log to a remote endpoint by FQDN.
~~~ txt
dnstap tcp://example.com:6000 full
~~~
## Command Line Tool ## Command Line Tool
Dnstap has a command line tool that can be used to inspect the logging. The tool can be found Dnstap has a command line tool that can be used to inspect the logging. The tool can be found

1
plugin/dnstap/io.go
View file

@ -25,7 +25,6 @@ type tapper interface {
type dio struct { type dio struct {
endpoint string endpoint string
proto string proto string
conn net.Conn
enc *encoder enc *encoder
queue chan tap.Dnstap queue chan tap.Dnstap
dropped uint32 dropped uint32

8
plugin/dnstap/setup.go
View file

@ -1,13 +1,13 @@
package dnstap package dnstap
import ( import (
"net/url"
"strings" "strings"
"github.com/coredns/caddy" "github.com/coredns/caddy"
"github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin"
clog "github.com/coredns/coredns/plugin/pkg/log" clog "github.com/coredns/coredns/plugin/pkg/log"
"github.com/coredns/coredns/plugin/pkg/parse"
) )
var log = clog.NewWithPlugin("dnstap") var log = clog.NewWithPlugin("dnstap")
@ -24,12 +24,12 @@ func parseConfig(c *caddy.Controller) (Dnstap, error) {
} }
if strings.HasPrefix(endpoint, "tcp://") { if strings.HasPrefix(endpoint, "tcp://") {
// remote IP endpoint // remote network endpoint
servers, err := parse.HostPortOrFile(endpoint[6:]) endpointURL, err := url.Parse(endpoint)
if err != nil { if err != nil {
return d, c.ArgErr() return d, c.ArgErr()
} }
dio := newIO("tcp", servers[0]) dio := newIO("tcp", endpointURL.Host)
d = Dnstap{io: dio} d = Dnstap{io: dio}
} else { } else {
endpoint = strings.TrimPrefix(endpoint, "unix://") endpoint = strings.TrimPrefix(endpoint, "unix://")

2
plugin/dnstap/setup_test.go
View file

@ -17,6 +17,8 @@ func TestConfig(t *testing.T) {
{"dnstap dnstap.sock full", "dnstap.sock", true, "unix", false}, {"dnstap dnstap.sock full", "dnstap.sock", true, "unix", false},
{"dnstap unix://dnstap.sock", "dnstap.sock", false, "unix", false}, {"dnstap unix://dnstap.sock", "dnstap.sock", false, "unix", false},
{"dnstap tcp://127.0.0.1:6000", "127.0.0.1:6000", false, "tcp", false}, {"dnstap tcp://127.0.0.1:6000", "127.0.0.1:6000", false, "tcp", false},
{"dnstap tcp://[::1]:6000", "[::1]:6000", false, "tcp", false},
{"dnstap tcp://example.com:6000", "example.com:6000", false, "tcp", false},
{"dnstap", "fail", false, "tcp", true}, {"dnstap", "fail", false, "tcp", true},
} }
for i, tc := range tests { for i, tc := range tests {