make new resolverStatus()
also fix dns-https Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
parent
2800b23f81
commit
46f58f7651
|
|
@ -1,476 +0,0 @@
|
||||||
/*
|
|
||||||
'dig'
|
|
||||||
|
|
||||||
This is essentially doing what the command 'dig' does
|
|
||||||
It performing DNS queries on TCP and UDP
|
|
||||||
against localhost, cloudflare & google
|
|
||||||
|
|
||||||
IPv4() and IPv6() return true if they are working
|
|
||||||
|
|
||||||
with the 'gui' package, it can also display the results
|
|
||||||
*/
|
|
||||||
|
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"fmt"
|
|
||||||
"time"
|
|
||||||
"strconv"
|
|
||||||
"reflect"
|
|
||||||
"errors"
|
|
||||||
|
|
||||||
"go.wit.com/log"
|
|
||||||
"go.wit.com/gui/gui"
|
|
||||||
"go.wit.com/gui/gadgets"
|
|
||||||
"go.wit.com/shell"
|
|
||||||
|
|
||||||
"github.com/miekg/dns"
|
|
||||||
)
|
|
||||||
|
|
||||||
type digStatus struct {
|
|
||||||
ready bool
|
|
||||||
hidden bool
|
|
||||||
statusIPv4 string
|
|
||||||
statusIPv6 string
|
|
||||||
|
|
||||||
parent *gui.Node
|
|
||||||
window *gadgets.BasicWindow
|
|
||||||
group *gui.Node
|
|
||||||
grid *gui.Node
|
|
||||||
|
|
||||||
summary *gui.Node
|
|
||||||
status *gadgets.OneLiner
|
|
||||||
statusAAAA *gadgets.OneLiner
|
|
||||||
speed *gadgets.OneLiner
|
|
||||||
speedActual *gadgets.OneLiner
|
|
||||||
|
|
||||||
details *gui.Node
|
|
||||||
dsLocalhost *dnsStatus
|
|
||||||
dsLocalNetwork *dnsStatus
|
|
||||||
dsCloudflare *dnsStatus
|
|
||||||
dsGoogle *dnsStatus
|
|
||||||
DnsDigUDP *gui.Node
|
|
||||||
DnsDigTCP *gui.Node
|
|
||||||
|
|
||||||
httpGoWitCom *gadgets.OneLiner
|
|
||||||
statusHTTP *gadgets.OneLiner
|
|
||||||
}
|
|
||||||
|
|
||||||
type dnsStatus struct {
|
|
||||||
title string
|
|
||||||
server string // The DNS server. Example: "127.0.0.1:53" or "1.1.1.1:53"
|
|
||||||
hostname string // the hostname to lookup. Example: "www.google.com" or "go.wit.com"
|
|
||||||
|
|
||||||
parent *gui.Node
|
|
||||||
group *gui.Node
|
|
||||||
grid *gui.Node
|
|
||||||
|
|
||||||
// DNS setup options
|
|
||||||
udpA *gui.Node
|
|
||||||
tcpA *gui.Node
|
|
||||||
udpAAAA *gui.Node
|
|
||||||
tcpAAAA *gui.Node
|
|
||||||
|
|
||||||
// show the display
|
|
||||||
aFail *gui.Node
|
|
||||||
aSuccess *gui.Node
|
|
||||||
aaaaFail *gui.Node
|
|
||||||
aaaaSuccess *gui.Node
|
|
||||||
|
|
||||||
// interger counters
|
|
||||||
aFailc int
|
|
||||||
aSuccessc int
|
|
||||||
aaaaFailc int
|
|
||||||
aaaaSuccessc int
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewDigStatusWindow(p *gui.Node) *digStatus {
|
|
||||||
var ds *digStatus
|
|
||||||
ds = new(digStatus)
|
|
||||||
|
|
||||||
ds.ready = false
|
|
||||||
ds.hidden = true
|
|
||||||
|
|
||||||
ds.window = gadgets.NewBasicWindow(p, "DNS Resolver Status")
|
|
||||||
ds.window.Draw()
|
|
||||||
ds.window.Hide()
|
|
||||||
|
|
||||||
// summary of the current state of things
|
|
||||||
ds.summary = ds.window.Box().NewGroup("Summary")
|
|
||||||
g := ds.summary.NewGrid("LookupStatus", 2, 2)
|
|
||||||
g.Pad()
|
|
||||||
|
|
||||||
ds.status = gadgets.NewOneLiner(g, "status").Set("unknown")
|
|
||||||
ds.statusAAAA = gadgets.NewOneLiner(g, "IPv6 status").Set("unknown")
|
|
||||||
ds.statusHTTP = gadgets.NewOneLiner(g, "IPv6 via HTTP").Set("unknown")
|
|
||||||
ds.speed = gadgets.NewOneLiner(g, "speed").Set("unknown")
|
|
||||||
ds.speedActual = gadgets.NewOneLiner(g, "actual").Set("unknown")
|
|
||||||
|
|
||||||
// make the area to store the raw details
|
|
||||||
ds.details = ds.window.Box().NewGroup("Details")
|
|
||||||
ds.dsLocalhost = NewDnsStatus(ds.details, "(localhost)", "127.0.0.1:53", "go.wit.com")
|
|
||||||
ds.dsLocalNetwork = NewDnsStatus(ds.details, "(Local Network)", "172.22.0.1:53", "go.wit.com")
|
|
||||||
ds.dsCloudflare = NewDnsStatus(ds.details, "(cloudflare)", "1.1.1.1:53", "go.wit.com")
|
|
||||||
ds.dsGoogle = NewDnsStatus(ds.details, "(google)", "8.8.8.8:53", "go.wit.com")
|
|
||||||
ds.makeDnsStatusGrid()
|
|
||||||
ds.makeHttpStatusGrid()
|
|
||||||
|
|
||||||
ds.hidden = false
|
|
||||||
ds.ready = true
|
|
||||||
return ds
|
|
||||||
}
|
|
||||||
|
|
||||||
func (ds *digStatus) Update() {
|
|
||||||
log.Info("digStatus() Update() START")
|
|
||||||
if ds == nil {
|
|
||||||
log.Error(errors.New("digStatus() Update() ds == nil"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
duration := timeFunction(func () {
|
|
||||||
ds.updateDnsStatus()
|
|
||||||
})
|
|
||||||
s := fmt.Sprint(duration)
|
|
||||||
// ds.speedActual.Set(s)
|
|
||||||
me.digStatus.set(ds.speedActual, s)
|
|
||||||
|
|
||||||
if (duration > 500 * time.Millisecond ) {
|
|
||||||
me.digStatus.set(ds.speed, "SLOW")
|
|
||||||
} else if (duration > 100 * time.Millisecond ) {
|
|
||||||
me.digStatus.set(ds.speed, "OK")
|
|
||||||
} else {
|
|
||||||
me.digStatus.set(ds.speed, "FAST")
|
|
||||||
}
|
|
||||||
log.Info("digStatus() Update() END")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns true if the status is valid
|
|
||||||
func (ds *digStatus) Ready() bool {
|
|
||||||
if ds == nil {return false}
|
|
||||||
return ds.ready
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns true if IPv4 is working
|
|
||||||
func (ds *digStatus) IPv4() bool {
|
|
||||||
if ! ds.Ready() {return false}
|
|
||||||
if (ds.statusIPv4 == "OK") {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
if (ds.statusIPv4 == "GOOD") {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns true if IPv6 is working
|
|
||||||
func (ds *digStatus) IPv6() bool {
|
|
||||||
if ! ds.Ready() {return false}
|
|
||||||
if (ds.statusIPv6 == "GOOD") {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func (ds *digStatus) setIPv4(s string) {
|
|
||||||
ds.statusIPv4 = s
|
|
||||||
if ! ds.Ready() {return}
|
|
||||||
me.digStatus.set(ds.status, s)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (ds *digStatus) setIPv6(s string) {
|
|
||||||
ds.statusIPv6 = s
|
|
||||||
if ! ds.Ready() {return}
|
|
||||||
me.digStatus.set(ds.statusAAAA, s)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (ds *digStatus) set(a any, s string) {
|
|
||||||
if ! ds.Ready() {return}
|
|
||||||
if ds.hidden {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if a == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var n *gui.Node
|
|
||||||
if reflect.TypeOf(a) == reflect.TypeOf(n) {
|
|
||||||
n = a.(*gui.Node)
|
|
||||||
n.SetText(s)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var ol *gadgets.OneLiner
|
|
||||||
if reflect.TypeOf(a) == reflect.TypeOf(ol) {
|
|
||||||
ol = a.(*gadgets.OneLiner)
|
|
||||||
ol.Set(s)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
log.Warn("unknown type TypeOf(a) =", reflect.TypeOf(a), "a =", a)
|
|
||||||
os.Exit(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (ds *digStatus) updateDnsStatus() {
|
|
||||||
var cmd, out string
|
|
||||||
var ipv4, ipv6 bool
|
|
||||||
|
|
||||||
log.Info("updateDnsStatus() START")
|
|
||||||
if (ds == nil) {
|
|
||||||
log.Error(errors.New("updateDnsStatus() not initialized yet. ds == nil"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! ds.ready) {
|
|
||||||
log.Error(errors.New("updateDnsStatus() not ready yet"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
ipv4, ipv6 = ds.dsLocalhost.update()
|
|
||||||
ipv4, ipv6 = ds.dsLocalNetwork.update()
|
|
||||||
ipv4, ipv6 = ds.dsCloudflare.update()
|
|
||||||
ipv4, ipv6 = ds.dsGoogle.update()
|
|
||||||
|
|
||||||
if ds.checkLookupDoH("go.wit.com") {
|
|
||||||
log.Println("updateDnsStatus() HTTP DNS lookups working")
|
|
||||||
me.digStatus.set(ds.statusHTTP, "WORKING")
|
|
||||||
} else {
|
|
||||||
log.Println("updateDnsStatus() HTTP DNS lookups not working")
|
|
||||||
log.Println("updateDnsStatus() It's really unlikely you are on the internet")
|
|
||||||
me.digStatus.set(ds.statusHTTP, "BROKEN")
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ipv4) {
|
|
||||||
log.Println("updateDnsStatus() IPv4 A lookups working")
|
|
||||||
ds.setIPv4("OK")
|
|
||||||
} else {
|
|
||||||
log.Println("updateDnsStatus() IPv4 A lookups not working. No internet?")
|
|
||||||
ds.setIPv4("No Internet?")
|
|
||||||
}
|
|
||||||
if (ipv6) {
|
|
||||||
log.Println("updateDnsStatus() IPv6 AAAA lookups working")
|
|
||||||
ds.setIPv4("GOOD")
|
|
||||||
ds.setIPv6("GOOD")
|
|
||||||
} else {
|
|
||||||
log.Println("updateDnsStatus() IPv6 AAAA lookups are not working")
|
|
||||||
ds.setIPv6("Need VPN")
|
|
||||||
}
|
|
||||||
|
|
||||||
cmd = "dig +noall +answer www.wit.com A"
|
|
||||||
out = shell.Run(cmd)
|
|
||||||
log.Println("makeDnsStatusGrid() dig", out)
|
|
||||||
me.digStatus.set(ds.DnsDigUDP, out)
|
|
||||||
|
|
||||||
cmd = "dig +noall +answer www.wit.com AAAA"
|
|
||||||
out = shell.Run(cmd)
|
|
||||||
log.Println("makeDnsStatusGrid() dig", out)
|
|
||||||
me.digStatus.set(ds.DnsDigTCP, out)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Makes a DNS Status Grid
|
|
||||||
func NewDnsStatus(p *gui.Node, title string, server string, hostname string) *dnsStatus {
|
|
||||||
var ds *dnsStatus
|
|
||||||
ds = new(dnsStatus)
|
|
||||||
ds.parent = p
|
|
||||||
ds.group = p.NewGroup(server + " " + title + " lookup")
|
|
||||||
ds.grid = ds.group.NewGrid("LookupStatus", 5, 2)
|
|
||||||
|
|
||||||
ds.server = server
|
|
||||||
ds.hostname = hostname
|
|
||||||
|
|
||||||
ds.grid.NewLabel("")
|
|
||||||
ds.grid.NewLabel("UDP")
|
|
||||||
ds.grid.NewLabel("TCP")
|
|
||||||
ds.grid.NewLabel("Success")
|
|
||||||
ds.grid.NewLabel("Fail")
|
|
||||||
|
|
||||||
ds.grid.NewLabel("A")
|
|
||||||
ds.udpA = ds.grid.NewLabel("?")
|
|
||||||
ds.tcpA = ds.grid.NewLabel("?")
|
|
||||||
ds.aSuccess = ds.grid.NewLabel("?")
|
|
||||||
ds.aFail = ds.grid.NewLabel("?")
|
|
||||||
|
|
||||||
ds.grid.NewLabel("AAAA")
|
|
||||||
ds.udpAAAA = ds.grid.NewLabel("?")
|
|
||||||
ds.tcpAAAA = ds.grid.NewLabel("?")
|
|
||||||
ds.aaaaSuccess = ds.grid.NewLabel("?")
|
|
||||||
ds.aaaaFail = ds.grid.NewLabel("?")
|
|
||||||
|
|
||||||
ds.group.Margin()
|
|
||||||
ds.grid.Margin()
|
|
||||||
ds.group.Pad()
|
|
||||||
ds.grid.Pad()
|
|
||||||
|
|
||||||
return ds
|
|
||||||
}
|
|
||||||
|
|
||||||
// special thanks to the Element Hotel wifi in Philidelphia that allowed me to
|
|
||||||
// easily debug this code since the internet connection here blocks port 53 traffic
|
|
||||||
func (ds *dnsStatus) update() (bool, bool) {
|
|
||||||
var results []string
|
|
||||||
var a bool = false
|
|
||||||
var aaaa bool = false
|
|
||||||
|
|
||||||
log.Println("dnsStatus.update() For server", ds.server, "on", ds.hostname)
|
|
||||||
results, _ = dnsUdpLookup(ds.server, ds.hostname, dns.TypeA)
|
|
||||||
log.Println("dnsStatus.update() UDP type A =", results)
|
|
||||||
|
|
||||||
if (len(results) == 0) {
|
|
||||||
me.digStatus.set(ds.udpA, "BROKEN")
|
|
||||||
ds.aFailc += 1
|
|
||||||
} else {
|
|
||||||
me.digStatus.set(ds.udpA, "WORKING")
|
|
||||||
ds.aSuccessc += 1
|
|
||||||
a = true
|
|
||||||
}
|
|
||||||
|
|
||||||
results, _ = dnsTcpLookup(ds.server, ds.hostname, dns.TypeA)
|
|
||||||
log.Println("dnsStatus.update() TCP type A =", results)
|
|
||||||
|
|
||||||
if (len(results) == 0) {
|
|
||||||
me.digStatus.set(ds.tcpA, "BROKEN")
|
|
||||||
ds.aFailc += 1
|
|
||||||
} else {
|
|
||||||
me.digStatus.set(ds.tcpA, "WORKING")
|
|
||||||
ds.aSuccessc += 1
|
|
||||||
a = true
|
|
||||||
}
|
|
||||||
|
|
||||||
me.digStatus.set(ds.aFail, strconv.Itoa(ds.aFailc))
|
|
||||||
me.digStatus.set(ds.aSuccess,strconv.Itoa(ds.aSuccessc))
|
|
||||||
|
|
||||||
results, _ = dnsUdpLookup(ds.server, ds.hostname, dns.TypeAAAA)
|
|
||||||
log.Println("dnsStatus.update() UDP type AAAA =", results)
|
|
||||||
|
|
||||||
if (len(results) == 0) {
|
|
||||||
me.digStatus.set(ds.udpAAAA, "BROKEN")
|
|
||||||
ds.aaaaFailc += 1
|
|
||||||
me.digStatus.set(ds.aaaaFail, strconv.Itoa(ds.aaaaFailc))
|
|
||||||
} else {
|
|
||||||
me.digStatus.set(ds.udpAAAA, "WORKING")
|
|
||||||
ds.aaaaSuccessc += 1
|
|
||||||
aaaa = true
|
|
||||||
}
|
|
||||||
|
|
||||||
results, _ = dnsTcpLookup(ds.server, ds.hostname, dns.TypeAAAA)
|
|
||||||
log.Println("dnsStatus.update() UDP type AAAA =", results)
|
|
||||||
|
|
||||||
if (len(results) == 0) {
|
|
||||||
me.digStatus.set(ds.tcpAAAA, "BROKEN")
|
|
||||||
ds.aaaaFailc += 1
|
|
||||||
me.digStatus.set(ds.aaaaFail, strconv.Itoa(ds.aaaaFailc))
|
|
||||||
} else {
|
|
||||||
me.digStatus.set(ds.tcpAAAA, "WORKING")
|
|
||||||
ds.aaaaSuccessc += 1
|
|
||||||
aaaa = true
|
|
||||||
}
|
|
||||||
|
|
||||||
me.digStatus.set(ds.aaaaFail, strconv.Itoa(ds.aaaaFailc))
|
|
||||||
me.digStatus.set(ds.aaaaSuccess,strconv.Itoa(ds.aaaaSuccessc))
|
|
||||||
|
|
||||||
return a, aaaa
|
|
||||||
}
|
|
||||||
|
|
||||||
func (ds *digStatus) makeHttpStatusGrid() {
|
|
||||||
group := ds.details.NewGroup("dns.google.com via HTTPS")
|
|
||||||
grid := group.NewGrid("LookupStatus", 2, 2)
|
|
||||||
|
|
||||||
ds.httpGoWitCom = gadgets.NewOneLiner(grid, "go.wit.com")
|
|
||||||
me.digStatus.set(ds.httpGoWitCom, "unknown")
|
|
||||||
|
|
||||||
group.Pad()
|
|
||||||
grid.Pad()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (ds *digStatus) makeDnsStatusGrid() {
|
|
||||||
var cmd, out string
|
|
||||||
group := ds.details.NewGroup("dig results")
|
|
||||||
grid := group.NewGrid("LookupStatus", 2, 2)
|
|
||||||
|
|
||||||
cmd = "dig +noall +answer go.wit.com A"
|
|
||||||
grid.NewLabel(cmd)
|
|
||||||
ds.DnsDigUDP = grid.NewLabel("?")
|
|
||||||
out = shell.Run(cmd)
|
|
||||||
log.Println("makeDnsStatusGrid() dig", out)
|
|
||||||
me.digStatus.set(ds.DnsDigUDP, out)
|
|
||||||
|
|
||||||
cmd = "dig +noall +answer go.wit.com AAAA"
|
|
||||||
grid.NewLabel(cmd)
|
|
||||||
ds.DnsDigTCP = grid.NewLabel("?")
|
|
||||||
out = shell.Run(cmd)
|
|
||||||
log.Println("makeDnsStatusGrid() dig", out)
|
|
||||||
me.digStatus.set(ds.DnsDigTCP, out)
|
|
||||||
|
|
||||||
group.Pad()
|
|
||||||
grid.Pad()
|
|
||||||
}
|
|
||||||
|
|
||||||
// dnsLookup performs a DNS lookup for the specified record type (e.g., "TXT", "AAAA") for a given domain.
|
|
||||||
func dnsUdpLookup(server string, domain string, recordType uint16) ([]string, error) {
|
|
||||||
var records []string
|
|
||||||
|
|
||||||
c := new(dns.Client)
|
|
||||||
m := new(dns.Msg)
|
|
||||||
m.SetQuestion(dns.Fqdn(domain), recordType)
|
|
||||||
r, _, err := c.Exchange(m, server) // If server = "1.1.1.1:53" then use Cloudflare's DNS server
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, ans := range r.Answer {
|
|
||||||
records = append(records, ans.String())
|
|
||||||
}
|
|
||||||
|
|
||||||
return records, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func dnsTcpLookup(server string, domain string, recordType uint16) ([]string, error) {
|
|
||||||
var records []string
|
|
||||||
|
|
||||||
c := new(dns.Client)
|
|
||||||
c.Net = "tcp" // Specify to use TCP for the query
|
|
||||||
c.Timeout = time.Second * 5 // Set a 5-second timeout
|
|
||||||
m := new(dns.Msg)
|
|
||||||
m.SetQuestion(dns.Fqdn(domain), recordType)
|
|
||||||
r, _, err := c.Exchange(m, server) // If server = "1.1.1.1:53" then use Cloudflare's DNS server
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, ans := range r.Answer {
|
|
||||||
records = append(records, ans.String())
|
|
||||||
}
|
|
||||||
|
|
||||||
return records, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (ds *digStatus) checkLookupDoH(hostname string) bool {
|
|
||||||
var status bool = false
|
|
||||||
|
|
||||||
domain := "go.wit.com"
|
|
||||||
ipv6Addresses, err := dnsAAAAlookupDoH(domain)
|
|
||||||
if err != nil {
|
|
||||||
log.Error(err, "checkLookupDoH()")
|
|
||||||
return status
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Println("IPv6 Addresses for %s:\n", domain)
|
|
||||||
for _, addr := range ipv6Addresses {
|
|
||||||
log.Println(addr)
|
|
||||||
me.digStatus.set(ds.httpGoWitCom, addr)
|
|
||||||
status = true
|
|
||||||
}
|
|
||||||
return status
|
|
||||||
}
|
|
||||||
|
|
||||||
func (ds *digStatus) Show() {
|
|
||||||
log.Info("digStatus.Show() window")
|
|
||||||
if me.digStatus.hidden {
|
|
||||||
me.digStatus.window.Show()
|
|
||||||
}
|
|
||||||
me.digStatus.hidden = false
|
|
||||||
}
|
|
||||||
|
|
||||||
func (ds *digStatus) Hide() {
|
|
||||||
log.Info("digStatus.Hide() window")
|
|
||||||
if ! me.digStatus.hidden {
|
|
||||||
me.digStatus.window.Hide()
|
|
||||||
}
|
|
||||||
me.digStatus.hidden = true
|
|
||||||
}
|
|
||||||
70
hostname.go
70
hostname.go
|
|
@ -22,14 +22,7 @@ func getHostname() {
|
||||||
log.Error(err, "FQDN hostname error")
|
log.Error(err, "FQDN hostname error")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (me.fqdn != nil) {
|
me.status.SetHostname(s)
|
||||||
if (me.hostname != s) {
|
|
||||||
me.fqdn.SetText(s)
|
|
||||||
me.hostname = s
|
|
||||||
me.changed = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
log.Log(NET, "FQDN =", s)
|
|
||||||
|
|
||||||
dn := run("domainname")
|
dn := run("domainname")
|
||||||
if (me.domainname.S != dn) {
|
if (me.domainname.S != dn) {
|
||||||
|
|
@ -47,17 +40,17 @@ func getHostname() {
|
||||||
|
|
||||||
var test string
|
var test string
|
||||||
test = hshort + "." + dn
|
test = hshort + "." + dn
|
||||||
if (me.hostname != test) {
|
if (me.status.GetHostname() != test) {
|
||||||
log.Info("me.hostname", me.hostname, "does not equal", test)
|
log.Log(CHANGE, "me.hostname", me.status.GetHostname(), "does not equal", test)
|
||||||
if (me.hostnameStatusOLD.S != "BROKEN") {
|
if (me.hostnameStatus.S != "BROKEN") {
|
||||||
log.Log(CHANGE, "me.hostname", me.hostname, "does not equal", test)
|
log.Log(CHANGE, "me.hostname", me.status.GetHostname(), "does not equal", test)
|
||||||
me.changed = true
|
me.changed = true
|
||||||
me.hostnameStatusOLD.SetText("BROKEN")
|
me.hostnameStatus.SetText("BROKEN")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (me.hostnameStatusOLD.S != "VALID") {
|
if (me.hostnameStatus.S != "VALID") {
|
||||||
log.Log(CHANGE, "me.hostname", me.hostname, "is valid")
|
log.Log(CHANGE, "me.hostname", me.status.GetHostname(), "is valid")
|
||||||
me.hostnameStatusOLD.SetText("VALID")
|
me.hostnameStatus.SetText("VALID")
|
||||||
me.changed = true
|
me.changed = true
|
||||||
}
|
}
|
||||||
// enable the cloudflare button if the provider is cloudflare
|
// enable the cloudflare button if the provider is cloudflare
|
||||||
|
|
@ -76,7 +69,7 @@ func getHostname() {
|
||||||
// check that all the OS settings are correct here
|
// check that all the OS settings are correct here
|
||||||
// On Linux, /etc/hosts, /etc/hostname
|
// On Linux, /etc/hosts, /etc/hostname
|
||||||
// and domainname and hostname
|
// and domainname and hostname
|
||||||
func goodHostname(h string) bool {
|
func goodHostname() bool {
|
||||||
hostname := shell.Chomp(shell.Cat("/etc/hostname"))
|
hostname := shell.Chomp(shell.Cat("/etc/hostname"))
|
||||||
log.Log(NOW, "hostname =", hostname)
|
log.Log(NOW, "hostname =", hostname)
|
||||||
|
|
||||||
|
|
@ -93,30 +86,6 @@ func goodHostname(h string) bool {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
func digAAAA(s string) []string {
|
|
||||||
var aaaa []string
|
|
||||||
// lookup the IP address from DNS
|
|
||||||
rrset := dnssecsocket.Dnstrace(s, "AAAA")
|
|
||||||
// log.Spew(args.VerboseDNS, SPEW, rrset)
|
|
||||||
for i, rr := range rrset {
|
|
||||||
ipaddr := dns.Field(rr, 1)
|
|
||||||
// how the hell do you detect a RRSIG AAAA record here?
|
|
||||||
if (ipaddr == "28") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
log.Log(NOW, "r.Answer =", i, "rr =", rr, "ipaddr =", ipaddr)
|
|
||||||
aaaa = append(aaaa, ipaddr)
|
|
||||||
me.ipv6s[ipaddr] = rr
|
|
||||||
}
|
|
||||||
log.Info(args.VerboseDNS, "aaaa =", aaaa)
|
|
||||||
log.Println("digAAAA() returned =", aaaa)
|
|
||||||
log.Println("digAAAA() me.ipv6s =", me.ipv6s)
|
|
||||||
os.Exit(0)
|
|
||||||
return aaaa
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
func digAAAA(hostname string) []string {
|
func digAAAA(hostname string) []string {
|
||||||
var blah, ipv6Addresses []string
|
var blah, ipv6Addresses []string
|
||||||
// domain := hostname
|
// domain := hostname
|
||||||
|
|
@ -128,7 +97,7 @@ func digAAAA(hostname string) []string {
|
||||||
|
|
||||||
if (len(blah) == 0) {
|
if (len(blah) == 0) {
|
||||||
log.Println("digAAAA() RUNNING dnsAAAAlookupDoH(domain)")
|
log.Println("digAAAA() RUNNING dnsAAAAlookupDoH(domain)")
|
||||||
ipv6Addresses, _ = dnsAAAAlookupDoH(hostname)
|
ipv6Addresses = lookupDoH(hostname, "AAAA")
|
||||||
log.Println("digAAAA() has ipv6Addresses =", strings.Join(ipv6Addresses, " "))
|
log.Println("digAAAA() has ipv6Addresses =", strings.Join(ipv6Addresses, " "))
|
||||||
for _, addr := range ipv6Addresses {
|
for _, addr := range ipv6Addresses {
|
||||||
log.Println(addr)
|
log.Println(addr)
|
||||||
|
|
@ -141,20 +110,3 @@ func digAAAA(hostname string) []string {
|
||||||
|
|
||||||
return blah
|
return blah
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
func dnsHttpsLookup(domain string, recordType uint16) ([]string, error) {
|
|
||||||
domain := "google.com"
|
|
||||||
dnsLookupDoH(domain string) ([]string, error) {
|
|
||||||
ipv6Addresses, err := dnsLookupDoH(domain)
|
|
||||||
if err != nil {
|
|
||||||
log.Println("Error:", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Printf("IPv6 Addresses for %s:\n", domain)
|
|
||||||
for _, addr := range ipv6Addresses {
|
|
||||||
log.Println(addr)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ func nsupdate() {
|
||||||
cmd := "go-nsupdate --tsig-algorithm=hmac-sha512"
|
cmd := "go-nsupdate --tsig-algorithm=hmac-sha512"
|
||||||
tsigSecret = os.Getenv("TIG_SECRET")
|
tsigSecret = os.Getenv("TIG_SECRET")
|
||||||
cmd += " --tig-secret=\"" + tsigSecret + "\""
|
cmd += " --tig-secret=\"" + tsigSecret + "\""
|
||||||
cmd += " -i wlo1 " + me.hostname
|
cmd += " -i wlo1 " + me.status.GetHostname()
|
||||||
log.Log(NET, "nsupdate() RUN:", cmd)
|
log.Log(NET, "nsupdate() RUN:", cmd)
|
||||||
|
|
||||||
for s, t := range me.ipmap {
|
for s, t := range me.ipmap {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue