mesh.cat/meshname
1
0
Fork 0
mirror of https://git.hackfreedom.org/mesh.cat/meshname.git synced 2026-05-22 06:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the useless remote IP check

Browse Source
This commit is contained in:
George
2021-10-31 18:46:29 +00:00
parent 166705fc60
commit 6610db601b
2 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/meshname/server.go
+12 -27
View File
@@ -3,7 +3,6 @@ package meshname
import (
"errors"
"net"
"strings"
"sync"
"github.com/gologme/log"
@@ -17,14 +16,13 @@ type MeshnameServer struct {
dnsServer *dns.Server
networks map[string]*net.IPNet
enableMeshIP bool
allowRemote bool
startedLock sync.RWMutex
started bool
}
// New is a constructor for MeshnameServer
func New(log *log.Logger, listenAddr string, networks map[string]*net.IPNet, enableMeshIP bool, allowRemote bool) *MeshnameServer {
func New(log *log.Logger, listenAddr string, networks map[string]*net.IPNet, enableMeshIP bool) *MeshnameServer {
dnsClient := new(dns.Client)
dnsClient.Timeout = 5000000000 // increased 5 seconds timeout
@@ -34,7 +32,6 @@ func New(log *log.Logger, listenAddr string, networks map[string]*net.IPNet, ena
networks: networks,
dnsClient: dnsClient,
enableMeshIP: enableMeshIP,
allowRemote: allowRemote,
}
}
@@ -99,21 +96,18 @@ func (s *MeshnameServer) handleMeshnameRequest(w dns.ResponseWriter, r *dns.Msg)
}
subDomain := labels[len(labels)-2]
if s.isRemoteLookupAllowed(w.RemoteAddr()) {
// do remote lookups only for local clients
resolvedAddr, err := IPFromDomain(&subDomain)
if err != nil {
s.log.Debugln(err)
continue
}
// check subnet validity
tld := labels[len(labels)-1]
resolvedAddr, err := IPFromDomain(&subDomain)
if err != nil {
s.log.Debugln(err)
continue
}
// check subnet validity
tld := labels[len(labels)-1]
if subnet, ok := s.networks[tld]; ok && subnet.Contains(resolvedAddr) {
remoteLookups[resolvedAddr.String()] = append(remoteLookups[resolvedAddr.String()], q)
} else {
s.log.Debugln("Error: subnet doesn't match")
}
if subnet, ok := s.networks[tld]; ok && subnet.Contains(resolvedAddr) {
remoteLookups[resolvedAddr.String()] = append(remoteLookups[resolvedAddr.String()], q)
} else {
s.log.Debugln("Error: subnet doesn't match")
}
}
@@ -165,15 +159,6 @@ func (s *MeshnameServer) handleMeshIPRequest(w dns.ResponseWriter, r *dns.Msg) {
}
}
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:")
}
func (s *MeshnameServer) IsStarted() bool {
s.startedLock.RLock()
started := s.started