readme: more tests (#1184)

* readme: more tests

Add dnssec and file plugin to the test readme. This requires creating a
bunch of files with the right content. Doing so already unconvered an
unconditional type assertion in DNSSEC. This PR will include the fix for
that as well.

Also extended the snippets in the file plugin README, so that they are
whole Corefile - showing more value and checking all corefile snippets.

Create outliner right now is the kubernetes plugin, because even setting
the right env vars will result in:

open /var/run/secrets/kubernetes.io/serviceaccount/token: no such file or directory":

Which we can't create for a test.

* lint
This commit is contained in:
Miek Gieben 2017-10-31 07:14:49 +00:00 committed by GitHub
parent 4a4556f0d6
commit 87c9f00c83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 68 additions and 20 deletions

View file

@ -47,10 +47,10 @@ If monitoring is enabled (via the *prometheus* directive) then the following met
Sign responses for `example.org` with the key "Kexample.org.+013+45330.key". Sign responses for `example.org` with the key "Kexample.org.+013+45330.key".
~~~ ~~~ corefile
example.org:53 { example.org {
dnssec { dnssec {
key file /etc/coredns/Kexample.org.+013+45330 key file Kexample.org.+013+45330
} }
whoami whoami
} }
@ -59,10 +59,10 @@ example.org:53 {
Sign responses for a kubernetes zone with the key "Kcluster.local+013+45129.key". Sign responses for a kubernetes zone with the key "Kcluster.local+013+45129.key".
~~~ ~~~
cluster.local:53 { cluster.local {
kubernetes cluster.local kubernetes
dnssec cluster.local { dnssec {
key file /etc/coredns/Kcluster.local+013+45129 key file Kcluster.local+013+45129
} }
} }
~~~ ~~~
@ -70,17 +70,16 @@ cluster.local:53 {
## Bugs ## Bugs
Multiple *dnssec* plugins inside one server stanza will silently overwrite earlier ones, here Multiple *dnssec* plugins inside one server stanza will silently overwrite earlier ones, here
`example.local` will overwrite the one for `cluster.local`. `example.local` will overwrite the one for `cluster.org`.
~~~ ~~~
.:53 { . {
kubernetes cluster.local kubernetes cluster.local
dnssec cluster.local { dnssec cluster.local {
key file /etc/coredns/cluster.local key file Kcluster.local+013+45129
} }
dnssec example.local { dnssec example.org {
key file /etc/coredns/example.local key file Kexample.org.+013+45330
} }
whoami
} }
~~~ ~~~

View file

@ -38,7 +38,10 @@ func ParseKeyFile(pubFile, privFile string) (*DNSKEY, error) {
return nil, e return nil, e
} }
dk := k.(*dns.DNSKEY) dk, ok := k.(*dns.DNSKEY)
if !ok {
return nil, errors.New("no public key found")
}
p, e := dk.ReadPrivateKey(f, privFile) p, e := dk.ReadPrivateKey(f, privFile)
if e != nil { if e != nil {
return nil, e return nil, e
@ -50,7 +53,7 @@ func ParseKeyFile(pubFile, privFile string) (*DNSKEY, error) {
if s, ok := p.(*ecdsa.PrivateKey); ok { if s, ok := p.(*ecdsa.PrivateKey); ok {
return &DNSKEY{K: dk, D: dk.ToDS(dns.SHA256), s: s, tag: dk.KeyTag()}, nil return &DNSKEY{K: dk, D: dk.ToDS(dns.SHA256), s: s, tag: dk.KeyTag()}, nil
} }
return &DNSKEY{K: dk, D: dk.ToDS(dns.SHA256), s: nil, tag: 0}, errors.New("no known private key found") return &DNSKEY{K: dk, D: dk.ToDS(dns.SHA256), s: nil, tag: 0}, errors.New("no private key found")
} }
// getDNSKEY returns the correct DNSKEY to the client. Signatures are added when do is true. // getDNSKEY returns the correct DNSKEY to the client. Signatures are added when do is true.

View file

@ -44,9 +44,22 @@ file DBFILE [ZONES... ] {
Load the `example.org` zone from `example.org.signed` and allow transfers to the internet, but send Load the `example.org` zone from `example.org.signed` and allow transfers to the internet, but send
notifies to 10.240.1.1 notifies to 10.240.1.1
~~~ ~~~ corefile
file example.org.signed example.org { example.org {
transfer to * file example.org.signed {
transfer to 10.240.1.1 transfer to *
transfer to 10.240.1.1
}
}
~~~
Or use a single zone file for multiple zones:
~~~
. {
file example.org.signed example.org example.net {
transfer to *
transfer to 10.240.1.1
}
} }
~~~ ~~~

View file

@ -14,7 +14,25 @@ import (
"github.com/mholt/caddy" "github.com/mholt/caddy"
) )
// TestReadme parses all README.md's of the plugins and checks if every example Corefile // As we use the filesystem as-is, these files need to exist ON DISK for the readme test to work. This is especially
// useful for the *file* and *dnssec* plugins as their Corefiles are now tested as well. We create files in the
// current dir for all these, meaning the example READMEs MUST use relative path in their READMEs.
var contents = map[string]string{
"Kexample.org.+013+45330.key": examplePub,
"Kexample.org.+013+45330.private": examplePriv,
"example.org.signed": exampleOrg, // not signed, but does not matter for this test.
}
const (
examplePub = `example.org. IN DNSKEY 256 3 13 eNMYFZYb6e0oJOV47IPo5f/UHy7wY9aBebotvcKakIYLyyGscBmXJQhbKLt/LhrMNDE2Q96hQnI5PdTBeOLzhQ==
`
examplePriv = `Private-key-format: v1.3
Algorithm: 13 (ECDSAP256SHA256)
PrivateKey: f03VplaIEA+KHI9uizlemUSbUJH86hPBPjmcUninPoM=
`
)
// TestReadme parses all README.mds of the plugins and checks if every example Corefile
// actually works. Each corefile snippet is only used if the language is set to 'corefile': // actually works. Each corefile snippet is only used if the language is set to 'corefile':
// //
// ~~~ corefile // ~~~ corefile
@ -27,6 +45,9 @@ func TestReadme(t *testing.T) {
caddy.Quiet = true caddy.Quiet = true
dnsserver.Quiet = true dnsserver.Quiet = true
create(contents)
defer remove(contents)
log.SetOutput(ioutil.Discard) log.SetOutput(ioutil.Discard)
middle := filepath.Join("..", "plugin") middle := filepath.Join("..", "plugin")
@ -99,3 +120,15 @@ func corefileFromReadme(readme string) ([]*Input, error) {
} }
return input, nil return input, nil
} }
func create(c map[string]string) {
for name, content := range c {
ioutil.WriteFile(name, []byte(content), 0644)
}
}
func remove(c map[string]string) {
for name := range c {
os.Remove(name)
}
}