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

Update SOA to the Ides of March (3/15)

Browse Source 
"Beware the ides of March."

William Shakespeare, _Julius Caesar_, Act 1, Scene 2

I should have bumped the SOA _before_ I cut release 2.7.0.
This commit is contained in:
Brian Cunnie
2023-03-15 13:32:13 -07:00
parent 463071ff90
commit fb755b89a1
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,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. 2022112600 900 900 1800 180\n`), `TypeA example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2023031500 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`,
@@ -81,7 +81,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. 2022112600 900 900 1800 180\n`), `TypeAAAA example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2023031500 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`,
@@ -98,23 +98,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. 2022112600 900 900 1800 180\n`), `TypeCNAME example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2023031500 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. 2022112600 900 900 1800 180\n\z`, `\Asslip.io. briancunnie.gmail.com. 2023031500 900 900 1800 180\n\z`,
`TypeSOA sslip.io. \? sslip.io. briancunnie.gmail.com. 2022112600 900 900 1800 180\n`), `TypeSOA sslip.io. \? sslip.io. briancunnie.gmail.com. 2023031500 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. 2022112600 900 900 1800 180\n\z`, `\Aexample.com. briancunnie.gmail.com. 2023031500 900 900 1800 180\n\z`,
`TypeSOA example.com. \? example.com. briancunnie.gmail.com. 2022112600 900 900 1800 180\n`), `TypeSOA example.com. \? example.com. briancunnie.gmail.com. 2023031500 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. 2022112600 900 900 1800 180\n`), `TypeSRV example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2023031500 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`,
@@ -126,7 +126,7 @@ 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. 2022112600 900 900 1800 180\n`), `TypeTXT example.com. \? nil, SOA example.com. briancunnie.gmail.com. 2023031500 900 900 1800 180\n`),
Entry(`get a PTR for 1.0.168.192.in-addr.arpa returns 192-168-0-1.sslip.io`, Entry(`get a PTR for 1.0.168.192.in-addr.arpa returns 192-168-0-1.sslip.io`,
"@127.0.0.1 1.0.168.192.in-addr.arpa ptr +short", "@127.0.0.1 1.0.168.192.in-addr.arpa ptr +short",
`\A192-168-0-1.sslip.io.\n\z`, `\A192-168-0-1.sslip.io.\n\z`,
@@ -134,15 +134,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. 2022112600 900 900 1800 180\n`), `TypePTR 1.0.0.127.blah.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2023031500 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. 2022112600 900 900 1800 180\n`), `TypePTR blah.1.0.0.127.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2023031500 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. 2022112600 900 900 1800 180\n`), `TypePTR 0.0.127.in-addr.arpa. \? nil, SOA sslip.io. briancunnie.gmail.com. 2023031500 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`,
@@ -150,15 +150,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. 2022112600 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. 2023031500 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. 2022112600 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. 2023031500 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. 2022112600 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. 2023031500 900 900 1800 180\n`),
) )
}) })
Describe("for more complex assertions", func() { Describe("for more complex assertions", func() {

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

@@ -798,7 +798,7 @@ func SOAResource(name dnsmessage.Name) dnsmessage.SOAResource {
return dnsmessage.SOAResource{ return dnsmessage.SOAResource{
NS: name, NS: name,
MBox: mbox, MBox: mbox,
Serial: 2022112600, Serial: 2023031500,
// 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