fix: add tests & fix missing soa

This commit is contained in:
David Arnold 2020-06-09 21:54:01 -05:00
parent d6daa054b5
commit 954195e4d0
No known key found for this signature in database
GPG Key ID: 6D6A936E69C59D08
7 changed files with 112 additions and 43 deletions

View File

@ -51,3 +51,4 @@ func (l Ldap) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (i
// Name implements the Handler interface. // Name implements the Handler interface.
func (l Ldap) Name() string { return "ldap" } func (l Ldap) Name() string { return "ldap" }

67
handler_test.go Normal file
View File

@ -0,0 +1,67 @@
package ldap
import (
"context"
"testing"
"github.com/coredns/coredns/plugin/file"
"github.com/coredns/coredns/plugin/pkg/dnstest"
"github.com/coredns/coredns/plugin/pkg/fall"
"github.com/coredns/coredns/plugin/test"
"github.com/miekg/dns"
)
var ldapTestCases = []test.Case{
{
// Simple case
Qname: "a.example.org.", Qtype: dns.TypeA,
Answer: []dns.RR{
test.A("a.example.org." + defaultA),
},
},
}
// Create a new Ldap Plugin. Use the test.ErrorHandler as the next plugin.
func newTestLdap() *Ldap {
ldap := New([]string{"example.org.", "www.example.org.", "example.org.", "sample.example.org."})
ldap.Zones.Z = newTestLdapZones()
ldap.Fall = fall.Zero
ldap.Next = test.ErrorHandler()
return ldap
}
func newTestLdapZones() map[string]*file.Zone {
Zone := file.NewZone("example.org.", "")
Zone.Insert(SOA("example.org."))
for _, rr := range []string{"example.org. " + defaultA} {
r, _ := dns.NewRR(rr)
Zone.Insert(r)
}
zones := make(map[string]*file.Zone)
zones["example.org."] = Zone
return zones
}
func TestServeDNS(t *testing.T) {
ldap := newTestLdap()
for i, tc := range ldapTestCases {
req := tc.Msg()
rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err := ldap.ServeDNS(context.Background(), rec, req)
if err != nil {
t.Errorf("Expected no error, got %v", err)
continue
}
resp := rec.Msg
if resp == nil {
t.Fatalf("Test %d, got nil message and no error for %q", i, req.Question[0].Name)
}
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}
const defaultA = " 3600 IN A 1.2.3.4"

24
ldap.go
View File

@ -85,3 +85,27 @@ func (l *Ldap) InitClient() (err error) {
return nil return nil
} }
// SOA returns a syntetic SOA record for a zone.
func SOA(zone string) (dns.RR) {
ttl := uint32(300)
header := dns.RR_Header{Name: zone, Rrtype: dns.TypeSOA, Ttl: ttl, Class: dns.ClassINET}
Mbox := hostmaster + "."
Ns := "ns.dns."
if zone[0] != '.' {
Mbox += zone
Ns += zone
}
return &dns.SOA{Hdr: header,
Mbox: Mbox,
Ns: Ns,
Serial: 12345,
Refresh: 7200,
Retry: 1800,
Expire: 86400,
Minttl: ttl,
}
}
const hostmaster = "hostmaster"

View File

@ -1,35 +0,0 @@
package ldap
import (
"bytes"
"context"
"testing"
"github.com/coredns/coredns/plugin/pkg/dnstest"
"github.com/coredns/coredns/plugin/test"
"github.com/miekg/dns"
)
func TestLdap(t *testing.T) {
// Create a new Ldap Plugin. Use the test.ErrorHandler as the next plugin.
x := Ldap{Next: test.ErrorHandler()}
// Setup a new output buffer that is *not* standard output, so we can check if
// ldap is really being printed.
b := &bytes.Buffer{}
out = b
ctx := context.TODO()
r := new(dns.Msg)
r.SetQuestion("ldap.org.", dns.TypeA)
// Create a new Recorder that captures the result, this isn't actually used in this test
// as it just serves as something that implements the dns.ResponseWriter interface.
rec := dnstest.NewRecorder(&test.ResponseWriter{})
// Call our plugin directly, and check the result.
x.ServeDNS(ctx, rec, r)
if a := b.String(); a != "ldap\n" {
t.Errorf("Failed to print '%s', got %s", ldap, a)
}
}

View File

@ -9,13 +9,24 @@ import (
// TestSetup tests the various things that should be parsed by setup. // TestSetup tests the various things that should be parsed by setup.
// Make sure you also test for parse errors. // Make sure you also test for parse errors.
func TestSetup(t *testing.T) { func TestSetup(t *testing.T) {
c := caddy.NewTestController("dns", `ldap`) tests := []struct {
if err := setup(c); err != nil { body string
t.Fatalf("Expected no errors, but got: %v", err) expectedError bool
}{
{`ldap`, false},
{`ldap :`, true},
{`ldap {
ldap_url ldap://example.com
base_dn ou=ae-dir
filter (objectClass=aeNwDevice)
attributes aeFqdn ipHostNumber
sasl
}`, false},
}
for i, test := range tests {
c := caddy.NewTestController("dns", test.body)
if _, err := ldapParse(c); (err == nil) == test.expectedError {
t.Fatalf("Unexpected errors: %v in test: %d\n\t%s", err, i, test.body)
} }
c = caddy.NewTestController("dns", `ldap more`)
if err := setup(c); err == nil {
t.Fatalf("Expected errors, but got: %v", err)
} }
} }

View File

@ -48,6 +48,7 @@ func (l *Ldap) updateZones(ctx context.Context) error {
if zoneFileMap[zn] == nil { if zoneFileMap[zn] == nil {
zoneFileMap[zn] = file.NewZone(zn, "") zoneFileMap[zn] = file.NewZone(zn, "")
zoneFileMap[zn].Upstream = l.Upstream zoneFileMap[zn].Upstream = l.Upstream
zoneFileMap[zn].Insert(SOA(zn))
} }
for _, lr := range lrpz { for _, lr := range lrpz {
zoneFileMap[zn].Insert(lr.A()) zoneFileMap[zn].Insert(lr.A())