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

Add allowremote flag. It allows remote meshname lookups for any IP address, not just localhost

Browse Source
This commit is contained in:
George 2020-12-08 09:21:39 -05:00
parent 8b557c92e1
commit a3fe08f5cb
2 changed files with 9 additions and 3 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 ( var (
genconf, subdomain, useconffile, listenAddr, networksconf string genconf, subdomain, useconffile, listenAddr, networksconf string
debug bool debug, allowRemote bool
) )
func init() { func init() {
@ -47,6 +47,7 @@ func init() {
flag.StringVar(&useconffile, "useconffile", "", "run daemon with a config file") flag.StringVar(&useconffile, "useconffile", "", "run daemon with a config file")
flag.StringVar(&listenAddr, "listenaddr", "[::1]:53535", "address to listen on") 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.StringVar(&networksconf, "networks", "ygg=200::/7,cjd=fc00::/8,meshname=::/0", "TLD=subnet list separated by comma")
flag.BoolVar(&allowRemote, "allowremote", false, "allow remote queries from any IP address")
flag.BoolVar(&debug, "debug", false, "enable debug logging") flag.BoolVar(&debug, "debug", false, "enable debug logging")
} }
@ -76,7 +77,7 @@ func main() {
logger.Fatalln(err) logger.Fatalln(err)
} }
s := meshname.New(logger, listenAddr, networks) s := meshname.New(logger, listenAddr, networks, allowRemote)
if useconffile != "" { if useconffile != "" {
if err := loadConfig(s, useconffile); err != nil { if err := loadConfig(s, useconffile); err != nil {
logger.Fatalln(err) logger.Fatalln(err)

7
pkg/meshname/server.go
View File

@ -16,6 +16,7 @@ type MeshnameServer struct {
dnsClient *dns.Client dnsClient *dns.Client
dnsServer *dns.Server dnsServer *dns.Server
networks map[string]*net.IPNet networks map[string]*net.IPNet
allowRemote bool
dnsRecordsLock sync.RWMutex dnsRecordsLock sync.RWMutex
dnsRecords map[string][]dns.RR dnsRecords map[string][]dns.RR
@ -25,7 +26,7 @@ type MeshnameServer struct {
} }
// New is a constructor for MeshnameServer // 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, allowRemote bool) *MeshnameServer {
dnsClient := new(dns.Client) dnsClient := new(dns.Client)
dnsClient.Timeout = 5000000000 // increased 5 seconds timeout dnsClient.Timeout = 5000000000 // increased 5 seconds timeout
@ -35,6 +36,7 @@ func New(log *log.Logger, listenAddr string, networks map[string]*net.IPNet) *Me
dnsRecords: make(map[string][]dns.RR), dnsRecords: make(map[string][]dns.RR),
networks: networks, networks: networks,
dnsClient: dnsClient, dnsClient: dnsClient,
allowRemote: allowRemote,
} }
} }
@ -143,6 +145,9 @@ func (s *MeshnameServer) handleRequest(w dns.ResponseWriter, r *dns.Msg) {
func (s *MeshnameServer) isRemoteLookupAllowed(addr net.Addr) bool { func (s *MeshnameServer) isRemoteLookupAllowed(addr net.Addr) bool {
// TODO prefix whitelists ? // TODO prefix whitelists ?
if s.allowRemote {
return true
}
ra := addr.String() ra := addr.String()
return strings.HasPrefix(ra, "[::1]:") || strings.HasPrefix(ra, "127.0.0.1:") return strings.HasPrefix(ra, "[::1]:") || strings.HasPrefix(ra, "127.0.0.1:")
} }