zishuo/nip
1
0
Fork 0
mirror of https://github.com/cunnie/sslip.io.git synced 2025-10-07 08:31:02 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update SOA to Bastille Day (7/14)

Browse Source 
I love Bastille Day. And I love bumping the SOA right before a new
release.
This commit is contained in:
Brian Cunnie
2022-07-14 09:06:35 -07:00
parent 61f56fea14
commit 314ce692f2
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/sslip.io-dns-server/integration_test.go
View File

@@ -75,7 +75,7 @@ var _ = Describe("sslip.io-dns-server", func() {
Entry("A (or lack thereof) for example.com", Entry("A (or lack thereof) for example.com",
"@localhost example.com +short", "@localhost example.com +short",
`\A\z`, `\A\z`,
`TypeA example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), `TypeA example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022071400 900 900 1800 180\n$`),
Entry("A for www-127-0-0-1.sslip.io", Entry("A for www-127-0-0-1.sslip.io",
"@localhost www-127-0-0-1.sslip.io +short", "@localhost www-127-0-0-1.sslip.io +short",
`\A127.0.0.1\n\z`, `\A127.0.0.1\n\z`,
@@ -91,7 +91,7 @@ var _ = Describe("sslip.io-dns-server", func() {
Entry("AAAA not found for example.com", Entry("AAAA not found for example.com",
"@localhost example.com aaaa +short", "@localhost example.com aaaa +short",
`\A\z`, `\A\z`,
`TypeAAAA example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), `TypeAAAA example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022071400 900 900 1800 180\n$`),
Entry("AAAA for www-2601-646-100-69f0-1c09-bae7-aa42-146c.sslip.io", 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", "@localhost www-2601-646-100-69f0-1c09-bae7-aa42-146c.sslip.io aaaa +short",
`\A2601:646:100:69f0:1c09:bae7:aa42:146c\n\z`, `\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", Entry("CNAME not found for example.com",
"@localhost example.com cname +short", "@localhost example.com cname +short",
`\A\z`, `\A\z`,
`TypeCNAME example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), `TypeCNAME example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022071400 900 900 1800 180\n$`),
Entry("MX for example.com", Entry("MX for example.com",
"@localhost example.com mx +short", "@localhost example.com mx +short",
`\A0 example.com.\n\z`, `\A0 example.com.\n\z`,
`TypeMX example.com. \? 0 example.com.\n$`), `TypeMX example.com. \? 0 example.com.\n$`),
Entry("SOA for sslip.io", Entry("SOA for sslip.io",
"@localhost sslip.io soa +short", "@localhost sslip.io soa +short",
`\Asslip.io. briancunnie.gmail.com. 2022042500 900 900 1800 180\n\z`, `\Asslip.io. briancunnie.gmail.com. 2022071400 900 900 1800 180\n\z`,
`TypeSOA sslip.io. \? sslip.io. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), `TypeSOA sslip.io. \? sslip.io. briancunnie.gmail.com. 2022071400 900 900 1800 180\n$`),
Entry("SOA for example.com", Entry("SOA for example.com",
"@localhost example.com soa +short", "@localhost example.com soa +short",
`\Aexample.com. briancunnie.gmail.com. 2022042500 900 900 1800 180\n\z`, `\Aexample.com. briancunnie.gmail.com. 2022071400 900 900 1800 180\n\z`,
`TypeSOA example.com. \? example.com. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), `TypeSOA example.com. \? example.com. briancunnie.gmail.com. 2022071400 900 900 1800 180\n$`),
Entry("SRV (or other record that we don't implement) for example.com", Entry("SRV (or other record that we don't implement) for example.com",
"@localhost example.com srv +short", "@localhost example.com srv +short",
`\A\z`, `\A\z`,
`TypeSRV example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), `TypeSRV example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022071400 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)`, 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", "@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`, `\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"`, Entry(`TXT is the querier's IPv4 address and the domain is NOT "ip.sslip.io"`,
"@127.0.0.1 example.com txt +short", "@127.0.0.1 example.com txt +short",
`\A\z`, `\A\z`,
`TypeTXT example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), `TypeTXT example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2022071400 900 900 1800 180\n$`),
Entry(`getting a non-existent value: TXT for my-key.k-v.io"`, Entry(`getting a non-existent value: TXT for my-key.k-v.io"`,
"@127.0.0.1 my-key.k-v.io txt +short", "@127.0.0.1 my-key.k-v.io txt +short",
`\A\z`, `\A\z`,
`TypeTXT my-key.k-v.io. \? nil, SOA my-key.k-v.io. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), `TypeTXT my-key.k-v.io. \? nil, SOA my-key.k-v.io. briancunnie.gmail.com. 2022071400 900 900 1800 180\n$`),
Entry(`putting a value: TXT for put.MyValue.MY-KEY.k-v.io"`, 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", "@127.0.0.1 put.MyValue.MY-KEY.k-v.io txt +short",
`"MyValue"`, `"MyValue"`,
@@ -152,11 +152,11 @@ var _ = Describe("sslip.io-dns-server", func() {
Entry(`deleting a value: TXT for delete.my-key.k-v.io"`, Entry(`deleting a value: TXT for delete.my-key.k-v.io"`,
"@127.0.0.1 delete.my-key.k-v.io txt +short", "@127.0.0.1 delete.my-key.k-v.io txt +short",
`\A\z`, `\A\z`,
`TypeTXT delete.my-key.k-v.io. \? nil, SOA delete.my-key.k-v.io. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), `TypeTXT delete.my-key.k-v.io. \? nil, SOA delete.my-key.k-v.io. briancunnie.gmail.com. 2022071400 900 900 1800 180\n$`),
Entry(`getting a non-existent value: TXT for my-key.k-v.io"`, Entry(`getting a non-existent value: TXT for my-key.k-v.io"`,
"@127.0.0.1 my-key.k-v.io txt +short", "@127.0.0.1 my-key.k-v.io txt +short",
`\A\z`, `\A\z`,
`TypeTXT my-key.k-v.io. \? nil, SOA my-key.k-v.io. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), `TypeTXT my-key.k-v.io. \? nil, SOA my-key.k-v.io. briancunnie.gmail.com. 2022071400 900 900 1800 180\n$`),
Entry(`setting a TXT for _acme-challenge.k-v.io appears to work (spoiler: it doesn't)'"`, 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", "@127.0.0.1 put.sneaky-boy._acme-challenge.k-v.io txt +short",
`sneaky-boy`, `sneaky-boy`,
@@ -180,15 +180,15 @@ var _ = Describe("sslip.io-dns-server", func() {
Entry(`get a PTR for 1.0.0.127.blah.in-addr.arpa returns no records`, Entry(`get a PTR for 1.0.0.127.blah.in-addr.arpa returns no records`,
"@127.0.0.1 1.0.0.127.blah.in-addr.arpa ptr +short", "@127.0.0.1 1.0.0.127.blah.in-addr.arpa ptr +short",
`\A\z`, `\A\z`,
`TypePTR 1.0.0.127.blah.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), `TypePTR 1.0.0.127.blah.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2022071400 900 900 1800 180\n$`),
Entry(`get a PTR for blah.1.0.0.127.in-addr.arpa returns no records`, Entry(`get a PTR for blah.1.0.0.127.in-addr.arpa returns no records`,
"@127.0.0.1 blah.1.0.0.127.in-addr.arpa ptr +short", "@127.0.0.1 blah.1.0.0.127.in-addr.arpa ptr +short",
`\A\z`, `\A\z`,
`TypePTR blah.1.0.0.127.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), `TypePTR blah.1.0.0.127.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2022071400 900 900 1800 180\n$`),
Entry(`get a PTR for 0.0.127.in-addr.arpa returns no records`, Entry(`get a PTR for 0.0.127.in-addr.arpa returns no records`,
"@127.0.0.1 0.0.127.in-addr.arpa ptr +short", "@127.0.0.1 0.0.127.in-addr.arpa ptr +short",
`\A\z`, `\A\z`,
`TypePTR 0.0.127.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2022042500 900 900 1800 180\n$`), `TypePTR 0.0.127.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2022071400 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`, 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 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 ptr +short", "@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.ip6.arpa ptr +short",
`\A2601-646-100-69f0-14ce-6eea-9204-bba2.sslip.io.\n\z`, `\A2601-646-100-69f0-14ce-6eea-9204-bba2.sslip.io.\n\z`,
@@ -196,15 +196,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`, 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`,
"@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", "@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`, `\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. 2022042500 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. 2022071400 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`, 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`,
"@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", "@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`, `\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. 2022042500 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. 2022071400 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`, 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`,
"@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", "@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`, `\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. 2022042500 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. 2022071400 900 900 1800 180\n$`),
) )
}) })
Describe("for more complex assertions", func() { Describe("for more complex assertions", func() {
@@ -314,7 +314,7 @@ var _ = Describe("sslip.io-dns-server", func() {
digSession, err = Start(digCmd, GinkgoWriter, GinkgoWriter) digSession, err = Start(digCmd, GinkgoWriter, GinkgoWriter)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Eventually(digSession, 1).Should(Exit(0)) 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. 2022042500 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. 2022071400 900 900 1800 180`))
}) })
It(`the DELETE on a non-existent key behaves the same as the DELETE on an existing key`, func() { 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) digArgs = "@localhost delete.b.k-v.io txt -p " + strconv.Itoa(port)
@@ -322,7 +322,7 @@ var _ = Describe("sslip.io-dns-server", func() {
digSession, err = Start(digCmd, GinkgoWriter, GinkgoWriter) digSession, err = Start(digCmd, GinkgoWriter, GinkgoWriter)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Eventually(digSession, 1).Should(Exit(0)) 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. 2022042500 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. 2022071400 900 900 1800 180`))
}) })
}) })
When(`a record for an "_acme-challenge" domain is queried`, func() { When(`a record for an "_acme-challenge" domain is queried`, func() {

2
src/sslip.io-dns-server/xip/xip.go
View File

@@ -832,7 +832,7 @@ func SOAResource(name dnsmessage.Name) dnsmessage.SOAResource {
return dnsmessage.SOAResource{ return dnsmessage.SOAResource{
NS: name, NS: name,
MBox: mbox, MBox: mbox,
Serial: 2022042500, Serial: 2022071400,
// cribbed the Refresh/Retry/Expire from google.com. // cribbed the Refresh/Retry/Expire from google.com.
// MinTTL was 300, but I dropped to 180 for faster // MinTTL was 300, but I dropped to 180 for faster
// key-value propagation // key-value propagation