mesh.cat/meshname
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add an option to disable .meship resolver

Browse Source
This commit is contained in:
George 2021-04-02 16:35:22 -04:00
parent 61c74e0568
commit 4e4e6f63ba
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/meshnamed/main.go
View File

@ -38,7 +38,7 @@ func loadConfig(s *meshname.MeshnameServer, confPath string) error {
var (
genconf, subdomain, useconffile, listenAddr, networksconf string
debug, allowRemote bool
debug, noMeshIP, allowRemote bool
)
func init() {
@ -47,6 +47,7 @@ func init() {
flag.StringVar(&useconffile, "useconffile", "", "run daemon with a config file")
flag.StringVar(&listenAddr, "listenaddr", "[::1]:53535", "address to listen on")
flag.StringVar(&networksconf, "networks", "ygg=200::/7,cjd=fc00::/8,meshname=::/0", "TLD=subnet list separated by comma")
flag.BoolVar(&noMeshIP, "nomeship", false, "disable .meship resolver")
flag.BoolVar(&allowRemote, "allowremote", false, "allow remote queries from any IP address")
flag.BoolVar(&debug, "debug", false, "enable debug logging")
}
@ -77,7 +78,7 @@ func main() {
logger.Fatalln(err)
}
s := meshname.New(logger, listenAddr, networks, allowRemote)
s := meshname.New(logger, listenAddr, networks, !noMeshIP, allowRemote)
if useconffile != "" {
if err := loadConfig(s, useconffile); err != nil {
logger.Fatalln(err)

10
pkg/meshname/server.go
View File

@ -16,6 +16,7 @@ type MeshnameServer struct {
dnsClient *dns.Client
dnsServer *dns.Server
networks map[string]*net.IPNet
enableMeshIP bool
allowRemote bool
dnsRecordsLock sync.RWMutex
@ -26,7 +27,7 @@ type MeshnameServer struct {
}
// New is a constructor for MeshnameServer
func New(log *log.Logger, listenAddr string, networks map[string]*net.IPNet, allowRemote bool) *MeshnameServer {
func New(log *log.Logger, listenAddr string, networks map[string]*net.IPNet, enableMeshIP bool, allowRemote bool) *MeshnameServer {
dnsClient := new(dns.Client)
dnsClient.Timeout = 5000000000 // increased 5 seconds timeout
@ -36,6 +37,7 @@ func New(log *log.Logger, listenAddr string, networks map[string]*net.IPNet, all
dnsRecords: make(map[string][]dns.RR),
networks: networks,
dnsClient: dnsClient,
enableMeshIP: enableMeshIP,
allowRemote: allowRemote,
}
}
@ -67,8 +69,11 @@ func (s *MeshnameServer) Start() error {
dns.HandleFunc(tld, s.handleMeshnameRequest)
s.log.Debugln("Handling:", tld, subnet)
}
if s.enableMeshIP {
dns.HandleFunc("meship", s.handleMeshIPRequest)
s.log.Debugln("Handling: meship ::/0")
}
go func() {
if err := s.dnsServer.ListenAndServe(); err != nil {
s.log.Fatalln("MeshnameServer failed to start:", err)
@ -159,9 +164,8 @@ func (s *MeshnameServer) handleMeshIPRequest(w dns.ResponseWriter, r *dns.Msg) {
s.log.Debugln("Error: invalid resource requested")
continue
}
subDomain := labels[len(labels)-2]
if resolvedAddr, err := IPFromDomain(&subDomain); err == nil {
if resolvedAddr, err := IPFromDomain(&labels[0]); err == nil {
answer := new(dns.AAAA)
answer.Hdr = dns.RR_Header{Name: q.Name, Rrtype: dns.TypeAAAA, Class: dns.ClassINET, Ttl: 3600}
answer.AAAA = resolvedAddr