diff --git a/src/sslip.io-dns-server/integration_test.go b/src/sslip.io-dns-server/integration_test.go index 16e3728..0e33733 100644 --- a/src/sslip.io-dns-server/integration_test.go +++ b/src/sslip.io-dns-server/integration_test.go @@ -75,7 +75,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. 2022020800 900 900 1800 180\n$`), + `TypeA example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022042500 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`, @@ -91,7 +91,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. 2022020800 900 900 1800 180\n$`), + `TypeAAAA example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022042500 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`, @@ -108,23 +108,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. 2022020800 900 900 1800 180\n$`), + `TypeCNAME example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022042500 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. 2022020800 900 900 1800 180\n\z`, - `TypeSOA sslip.io. \? sslip.io. briancunnie.gmail.com. 2022020800 900 900 1800 180\n$`), + `\Asslip.io. briancunnie.gmail.com. 2022042500 900 900 1800 180\n\z`, + `TypeSOA sslip.io. \? sslip.io. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), Entry("SOA for example.com", "@localhost example.com soa +short", - `\Aexample.com. briancunnie.gmail.com. 2022020800 900 900 1800 180\n\z`, - `TypeSOA example.com. \? example.com. briancunnie.gmail.com. 2022020800 900 900 1800 180\n$`), + `\Aexample.com. briancunnie.gmail.com. 2022042500 900 900 1800 180\n\z`, + `TypeSOA example.com. \? example.com. briancunnie.gmail.com. 2022042500 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. 2022020800 900 900 1800 180\n$`), + `TypeSRV example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022042500 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`, @@ -136,11 +136,11 @@ 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. 2022020800 900 900 1800 180\n$`), + `TypeTXT example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), Entry(`getting a non-existent value: TXT for my-key.k-v.io"`, "@127.0.0.1 my-key.k-v.io txt +short", `\A\z`, - `TypeTXT my-key.k-v.io. \? nil, SOA my-key.k-v.io. briancunnie.gmail.com. 2022020800 900 900 1800 180\n$`), + `TypeTXT my-key.k-v.io. \? nil, SOA my-key.k-v.io. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), Entry(`putting a value: TXT for put.MyValue.MY-KEY.k-v.io"`, "@127.0.0.1 put.MyValue.MY-KEY.k-v.io txt +short", `"MyValue"`, @@ -152,11 +152,11 @@ var _ = Describe("sslip.io-dns-server", func() { Entry(`deleting a value: TXT for delete.my-key.k-v.io"`, "@127.0.0.1 delete.my-key.k-v.io txt +short", `\A\z`, - `TypeTXT delete.my-key.k-v.io. \? nil, SOA delete.my-key.k-v.io. briancunnie.gmail.com. 2022020800 900 900 1800 180\n$`), + `TypeTXT delete.my-key.k-v.io. \? nil, SOA delete.my-key.k-v.io. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), Entry(`getting a non-existent value: TXT for my-key.k-v.io"`, "@127.0.0.1 my-key.k-v.io txt +short", `\A\z`, - `TypeTXT my-key.k-v.io. \? nil, SOA my-key.k-v.io. briancunnie.gmail.com. 2022020800 900 900 1800 180\n$`), + `TypeTXT my-key.k-v.io. \? nil, SOA my-key.k-v.io. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), Entry(`setting a TXT for _acme-challenge.k-v.io appears to work (spoiler: it doesn't)'"`, "@127.0.0.1 put.sneaky-boy._acme-challenge.k-v.io txt +short", `sneaky-boy`, @@ -274,7 +274,7 @@ var _ = Describe("sslip.io-dns-server", func() { digSession, err = Start(digCmd, GinkgoWriter, GinkgoWriter) Expect(err).ToNot(HaveOccurred()) Eventually(digSession, 1).Should(Exit(0)) - Eventually(string(serverSession.Err.Contents())).Should(MatchRegexp(`TypeTXT delete.b.k-v.io. \? nil, SOA delete.b.k-v.io. briancunnie.gmail.com. 2022020800 900 900 1800 180`)) + Eventually(string(serverSession.Err.Contents())).Should(MatchRegexp(`TypeTXT delete.b.k-v.io. \? nil, SOA delete.b.k-v.io. briancunnie.gmail.com. 2022042500 900 900 1800 180`)) }) It(`the DELETE on a non-existent key behaves the same as the DELETE on an existing key`, func() { digArgs = "@localhost delete.b.k-v.io txt -p " + strconv.Itoa(port) @@ -282,7 +282,7 @@ var _ = Describe("sslip.io-dns-server", func() { digSession, err = Start(digCmd, GinkgoWriter, GinkgoWriter) Expect(err).ToNot(HaveOccurred()) Eventually(digSession, 1).Should(Exit(0)) - Eventually(string(serverSession.Err.Contents())).Should(MatchRegexp(`TypeTXT delete.b.k-v.io. \? nil, SOA delete.b.k-v.io. briancunnie.gmail.com. 2022020800 900 900 1800 180`)) + Eventually(string(serverSession.Err.Contents())).Should(MatchRegexp(`TypeTXT delete.b.k-v.io. \? nil, SOA delete.b.k-v.io. briancunnie.gmail.com. 2022042500 900 900 1800 180`)) }) }) When(`a record for an "_acme-challenge" domain is queried`, func() { diff --git a/src/sslip.io-dns-server/xip/xip.go b/src/sslip.io-dns-server/xip/xip.go index 97fa283..3d455bf 100644 --- a/src/sslip.io-dns-server/xip/xip.go +++ b/src/sslip.io-dns-server/xip/xip.go @@ -790,7 +790,7 @@ func SOAResource(name dnsmessage.Name) dnsmessage.SOAResource { return dnsmessage.SOAResource{ NS: name, MBox: mbox, - Serial: 2022020800, + Serial: 2022042500, // cribbed the Refresh/Retry/Expire from google.com. // MinTTL was 300, but I dropped to 180 for faster // key-value propagation