Merge branch 'dev'

README.md

@@ -24,6 +24,8 @@ The program will convert IPv4-only wireguard-interfaces to IPv6. It converts and
 
 IPv6-Adresses are generated based on the IPv4-Adress.
 
+If not filtered out, then default routes (0.0.0.0/0) are handled specially and are converted to the IPv6 default route (::/0).
+
 Beware: This program needs `NET_ADMIN` privileges for setting Adresses and to access the wireguard-daemon.
 
 <br>
@@ -51,7 +53,8 @@ Variable|Description|Default
 -|-|-
 `INTERFACE`*        | Wireguard-Interface Name                  |
 `IPV6_FORMAT`       | Format to use for converting v4 to v6 <br> The CIDR-Mask gets translated using 128 - 24 - Mask <br> e.g. `10.0.100.5/16` -> `fc12::0a00:6405/96`   | `fc12::%02x%02x:%02x%02x/%d`
-`RECHECK_INTERVAL`  | Interval in seconds to recheck AllowedIPs entries in case something changed  | 300
+`FILTER_PREFIX`     | Prefix to filter for IP-Networks          | `100.100`
+`RECHECK_INTERVAL`  | Interval in go-time-format to recheck AllowedIPs entries in case something changed  | 5m
 
 *\* Required*
 
@@ -81,7 +84,7 @@ Restart=always
 RestartSec=30
 
 Environment="INTERFACE=wt0"
-Environment="RECHECK_INTERVAL=60"
+Environment="RECHECK_INTERVAL=60s"
 
 [Install]
 WantedBy=multi-user.target

build/Dockerfile

@@ -0,0 +1,13 @@
+# ---- Build ----
+FROM golang:1.19-alpine AS build
+WORKDIR /build
+# Copy sources
+ADD . .
+# Get dependencies
+RUN go get ./cmd/app
+# Compile
+RUN CGO_ENABLED=0 go build -a -o app ./cmd/app
+
+# ---- Output ----
+FROM scratch AS export-stage
+COPY --from=build /build/app .

build/build-multiarch.sh

@@ -0,0 +1,9 @@
+PLATFORM="linux/amd64,linux/arm64/v8,linux/arm/v7"
+EXTRA_ARGS="$@"
+
+docker buildx build \
+    --platform $PLATFORM \
+    -f $(dirname $0)/Dockerfile \
+    --output out \
+    $EXTRA_ARGS \
+    .

build/build-ownarch.sh

@@ -0,0 +1,7 @@
+EXTRA_ARGS="$@"
+
+docker build \
+    -f $(dirname $0)/Dockerfile \
+    --output out \
+    $EXTRA_ARGS \
+    .

cmd/app/main.go

@@ -4,12 +4,11 @@ import (
 	"fmt"
 	"net"
 	"os"
-	"strconv"
 	"time"
 
 	envChecks "git.ruekov.eu/ruakij/routingtabletowg/lib/environmentchecks"
-    "git.ruekov.eu/ruakij/routingtabletowg/lib/wgchecks/netchecks"
-    
+	"git.ruekov.eu/ruakij/routingtabletowg/lib/wgchecks/netchecks"
+
 	"github.com/vishvananda/netlink"
 	"golang.zx2c4.com/wireguard/wgctrl"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
@@ -18,142 +17,162 @@ import (
 var envRequired = []string{
 	"INTERFACE",
 }
+
 var envDefaults = map[string]string{
-    "IPV6_FORMAT": "fc12::%02x%02x:%02x%02x/%d",
-    "FILTER_PREFIX": "100.100",
-    "RECHECK_INTERVAL": "300",
+	"IPV6_FORMAT":      "fc12::%02x%02x:%02x%02x/%d",
+	"FILTER_PREFIX":    "100.100",
+	"RECHECK_INTERVAL": "5m",
 }
 
 func main() {
 	// Environment-vars
 	err := envChecks.HandleRequired(envRequired)
-	if(err != nil){
+	if err != nil {
 		logger.Error.Fatal(err)
 	}
 	envChecks.HandleDefaults(envDefaults)
 
-    // Get the network interface object
+	// Get the network interface object
 	iface := os.Getenv("INTERFACE")
-    netInterface, err := netlink.LinkByName(iface)
-    if err != nil {
-        logger.Error.Fatal(err)
-    }
-
-    ipv6Format := os.Getenv("IPV6_FORMAT")
-    ipv6TestStr := *convertIPv4ToIPv6(&ipv6Format, &net.IPNet{IP: net.IPv4(1,1,1,1), Mask: net.CIDRMask(24, net.IPv4len)})
-    _, err = netlink.ParseIPNet(ipv6TestStr)
-    if err != nil {
-        logger.Error.Fatalf("IPV6_FORMAT is invalid: %s", err)
-    }
-
-    filterPrefix := os.Getenv("FILTER_PREFIX")
-
-    checkIntervalStr := os.Getenv("RECHECK_INTERVAL")
-    checkIntervalSec, err := strconv.Atoi(checkIntervalStr)
+	netInterface, err := netlink.LinkByName(iface)
 	if err != nil {
-		logger.Error.Fatalf("Couldn't read RECHECK_INTERVAL '%s': %s", checkIntervalStr, err)
+		logger.Error.Fatal(err)
 	}
-    checkInterval := time.Second * time.Duration(checkIntervalSec)
 
-    // Get the IPv4 address of the interface
-    addrs, err := netlink.AddrList(netInterface, netlink.FAMILY_V4)
-    if err != nil {
-        logger.Error.Fatal(err)
-    }
-    if(len(addrs) == 0){
-        logger.Error.Fatal("Interface doesnt have IPv4-Adresses")
-    }
+	ipv6Format := os.Getenv("IPV6_FORMAT")
+	ipv6TestStr := *convertIPv4ToIPv6(&ipv6Format, &net.IPNet{IP: net.IPv4(1, 1, 1, 1), Mask: net.CIDRMask(24, net.IPv4len)})
+	_, err = netlink.ParseIPNet(ipv6TestStr)
+	if err != nil {
+		logger.Error.Fatalf("IPV6_FORMAT is invalid: %s", err)
+	}
 
-    // Add the IPv6 address to the interface
-    ipv6Str := *convertIPv4ToIPv6(&ipv6Format, addrs[0].IPNet)
-    ipv6, err := netlink.ParseAddr(ipv6Str)
-    if err != nil {
-        logger.Error.Fatal(err)
-    }
-    logger.Info.Printf("Adding converted %s -> %s to interface", addrs[0].IPNet.String(), ipv6Str)
-    err = netlink.AddrAdd(netInterface, ipv6)
-    if err != nil {
-        switch {
-        case os.IsExist(err):
-            logger.Warn.Println("Address is already set on interface")
-        default:
-            logger.Error.Fatalf("Failed to set address on interface: %v", err)
-        }
-    }
+	filterPrefix := os.Getenv("FILTER_PREFIX")
 
-    // Create a WireGuard client
-    client, err := wgctrl.New()
-    if err != nil {
-        logger.Error.Fatal(err)
-    }
-    defer client.Close()
+	checkIntervalStr := os.Getenv("RECHECK_INTERVAL")
+	checkInterval, err := time.ParseDuration(checkIntervalStr)
+	if err != nil {
+		logger.Error.Fatalf("Couldn't parse RECHECK_INTERVAL '%s': %s", checkIntervalStr, err)
+	}
 
-    // Loop indefinitely
-    for {
-        // Get the WireGuard peers on the interface
-        wgDevice, err := client.Device(iface)
-        if err != nil {
-            logger.Error.Fatalf("getting WireGuard device from interface '%s' failed: %s", iface, err)
-        }
+	// Create a WireGuard client
+	client, err := wgctrl.New()
+	if err != nil {
+		logger.Error.Fatal(err)
+	}
+	defer client.Close()
+
+	// Loop indefinitely
+	for {
+		// Get the IPv4 addresses of the interface
+		addrs, err := netlink.AddrList(netInterface, netlink.FAMILY_V4)
+		if err != nil {
+			logger.Error.Fatal(err)
+		}
+		processedCount := 0
+		filteredCount := 0
+		for _, addr := range addrs {
+			// Check filter
+			if addr.String()[:len(filterPrefix)] != filterPrefix {
+				filteredCount++
+				continue
+			}
+
+			// Add the IPv6 address to the interface
+			ipv6Str := *convertIPv4ToIPv6(&ipv6Format, addr.IPNet)
+			ipv6, err := netlink.ParseAddr(ipv6Str)
+			if err != nil {
+				logger.Warn.Printf("failed parsing converted %s -> %s : %s", addr.IPNet.String(), ipv6Str, err)
+				continue
+			}
+
+			logger.Info.Printf("Adding converted %s -> %s to interface", addr.IPNet.String(), ipv6Str)
+			err = netlink.AddrAdd(netInterface, ipv6)
+			if err != nil {
+				switch {
+				case os.IsExist(err):
+					logger.Warn.Println("Address is already set on interface")
+				default:
+					logger.Error.Fatalf("Failed to set address on interface: %v", err)
+				}
+			}
+			processedCount++
+		}
+		if processedCount != len(addrs) {
+			logger.Warn.Printf("Not all Interface-Addresses were processed. Summary: %d processed, %d filtered, %d failed", processedCount, filteredCount, len(addrs)-processedCount-filteredCount)
+		}
+
+		// Get the WireGuard peers on the interface
+		wgDevice, err := client.Device(iface)
+		if err != nil {
+			logger.Error.Fatalf("getting WireGuard device from interface '%s' failed: %s", iface, err)
+		}
 
 		var wgConfig wgtypes.Config
-        wgConfig.Peers = make([]wgtypes.PeerConfig, 0, len(wgDevice.Peers))
+		wgConfig.Peers = make([]wgtypes.PeerConfig, 0, len(wgDevice.Peers))
 
-        for _, peer := range wgDevice.Peers {
-            // Create slice for 1 expected addition
-            var addAllowedIPs = make([]net.IPNet, 0, 1)
+		for _, peer := range wgDevice.Peers {
+			// Create slice for 1 expected addition
+			addAllowedIPs := make([]net.IPNet, 0, 1)
 
-            // Loop through the allowed-ips and add the ones starting with 100.100
-            for _, allowedIP := range peer.AllowedIPs {
-                if allowedIP.String()[:len(filterPrefix)] == filterPrefix {
-                    // Convert the IPv4 allowed-ip to an IPv6 address
-                    ipv6Str := *convertIPv4ToIPv6(&ipv6Format, &allowedIP)
-                    logger.Info.Printf("AllowedIP %s -> %s to peer %s", allowedIP.String(), ipv6Str, peer.PublicKey)
-                    ipv6, err := netlink.ParseIPNet(ipv6Str)
-                    if err != nil {
-                        logger.Warn.Printf("Couldnt parse IPv6 address %s of peer %s: %s", ipv6Str, peer.PublicKey, err)
-                        continue
-                    }
-                    
-                    // Check if already set
-                    if i, _ := netchecks.IPNetIndexByIPNet(&peer.AllowedIPs, ipv6); i != -1 {
-                        continue
-                    }
+			// Loop through the allowed-ips and add the ones starting with 100.100
+			for _, allowedIP := range peer.AllowedIPs {
+				if allowedIP.String()[:len(filterPrefix)] == filterPrefix {
+					// Convert the IPv4 allowed-ip to an IPv6 address
+					ipv6Str := *convertIPv4ToIPv6(&ipv6Format, &allowedIP)
+					logger.Info.Printf("AllowedIP %s -> %s to peer %s", allowedIP.String(), ipv6Str, peer.PublicKey)
+					ipv6, err := netlink.ParseIPNet(ipv6Str)
+					if err != nil {
+						logger.Warn.Printf("Couldnt parse IPv6 address %s of peer %s: %s", ipv6Str, peer.PublicKey, err)
+						continue
+					}
 
-                    // Add the IPv6 allowed-ip to the peer
-                    addAllowedIPs = append(addAllowedIPs, *ipv6)
-                }
-            }
+					// Check if already set
+					if i, _ := netchecks.IPNetIndexByIPNet(&peer.AllowedIPs, ipv6); i != -1 {
+						continue
+					}
 
-            if(len(addAllowedIPs) > 0){
-                // Create peer-config
-                peerConfig := wgtypes.PeerConfig{
-                    PublicKey: peer.PublicKey,
-                    AllowedIPs: append(peer.AllowedIPs, addAllowedIPs...),
-                }
+					// Add the IPv6 allowed-ip to the peer
+					addAllowedIPs = append(addAllowedIPs, *ipv6)
+				}
+			}
 
-                // Add entry
-                wgConfig.Peers = append(wgConfig.Peers, peerConfig)
-            }
-        }
+			if len(addAllowedIPs) > 0 {
+				// Create peer-config
+				peerConfig := wgtypes.PeerConfig{
+					PublicKey:  peer.PublicKey,
+					AllowedIPs: append(peer.AllowedIPs, addAllowedIPs...),
+				}
 
-        if(len(wgConfig.Peers) == 0){
-            logger.Info.Println("No changes, skipping")
-        } else {
-            err = client.ConfigureDevice(iface, wgConfig)
-            if(err != nil){
-                logger.Error.Fatalf("Error configuring wg-device '%s': %s", iface, err)
-            }
-        }
-        
-        // Sleep for x seconds before running the loop again
-        time.Sleep(checkInterval)
-    }
+				// Add entry
+				wgConfig.Peers = append(wgConfig.Peers, peerConfig)
+			}
+		}
+
+		if len(wgConfig.Peers) == 0 {
+			logger.Info.Println("No changes, skipping")
+		} else {
+			err = client.ConfigureDevice(iface, wgConfig)
+			if err != nil {
+				logger.Error.Fatalf("Error configuring wg-device '%s': %s", iface, err)
+			}
+		}
+
+		// Sleep for x seconds before running the loop again
+		time.Sleep(checkInterval)
+	}
 }
 
-func convertIPv4ToIPv6(ipv6Format *string, ipv4 *net.IPNet) (*string) {
-    CIDR, _ := ipv4.Mask.Size()
-    // Run format
-    ipv6Str := fmt.Sprintf(*ipv6Format, (*ipv4).IP[0], (*ipv4).IP[1], (*ipv4).IP[2], (*ipv4).IP[3], net.IPv6len*8-(net.IPv4len*8-CIDR))
-    return &ipv6Str
+func convertIPv4ToIPv6(ipv6Format *string, ipv4 *net.IPNet) *string {
+	// Check if this is a default route (0.0.0.0/0)
+	if ipv4.IP.Equal(net.IPv4zero) {
+		if ones, _ := ipv4.Mask.Size(); ones == 0 {
+			defaultRoute := "::/0"
+			return &defaultRoute
+		}
+	}
+
+	CIDR, _ := ipv4.Mask.Size()
+	// Run format
+	ipv6Str := fmt.Sprintf(*ipv6Format, (*ipv4).IP[0], (*ipv4).IP[1], (*ipv4).IP[2], (*ipv4).IP[3], net.IPv6len*8-(net.IPv4len*8-CIDR))
+	return &ipv6Str
 }