Compare commits
34 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
ebc2393d96 | ||
|
0de7bd35f3 | ||
|
6a10139785 | ||
|
4a163fde36 | ||
|
7e32f63216 | ||
|
507b16fbd0 | ||
|
46b3388b83 | ||
|
d0033bc409 | ||
|
df90e5947e | ||
|
a288e99bda | ||
|
2b23be6f74 | ||
|
d0fc2ff8e6 | ||
|
b51cca5347 | ||
|
54be47f844 | ||
|
32e9a42493 | ||
|
fce8a51ed8 | ||
|
6adda5f544 | ||
|
4ad4578103 | ||
|
4b0f083f72 | ||
|
a1d3313299 | ||
|
5bbc9b922c | ||
|
4201a704f8 | ||
|
be529a50d1 | ||
|
f7c594af5a | ||
|
17a8ed4414 | ||
|
5b4fd41ffa | ||
|
9f31f76d02 | ||
|
1919aed4e6 | ||
|
73c604e9c4 | ||
|
38781e39fe | ||
|
92a819e45a | ||
|
6610db601b | ||
|
166705fc60 | ||
|
d006a19738 |
12
Makefile
12
Makefile
@ -2,13 +2,19 @@ GOARCH := $(GOARCH)
|
||||
GOOS := $(GOOS)
|
||||
FLAGS := -ldflags "-s -w"
|
||||
|
||||
all:
|
||||
all: meshnamed whoami
|
||||
|
||||
meshnamed:
|
||||
GOARCH=$$GOARCH GOOS=$$GOOS go build $(FLAGS) ./cmd/meshnamed
|
||||
|
||||
whoami:
|
||||
GOARCH=$$GOARCH GOOS=$$GOOS go build $(FLAGS) ./cmd/whoami
|
||||
|
||||
clean:
|
||||
$(RM) meshnamed meshnamed.exe
|
||||
$(RM) meshnamed meshnamed.exe whoami whoami.exe
|
||||
|
||||
test:
|
||||
go test pkg/meshname/*_test.go
|
||||
|
||||
.PHONY: all clean test
|
||||
.PHONY: all meshnamed whoami clean test
|
||||
|
||||
|
80
README.md
80
README.md
@ -13,85 +13,17 @@ Implements the [Meshname protocol](https://github.com/zhoreeq/meshname/blob/mast
|
||||
- Q: *Meshname domains are ugly.*
|
||||
- A: Yes, if you want decentralization, you either have ugly names or a blockchain. Meshname has ugly names, but it works at least!
|
||||
|
||||
## How to install and use
|
||||
## How to use meshname domains?
|
||||
|
||||
Minimum go version 1.12 is required.
|
||||
Use a full-featured DNS server with the meshname protocol support, i.e. [PopuraDNS](https://github.com/popura-network/PopuraDNS).
|
||||
|
||||
1) Get the source code and compile
|
||||
```
|
||||
git clone https://github.com/zhoreeq/meshname.git
|
||||
cd meshname
|
||||
make
|
||||
```
|
||||
2) Generate the default config for your host
|
||||
```
|
||||
./meshnamed -genconf 200:6fc8:9220:f400:5cc2:305a:4ac6:967e -subdomain meshname | tee /tmp/meshnamed.conf
|
||||
```
|
||||
3) Run the daemon
|
||||
```
|
||||
./meshnamed -useconffile /tmp/meshnamed.conf
|
||||
```
|
||||
4) Optionally, set configuration flags
|
||||
```
|
||||
./meshnamed -listenaddr [::1]:53535 -debug -useconffile /tmp/meshnamed.conf
|
||||
```
|
||||
5) See the list of all configuration flags
|
||||
```
|
||||
./meshnamed -help
|
||||
```
|
||||
Add custom DNS records to the configuration file and restart the daemon to apply settings.
|
||||
A DNS record can be of any valid string form parsed by [miekg/dns#NewRR](https://godoc.org/github.com/miekg/dns#NewRR) function (see example configuration file below).
|
||||
For a standalone .meshname stub resolver see `USAGE.md`
|
||||
|
||||
## systemd unit
|
||||
## Alternative implementations
|
||||
|
||||
Look for `meshnamed.service` in the source directory for a systemd unit file.
|
||||
[Mario DNS](https://notabug.org/acetone/mario-dns) by acetone, a C++ implementation with a web interface.
|
||||
|
||||
## Example configuration file
|
||||
|
||||
In this example, meshnamed is configured as authoritative server for two domain zones:
|
||||
|
||||
{
|
||||
"aiag7sesed2aaxgcgbnevruwpy": [
|
||||
"aiag7sesed2aaxgcgbnevruwpy.meshname. AAAA 200:6fc8:9220:f400:5cc2:305a:4ac6:967e",
|
||||
"_xmpp-client._tcp.aiag7sesed2aaxgcgbnevruwpy.meshname. SRV 5 0 5222 xmpp.aiag7sesed2aaxgcgbnevruwpy.meshname",
|
||||
"_xmpp-server._tcp.aiag7sesed2aaxgcgbnevruwpy.meshname. SRV 5 0 5269 xmpp.aiag7sesed2aaxgcgbnevruwpy.meshname",
|
||||
"xmpp.aiag7sesed2aaxgcgbnevruwpy.meshname. AAAA 300:6fc8:9220:f400::1",
|
||||
"forum.aiag7sesed2aaxgcgbnevruwpy.meshname. CNAME amag7sesed2aaaaaaaaaaaaaau.meshname."
|
||||
],
|
||||
"amag7sesed2aaaaaaaaaaaaaau": [
|
||||
"amag7sesed2aaaaaaaaaaaaaau.meshname. AAAA 300:6fc8:9220:f400::5"
|
||||
]
|
||||
}
|
||||
|
||||
## Configure dnsmasq as a primary DNS resolver with "meshname." support
|
||||
|
||||
`/etc/dnsmasq.conf`
|
||||
|
||||
port=53
|
||||
domain-needed
|
||||
bogus-priv
|
||||
server=/meshname/::1#53535
|
||||
server=8.8.8.8
|
||||
|
||||
## Using meshnamed as a standalone DNS server
|
||||
|
||||
Set the flag to listen on all interfaces and a standard DNS server port
|
||||
|
||||
./meshnamed -listenaddr [::]:53 -useconffile /tmp/meshnamed.conf
|
||||
|
||||
Run as root and allow incoming connections to port 53/UDP in firewall settings.
|
||||
|
||||
## Custom top level domains (TLD) and subnet filtering
|
||||
|
||||
meshnamed can be configured to resolve custom TLDs.
|
||||
To run meshnamed for TLD `.newmesh` with addresses in `fd00::/8`
|
||||
set a flag `-networks newmesh=fd00::/8`.
|
||||
|
||||
By default, in addition to `.meshname` it also resolves `.ygg` for IPv6 addresses in
|
||||
`200::/7` subnet and `.cjd` for `fc00::/8`.
|
||||
|
||||
Requests are filtered by subnet validation. Request is ignored if a decoded
|
||||
IPv6 address doesn't match the specified subnet for a TLD.
|
||||
[Ruby gem](https://rubygems.org/gems/meshname) by marek22k, [source](https://github.com/marek22k/meshname).
|
||||
|
||||
## See also
|
||||
|
||||
|
58
USAGE.md
Normal file
58
USAGE.md
Normal file
@ -0,0 +1,58 @@
|
||||
# How to install and use
|
||||
|
||||
Minimum go version 1.12 is required.
|
||||
|
||||
1) Get the source code and compile
|
||||
```
|
||||
git clone https://github.com/zhoreeq/meshname.git
|
||||
cd meshname
|
||||
make
|
||||
```
|
||||
2) Run the daemon
|
||||
```
|
||||
./meshnamed
|
||||
```
|
||||
3) Optionally, set configuration flags
|
||||
```
|
||||
./meshnamed -listenaddr [::1]:53535 -debug
|
||||
```
|
||||
4) See the list of all available flags
|
||||
```
|
||||
./meshnamed -help
|
||||
```
|
||||
|
||||
## Get meshname subdomain from an IPv6 address
|
||||
|
||||
```
|
||||
./meshnamed -getname 200:f8b1:f974:967f:dd32:145d:1cc0:3679
|
||||
aiaprmpzoslh7xjscrorzqbwpe
|
||||
```
|
||||
|
||||
Use this subdomain with a .meshname TLD to configure DNS records
|
||||
on your authoritative server, (i.e. dnsmasq, bind or PopuraDNS).
|
||||
|
||||
## systemd unit
|
||||
|
||||
Look for `meshnamed.service` in the source directory for a systemd unit file.
|
||||
|
||||
## Configure dnsmasq as a primary DNS resolver with "meshname." support
|
||||
|
||||
`/etc/dnsmasq.conf`
|
||||
|
||||
port=53
|
||||
domain-needed
|
||||
bogus-priv
|
||||
server=/meshname/::1#53535
|
||||
server=8.8.8.8
|
||||
|
||||
## Custom top level domains (TLD) and subnet filtering
|
||||
|
||||
meshnamed can be configured to resolve custom TLDs.
|
||||
To run meshnamed for TLD `.newmesh` with addresses in `fd00::/8`
|
||||
set a flag `-networks newmesh=fd00::/8`.
|
||||
|
||||
By default, in addition to `.meshname` it also resolves `.ygg` for IPv6 addresses in
|
||||
`200::/7` subnet and `.cjd` for `fc00::/8`.
|
||||
|
||||
Requests are filtered by subnet validation. Request is ignored if a decoded
|
||||
IPv6 address doesn't match the specified subnet for a TLD.
|
@ -28,30 +28,22 @@ func parseNetworks(networksconf string) (map[string]*net.IPNet, error) {
|
||||
return networks, nil
|
||||
}
|
||||
|
||||
func loadConfig(s *meshname.MeshnameServer, confPath string) error {
|
||||
dnsRecords, err := meshname.ParseConfigFile(confPath)
|
||||
if err == nil {
|
||||
s.ConfigureDNSRecords(dnsRecords)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
var (
|
||||
genconf, subdomain, useconffile, listenAddr, networksconf string
|
||||
listenAddr, networksconf string
|
||||
meshipNetworksconf string
|
||||
getName, getIP string
|
||||
debug, noMeshIP, allowRemote bool
|
||||
acmePort string
|
||||
debug, noMeshIP bool
|
||||
)
|
||||
|
||||
func init() {
|
||||
flag.StringVar(&genconf, "genconf", "", "generate a new config for IP address")
|
||||
flag.StringVar(&subdomain, "subdomain", "meshname.", "subdomain used to generate config")
|
||||
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,vapordns=::/0", "TLD=subnet list separated by comma")
|
||||
flag.StringVar(&networksconf, "networks", "ygg=200::/7,cjd=fc00::/8,meshname=::/0,popura=::/0", "TLD=subnet list separated by comma")
|
||||
flag.StringVar(&meshipNetworksconf, "meshipnetworks", "meship=::/0", "TLD=subnet list separated by comma")
|
||||
flag.BoolVar(&noMeshIP, "nomeship", false, "disable .meship resolver")
|
||||
flag.StringVar(&getName, "getname", "", "convert IPv6 address to a name")
|
||||
flag.StringVar(&getIP, "getip", "", "convert a name to IPv6 address")
|
||||
flag.BoolVar(&allowRemote, "allowremote", false, "allow remote queries from any IP address")
|
||||
flag.StringVar(&acmePort, "acmeport", "53536", "try alternative port for acme challenges")
|
||||
flag.BoolVar(&debug, "debug", false, "enable debug logging")
|
||||
}
|
||||
|
||||
@ -82,26 +74,15 @@ func main() {
|
||||
}
|
||||
fmt.Println(ip)
|
||||
return
|
||||
} else if genconf != "" {
|
||||
if conf, err := meshname.GenConf(genconf, subdomain); err == nil {
|
||||
fmt.Println(conf)
|
||||
} else {
|
||||
logger.Errorln(err)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
networks, err := parseNetworks(networksconf)
|
||||
meshipNetworks, err := parseNetworks(meshipNetworksconf)
|
||||
if err != nil {
|
||||
logger.Fatalln(err)
|
||||
}
|
||||
|
||||
s := meshname.New(logger, listenAddr, networks, !noMeshIP, allowRemote)
|
||||
if useconffile != "" {
|
||||
if err := loadConfig(s, useconffile); err != nil {
|
||||
logger.Fatalln(err)
|
||||
}
|
||||
}
|
||||
s := meshname.New(logger, listenAddr, networks, meshipNetworks, !noMeshIP, acmePort)
|
||||
|
||||
if err := s.Start(); err != nil {
|
||||
logger.Fatal(err)
|
||||
@ -117,12 +98,6 @@ func main() {
|
||||
select {
|
||||
case <-c:
|
||||
return
|
||||
case <-r:
|
||||
if useconffile != "" {
|
||||
if err := loadConfig(s, useconffile); err != nil {
|
||||
logger.Errorln(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
69
cmd/whoami/main.go
Normal file
69
cmd/whoami/main.go
Normal file
@ -0,0 +1,69 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"net"
|
||||
"encoding/base32"
|
||||
"strings"
|
||||
"flag"
|
||||
"log"
|
||||
)
|
||||
|
||||
// define tld
|
||||
var tld = flag.String("tld", "mesh.cat", "The top level domain for our network")
|
||||
|
||||
// domainFromIP derives a meshname subdomain for the authoritative DNS server address
|
||||
func domainFromIP(target net.IP) string {
|
||||
host := strings.ToLower(base32.StdEncoding.EncodeToString(target)[0:26])
|
||||
domain := host + "." + *tld
|
||||
return domain
|
||||
}
|
||||
|
||||
// handle HTTP requests
|
||||
func handler(w http.ResponseWriter, r *http.Request) {
|
||||
// parse query parameters
|
||||
params := r.URL.Query()
|
||||
ipParam := params.Get("ip")
|
||||
// check if the "ip" query parameter is set to "true"
|
||||
showIP := ipParam == "true"
|
||||
// get client's ip address
|
||||
ip, port, err := net.SplitHostPort(r.RemoteAddr)
|
||||
_, _ = port, err
|
||||
// check if we're behind a reverse proxy
|
||||
xForwardedFor := r.Header.Get("X-Forwarded-For")
|
||||
if xForwardedFor != "" {
|
||||
ip = xForwardedFor
|
||||
}
|
||||
parsedIP := net.ParseIP(ip)
|
||||
// return domain for IPv6 only
|
||||
if parsedIP.To4() == nil {
|
||||
if (showIP) {
|
||||
w.Write([]byte(ip + "\n"))
|
||||
log.Println(ip)
|
||||
} else {
|
||||
domain := domainFromIP(parsedIP)
|
||||
w.Write([]byte(domain + "\n"))
|
||||
log.Println(domain)
|
||||
}
|
||||
} else {
|
||||
// set the response status code to 422
|
||||
w.WriteHeader(http.StatusUnprocessableEntity)
|
||||
w.Write([]byte("ipv4 not supported\n"))
|
||||
}
|
||||
}
|
||||
|
||||
func main() {
|
||||
// define path
|
||||
http.HandleFunc("/", handler)
|
||||
// define ip address
|
||||
address := flag.String("address", "[::0]", "The interface address to listen on")
|
||||
// define port
|
||||
port := flag.String("port", "8008", "The port to listen on")
|
||||
// parse the command-line arguments
|
||||
flag.Parse()
|
||||
// construct listening address
|
||||
listenAddr := *address + ":" + *port
|
||||
print("Listening on address: ", listenAddr, "\n")
|
||||
// start server
|
||||
http.ListenAndServe(listenAddr, nil)
|
||||
}
|
@ -60,9 +60,6 @@ src_install() {
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "The meshname config file must be generated before use:"
|
||||
elog " # meshnamed -genconf <IPv6> -subdomain meshname | tee /etc/meshnamed.conf"
|
||||
elog
|
||||
elog "The meshname daemon will have to be started before use:"
|
||||
if use systemd ; then
|
||||
elog " # systemctl start meshnamed"
|
||||
|
@ -6,7 +6,7 @@ command="/usr/bin/meshnamed"
|
||||
description="Distributed naming system for IPv6 mesh networks"
|
||||
pidfile="/run/meshnamed.pid"
|
||||
logfile="/var/run/meshnamed.log"
|
||||
start_stop_daemon_args="--user nobody --group nobody -listenaddr '[::1]:53535' -useconffile /etc/meshnamed.conf"
|
||||
start_stop_daemon_args="--user nobody --group nobody -listenaddr '[::1]:53535'"
|
||||
|
||||
start() {
|
||||
ebegin "Starting Distributed naming system for IPv6 mesh networks"
|
||||
|
@ -9,7 +9,7 @@ Group=nogroup
|
||||
ProtectHome=true
|
||||
ProtectSystem=true
|
||||
SyslogIdentifier=meshnamed
|
||||
ExecStart=/usr/local/bin/meshnamed -listenaddr [::1]:53535 -useconffile /etc/meshnamed.conf
|
||||
ExecStart=/usr/local/bin/meshnamed -listenaddr [::1]:53535
|
||||
Restart=always
|
||||
TimeoutStopSec=5
|
||||
|
||||
|
@ -1,52 +0,0 @@
|
||||
package meshname
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"net"
|
||||
|
||||
"github.com/miekg/dns"
|
||||
)
|
||||
|
||||
func GenConf(target, zone string) (string, error) {
|
||||
ip := net.ParseIP(target)
|
||||
if ip == nil {
|
||||
return "", errors.New("Invalid IP address")
|
||||
}
|
||||
subDomain := DomainFromIP(&ip)
|
||||
selfRecord := fmt.Sprintf("\t\t\"%s.%s AAAA %s\"\n", subDomain, zone, target)
|
||||
confString := fmt.Sprintf("{\n\t\"%s\":[\n%s\t]\n}", subDomain, selfRecord)
|
||||
|
||||
return confString, nil
|
||||
}
|
||||
|
||||
// Load dnsRecords from a JSON file
|
||||
func ParseConfigFile(configPath string) (map[string][]dns.RR, error) {
|
||||
conf, err := ioutil.ReadFile(configPath)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var dat map[string][]string
|
||||
if err := json.Unmarshal(conf, &dat); err == nil {
|
||||
return ParseDNSRecordsMap(dat)
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
// ParseDNSRecordsMap takes a string map and returns a resource record map
|
||||
func ParseDNSRecordsMap(dnsRecordsMap map[string][]string) (map[string][]dns.RR, error) {
|
||||
var dnsRecords = make(map[string][]dns.RR)
|
||||
for subDomain, records := range dnsRecordsMap {
|
||||
for _, r := range records {
|
||||
if rr, err := dns.NewRR(r); err == nil {
|
||||
dnsRecords[subDomain] = append(dnsRecords[subDomain], rr)
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
}
|
||||
return dnsRecords, nil
|
||||
}
|
@ -3,8 +3,8 @@ package meshname
|
||||
import (
|
||||
"errors"
|
||||
"net"
|
||||
"strings"
|
||||
"sync"
|
||||
"strings"
|
||||
|
||||
"github.com/gologme/log"
|
||||
"github.com/miekg/dns"
|
||||
@ -16,29 +16,27 @@ type MeshnameServer struct {
|
||||
dnsClient *dns.Client
|
||||
dnsServer *dns.Server
|
||||
networks map[string]*net.IPNet
|
||||
meshipNetworks map[string]*net.IPNet
|
||||
enableMeshIP bool
|
||||
allowRemote bool
|
||||
|
||||
dnsRecordsLock sync.RWMutex
|
||||
dnsRecords map[string][]dns.RR
|
||||
acmePort string
|
||||
|
||||
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, meshipNetworks map[string]*net.IPNet, enableMeshIP bool, acmePort string) *MeshnameServer {
|
||||
dnsClient := new(dns.Client)
|
||||
dnsClient.Timeout = 5000000000 // increased 5 seconds timeout
|
||||
|
||||
return &MeshnameServer{
|
||||
log: log,
|
||||
listenAddr: listenAddr,
|
||||
dnsRecords: make(map[string][]dns.RR),
|
||||
networks: networks,
|
||||
meshipNetworks: meshipNetworks,
|
||||
dnsClient: dnsClient,
|
||||
enableMeshIP: enableMeshIP,
|
||||
allowRemote: allowRemote,
|
||||
acmePort: acmePort,
|
||||
}
|
||||
}
|
||||
|
||||
@ -65,14 +63,16 @@ func (s *MeshnameServer) Start() error {
|
||||
Net: "udp",
|
||||
NotifyStartedFunc: func() { close(waitStarted) },
|
||||
}
|
||||
if s.enableMeshIP {
|
||||
for mtld, subnet := range s.meshipNetworks {
|
||||
dns.HandleFunc(mtld, s.handleMeshIPRequest)
|
||||
s.log.Debugln("Handling as meship:", mtld, subnet)
|
||||
}
|
||||
}
|
||||
for tld, subnet := range s.networks {
|
||||
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 {
|
||||
@ -89,65 +89,91 @@ func (s *MeshnameServer) Start() error {
|
||||
}
|
||||
}
|
||||
|
||||
func (s *MeshnameServer) ConfigureDNSRecords(dnsRecords map[string][]dns.RR) {
|
||||
s.dnsRecordsLock.Lock()
|
||||
s.dnsRecords = dnsRecords
|
||||
s.dnsRecordsLock.Unlock()
|
||||
}
|
||||
|
||||
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()
|
||||
var tldList []string
|
||||
for tld := range s.networks {
|
||||
tldList = append(tldList, tld)
|
||||
}
|
||||
|
||||
for _, q := range r.Question {
|
||||
labels := dns.SplitDomainName(q.Name)
|
||||
if len(labels) < 2 {
|
||||
s.log.Debugln("Error: invalid domain requested")
|
||||
continue
|
||||
}
|
||||
subDomain := labels[len(labels)-2]
|
||||
|
||||
if records, ok := s.dnsRecords[subDomain]; ok {
|
||||
for _, rec := range records {
|
||||
if h := rec.Header(); h.Name == q.Name && h.Rrtype == q.Qtype && h.Class == q.Qclass {
|
||||
m.Answer = append(m.Answer, rec)
|
||||
// process domain
|
||||
input := strings.ToLower(strings.TrimSuffix(q.Name, "."))
|
||||
subDomain := ""
|
||||
tld := ""
|
||||
for i := range tldList {
|
||||
t := strings.ToLower(tldList[i])
|
||||
if strings.HasSuffix(input, "."+t) {
|
||||
// define tld
|
||||
tld = t
|
||||
domainParts := strings.SplitN(input, "."+t, 2)
|
||||
firstPart := domainParts[0]
|
||||
firstPartLabels := dns.SplitDomainName(firstPart)
|
||||
// define hostname ("subDomain")
|
||||
subDomain = firstPartLabels[len(firstPartLabels)-1]
|
||||
if len(firstPartLabels) == 1 && q.Qtype == dns.TypeAAAA {
|
||||
s.handleMeshIPRequest(w, r)
|
||||
return
|
||||
}
|
||||
}
|
||||
} else 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]
|
||||
|
||||
// check subnet validity
|
||||
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")
|
||||
}
|
||||
}
|
||||
}
|
||||
s.dnsRecordsLock.RUnlock()
|
||||
|
||||
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
|
||||
// always use lowercase internally among meshname instances
|
||||
originalQuestionName := rm.Question[0].Name
|
||||
// mocking spongebob dns encoding support
|
||||
rm.Question[0].Name = strings.ToLower(originalQuestionName)
|
||||
// add alternative port number
|
||||
portNumbers := []string{"53"}
|
||||
portNumbers = append([]string{s.acmePort}, portNumbers...) // TODO: rename acmePort to alternativePort
|
||||
// make request
|
||||
err := error(nil)
|
||||
for _, port := range portNumbers {
|
||||
s.log.Debugln("trying port:"+port)
|
||||
resp, _, err := s.dnsClient.Exchange(rm, "["+remoteServer+"]:"+port)
|
||||
// if we had success we don't keep trying other ports
|
||||
if err == nil {
|
||||
if len(resp.Answer) > 0 {
|
||||
// mocking spongebob dns encoding support
|
||||
resp.Question[0].Name = originalQuestionName
|
||||
resp.Answer[0].Header().Name = originalQuestionName
|
||||
}
|
||||
s.log.Debugln(resp.String())
|
||||
m.Answer = append(m.Answer, resp.Answer...)
|
||||
m.Ns = append(m.Ns, resp.Ns...)
|
||||
m.Extra = append(m.Extra, resp.Extra...)
|
||||
break
|
||||
}
|
||||
}
|
||||
if err != nil {
|
||||
s.log.Debugln(err)
|
||||
}
|
||||
}
|
||||
|
||||
if err := w.WriteMsg(m); err != nil {
|
||||
@ -158,21 +184,16 @@ func (s *MeshnameServer) handleMeshnameRequest(w dns.ResponseWriter, r *dns.Msg)
|
||||
func (s *MeshnameServer) handleMeshIPRequest(w dns.ResponseWriter, r *dns.Msg) {
|
||||
m := new(dns.Msg)
|
||||
m.SetReply(r)
|
||||
m.Authoritative = true
|
||||
|
||||
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)
|
||||
s.log.Debugln(m)
|
||||
} else {
|
||||
s.log.Debugln(err)
|
||||
}
|
||||
@ -183,15 +204,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
|
||||
|
@ -1,51 +0,0 @@
|
||||
package meshname
|
||||
|
||||
import (
|
||||
"net"
|
||||
"os"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/gologme/log"
|
||||
"github.com/miekg/dns"
|
||||
|
||||
"github.com/zhoreeq/meshname/pkg/meshname"
|
||||
)
|
||||
|
||||
func TestServerLocalDomain(t *testing.T) {
|
||||
bindAddr := "[::1]:54545"
|
||||
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, allowRemote)
|
||||
|
||||
exampleConfig := make(map[string][]string)
|
||||
exampleConfig["aiarnf2wpqjxkp6rhivuxbondy"] = append(exampleConfig["aiarnf2wpqjxkp6rhivuxbondy"],
|
||||
"test.aiarnf2wpqjxkp6rhivuxbondy.meshname. AAAA 201:1697:567c:1375:3fd1:3a2b:4b85:cd1e")
|
||||
|
||||
if dnsRecords, err := meshname.ParseDNSRecordsMap(exampleConfig); err == nil {
|
||||
ts.ConfigureDNSRecords(dnsRecords)
|
||||
} else {
|
||||
t.Fatalf("meshname: Failed to parse Meshname config: %s", err)
|
||||
}
|
||||
|
||||
ts.Start()
|
||||
|
||||
tc := new(dns.Client)
|
||||
m := new(dns.Msg)
|
||||
m.SetQuestion("test.aiarnf2wpqjxkp6rhivuxbondy.meshname.", dns.TypeAAAA)
|
||||
resp, _, err := tc.Exchange(m, bindAddr)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(resp.Answer) != 1 {
|
||||
t.Fatalf("Invalid response: %s", resp.String())
|
||||
}
|
||||
if !strings.Contains(resp.Answer[0].String(), "201:1697:567c:1375:3fd1:3a2b:4b85:cd1e") {
|
||||
t.Fatalf("Invalid IP in response: %s", resp.Answer[0].String())
|
||||
}
|
||||
|
||||
ts.Stop()
|
||||
}
|
Loading…
Reference in New Issue
Block a user