From e6169f6b1329eeeea5835a9535fd0234fa61f5fa Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Thu, 24 Jan 2019 18:04:25 +0000 Subject: [PATCH] Respect recursive nameservers flag when finding zone for fqdn Signed-off-by: James Munnelly --- pkg/issuer/acme/dns/akamai/akamai.go | 8 ++++---- pkg/issuer/acme/dns/akamai/akamai_test.go | 2 +- pkg/issuer/acme/dns/azuredns/azuredns.go | 2 +- pkg/issuer/acme/dns/clouddns/clouddns.go | 2 +- pkg/issuer/acme/dns/cloudflare/cloudflare.go | 2 +- pkg/issuer/acme/dns/route53/route53.go | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/issuer/acme/dns/akamai/akamai.go b/pkg/issuer/acme/dns/akamai/akamai.go index c203edb3e..97d1ef8ac 100644 --- a/pkg/issuer/acme/dns/akamai/akamai.go +++ b/pkg/issuer/acme/dns/akamai/akamai.go @@ -45,7 +45,7 @@ type DNSProvider struct { auth *EdgeGridAuth transport http.RoundTripper - findHostedDomainByFqdn func(string) (string, error) + findHostedDomainByFqdn func(string, []string) (string, error) } // NewDNSProvider returns a DNSProvider instance configured for Akamai. @@ -59,8 +59,8 @@ func NewDNSProvider(serviceConsumerDomain, clientToken, clientSecret, accessToke }, nil } -func findHostedDomainByFqdn(fqdn string) (string, error) { - zone, err := util.FindZoneByFqdn(fqdn, util.RecursiveNameservers) +func findHostedDomainByFqdn(fqdn string, ns []string) (string, error) { + zone, err := util.FindZoneByFqdn(fqdn, ns) if err != nil { return "", err } @@ -84,7 +84,7 @@ type dns01Record struct { } func (a *DNSProvider) setTxtRecord(fqdn string, dns01Record *dns01Record) error { - hostedDomain, err := a.findHostedDomainByFqdn(fqdn) + hostedDomain, err := a.findHostedDomainByFqdn(fqdn, a.dns01Nameservers) if err != nil { return errors.Wrapf(err, "failed to determine hosted domain for %q", fqdn) } diff --git a/pkg/issuer/acme/dns/akamai/akamai_test.go b/pkg/issuer/acme/dns/akamai/akamai_test.go index 27b815f99..1c4b9c349 100644 --- a/pkg/issuer/acme/dns/akamai/akamai_test.go +++ b/pkg/issuer/acme/dns/akamai/akamai_test.go @@ -171,7 +171,7 @@ func mockTransport(t *testing.T, akamai *DNSProvider, domain, data string, respo t.Fatalf("unexpected method: %v", req.Method) return nil, nil }) - akamai.findHostedDomainByFqdn = func(fqdn string) (string, error) { + akamai.findHostedDomainByFqdn = func(fqdn string, _ []string) (string, error) { if !strings.HasSuffix(fqdn, domain+".") { t.Fatalf("unexpected fqdn: %s", fqdn) } diff --git a/pkg/issuer/acme/dns/azuredns/azuredns.go b/pkg/issuer/acme/dns/azuredns/azuredns.go index a4759bfea..9fbb4fd27 100644 --- a/pkg/issuer/acme/dns/azuredns/azuredns.go +++ b/pkg/issuer/acme/dns/azuredns/azuredns.go @@ -136,7 +136,7 @@ func (c *DNSProvider) getHostedZoneName(fqdn string) (string, error) { if c.zoneName != "" { return c.zoneName, nil } - z, err := util.FindZoneByFqdn(fqdn, util.RecursiveNameservers) + z, err := util.FindZoneByFqdn(fqdn, c.dns01Nameservers) if err != nil { return "", err } diff --git a/pkg/issuer/acme/dns/clouddns/clouddns.go b/pkg/issuer/acme/dns/clouddns/clouddns.go index 48779110e..4465e9733 100644 --- a/pkg/issuer/acme/dns/clouddns/clouddns.go +++ b/pkg/issuer/acme/dns/clouddns/clouddns.go @@ -200,7 +200,7 @@ func (c *DNSProvider) CleanUp(domain, fqdn, value string) error { // getHostedZone returns the managed-zone func (c *DNSProvider) getHostedZone(domain string) (string, error) { - authZone, err := util.FindZoneByFqdn(util.ToFqdn(domain), util.RecursiveNameservers) + authZone, err := util.FindZoneByFqdn(util.ToFqdn(domain), c.dns01Nameservers) if err != nil { return "", err } diff --git a/pkg/issuer/acme/dns/cloudflare/cloudflare.go b/pkg/issuer/acme/dns/cloudflare/cloudflare.go index d8af531d0..810860d5f 100644 --- a/pkg/issuer/acme/dns/cloudflare/cloudflare.go +++ b/pkg/issuer/acme/dns/cloudflare/cloudflare.go @@ -128,7 +128,7 @@ func (c *DNSProvider) getHostedZoneID(fqdn string) (string, error) { Name string `json:"name"` } - authZone, err := util.FindZoneByFqdn(fqdn, util.RecursiveNameservers) + authZone, err := util.FindZoneByFqdn(fqdn, c.dns01Nameservers) if err != nil { return "", err } diff --git a/pkg/issuer/acme/dns/route53/route53.go b/pkg/issuer/acme/dns/route53/route53.go index 1894de78b..a32f85d5e 100644 --- a/pkg/issuer/acme/dns/route53/route53.go +++ b/pkg/issuer/acme/dns/route53/route53.go @@ -182,7 +182,7 @@ func (r *DNSProvider) getHostedZoneID(fqdn string) (string, error) { return r.hostedZoneID, nil } - authZone, err := util.FindZoneByFqdn(fqdn, util.RecursiveNameservers) + authZone, err := util.FindZoneByFqdn(fqdn, r.dns01Nameservers) if err != nil { return "", fmt.Errorf("error finding zone from fqdn: %v", err) }