IP endpoint for dnstap (#1002)

* adds the option to log to a remote endpoint

* examples

* tests

* tcp:// or default to unix://

* cosmetic update

* bad naked returns
This commit is contained in:
varyoo
2017-09-01 14:07:21 +02:00
committed by Miek Gieben
parent c5efd45720
commit 345dee82ed
5 changed files with 200 additions and 20 deletions

View File

@@ -2,11 +2,14 @@ package dnstap
import (
"fmt"
"io"
"log"
"strings"
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/middleware"
"github.com/coredns/coredns/middleware/dnstap/out"
"github.com/coredns/coredns/middleware/pkg/dnsutil"
"github.com/mholt/caddy"
"github.com/mholt/caddy/caddyfile"
@@ -26,30 +29,55 @@ func wrapSetup(c *caddy.Controller) error {
return nil
}
func parseConfig(c *caddyfile.Dispenser) (path string, full bool, err error) {
c.Next() // directive name
type config struct {
target string
socket bool
full bool
}
if !c.Args(&path) {
err = c.ArgErr()
return
func parseConfig(d *caddyfile.Dispenser) (c config, err error) {
d.Next() // directive name
if !d.Args(&c.target) {
return c, d.ArgErr()
}
full = c.NextArg() && c.Val() == "full"
if strings.HasPrefix(c.target, "tcp://") {
// remote IP endpoint
servers, err := dnsutil.ParseHostPortOrFile(c.target[6:])
if err != nil {
return c, d.ArgErr()
}
c.target = servers[0]
} else {
// default to UNIX socket
if strings.HasPrefix(c.target, "unix://") {
c.target = c.target[7:]
}
c.socket = true
}
c.full = d.NextArg() && d.Val() == "full"
return
}
func setup(c *caddy.Controller) error {
path, full, err := parseConfig(&c.Dispenser)
conf, err := parseConfig(&c.Dispenser)
if err != nil {
return err
}
dnstap := Dnstap{Pack: full}
dnstap := Dnstap{Pack: conf.full}
o, err := out.NewSocket(path)
if err != nil {
log.Printf("[WARN] Can't connect to %s at the moment", path)
var o io.WriteCloser
if conf.socket {
o, err = out.NewSocket(conf.target)
if err != nil {
log.Printf("[WARN] Can't connect to %s at the moment: %s", conf.target, err)
}
} else {
o = out.NewTCP(conf.target)
}
dnstap.Out = o