diff options
| -rw-r--r-- | cloudflare/oneLiner.go | 14 | ||||
| -rw-r--r-- | dns-https.go | 39 | ||||
| -rw-r--r-- | dnsLookupStatus.go | 225 | ||||
| -rw-r--r-- | gui.go | 21 | ||||
| -rw-r--r-- | hostname.go | 10 | ||||
| -rw-r--r-- | main.go | 21 | ||||
| -rw-r--r-- | structs.go | 1 |
7 files changed, 227 insertions, 104 deletions
diff --git a/cloudflare/oneLiner.go b/cloudflare/oneLiner.go index 5fc7a51..230f370 100644 --- a/cloudflare/oneLiner.go +++ b/cloudflare/oneLiner.go @@ -2,8 +2,7 @@ package cloudflare import ( - "log" - + "go.wit.com/log" "go.wit.com/gui" ) @@ -18,10 +17,17 @@ type OneLiner struct { Custom func() } -func (n *OneLiner) Set(value string) { +func (n *OneLiner) Get() string { + return n.value +} + +func (n *OneLiner) Set(value string) *OneLiner { log.Println("OneLiner.Set() =", value) - n.v.Set(value) + if (n.v != nil) { + n.v.Set(value) + } n.value = value + return n } func NewOneLiner(n *gui.Node, name string) *OneLiner { diff --git a/dns-https.go b/dns-https.go index 00eec82..c61aa2f 100644 --- a/dns-https.go +++ b/dns-https.go @@ -1,19 +1,38 @@ package main import ( - "encoding/json" "fmt" + "go.wit.com/log" "io/ioutil" + "encoding/json" "net/http" ) +/* +func getAAAArecords() { + hostname := "go.wit.com" + ipv6Addresses, err := dnsLookupDoH(hostname) + if err != nil { + log.Error(err, "getAAAArecords") + return + } + + fmt.Printf("IPv6 Addresses for %s:\n", hostname) + for _, addr := range ipv6Addresses { + log.Println(addr) + } +} +*/ + // dnsLookupDoH performs a DNS lookup for AAAA records over HTTPS. -func dnsLookupDoH(domain string) ([]string, error) { +func dnsAAAAlookupDoH(domain string) ([]string, error) { var ipv6Addresses []string // Construct the URL for a DNS query with Google's DNS-over-HTTPS API url := fmt.Sprintf("https://dns.google/resolve?name=%s&type=AAAA", domain) + log.Println("curl", url) + // Perform the HTTP GET request resp, err := http.Get(url) if err != nil { @@ -44,19 +63,3 @@ func dnsLookupDoH(domain string) ([]string, error) { return ipv6Addresses, nil } - -/* -func main() { - domain := "google.com" - ipv6Addresses, err := dnsLookupDoH(domain) - if err != nil { - fmt.Println("Error:", err) - return - } - - fmt.Printf("IPv6 Addresses for %s:\n", domain) - for _, addr := range ipv6Addresses { - fmt.Println(addr) - } -} -*/ diff --git a/dnsLookupStatus.go b/dnsLookupStatus.go index e623cae..280ac92 100644 --- a/dnsLookupStatus.go +++ b/dnsLookupStatus.go @@ -13,19 +13,23 @@ package main import ( - "log" + "os" "fmt" "time" "strconv" + "reflect" - "github.com/miekg/dns" + "go.wit.com/log" "go.wit.com/gui" "go.wit.com/control-panel-dns/cloudflare" "go.wit.com/shell" + + "github.com/miekg/dns" ) type digStatus struct { ready bool + hidden bool statusIPv4 string statusIPv6 string @@ -48,6 +52,9 @@ type digStatus struct { dsGoogle *dnsStatus DnsDigUDP *gui.Node DnsDigTCP *gui.Node + + httpGoWitCom *cloudflare.OneLiner + statusHTTP *cloudflare.OneLiner } type dnsStatus struct { @@ -83,61 +90,72 @@ func NewDigStatusWindow(p *gui.Node) *digStatus { ds = new(digStatus) ds.ready = false + ds.hidden = true ds.window = p.NewWindow("DNS Lookup Status") + ds.window.Custom = func () { + ds.hidden = true + ds.window.Hide() + } ds.box = ds.window.NewBox("hBox", true) // summary of the current state of things ds.summary = ds.box.NewGroup("Summary") + g := ds.summary.NewGrid("LookupStatus", 2, 2) + g.Pad() - b := ds.summary.NewBox("hBox", true) - ds.status = cloudflare.NewOneLiner(b, "status") - ds.status.Set("unknown") - - b = ds.summary.NewBox("hBox", true) - ds.statusAAAA = cloudflare.NewOneLiner(b, "IPv6 status") - ds.statusAAAA.Set("unknown") - - b = ds.summary.NewBox("hBox", true) - ds.speed = cloudflare.NewOneLiner(b, "speed") - ds.speed.Set("unknown") - - b = ds.summary.NewBox("hBox", true) - ds.speedActual = cloudflare.NewOneLiner(b, "actual") - ds.speedActual.Set("unknown") + ds.status = cloudflare.NewOneLiner(g, "status").Set("unknown") + ds.statusAAAA = cloudflare.NewOneLiner(g, "IPv6 status").Set("unknown") + ds.statusHTTP = cloudflare.NewOneLiner(g, "IPv6 via HTTP").Set("unknown") + ds.speed = cloudflare.NewOneLiner(g, "speed").Set("unknown") + ds.speedActual = cloudflare.NewOneLiner(g, "actual").Set("unknown") // make the area to store the raw details ds.details = ds.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.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() { - duration := timeFunction(func () { ds.updateDnsStatus() }) + log.Info("digStatus() Update() START") + if ds == nil { + log.Error("digStatus() Update() ds == nil") + return + } + duration := timeFunction(func () { + ds.updateDnsStatus() + }) s := fmt.Sprint(duration) - ds.speedActual.Set(s) + // ds.speedActual.Set(s) + me.digStatus.set(ds.speedActual, s) if (duration > 500 * time.Millisecond ) { - ds.speed.Set("SLOW") + me.digStatus.set(ds.speed, "SLOW") } else if (duration > 100 * time.Millisecond ) { - ds.speed.Set("OK") + me.digStatus.set(ds.speed, "OK") } else { - ds.speed.Set("FAST") + 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 } @@ -149,6 +167,7 @@ func (ds *digStatus) IPv4() bool { // Returns true if IPv6 is working func (ds *digStatus) IPv6() bool { + if ! ds.Ready() {return false} if (ds.statusIPv6 == "GOOD") { return true } @@ -156,23 +175,69 @@ func (ds *digStatus) IPv6() bool { } func (ds *digStatus) setIPv4(s string) { - ds.status.Set(s) ds.statusIPv4 = s + if ! ds.Ready() {return} + me.digStatus.set(ds.status, s) } func (ds *digStatus) setIPv6(s string) { - ds.statusAAAA.Set(s) 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 *cloudflare.OneLiner + if reflect.TypeOf(a) == reflect.TypeOf(ol) { + ol = a.(*cloudflare.OneLiner) + ol.Set(s) + return + } + log.Error("unknown type TypeOf(a) =", reflect.TypeOf(a), "a =", a) + os.Exit(0) } func (ds *digStatus) updateDnsStatus() { var cmd, out string var ipv4, ipv6 bool - ipv4, ipv6 = ds.dsLocalhost.Update() - ipv4, ipv6 = ds.dsLocalNetwork.Update() - ipv4, ipv6 = ds.dsCloudflare.Update() - ipv4, ipv6 = ds.dsGoogle.Update() + log.Info("updateDnsStatus() START") + if (ds == nil) { + log.Error("updateDnsStatus() not initialized yet. ds == nil") + return + } + + if (! ds.ready) { + log.Error("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") @@ -193,14 +258,12 @@ func (ds *digStatus) updateDnsStatus() { cmd = "dig +noall +answer www.wit.com A" out = shell.Run(cmd) log.Println("makeDnsStatusGrid() dig", out) - ds.DnsDigUDP.SetText(out) + me.digStatus.set(ds.DnsDigUDP, out) cmd = "dig +noall +answer www.wit.com AAAA" out = shell.Run(cmd) log.Println("makeDnsStatusGrid() dig", out) - ds.DnsDigTCP.SetText(out) - - ds.ready = true + me.digStatus.set(ds.DnsDigTCP, out) } // Makes a DNS Status Grid @@ -242,71 +305,82 @@ func NewDnsStatus(p *gui.Node, title string, server string, hostname string) *dn // 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) { +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) + 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) + log.Println("dnsStatus.update() UDP type A =", results) if (len(results) == 0) { - ds.udpA.SetText("BROKEN") + me.digStatus.set(ds.udpA, "BROKEN") ds.aFailc += 1 } else { - ds.udpA.SetText("WORKING") + 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) + log.Println("dnsStatus.update() TCP type A =", results) if (len(results) == 0) { - ds.tcpA.SetText("BROKEN") + me.digStatus.set(ds.tcpA, "BROKEN") ds.aFailc += 1 } else { - ds.tcpA.SetText("WORKING") + me.digStatus.set(ds.tcpA, "WORKING") ds.aSuccessc += 1 a = true } - ds.aFail.SetText(strconv.Itoa(ds.aFailc)) - ds.aSuccess.SetText(strconv.Itoa(ds.aSuccessc)) + 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) + log.Println("dnsStatus.update() UDP type AAAA =", results) if (len(results) == 0) { - ds.udpAAAA.SetText("BROKEN") + me.digStatus.set(ds.udpAAAA, "BROKEN") ds.aaaaFailc += 1 - ds.aaaaFail.SetText(strconv.Itoa(ds.aaaaFailc)) + me.digStatus.set(ds.aaaaFail, strconv.Itoa(ds.aaaaFailc)) } else { - ds.udpAAAA.SetText("WORKING") + 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) + log.Println("dnsStatus.update() UDP type AAAA =", results) if (len(results) == 0) { - ds.tcpAAAA.SetText("BROKEN") + me.digStatus.set(ds.tcpAAAA, "BROKEN") ds.aaaaFailc += 1 - ds.aaaaFail.SetText(strconv.Itoa(ds.aaaaFailc)) + me.digStatus.set(ds.aaaaFail, strconv.Itoa(ds.aaaaFailc)) } else { - ds.tcpAAAA.SetText("WORKING") + me.digStatus.set(ds.tcpAAAA, "WORKING") ds.aaaaSuccessc += 1 aaaa = true } - ds.aaaaFail.SetText(strconv.Itoa(ds.aaaaFailc)) - ds.aaaaSuccess.SetText(strconv.Itoa(ds.aaaaSuccessc)) + 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 = cloudflare.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") @@ -317,14 +391,14 @@ func (ds *digStatus) makeDnsStatusGrid() { ds.DnsDigUDP = grid.NewLabel("?") out = shell.Run(cmd) log.Println("makeDnsStatusGrid() dig", out) - ds.DnsDigUDP.SetText(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) - ds.DnsDigTCP.SetText(out) + me.digStatus.set(ds.DnsDigTCP, out) group.Pad() grid.Pad() @@ -368,3 +442,38 @@ func dnsTcpLookup(server string, domain string, recordType uint16) ([]string, er 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 +} @@ -2,7 +2,6 @@ package main import ( - "log" "fmt" "time" "os" @@ -12,6 +11,7 @@ import ( "strings" "go.wit.com/gui" + "go.wit.com/log" "go.wit.com/shell" "go.wit.com/control-panel-dns/cloudflare" ) @@ -29,7 +29,7 @@ func setupControlPanelWindow() { detailsTab("Details") debugTab("Debug") - me.digStatus = NewDigStatusWindow(me.window) + // me.digStatus = NewDigStatusWindow(me.window) } func detailsTab(title string) { @@ -308,6 +308,23 @@ func dnsTab(title string) { }) me.fix.Disable() + me.digStatusButton = me.mainStatus.NewButton("Show DNS Lookup Status", func () { + if (me.digStatus == nil) { + log.Info("drawing the digStatus window START") + me.digStatus = NewDigStatusWindow(me.window) + log.Info("drawing the digStatus window END") + me.digStatusButton.SetText("Hide DNS Lookup Status") + } else { + if me.digStatus.hidden { + me.digStatusButton.SetText("Hide DNS Lookup Status") + me.digStatus.Show() + } else { + me.digStatusButton.SetText("Show DNS Lookup Status") + me.digStatus.Hide() + } + } + }) + grid.Margin() grid.Pad() diff --git a/hostname.go b/hostname.go index 7b7132a..32897d5 100644 --- a/hostname.go +++ b/hostname.go @@ -137,8 +137,8 @@ func digAAAA(hostname string) []string { log.Println("digAAAA() has BLAH =", blah) if (len(blah) == 0) { - log.Println("digAAAA() RUNNING dnsLookupDoH(domain)") - ipv6Addresses, _ = dnsLookupDoH(hostname) + log.Println("digAAAA() RUNNING dnsAAAAlookupDoH(domain)") + ipv6Addresses, _ = dnsAAAAlookupDoH(hostname) log.Println("digAAAA() has ipv6Addresses =", strings.Join(ipv6Addresses, " ")) log.Printf("digAAAA() IPv6 Addresses for %s:\n", hostname) for _, addr := range ipv6Addresses { @@ -159,13 +159,13 @@ func dnsHttpsLookup(domain string, recordType uint16) ([]string, error) { dnsLookupDoH(domain string) ([]string, error) { ipv6Addresses, err := dnsLookupDoH(domain) if err != nil { - fmt.Println("Error:", err) + log.Println("Error:", err) return } - fmt.Printf("IPv6 Addresses for %s:\n", domain) + log.Printf("IPv6 Addresses for %s:\n", domain) for _, addr := range ipv6Addresses { - fmt.Println(addr) + log.Println(addr) } } */ @@ -13,6 +13,7 @@ import ( "time" "embed" + "go.wit.com/log" "go.wit.com/gui" "github.com/miekg/dns" ) @@ -35,22 +36,14 @@ func main() { me.ipv4s = make(map[string]dns.RR) me.ipv6s = make(map[string]dns.RR) - // will set all debugging flags - // gui.SetDebug(true) + // send all log() output to a file in /tmp + log.SetTmp() - // myGui = gui.New().InitEmbed(resToolkit).LoadToolkit("gocui") myGui = gui.New().Default() sleep(me.artificialSleep) setupControlPanelWindow() - /* - if (args.GuiDebug) { - gui.DebugWindow() - } - gui.ShowDebugValues() - */ - // forever monitor for network and dns changes sleep(me.artificialSleep) checkNetworkChanges() @@ -83,13 +76,7 @@ func (c *Cron) run() { func checkNetworkChanges() { var lastLocal time.Time = time.Now() var lastDNS time.Time = time.Now() - /* -func timeFunction(f func()) time.Duration { - startTime := time.Now() // Record the start time - f() // Execute the function - return time.Since(startTime) // Calculate the elapsed time -} -*/ + timer2 := time.NewTimer(time.Second) go func() { <-timer2.C @@ -76,6 +76,7 @@ type Host struct { digStatus *digStatus statusIPv6 *cloudflare.OneLiner + digStatusButton *gui.Node } type IPtype struct { |