mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

SPF Flatten for non apex domains (#1220)

Browse Source
This commit is contained in:
Vincent Hagen
2021-07-25 17:53:31 +02:00
committed by GitHub
parent f63302b978
commit 243762d171
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
models/record.go
View File

@ -452,6 +452,16 @@ func (recs Records) FQDNMap() (m map[string]bool) {
return m return m
} }
func (recs Records) GetByType(typeName string) Records {
results := Records{}
for _, rec := range recs {
if rec.Type == typeName {
results = append(results, rec)
}
}
return results
}
// GroupedByKey returns a map of keys to records. // GroupedByKey returns a map of keys to records.
func (recs Records) GroupedByKey() map[RecordKey]Records { func (recs Records) GroupedByKey() map[RecordKey]Records {
groups := map[RecordKey]Records{} groups := map[RecordKey]Records{}

4
pkg/normalize/flatten.go
View File

@ -15,9 +15,9 @@ func flattenSPFs(cfg *models.DNSConfig) []error {
var errs []error var errs []error
var err error var err error
for _, domain := range cfg.Domains { for _, domain := range cfg.Domains {
apexTXTs := domain.Records.GroupedByKey()[models.RecordKey{Type: "TXT", NameFQDN: domain.Name}] txtRecords := domain.Records.GetByType("TXT")
// flatten all spf records that have the "flatten" metadata // flatten all spf records that have the "flatten" metadata
for _, txt := range apexTXTs { for _, txt := range txtRecords {
var rec *spflib.SPFRecord var rec *spflib.SPFRecord
txtTarget := strings.Join(txt.TxtStrings, "") txtTarget := strings.Join(txt.TxtStrings, "")
if txt.Metadata["flatten"] != "" || txt.Metadata["split"] != "" { if txt.Metadata["flatten"] != "" || txt.Metadata["split"] != "" {