pogpp/lego
1
0
Fork 0
forked from TrueCloudLab/lego
Code Pull requests Activity

Move duplicate code to a function

Browse source 
Signed-off-by: xenolf <xenolf@users.noreply.github.com>
This commit is contained in:
xenolf 2016-04-08 01:00:29 +02:00
parent 239a7005ef
commit 44d92633c6
No known key found for this signature in database
GPG key ID: C9C13317912FAB20
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
acme/dns_challenge.go
View file

@ -214,14 +214,7 @@ func FindZoneByFqdn(fqdn, nameserver string) (string, error) {
// We have a success, so one of the answers has to be a SOA RR // We have a success, so one of the answers has to be a SOA RR
for _, ans := range in.Answer { for _, ans := range in.Answer {
if soa, ok := ans.(*dns.SOA); ok { if soa, ok := ans.(*dns.SOA); ok {
zone := soa.Hdr.Name return checkIfTLD(fqdn, soa)
// If we ended up on one of the TLDs, it means the domain did not exist.
publicsuffix, _ := publicsuffix.PublicSuffix(UnFqdn(zone))
if publicsuffix == UnFqdn(zone) {
return "", fmt.Errorf("Could not determine zone authoritatively")
}
fqdnToZone[fqdn] = zone
return zone, nil
} }
} }
// Or it is NODATA, fall through to NXDOMAIN // Or it is NODATA, fall through to NXDOMAIN
@ -229,6 +222,13 @@ func FindZoneByFqdn(fqdn, nameserver string) (string, error) {
// Search the authority section for our precious SOA RR // Search the authority section for our precious SOA RR
for _, ns := range in.Ns { for _, ns := range in.Ns {
if soa, ok := ns.(*dns.SOA); ok { if soa, ok := ns.(*dns.SOA); ok {
return checkIfTLD(fqdn, soa)
}
}
return "", fmt.Errorf("NS %s did not return the expected SOA record in the authority section", nameserver)
}
func checkIfTLD(fqdn string, soa *dns.SOA) (string, error) {
zone := soa.Hdr.Name zone := soa.Hdr.Name
// If we ended up on one of the TLDs, it means the domain did not exist. // If we ended up on one of the TLDs, it means the domain did not exist.
publicsuffix, _ := publicsuffix.PublicSuffix(UnFqdn(zone)) publicsuffix, _ := publicsuffix.PublicSuffix(UnFqdn(zone))
@ -237,9 +237,6 @@ func FindZoneByFqdn(fqdn, nameserver string) (string, error) {
} }
fqdnToZone[fqdn] = zone fqdnToZone[fqdn] = zone
return zone, nil return zone, nil
}
}
return "", fmt.Errorf("NS %s did not return the expected SOA record in the authority section", nameserver)
} }
// ClearFqdnCache clears the cache of fqdn to zone mappings. Primarily used in testing. // ClearFqdnCache clears the cache of fqdn to zone mappings. Primarily used in testing.