Add an option to disable .meship resolver

Specify explicit base32 implementation

Dockerfile

@@ -0,0 +1,19 @@
+FROM docker.io/golang:alpine as builder
+
+COPY . /src
+WORKDIR /src
+RUN apk add git make && make
+
+FROM docker.io/alpine
+
+LABEL maintainer="George <zhoreeq@users.noreply.github.com>"
+
+COPY --from=builder /src/meshnamed /usr/bin/meshnamed
+
+USER nobody
+
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+EXPOSE 53535/udp
+CMD ["meshnamed"]

cmd/meshnamed/main.go

@@ -38,7 +38,7 @@ func loadConfig(s *meshname.MeshnameServer, confPath string) error {
 
 var (
 	genconf, subdomain, useconffile, listenAddr, networksconf string
-	debug                                                     bool
+	debug, noMeshIP, allowRemote                              bool
 )
 
 func init() {
@@ -47,6 +47,8 @@ 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")
 }
 
@@ -76,7 +78,7 @@ func main() {
 		logger.Fatalln(err)
 	}
 
-	s := meshname.New(logger, listenAddr, networks)
+	s := meshname.New(logger, listenAddr, networks, !noMeshIP, allowRemote)
 	if useconffile != "" {
 		if err := loadConfig(s, useconffile); err != nil {
 			logger.Fatalln(err)

docker-entrypoint.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+exec meshnamed "$@"

pkg/meshname/server.go

@@ -16,6 +16,8 @@ type MeshnameServer struct {
 	dnsClient    *dns.Client
 	dnsServer    *dns.Server
 	networks     map[string]*net.IPNet
+	enableMeshIP bool
+	allowRemote  bool
 
 	dnsRecordsLock sync.RWMutex
 	dnsRecords     map[string][]dns.RR
@@ -25,7 +27,7 @@ type MeshnameServer struct {
 }
 
 // New is a constructor for MeshnameServer
-func New(log *log.Logger, listenAddr string, networks map[string]*net.IPNet) *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
 
@@ -35,6 +37,8 @@ func New(log *log.Logger, listenAddr string, networks map[string]*net.IPNet) *Me
 		dnsRecords:   make(map[string][]dns.RR),
 		networks:     networks,
 		dnsClient:    dnsClient,
+		enableMeshIP: enableMeshIP,
+		allowRemote:  allowRemote,
 	}
 }
 
@@ -59,13 +63,18 @@ func (s *MeshnameServer) Start() error {
 		s.dnsServer = &dns.Server{
 			Addr:              s.listenAddr,
 			Net:               "udp",
-			NotifyStartedFunc: func(){ close(waitStarted) },
+			NotifyStartedFunc: func() { close(waitStarted) },
 		}
 		for tld, subnet := range s.networks {
-			dns.HandleFunc(tld, s.handleRequest)
+			dns.HandleFunc(tld, s.handleMeshnameRequest)
 			s.log.Debugln("Handling:", tld, subnet)
 		}
-		go func(){
+		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)
 			}
@@ -86,10 +95,11 @@ func (s *MeshnameServer) ConfigureDNSRecords(dnsRecords map[string][]dns.RR) {
 	s.dnsRecordsLock.Unlock()
 }
 
-func (s *MeshnameServer) handleRequest(w dns.ResponseWriter, r *dns.Msg) {
+func (s *MeshnameServer) handleMeshnameRequest(w dns.ResponseWriter, r *dns.Msg) {
 	var remoteLookups = make(map[string][]dns.Question)
 	m := new(dns.Msg)
 	m.SetReply(r)
+	s.log.Debugln(r.String())
 
 	s.dnsRecordsLock.RLock()
 	for _, q := range r.Question {
@@ -127,12 +137,14 @@ func (s *MeshnameServer) handleRequest(w dns.ResponseWriter, r *dns.Msg) {
 
 	for remoteServer, questions := range remoteLookups {
 		rm := new(dns.Msg)
+		rm.RecursionDesired = true
 		rm.Question = questions
 		resp, _, err := s.dnsClient.Exchange(rm, "["+remoteServer+"]:53") // no retries
 		if err != nil {
 			s.log.Debugln(err)
 			continue
 		}
+		s.log.Debugln(resp.String())
 		m.Answer = append(m.Answer, resp.Answer...)
 	}
 
@@ -141,8 +153,39 @@ func (s *MeshnameServer) handleRequest(w dns.ResponseWriter, r *dns.Msg) {
 	}
 }
 
+func (s *MeshnameServer) handleMeshIPRequest(w dns.ResponseWriter, r *dns.Msg) {
+	m := new(dns.Msg)
+	m.SetReply(r)
+
+	for _, q := range r.Question {
+		labels := dns.SplitDomainName(q.Name)
+		// resolve only 2nd level domains and AAAA type
+		if len(labels) != 2 || q.Qtype != dns.TypeAAAA || q.Qclass != dns.ClassINET {
+			s.log.Debugln("Error: invalid resource requested")
+			continue
+		}
+
+		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
+
+			m.Answer = append(m.Answer, answer)
+		} else {
+			s.log.Debugln(err)
+		}
+	}
+
+	if err := w.WriteMsg(m); err != nil {
+		s.log.Debugln("Error writing response:", err)
+	}
+}
+
 func (s *MeshnameServer) isRemoteLookupAllowed(addr net.Addr) bool {
 	// TODO prefix whitelists ?
+	if s.allowRemote {
+		return true
+	}
 	ra := addr.String()
 	return strings.HasPrefix(ra, "[::1]:") || strings.HasPrefix(ra, "127.0.0.1:")
 }

pkg/meshname/server_test.go

@@ -17,8 +17,9 @@ func TestServerLocalDomain(t *testing.T) {
 	log := log.New(os.Stdout, "", log.Flags())
 	yggIPNet := &net.IPNet{IP: net.ParseIP("200::"), Mask: net.CIDRMask(7, 128)}
 	networks := map[string]*net.IPNet{"meshname": yggIPNet}
+	allowRemote := false
 
-	ts := meshname.New(log, bindAddr, networks)
+	ts := meshname.New(log, bindAddr, networks, allowRemote)
 
 	exampleConfig := make(map[string][]string)
 	exampleConfig["aiarnf2wpqjxkp6rhivuxbondy"] = append(exampleConfig["aiarnf2wpqjxkp6rhivuxbondy"],

protocol.md

@@ -30,7 +30,7 @@ The name space is derived from its IPv6 address as follows:
 
     b'\x02\x00o\xc8\x92 \xf4\x00\\\xc20ZJ\xc6\x96~'
 
-2) The binary value is encoded to base32:
+2) The binary value is encoded to base32 (RFC 4648):
 
     AIAG7SESED2AAXGCGBNEVRUWPY======