mirror/mje-nz-zerotier-dns
1
0
Fork 0
mirror of https://github.com/mje-nz/zerotier-dns.git synced 2024-05-11 05:55:15 +00:00
Code Issues Projects Releases Wiki Activity

Improved error handling

Browse Source
This commit is contained in:
Aaryn Smith
2017-06-16 15:47:55 -05:00
parent 6f078d7bc8
commit d1cc2ee280
3 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/root.go
View File

@ -24,7 +24,7 @@ network for both A (IPv4) and AAAA (IPv6) requests`,
// This is called by main.main(). It only needs to happen once to the rootCmd.
func Execute() {
if err := RootCmd.Execute(); err != nil {
log.Fatal(err)
// log.Fatal(err)
// os.Exit(-1)
}
}

184
cmd/server.go
View File

@ -1,92 +1,98 @@
// Copyright © 2017 uxbh
// This file is part of gitlab.com/uxbh/ztdns.
package cmd
import (
"net"
"time"
log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"gitlab.com/uxbh/ztdns/dnssrv"
"gitlab.com/uxbh/ztdns/ztapi"
)
// serverCmd represents the server command
var serverCmd = &cobra.Command{
Use: "server",
Short: "Run ztDNS server",
Long: `Server (ztdns server) will start the DNS server.append
Example: ztdns server`,
Run: func(cmd *cobra.Command, args []string) {
if viper.GetBool("debug") {
log.SetLevel(log.DebugLevel)
log.Debug("Setting Debug Mode")
}
if viper.GetString("ZT.API") == "" {
log.Fatal("No API key provided")
}
if viper.GetString("ZT.URL") == "" {
log.Fatal("No URL provided. Run ztdns mkconfig first")
}
log.Debugf("Using API: %s", viper.GetString("ZT.API"))
if viper.GetString("ZT.Network") == "" {
log.Fatal("No Network ID Provided")
}
lastUpdate := updateDNS()
// Copyright © 2017 uxbh
// This file is part of gitlab.com/uxbh/ztdns.
package cmd
import (
"fmt"
"net"
"time"
log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"gitlab.com/uxbh/ztdns/dnssrv"
"gitlab.com/uxbh/ztdns/ztapi"
)
// serverCmd represents the server command
var serverCmd = &cobra.Command{
Use: "server",
Short: "Run ztDNS server",
Long: `Server (ztdns server) will start the DNS server.append
Example: ztdns server`,
PreRunE: func(cmd *cobra.Command, args []string) error {
// Check config and bail if anything important is missing.
if viper.GetBool("debug") {
log.SetLevel(log.DebugLevel)
log.Debug("Setting Debug Mode")
}
if viper.GetString("ZT.API") == "" {
return fmt.Errorf("no API key provided")
}
if viper.GetString("ZT.Network") == "" {
return fmt.Errorf("no Network ID Provided")
}
if viper.GetString("ZT.URL") == "" {
return fmt.Errorf("no URL provided. Run ztdns mkconfig first")
}
if viper.GetString("suffix") == "" {
return fmt.Errorf("no DNS Suffix provided. Run ztdns mkconfig first")
}
return nil
},
Run: func(cmd *cobra.Command, args []string) {
lastUpdate := updateDNS()
req := make(chan string)
go dnssrv.Start(viper.GetString("interface"), viper.GetInt("port"), viper.GetString("suffix"), req)
for {
go dnssrv.Start(viper.GetString("interface"), viper.GetInt("port"), viper.GetString("suffix"), req)
for {
n := <-req
log.Debugf("Got request for %s", n)
if time.Since(lastUpdate) > 30*time.Minute {
log.Infof("DNSDatabase is stale. Refreshing.")
lastUpdate = updateDNS()
}
}
},
}
func init() {
RootCmd.AddCommand(serverCmd)
serverCmd.PersistentFlags().String("interface", "", "interface to listen on")
viper.BindPFlag("interface", serverCmd.PersistentFlags().Lookup("interface"))
}
func updateDNS() time.Time {
API := viper.GetString("ZT.API")
URL := viper.GetString("ZT.URL")
NetworkID := viper.GetString("ZT.Network")
suffix := viper.GetString("suffix")
ztnetwork := ztapi.GetNetworkInfo(API, URL, NetworkID)
log.Infof("Getting Members of Network: %s", ztnetwork.Config.Name)
lst := ztapi.GetMemberList(API, URL, ztnetwork.ID)
log.Infof("Got %d members", len(*lst))
for _, n := range *lst {
if n.Online {
record := n.Name + "." + suffix + "."
dnssrv.DNSDatabase[record] = dnssrv.Records{}
ip6 := []net.IP{}
ip4 := []net.IP{}
if ztnetwork.Config.V6AssignMode.Sixplane {
ip6 = append(ip6, n.Get6Plane())
}
if ztnetwork.Config.V6AssignMode.Rfc4193 {
ip6 = append(ip6, n.GetRFC4193())
}
for _, a := range n.Config.IPAssignments {
ip4 = append(ip4, net.ParseIP(a))
}
log.Infof("Updating %-15s IPv4: %-15s IPv6: %s", record, ip4, ip6)
dnssrv.DNSDatabase[record] = dnssrv.Records{
A: ip4,
AAAA: ip6,
}
}
}
return time.Now()
}
if time.Since(lastUpdate) > 30*time.Minute {
log.Infof("DNSDatabase is stale. Refreshing.")
lastUpdate = updateDNS()
}
}
},
}
func init() {
RootCmd.AddCommand(serverCmd)
serverCmd.PersistentFlags().String("interface", "", "interface to listen on")
viper.BindPFlag("interface", serverCmd.PersistentFlags().Lookup("interface"))
}
func updateDNS() time.Time {
API := viper.GetString("ZT.API")
URL := viper.GetString("ZT.URL")
NetworkID := viper.GetString("ZT.Network")
suffix := viper.GetString("suffix")
ztnetwork := ztapi.GetNetworkInfo(API, URL, NetworkID)
log.Infof("Getting Members of Network: %s", ztnetwork.Config.Name)
lst := ztapi.GetMemberList(API, URL, ztnetwork.ID)
log.Infof("Got %d members", len(*lst))
for _, n := range *lst {
if n.Online {
record := n.Name + "." + suffix + "."
dnssrv.DNSDatabase[record] = dnssrv.Records{}
ip6 := []net.IP{}
ip4 := []net.IP{}
if ztnetwork.Config.V6AssignMode.Sixplane {
ip6 = append(ip6, n.Get6Plane())
}
if ztnetwork.Config.V6AssignMode.Rfc4193 {
ip6 = append(ip6, n.GetRFC4193())
}
for _, a := range n.Config.IPAssignments {
ip4 = append(ip4, net.ParseIP(a))
}
log.Infof("Updating %-15s IPv4: %-15s IPv6: %s", record, ip4, ip6)
dnssrv.DNSDatabase[record] = dnssrv.Records{
A: ip4,
AAAA: ip6,
}
}
}
return time.Now()
}

6
dnssrv/dnssrv.go
View File

@ -34,12 +34,6 @@ func Start(iface string, port int, suffix string, req chan string) error {
port = 53
}
if suffix == "" {
log.Fatal("No DNS Suffix provided.")
}
dns.HandleFunc(suffix, handleDNSRequest)
for _, addr := range getIfaceAddrs(iface) {
go func(suffix string, addr net.IP, port int) {
var server *dns.Server