StackExchange/dnscontrol
1
1
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2025-09-04 20:24:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

DESEC: clarify supported capabilities (#1160)

Browse source 
* DESEC: clarify AutoDNSSEC

* DESEC: improve error messages / hints

* DESEC: add NAPTR support

* DESEC: add to integration test configuration
This commit is contained in:
Peter Thomassen 2021-05-17 21:45:24 +02:00 • committed by GitHub
parent 9949cba00d
commit d567d554cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
integrationTest/providers.json
View file

@ -39,6 +39,10 @@
"auth-password": "$CLOUDNS_AUTH_PASSWORD", "auth-password": "$CLOUDNS_AUTH_PASSWORD",
"domain": "$CLOUDNS_DOMAIN" "domain": "$CLOUDNS_DOMAIN"
}, },
"DESEC": {
"auth-token": "$DESEC_TOKEN",
"domain": "$DESEC_DOMAIN"
},
"DIGITALOCEAN": { "DIGITALOCEAN": {
"domain": "$DIGITALOCEAN_DOMAIN", "domain": "$DIGITALOCEAN_DOMAIN",
"token": "$DIGITALOCEAN_TOKEN" "token": "$DIGITALOCEAN_TOKEN"

11
providers/desec/desecProvider.go
View file

@ -39,15 +39,16 @@ var features = providers.DocumentationNotes{
providers.DocDualHost: providers.Unimplemented(), providers.DocDualHost: providers.Unimplemented(),
providers.DocOfficiallySupported: providers.Cannot(), providers.DocOfficiallySupported: providers.Cannot(),
providers.DocCreateDomains: providers.Can(), providers.DocCreateDomains: providers.Can(),
providers.CanUseAlias: providers.Cannot(), providers.CanUseAlias: providers.Unimplemented("Apex aliasing is supported via new SVCB and HTTPS record types. For details, check the deSEC docs."),
providers.CanUseSRV: providers.Can(), providers.CanUseSRV: providers.Can(),
providers.CanUseDS: providers.Can(), providers.CanUseDS: providers.Can(),
providers.CanUseSSHFP: providers.Can(), providers.CanUseSSHFP: providers.Can(),
providers.CanUseCAA: providers.Can(), providers.CanUseCAA: providers.Can(),
providers.CanUseTLSA: providers.Can(), providers.CanUseTLSA: providers.Can(),
providers.CanUsePTR: providers.Can(), providers.CanUsePTR: providers.Can(),
providers.CanUseNAPTR: providers.Can(),
providers.CanGetZones: providers.Can(), providers.CanGetZones: providers.Can(),
providers.CanAutoDNSSEC: providers.Cannot(), providers.CanAutoDNSSEC: providers.Can("deSEC always signs all records. When trying to disable, a notice is printed."),
} }
var defaultNameServerNames = []string{ var defaultNameServerNames = []string{
@ -69,6 +70,10 @@ func (c *desecProvider) GetNameservers(domain string) ([]*models.Nameserver, err
} }
func (c *desecProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*models.Correction, error) { func (c *desecProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*models.Correction, error) {
if dc.AutoDNSSEC == "off" {
fmt.Printf("Notice: DNSSEC signing was not requested, but cannot be turned off. (deSEC always signs all records.)\n")
}
existing, err := c.GetZoneRecords(dc.Name) existing, err := c.GetZoneRecords(dc.Name)
if err != nil { if err != nil {
return nil, err return nil, err
@ -137,7 +142,7 @@ func PrepDesiredRecords(dc *models.DomainConfig, minTTL uint32) {
} }
if rec.TTL < minTTL { if rec.TTL < minTTL {
if rec.Type != "NS" { if rec.Type != "NS" {
printer.Warnf("Please contact support@desec.io if you need ttls < %d. Setting ttl of %s type %s from %d to %d\n", minTTL, rec.GetLabelFQDN(), rec.Type, rec.TTL, minTTL) printer.Warnf("Please contact support@desec.io if you need TTLs < %d. Setting TTL of %s type %s from %d to %d\n", minTTL, rec.GetLabelFQDN(), rec.Type, rec.TTL, minTTL)
} }
rec.TTL = minTTL rec.TTL = minTTL
} }

18
providers/desec/protocol.go
View file

@ -65,7 +65,7 @@ func (c *desecProvider) fetchDomainList() error {
endpoint := "/domains/" endpoint := "/domains/"
var bodyString, err = c.get(endpoint, "GET") var bodyString, err = c.get(endpoint, "GET")
if err != nil { if err != nil {
return fmt.Errorf("failed fetching domain list (deSEC): %s", err) return fmt.Errorf("Failed fetching domain list (deSEC): %s", err)
} }
err = json.Unmarshal(bodyString, &dr) err = json.Unmarshal(bodyString, &dr)
if err != nil { if err != nil {
@ -85,7 +85,7 @@ func (c *desecProvider) getRecords(domain string) ([]resourceRecord, error) {
var rrsNew []resourceRecord var rrsNew []resourceRecord
var bodyString, err = c.get(fmt.Sprintf(endpoint, domain), "GET") var bodyString, err = c.get(fmt.Sprintf(endpoint, domain), "GET")
if err != nil { if err != nil {
return rrsNew, fmt.Errorf("failed fetching records for domain %s (deSEC): %s", domain, err) return rrsNew, fmt.Errorf("Failed fetching records for domain %s (deSEC): %s", domain, err)
} }
err = json.Unmarshal(bodyString, &rrs) err = json.Unmarshal(bodyString, &rrs)
if err != nil { if err != nil {
@ -112,14 +112,14 @@ func (c *desecProvider) createDomain(domain string) error {
var resp []byte var resp []byte
var err error var err error
if resp, err = c.post(endpoint, "POST", byt); err != nil { if resp, err = c.post(endpoint, "POST", byt); err != nil {
return fmt.Errorf("failed domain create (deSEC): %v", err) return fmt.Errorf("Failed domain create (deSEC): %v", err)
} }
dm := domainObject{} dm := domainObject{}
err = json.Unmarshal(resp, &dm) err = json.Unmarshal(resp, &dm)
if err != nil { if err != nil {
return err return err
} }
printer.Printf("If you want to use DNSSec please add the DS record at your registrar using one of the keys:\n") printer.Printf("To enable DNSSEC validation for your domain, make sure to convey the DS record(s) to your registrar:\n")
printer.Printf("%+q", dm.Keys) printer.Printf("%+q", dm.Keys)
return nil return nil
} }
@ -129,7 +129,7 @@ func (c *desecProvider) upsertRR(rr []resourceRecord, domain string) error {
endpoint := fmt.Sprintf("/domains/%s/rrsets/", domain) endpoint := fmt.Sprintf("/domains/%s/rrsets/", domain)
byt, _ := json.Marshal(rr) byt, _ := json.Marshal(rr)
if _, err := c.post(endpoint, "PUT", byt); err != nil { if _, err := c.post(endpoint, "PUT", byt); err != nil {
return fmt.Errorf("failed create rrset (deSEC): %v", err) return fmt.Errorf("Failed create RRset (deSEC): %v", err)
} }
return nil return nil
} }
@ -137,7 +137,7 @@ func (c *desecProvider) upsertRR(rr []resourceRecord, domain string) error {
func (c *desecProvider) deleteRR(domain, shortname, t string) error { func (c *desecProvider) deleteRR(domain, shortname, t string) error {
endpoint := fmt.Sprintf("/domains/%s/rrsets/%s/%s/", domain, shortname, t) endpoint := fmt.Sprintf("/domains/%s/rrsets/%s/%s/", domain, shortname, t)
if _, err := c.get(endpoint, "DELETE"); err != nil { if _, err := c.get(endpoint, "DELETE"); err != nil {
return fmt.Errorf("failed delete rrset (deSEC): %v", err) return fmt.Errorf("Failed delete RRset (deSEC): %v", err)
} }
return nil return nil
} }
@ -170,7 +170,7 @@ retry:
if err == nil { if err == nil {
return bodyString, fmt.Errorf("%s", errResp.Detail) return bodyString, fmt.Errorf("%s", errResp.Detail)
} }
return bodyString, fmt.Errorf("http status %d %s, the api does not provide more information", resp.StatusCode, resp.Status) return bodyString, fmt.Errorf("HTTP status %d %s, the API does not provide more information", resp.StatusCode, resp.Status)
} }
return bodyString, nil return bodyString, nil
} }
@ -208,9 +208,9 @@ retry:
var errResp errorResponse var errResp errorResponse
err = json.Unmarshal(bodyString, &errResp) err = json.Unmarshal(bodyString, &errResp)
if err == nil { if err == nil {
return bodyString, fmt.Errorf("http status %d %s details: %s", resp.StatusCode, resp.Status, errResp.Detail) return bodyString, fmt.Errorf("HTTP status %d %s details: %s", resp.StatusCode, resp.Status, errResp.Detail)
} }
return bodyString, fmt.Errorf("http status %d %s, the api does not provide more information", resp.StatusCode, resp.Status) return bodyString, fmt.Errorf("HTTP status %d %s, the API does not provide more information", resp.StatusCode, resp.Status)
} }
//time.Sleep(334 * time.Millisecond) //time.Sleep(334 * time.Millisecond)
return bodyString, nil return bodyString, nil