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

fix names for internal transformed records (#358)

Browse source 
* fix names for internal transformed records

* activedirectory use standard messaged

* add test for fqdn consistency in final validation pass
This commit is contained in:
Craig Peterson 2018-04-26 14:45:10 -04:00 • committed by GitHub
parent 2e8c4a758f
commit 17e64ca28d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -17,3 +17,4 @@ certs/
spfcache* spfcache*
adzonedump.* adzonedump.*
zones/ zones/
stack.sh

16
pkg/normalize/validate.go
View file

@ -1,6 +1,7 @@
package normalize package normalize
import ( import (
"fmt"
"net" "net"
"strings" "strings"
@ -195,7 +196,7 @@ func importTransform(srcDomain, dstDomain *models.DomainConfig, transforms []tra
newRec := func() *models.RecordConfig { newRec := func() *models.RecordConfig {
rec2, _ := rec.Copy() rec2, _ := rec.Copy()
newlabel := rec2.GetLabelFQDN() newlabel := rec2.GetLabelFQDN()
rec2.SetLabelFromFQDN(newlabel, dstDomain.Name) rec2.SetLabel(newlabel, dstDomain.Name)
if ttl != 0 { if ttl != 0 {
rec2.TTL = ttl rec2.TTL = ttl
} }
@ -357,17 +358,20 @@ func NormalizeAndValidateConfig(config *models.DNSConfig) (errs []error) {
} }
} }
for _, d := range config.Domains {
// Check that CNAMES don't have to co-exist with any other records // Check that CNAMES don't have to co-exist with any other records
for _, d := range config.Domains {
errs = append(errs, checkCNAMEs(d)...) errs = append(errs, checkCNAMEs(d)...)
} // Check that if any advanced record types are used in a domain, every provider for that domain supports them
// Check that if any aliases / ptr / etc.. are used in a domain, every provider for that domain supports them
for _, d := range config.Domains {
err := checkProviderCapabilities(d) err := checkProviderCapabilities(d)
if err != nil { if err != nil {
errs = append(errs, err) errs = append(errs, err)
} }
// Validate FQDN consistency
for _, r := range d.Records {
if r.NameFQDN == "" || !strings.HasSuffix(r.NameFQDN, d.Name) {
errs = append(errs, fmt.Errorf("Record named '%s' does not have correct FQDN in domain '%s'. FQDN: %s", r.Name, d.Name, r.NameFQDN))
}
}
} }
return errs return errs

14
providers/activedir/domains.go
View file

@ -58,10 +58,10 @@ func (c *adProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*models.Co
// Generate changes. // Generate changes.
corrections := []*models.Correction{} corrections := []*models.Correction{}
for _, del := range dels { for _, del := range dels {
corrections = append(corrections, c.deleteRec(dc.Name, del.Existing)) corrections = append(corrections, c.deleteRec(dc.Name, del))
} }
for _, cre := range creates { for _, cre := range creates {
corrections = append(corrections, c.createRec(dc.Name, cre.Desired)...) corrections = append(corrections, c.createRec(dc.Name, cre)...)
} }
for _, m := range modifications { for _, m := range modifications {
corrections = append(corrections, c.modifyRec(dc.Name, m)) corrections = append(corrections, c.modifyRec(dc.Name, m))
@ -280,10 +280,11 @@ func (c *adProvider) generatePowerShellDelete(domainname, recName, recType, cont
return fmt.Sprintf(text, c.adServer, domainname, recName, recType, content) return fmt.Sprintf(text, c.adServer, domainname, recName, recType, content)
} }
func (c *adProvider) createRec(domainname string, rec *models.RecordConfig) []*models.Correction { func (c *adProvider) createRec(domainname string, cre diff.Correlation) []*models.Correction {
rec := cre.Desired
arr := []*models.Correction{ arr := []*models.Correction{
{ {
Msg: fmt.Sprintf("CREATE record: %s %s ttl(%d) %s", rec.GetLabel(), rec.Type, rec.TTL, rec.GetTargetField()), Msg: cre.String(),
F: func() error { F: func() error {
return c.powerShellDoCommand(c.generatePowerShellCreate(domainname, rec), true) return c.powerShellDoCommand(c.generatePowerShellCreate(domainname, rec), true)
}}, }},
@ -301,9 +302,10 @@ func (c *adProvider) modifyRec(domainname string, m diff.Correlation) *models.Co
} }
} }
func (c *adProvider) deleteRec(domainname string, rec *models.RecordConfig) *models.Correction { func (c *adProvider) deleteRec(domainname string, cor diff.Correlation) *models.Correction {
rec := cor.Existing
return &models.Correction{ return &models.Correction{
Msg: fmt.Sprintf("DELETE record: %s %s ttl(%d) %s", rec.GetLabel(), rec.Type, rec.TTL, rec.GetTargetField()), Msg: cor.String(),
F: func() error { F: func() error {
return c.powerShellDoCommand(c.generatePowerShellDelete(domainname, rec.GetLabel(), rec.Type, rec.GetTargetField()), true) return c.powerShellDoCommand(c.generatePowerShellDelete(domainname, rec.GetLabel(), rec.Type, rec.GetTargetField()), true)
}, },