mokhtar/local-ip.sh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make the hardcoded records structure more consistent

Browse Source
This commit is contained in:
m5r 2022-10-29 15:37:31 +02:00
parent 97b5751a34
commit 2be8951193
No known key found for this signature in database
GPG Key ID: 5BC847276DD5DDEA
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xip/xip.go
View File

@ -19,9 +19,9 @@ type Xip struct {
} }
type HardcodedRecord struct { type HardcodedRecord struct {
A net.IP A *dns.A
TXT []string TXT *dns.TXT
MX []dns.MX MX []*dns.MX
} }
var ( var (
@ -30,15 +30,17 @@ var (
dashedIpV4Regex = regexp.MustCompile(`(?:^|(?:[\w\d])+\.)(((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\-?\b){4})($|[.-])`) dashedIpV4Regex = regexp.MustCompile(`(?:^|(?:[\w\d])+\.)(((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\-?\b){4})($|[.-])`)
hardcodedRecords = map[string]HardcodedRecord{ hardcodedRecords = map[string]HardcodedRecord{
"ns.local-ip.sh.": { "ns.local-ip.sh.": {
A: net.IPv4(137, 66, 38, 214), A: &dns.A{A: net.IPv4(137, 66, 38, 214)},
}, },
"local-ip.sh.": { "local-ip.sh.": {
A: net.IPv4(137, 66, 53, 22), A: &dns.A{A: net.IPv4(137, 66, 53, 22)},
TXT: []string{ TXT: &dns.TXT{
Txt: []string{
"sl-verification=frudknyqpqlpgzbglkqnsmorfcvxrf", "sl-verification=frudknyqpqlpgzbglkqnsmorfcvxrf",
"v=spf1 include:simplelogin.co ~all", "v=spf1 include:simplelogin.co ~all",
}, },
MX: []dns.MX{ },
MX: []*dns.MX{
{Preference: 10, Mx: "mx1.simplelogin.co."}, {Preference: 10, Mx: "mx1.simplelogin.co."},
{Preference: 20, Mx: "mx2.simplelogin.co."}, {Preference: 20, Mx: "mx2.simplelogin.co."},
}, },
@ -49,7 +51,7 @@ var (
func (xip *Xip) fqdnToA(fqdn string) *dns.A { func (xip *Xip) fqdnToA(fqdn string) *dns.A {
var ipV4Address net.IP var ipV4Address net.IP
if hardcodedRecords[strings.ToLower(fqdn)].A != nil { if hardcodedRecords[strings.ToLower(fqdn)].A != nil {
ipV4Address = hardcodedRecords[strings.ToLower(fqdn)].A ipV4Address = hardcodedRecords[strings.ToLower(fqdn)].A.A
} }
for _, ipV4RE := range []*regexp.Regexp{dashedIpV4Regex, dottedIpV4Regex} { for _, ipV4RE := range []*regexp.Regexp{dashedIpV4Regex, dottedIpV4Regex} {
@ -133,7 +135,7 @@ func (xip *Xip) handleTXT(question dns.Question, message *dns.Msg) {
Rrtype: dns.TypeTXT, Rrtype: dns.TypeTXT,
Class: dns.ClassINET, Class: dns.ClassINET,
}, },
Txt: hardcodedRecords[strings.ToLower(fqdn)].TXT, Txt: hardcodedRecords[strings.ToLower(fqdn)].TXT.Txt,
}) })
} }