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

bug(split horizon): Domains with split horizons not working (#3895)

Browse source 
Fixes https://github.com/StackExchange/dnscontrol/issues/3894

# Issue

* Split horizon DNS broke in 4.28.0
* Insufficient automated testing to detect this in the future 

# Resolution

* domain.PostProcess() was called twice. The first time the tag was
properly parsed, removing the tag from DomainConfig.Name and putting it
in DomainConfig.Tag. The second time DomainConfig.Name no longer had the
tag and .Tag was set to "".
* The JSON output of DomainConfig doesn't output .UniqueName. If it had,
this bug would have been noticed prior to release. Test updated to
include that field.
This commit is contained in:
Tom Limoncelli 2025-12-05 11:41:16 -05:00 • committed by GitHub
parent 11e9fd138b
commit a0288bd759
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
58 changed files with 172 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
commands/ppreviewPush_test.go
View file

@ -22,6 +22,7 @@ func Test_whichZonesToProcess(t *testing.T) {
dcTaggedEmpty,
}
// This is needed since we aren't calling js.ExecuteJavaScript().
for _, dc := range allDC {
dc.PostProcess()
}

5
commands/printIR.go
View file

@ -129,11 +129,6 @@ func ExecuteDSL(args ExecuteDSLArgs) (*models.DNSConfig, error) {
return nil, fmt.Errorf("executing %s: %w", args.JSFile, err)
}
err = dnsConfig.PostProcess()
if err != nil {
return nil, err
}
return dnsConfig, nil
}

2
models/domain.go
View file

@ -24,7 +24,7 @@ type DomainConfig struct {
NameUnicode string `json:"-"` // name in Unicode format
Tag string `json:"tag,omitempty"` // Split horizon tag.
UniqueName string `json:"-"` // .Name + "!" + .Tag
UniqueName string `json:"uniquename"` // .Name + "!" + .Tag (no !tag added if tag is "")
RegistrarName string `json:"registrar"`
DNSProviderNames map[string]int `json:"dnsProviders"`

3
pkg/js/parse_tests/001-basic.json
View file

@ -23,7 +23,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "foo.com"
}
],
"registrars": [

3
pkg/js/parse_tests/002-ttl.json
View file

@ -23,7 +23,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "foo.com"
}
],
"registrars": [

3
pkg/js/parse_tests/003-meta.json
View file

@ -19,7 +19,8 @@
"type": "A"
}
],
"registrar": "Cloudflare"
"registrar": "Cloudflare",
"uniquename": "foo.com"
}
],
"registrars": [

3
pkg/js/parse_tests/004-ips.json
View file

@ -37,7 +37,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "foo.com"
}
],
"registrars": [

2
pkg/js/parse_tests/005-ignored-records.json
View file

@ -9,6 +9,7 @@
"name": "foo.com",
"records": [],
"registrar": "none",
"uniquename": "foo.com",
"unmanaged": [
{
"label_pattern": "testignore",
@ -60,6 +61,7 @@
"name": "diff2.com",
"records": [],
"registrar": "none",
"uniquename": "diff2.com",
"unmanaged": [
{
"label_pattern": "mylabel",

3
pkg/js/parse_tests/006-transforms.json
View file

@ -46,7 +46,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "foo.com"
}
],
"registrars": [

9
pkg/js/parse_tests/007-importTransformTTL.json
View file

@ -23,7 +23,8 @@
"type": "A"
}
],
"registrar": "reg"
"registrar": "reg",
"uniquename": "foo1.com"
},
{
"dnsProviders": {},
@ -47,7 +48,8 @@
"type": "A"
}
],
"registrar": "reg"
"registrar": "reg",
"uniquename": "inny"
},
{
"dnsProviders": {},
@ -71,7 +73,8 @@
"type": "A"
}
],
"registrar": "reg"
"registrar": "reg",
"uniquename": "com.inny"
}
],
"registrars": []

3
pkg/js/parse_tests/008-import.json
View file

@ -16,7 +16,8 @@
"type": "A"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/009-reverse.json
View file

@ -8,7 +8,8 @@
},
"name": "2.1.in-addr.arpa",
"records": [],
"registrar": "none"
"registrar": "none",
"uniquename": "2.1.in-addr.arpa"
}
],
"registrars": []

3
pkg/js/parse_tests/010-alias.json
View file

@ -16,7 +16,8 @@
"type": "ALIAS"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/011-cfRedirect.json
View file

@ -45,7 +45,8 @@
"zonfefilepartial": "name=(302,test2.foo.com,https://goo.com/$1) code=(302) when=(http.host eq \"test2.foo.com\" and http.request.uri.path eq \"/\") then=(concat(\"https://goo.com\", http.request.uri.path))"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/012-duration.json
View file

@ -44,7 +44,8 @@
"type": "A"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/013-mx.json
View file

@ -17,7 +17,8 @@
"type": "MX"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/014-caa.json
View file

@ -51,7 +51,8 @@
"type": "CAA"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/015-tlsa.json
View file

@ -19,7 +19,8 @@
"type": "TLSA"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/017-txt.json
View file

@ -44,7 +44,8 @@
"type": "TXT"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/018-dkim.json
View file

@ -16,7 +16,8 @@
"type": "TXT"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/019-r53-alias.json
View file

@ -193,7 +193,8 @@
"type": "R53_ALIAS"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/020-complexRequire.json
View file

@ -44,7 +44,8 @@
"type": "CNAME"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "sortfoo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/021-srv.json
View file

@ -57,7 +57,8 @@
"type": "SRV"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/022-sshfp.json
View file

@ -81,7 +81,8 @@
"type": "SSHFP"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

1
pkg/js/parse_tests/023-ignored-glob-records.json
View file

@ -9,6 +9,7 @@
"name": "foo.com",
"records": [],
"registrar": "none",
"uniquename": "foo.com",
"unmanaged": [
{
"label_pattern": "\\*.testignore",

3
pkg/js/parse_tests/024-json-import.json
View file

@ -16,7 +16,8 @@
"type": "A"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

9
pkg/js/parse_tests/025-autodnssec.json
View file

@ -8,7 +8,8 @@
},
"name": "nothing.com",
"records": [],
"registrar": "none"
"registrar": "none",
"uniquename": "nothing.com"
},
{
"auto_dnssec": "on",
@ -18,7 +19,8 @@
},
"name": "with.com",
"records": [],
"registrar": "none"
"registrar": "none",
"uniquename": "with.com"
},
{
"auto_dnssec": "off",
@ -28,7 +30,8 @@
},
"name": "without.com",
"records": [],
"registrar": "none"
"registrar": "none",
"uniquename": "without.com"
}
],
"registrars": []

3
pkg/js/parse_tests/026-azure-alias.json
View file

@ -48,7 +48,8 @@
"type": "AZURE_ALIAS"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/027-ds.json
View file

@ -31,7 +31,8 @@
"type": "DS"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

9
pkg/js/parse_tests/028-dextend.json
View file

@ -30,7 +30,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "foo.com"
},
{
"dnsProviders": {
@ -56,7 +57,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "bar.foo.com"
},
{
"dnsProviders": {
@ -96,7 +98,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "foo.edu"
}
],
"registrars": [

30
pkg/js/parse_tests/029-dextendsub.json
View file

@ -62,7 +62,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "foo.net"
},
{
"dnsProviders": {
@ -95,7 +96,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "foo.tld"
},
{
"dnsProviders": {
@ -128,7 +130,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "bar.foo.tld"
},
{
"dnsProviders": {
@ -170,7 +173,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "foo.help"
},
{
"dnsProviders": {
@ -212,7 +216,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "bar.foo.help"
},
{
"dnsProviders": {
@ -270,7 +275,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "foo.here"
},
{
"dnsProviders": {
@ -328,7 +334,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "example.com"
},
{
"dnsProviders": {
@ -402,7 +409,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "xn--dsseldorf-q9a.example.net"
},
{
"dnsProviders": {
@ -476,7 +484,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "xn--tda.example.net"
},
{
"dnsProviders": {
@ -520,7 +529,8 @@
"type": "CNAME"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "example.tld"
}
],
"registrars": [

3
pkg/js/parse_tests/030-dextenddoc.json
View file

@ -107,7 +107,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "domain.tld"
}
],
"registrars": [

6
pkg/js/parse_tests/031-dextendnames.json
View file

@ -106,7 +106,8 @@
"type": "CNAME"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "domain.tld"
},
{
"dnsProviders": {
@ -160,7 +161,8 @@
"type": "CNAME"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "sub.domain.tld"
}
],
"registrars": [

3
pkg/js/parse_tests/032-reverseip.json
View file

@ -88,7 +88,8 @@
"type": "PTR"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "3.2.1.in-addr.arpa"
}
],
"registrars": [

6
pkg/js/parse_tests/033-revextend.json
View file

@ -31,7 +31,8 @@
"type": "NS"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "8.9.in-addr.arpa"
},
{
"dnsProviders": {
@ -66,7 +67,8 @@
"type": "NS"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "example.com"
}
],
"registrars": [

6
pkg/js/parse_tests/034-nameserver-ttl.json
View file

@ -9,7 +9,8 @@
},
"name": "foo.com",
"records": [],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
},
{
"dnsProviders": {},
@ -19,7 +20,8 @@
},
"name": "bar.com",
"records": [],
"registrar": "none"
"registrar": "none",
"uniquename": "bar.com"
}
],
"registrars": []

3
pkg/js/parse_tests/035-naptr.json
View file

@ -57,7 +57,8 @@
"type": "NAPTR"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/036-dextendcf.json
View file

@ -86,7 +86,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "foo.com"
}
],
"registrars": [

24
pkg/js/parse_tests/037-splithor.json
View file

@ -38,7 +38,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "example.com"
},
{
"dnsProviders": {
@ -66,7 +67,8 @@
}
],
"registrar": "Third-Party",
"tag": "inside"
"tag": "inside",
"uniquename": "example.com!inside"
},
{
"dnsProviders": {
@ -87,7 +89,8 @@
}
],
"registrar": "Third-Party",
"tag": "outside"
"tag": "outside",
"uniquename": "example.com!outside"
},
{
"dnsProviders": {
@ -113,7 +116,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "example.net"
},
{
"dnsProviders": {
@ -148,7 +152,8 @@
}
],
"registrar": "Third-Party",
"tag": "inside"
"tag": "inside",
"uniquename": "example.net!inside"
},
{
"dnsProviders": {
@ -183,7 +188,8 @@
}
],
"registrar": "Third-Party",
"tag": "outside"
"tag": "outside",
"uniquename": "example.net!outside"
},
{
"dnsProviders": {
@ -209,7 +215,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "empty.example.net"
},
{
"dnsProviders": {
@ -235,7 +242,8 @@
"type": "A"
}
],
"registrar": "Third-Party"
"registrar": "Third-Party",
"uniquename": "example-b.net!"
}
],
"registrars": [

3
pkg/js/parse_tests/038-soa.json
View file

@ -21,7 +21,8 @@
"type": "SOA"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

6
pkg/js/parse_tests/039-include.json
View file

@ -25,7 +25,8 @@
}
],
"registrar": "Third-Party",
"tag": "external"
"tag": "external",
"uniquename": "foo.com!external"
},
{
"dnsProviders": {
@ -53,7 +54,8 @@
}
],
"registrar": "Third-Party",
"tag": "internal"
"tag": "internal",
"uniquename": "foo.com!internal"
}
],
"registrars": [

3
pkg/js/parse_tests/040-cfWorkerRoute.json
View file

@ -19,7 +19,8 @@
"type": "CF_WORKER_ROUTE"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

6
pkg/js/parse_tests/040-r53-zone.json
View file

@ -9,7 +9,8 @@
},
"name": "foo.com",
"records": [],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
},
{
"dnsProviders": {},
@ -37,7 +38,8 @@
}
],
"registrar": "none",
"tag": "internal"
"tag": "internal",
"uniquename": "foo.com!internal"
}
],
"registrars": []

4
pkg/js/parse_tests/043-safety.json
View file

@ -9,6 +9,7 @@
"name": "unsafe.com",
"records": [],
"registrar": "none",
"uniquename": "unsafe.com",
"unmanaged_disable_safety_check": true
},
{
@ -18,7 +19,8 @@
},
"name": "safe.com",
"records": [],
"registrar": "none"
"registrar": "none",
"uniquename": "safe.com"
}
],
"registrars": []

3
pkg/js/parse_tests/044-ensureabsent.json
View file

@ -24,7 +24,8 @@
"type": "A"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "example.com"
}
],
"registrars": []

3
pkg/js/parse_tests/045-loc.json
View file

@ -328,7 +328,8 @@
"type": "LOC"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/046-DHCID.json
View file

@ -16,7 +16,8 @@
"type": "DHCID"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/047-DNAME.json
View file

@ -16,7 +16,8 @@
"type": "DNAME"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/047-SVCB.json
View file

@ -26,7 +26,8 @@
"type": "SVCB"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/048-DNSKEY.json
View file

@ -20,7 +20,8 @@
"type": "DNSKEY"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/049-json5-require.json
View file

@ -16,7 +16,8 @@
"type": "A"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/050-cfSingleRedirect.json
View file

@ -109,7 +109,8 @@
"type": "A"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/051-HASH.json
View file

@ -8,7 +8,8 @@
},
"name": "a9993e364706816aba3e25717850c26c9cd0d89d",
"records": [],
"registrar": "reg"
"registrar": "reg",
"uniquename": "a9993e364706816aba3e25717850c26c9cd0d89d"
}
],
"registrars": []

3
pkg/js/parse_tests/054-b3487_d_extend_rev.json
View file

@ -110,7 +110,8 @@
"type": "PTR"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "6.10.in-addr.arpa"
}
],
"registrars": [

6
pkg/js/parse_tests/055-b3550-ipv6ptr.json
View file

@ -30,7 +30,8 @@
"type": "PTR"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "d.c.b.a.1.1.0.2.ip6.arpa"
},
{
"dnsProviders": {
@ -64,7 +65,8 @@
"type": "PTR"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "8.b.d.0.1.0.0.2.ip6.arpa"
}
],
"registrars": [

3
pkg/js/parse_tests/056-openpgpkey.json
View file

@ -16,7 +16,8 @@
"type": "OPENPGPKEY"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

3
pkg/js/parse_tests/057-smimea.json
View file

@ -17,7 +17,8 @@
"type": "SMIMEA"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "foo.com"
}
],
"registrars": []

9
pkg/js/parse_tests/058-ignore-external-dns.json
View file

@ -9,7 +9,8 @@
},
"name": "extdns-default.com",
"records": [],
"registrar": "none"
"registrar": "none",
"uniquename": "extdns-default.com"
},
{
"dnsProviders": {},
@ -20,7 +21,8 @@
},
"name": "extdns-custom.com",
"records": [],
"registrar": "none"
"registrar": "none",
"uniquename": "extdns-custom.com"
},
{
"dnsProviders": {},
@ -45,7 +47,8 @@
"type": "A"
}
],
"registrar": "none"
"registrar": "none",
"uniquename": "extdns-combined.com"
}
],
"registrars": []