weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Update code structure of cname following

Browse Source 
Signed-off-by: Maartje Eyskens <maartje@eyskens.me>
This commit is contained in:
Maartje Eyskens 2021-01-20 17:11:40 +01:00
parent f9d34991bc
commit d0b13b6c8a
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/issuer/acme/dns/util/wait.go
View File

@ -74,26 +74,27 @@ func getNameservers(path string, defaults []string) []string {
// this will error if there is a recursive CNAME in the chain
func updateDomainWithCName(fqdn string, nameservers []string, fqdnChain ...string) (string, error) {
r, err := dnsQuery(fqdn, dns.TypeCNAME, nameservers, true)
if err == nil && r.Rcode == dns.RcodeSuccess {
for _, rr := range r.Answer {
if cn, ok := rr.(*dns.CNAME); ok {
if cn.Hdr.Name == fqdn {
logf.V(logf.DebugLevel).Infof("Updating FQDN: %s with its CNAME: %s", fqdn, cn.Target)
// check if we were here before to prevent recursive records causing issues
for _, fqdnInChain := range fqdnChain {
if cn.Target == fqdnInChain {
return "", fmt.Errorf("Found CNAME loop on %q when looking up %q", cn.Target, fqdn)
}
}
return updateDomainWithCName(cn.Target, nameservers, append(fqdnChain, fqdn)...)
}
}
}
} else if err != nil {
if err != nil {
return "", err
}
if r.Rcode != dns.RcodeSuccess {
return fqdn, err
}
for _, rr := range r.Answer {
cn, ok := rr.(*dns.CNAME)
if !ok || cn.Hdr.Name != fqdn {
continue
}
logf.V(logf.DebugLevel).Infof("Updating FQDN: %s with its CNAME: %s", fqdn, cn.Target)
// check if we were here before to prevent recursive records causing issues
for _, fqdnInChain := range fqdnChain {
if cn.Target != fqdnInChain {
continue
}
return "", fmt.Errorf("Found recursive CNAME record to %q when looking up %q", cn.Target, fqdn)
}
return updateDomainWithCName(cn.Target, nameservers, append(fqdnChain, fqdn)...)
}
return fqdn, nil
}