diff --git a/integration_test.go b/integration_test.go index 8250d3b4..6df964a7 100644 --- a/integration_test.go +++ b/integration_test.go @@ -68,7 +68,7 @@ var _ = Describe("sslip.io-dns-server", func() { Entry("A (or lack thereof) for example.com", "@localhost example.com +short", `\A\z`, - `TypeA example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2024050500 900 900 1800 180\n`), + `TypeA example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2024091500 900 900 1800 180\n`), Entry("A for www-127-0-0-1.sslip.io", "@localhost www-127-0-0-1.sslip.io +short", `\A127.0.0.1\n\z`, @@ -84,7 +84,7 @@ var _ = Describe("sslip.io-dns-server", func() { Entry("AAAA not found for example.com", "@localhost example.com aaaa +short", `\A\z`, - `TypeAAAA example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2024050500 900 900 1800 180\n`), + `TypeAAAA example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2024091500 900 900 1800 180\n`), Entry("AAAA for www-2601-646-100-69f0-1c09-bae7-aa42-146c.sslip.io", "@localhost www-2601-646-100-69f0-1c09-bae7-aa42-146c.sslip.io aaaa +short", `\A2601:646:100:69f0:1c09:bae7:aa42:146c\n\z`, @@ -101,23 +101,23 @@ var _ = Describe("sslip.io-dns-server", func() { Entry("CNAME not found for example.com", "@localhost example.com cname +short", `\A\z`, - `TypeCNAME example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2024050500 900 900 1800 180\n`), + `TypeCNAME example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2024091500 900 900 1800 180\n`), Entry("MX for example.com", "@localhost example.com mx +short", `\A0 example.com.\n\z`, `TypeMX example.com. \? 0 example.com.\n`), Entry("SOA for sslip.io", "@localhost sslip.io soa +short", - `\Asslip.io. briancunnie.gmail.com. 2024050500 900 900 1800 180\n\z`, - `TypeSOA sslip.io. \? sslip.io. briancunnie.gmail.com. 2024050500 900 900 1800 180\n`), + `\Asslip.io. briancunnie.gmail.com. 2024091500 900 900 1800 180\n\z`, + `TypeSOA sslip.io. \? sslip.io. briancunnie.gmail.com. 2024091500 900 900 1800 180\n`), Entry("SOA for example.com", "@localhost example.com soa +short", - `\Aexample.com. briancunnie.gmail.com. 2024050500 900 900 1800 180\n\z`, - `TypeSOA example.com. \? example.com. briancunnie.gmail.com. 2024050500 900 900 1800 180\n`), + `\Aexample.com. briancunnie.gmail.com. 2024091500 900 900 1800 180\n\z`, + `TypeSOA example.com. \? example.com. briancunnie.gmail.com. 2024091500 900 900 1800 180\n`), Entry("SRV (or other record that we don't implement) for example.com", "@localhost example.com srv +short", `\A\z`, - `TypeSRV example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2024050500 900 900 1800 180\n`), + `TypeSRV example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2024091500 900 900 1800 180\n`), Entry(`TXT for version.status.sslip.io is the version number of the xip software (which gets overwritten during linking)`, "@127.0.0.1 version.status.sslip.io txt +short", `\A"0.0.0"\n"0001/01/01-99:99:99-0800"\n"cafexxx"\n\z`, @@ -129,7 +129,7 @@ var _ = Describe("sslip.io-dns-server", func() { Entry(`TXT is the querier's IPv4 address and the domain is NOT "ip.sslip.io"`, "@127.0.0.1 example.com txt +short", `\A\z`, - `TypeTXT example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2024050500 900 900 1800 180\n`), + `TypeTXT example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2024091500 900 900 1800 180\n`), Entry(`get a PTR for 1.0.168.192.in-addr.arpa returns 192-168-0-1.sslip.io`, "@127.0.0.1 ptr -x 192.168.0.1 +short", `\A192-168-0-1.sslip.io.\n\z`, @@ -137,15 +137,15 @@ var _ = Describe("sslip.io-dns-server", func() { Entry(`get a PTR for 1.0.0.127.blah.in-addr.arpa returns no records; "blah.in-addr.arpa is not a valid domain."`, "@127.0.0.1 1.0.0.127.blah.in-addr.arpa ptr +short", `\A\z`, - `TypePTR 1.0.0.127.blah.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2024050500 900 900 1800 180\n`), + `TypePTR 1.0.0.127.blah.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2024091500 900 900 1800 180\n`), Entry(`get a PTR for blah.1.0.0.127.in-addr.arpa returns no records; "blah" isn't a valid subdomain' `, "@127.0.0.1 blah.1.0.0.127.in-addr.arpa ptr +short", `\A\z`, - `TypePTR blah.1.0.0.127.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2024050500 900 900 1800 180\n`), + `TypePTR blah.1.0.0.127.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2024091500 900 900 1800 180\n`), Entry(`get a PTR for 0.0.127.in-addr.arpa returns no records; should have 4 octets, not 3`, "@127.0.0.1 0.0.127.in-addr.arpa ptr +short", `\A\z`, - `TypePTR 0.0.127.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2024050500 900 900 1800 180\n`), + `TypePTR 0.0.127.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2024091500 900 900 1800 180\n`), Entry(`get a PTR for 2.a.b.b.4.0.2.9.a.e.e.6.e.c.4.1.0.f.9.6.0.0.1.0.6.4.6.0.1.0.6.2.ip6.arpa returns 2601-646-100-69f0-14ce-6eea-9204-bba2.sslip.io`, "@127.0.0.1 ptr -x 2601:646:100:69f0:14ce:6eea:9204:bba2 +short", `\A2601-646-100-69f0-14ce-6eea-9204-bba2.sslip.io.\n\z`, @@ -153,15 +153,15 @@ var _ = Describe("sslip.io-dns-server", func() { Entry(`get a PTR for 2.a.b.b.4.0.2.9.a.e.e.6.e.c.4.1.0.f.9.6.0.0.1.0.6.4.6.0.1.0.6.2.blah.ip6.arpa returns no records; "blah isn't a valid subdomain'"`, "@127.0.0.1 2.a.b.b.4.0.2.9.a.e.e.6.e.c.4.1.0.f.9.6.0.0.1.0.6.4.6.0.1.0.6.2.blah.ip6.arpa ptr +short", `\A\z`, - `TypePTR 2.a.b.b.4.0.2.9.a.e.e.6.e.c.4.1.0.f.9.6.0.0.1.0.6.4.6.0.1.0.6.2.blah.ip6.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2024050500 900 900 1800 180\n`), + `TypePTR 2.a.b.b.4.0.2.9.a.e.e.6.e.c.4.1.0.f.9.6.0.0.1.0.6.4.6.0.1.0.6.2.blah.ip6.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2024091500 900 900 1800 180\n`), Entry(`get a PTR for b2.a.b.b.4.0.2.9.a.e.e.6.e.c.4.1.0.f.9.6.0.0.1.0.6.4.6.0.1.0.6.2.ip6.arpa returns no records; "b2" isn't a valid subdomain'`, "@127.0.0.1 b2.a.b.b.4.0.2.9.a.e.e.6.e.c.4.1.0.f.9.6.0.0.1.0.6.4.6.0.1.0.6.2.ip6.arpa ptr +short", `\A\z`, - `TypePTR b2.a.b.b.4.0.2.9.a.e.e.6.e.c.4.1.0.f.9.6.0.0.1.0.6.4.6.0.1.0.6.2.ip6.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2024050500 900 900 1800 180\n`), + `TypePTR b2.a.b.b.4.0.2.9.a.e.e.6.e.c.4.1.0.f.9.6.0.0.1.0.6.4.6.0.1.0.6.2.ip6.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2024091500 900 900 1800 180\n`), Entry(`get a PTR for b.b.4.0.2.9.a.e.e.6.e.c.4.1.0.f.9.6.0.0.1.0.6.4.6.0.1.0.6.2.ip6.arpa returns no records; has too few numbers`, "@127.0.0.1 b.b.4.0.2.9.a.e.e.6.e.c.4.1.0.f.9.6.0.0.1.0.6.4.6.0.1.0.6.2.ip6.arpa ptr +short", `\A\z`, - `TypePTR b.b.4.0.2.9.a.e.e.6.e.c.4.1.0.f.9.6.0.0.1.0.6.4.6.0.1.0.6.2.ip6.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2024050500 900 900 1800 180\n`), + `TypePTR b.b.4.0.2.9.a.e.e.6.e.c.4.1.0.f.9.6.0.0.1.0.6.4.6.0.1.0.6.2.ip6.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2024091500 900 900 1800 180\n`), Entry(`TODO: should, but doesn't, return an IDNA2008-compliant record for ::1`, "@127.0.0.1 -x ::1 +short", `\A--1.sslip.io.\n\z`, diff --git a/xip/xip.go b/xip/xip.go index 1677ec97..7ba392c9 100644 --- a/xip/xip.go +++ b/xip/xip.go @@ -877,7 +877,7 @@ func SOAResource(name dnsmessage.Name) dnsmessage.SOAResource { return dnsmessage.SOAResource{ NS: name, MBox: mbox, - Serial: 2024050500, + Serial: 2024091500, // cribbed the Refresh/Retry/Expire from google.com. // MinTTL was 300, but I dropped to 180 for faster // key-value propagation