github/jwhited-wgsd
1
0
Fork 0
mirror of https://github.com/jwhited/wgsd.git synced 2025-04-04 11:09:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adds option to only propogate peers with > 1 IP

Browse Source 
https://github.com/jwhited/wgsd/issues/35
This commit is contained in:
George Harvey 2021-04-06 14:54:18 +01:00 committed by GitHub
parent 7eaacc000b
commit 2bca63ac8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
wgsd.go
View File

@ -7,6 +7,7 @@ import (
"fmt" "fmt"
"net" "net"
"strings" "strings"
"math"
"github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin"
clog "github.com/coredns/coredns/plugin/pkg/log" clog "github.com/coredns/coredns/plugin/pkg/log"
@ -41,6 +42,7 @@ type Zone struct {
serveSelf bool // flag to enable serving data about self serveSelf bool // flag to enable serving data about self
selfEndpoint *net.UDPAddr // overrides the self endpoint value selfEndpoint *net.UDPAddr // overrides the self endpoint value
selfAllowedIPs []net.IPNet // self allowed IPs selfAllowedIPs []net.IPNet // self allowed IPs
onlySubnets bool //
} }
type wgctrlClient interface { type wgctrlClient interface {
@ -176,6 +178,18 @@ func getSelfPeer(zone *Zone, device *wgtypes.Device, state request.Request) (wgt
return self, nil return self, nil
} }
func networkSizes(ips []*net.IPNet) (int, float64) {
var len int
var tot float64
for _, ip := range ips {
ones, bits := ip.Mask.Size()
bitsize := (bits - ones)
len ++
tot += math.Pow(2,float64(bitsize))
}
return len, tot
}
func getPeers(client wgctrlClient, zone *Zone, state request.Request) ( func getPeers(client wgctrlClient, zone *Zone, state request.Request) (
[]wgtypes.Peer, error) { []wgtypes.Peer, error) {
peers := make([]wgtypes.Peer, 0) peers := make([]wgtypes.Peer, 0)
@ -183,7 +197,15 @@ func getPeers(client wgctrlClient, zone *Zone, state request.Request) (
if err != nil { if err != nil {
return nil, err return nil, err
} }
peers = append(peers, device.Peers...) if !zone.onlySubnets {
peers = append(peers, device.Peers...)
} else {
for _, peer in range device.Peers{
if l , t := networkSizes(networks); l > 1 || t > 1 {
peers = append(peers, peer)
}
}
}
if zone.serveSelf { if zone.serveSelf {
self, err := getSelfPeer(zone, device, state) self, err := getSelfPeer(zone, device, state)
if err != nil { if err != nil {
@ -200,7 +222,8 @@ func (p *WGSD) ServeDNS(ctx context.Context, w dns.ResponseWriter,
// ResponseWriter. // ResponseWriter.
state := request.Request{W: w, Req: r} state := request.Request{W: w, Req: r}
// Check if the request is for a zone we are serving. If it doesn't match we // Check if the request is
a zone we are serving. If it doesn't match we
// pass the request on to the next plugin. // pass the request on to the next plugin.
zoneName := plugin.Zones(p.Names).Matches(state.Name()) zoneName := plugin.Zones(p.Names).Matches(state.Name())
if zoneName == "" { if zoneName == "" {
@ -317,7 +340,7 @@ func soa(zone string) dns.RR {
Refresh: 86400, Refresh: 86400,
Retry: 7200, Retry: 7200,
Expire: 3600000, Expire: 3600000,
Minttl: 60, Minttl: 60,pe
} }
} }