Compare commits
No commits in common. "34bfe19158c22633d273d9e4399436c4dd94a4e3" and "df1708152c6bff232badc9fa3b8ba415024912c7" have entirely different histories.
34bfe19158
...
df1708152c
@ -51,8 +51,7 @@ Variable|Description|Default
|
|||||||
-|-|-
|
-|-|-
|
||||||
`INTERFACE`* | Wireguard-Interface Name |
|
`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`
|
`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`
|
||||||
`FILTER_PREFIX` | Prefix to filter for IP-Networks | `100.100`
|
`RECHECK_INTERVAL` | Interval in seconds to recheck AllowedIPs entries in case something changed | 300
|
||||||
`RECHECK_INTERVAL` | Interval in go-time-format to recheck AllowedIPs entries in case something changed | 5m
|
|
||||||
|
|
||||||
*\* Required*
|
*\* Required*
|
||||||
|
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
# ---- 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 .
|
|
@ -1,9 +0,0 @@
|
|||||||
PLATFORM="linux/amd64,linux/arm64/v8,linux/arm/v7"
|
|
||||||
EXTRA_ARGS="$@"
|
|
||||||
|
|
||||||
docker buildx build \
|
|
||||||
--platform $PLATFORM \
|
|
||||||
-f $(dirname $0)/Dockerfile \
|
|
||||||
--output out \
|
|
||||||
$EXTRA_ARGS \
|
|
||||||
.
|
|
@ -1,7 +0,0 @@
|
|||||||
EXTRA_ARGS="$@"
|
|
||||||
|
|
||||||
docker build \
|
|
||||||
-f $(dirname $0)/Dockerfile \
|
|
||||||
--output out \
|
|
||||||
$EXTRA_ARGS \
|
|
||||||
.
|
|
@ -4,6 +4,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"os"
|
"os"
|
||||||
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
envChecks "git.ruekov.eu/ruakij/routingtabletowg/lib/environmentchecks"
|
envChecks "git.ruekov.eu/ruakij/routingtabletowg/lib/environmentchecks"
|
||||||
@ -20,7 +21,7 @@ var envRequired = []string{
|
|||||||
var envDefaults = map[string]string{
|
var envDefaults = map[string]string{
|
||||||
"IPV6_FORMAT": "fc12::%02x%02x:%02x%02x/%d",
|
"IPV6_FORMAT": "fc12::%02x%02x:%02x%02x/%d",
|
||||||
"FILTER_PREFIX": "100.100",
|
"FILTER_PREFIX": "100.100",
|
||||||
"RECHECK_INTERVAL": "5m",
|
"RECHECK_INTERVAL": "300",
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@ -48,47 +49,36 @@ func main() {
|
|||||||
filterPrefix := os.Getenv("FILTER_PREFIX")
|
filterPrefix := os.Getenv("FILTER_PREFIX")
|
||||||
|
|
||||||
checkIntervalStr := os.Getenv("RECHECK_INTERVAL")
|
checkIntervalStr := os.Getenv("RECHECK_INTERVAL")
|
||||||
checkInterval, err := time.ParseDuration(checkIntervalStr)
|
checkIntervalSec, err := strconv.Atoi(checkIntervalStr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error.Fatalf("Couldn't parse RECHECK_INTERVAL '%s': %s", checkIntervalStr, err)
|
logger.Error.Fatalf("Couldn't read RECHECK_INTERVAL '%s': %s", checkIntervalStr, err)
|
||||||
}
|
}
|
||||||
|
checkInterval := time.Second * time.Duration(checkIntervalSec)
|
||||||
|
|
||||||
// Get the IPv4 address of the interface
|
// Get the IPv4 address of the interface
|
||||||
addrs, err := netlink.AddrList(netInterface, netlink.FAMILY_V4)
|
addrs, err := netlink.AddrList(netInterface, netlink.FAMILY_V4)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error.Fatal(err)
|
logger.Error.Fatal(err)
|
||||||
}
|
}
|
||||||
processedCount := 0
|
if(len(addrs) == 0){
|
||||||
filteredCount := 0
|
logger.Error.Fatal("Interface doesnt have IPv4-Adresses")
|
||||||
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.Warn.Printf("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)
|
// 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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a WireGuard client
|
// Create a WireGuard client
|
||||||
|
Loading…
x
Reference in New Issue
Block a user