admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hotfix(config/wireguard): add /32 to address without bits specified

Browse Source
This commit is contained in:
Quentin McGaw
2024-03-29 15:06:34 +00:00
parent 8454123cae
commit e859c60343
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/configuration/settings/wireguard.go
View File

@@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"net/netip" "net/netip"
"regexp" "regexp"
"strings"
"github.com/qdm12/gluetun/internal/configuration/settings/helpers" "github.com/qdm12/gluetun/internal/configuration/settings/helpers"
"github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/constants/providers"
@@ -220,11 +221,19 @@ func (w *Wireguard) read(r *reader.Reader) (err error) {
w.Interface = r.String("VPN_INTERFACE", w.Interface = r.String("VPN_INTERFACE",
reader.RetroKeys("WIREGUARD_INTERFACE"), reader.ForceLowercase(false)) reader.RetroKeys("WIREGUARD_INTERFACE"), reader.ForceLowercase(false))
w.Implementation = r.String("WIREGUARD_IMPLEMENTATION") w.Implementation = r.String("WIREGUARD_IMPLEMENTATION")
w.Addresses, err = r.CSVNetipPrefixes("WIREGUARD_ADDRESSES",
reader.RetroKeys("WIREGUARD_ADDRESS")) addressStrings := r.CSV("WIREGUARD_ADDRESSES", reader.RetroKeys("WIREGUARD_ADDRESS"))
if err != nil { w.Addresses = make([]netip.Prefix, len(addressStrings))
return err // already wrapped for i, addressString := range addressStrings {
if !strings.ContainsRune(addressString, '/') {
addressString += "/32"
}
w.Addresses[i], err = netip.ParsePrefix(addressString)
if err != nil {
return fmt.Errorf("parsing address: %w", err)
}
} }
w.AllowedIPs, err = r.CSVNetipPrefixes("WIREGUARD_ALLOWED_IPS") w.AllowedIPs, err = r.CSVNetipPrefixes("WIREGUARD_ALLOWED_IPS")
if err != nil { if err != nil {
return err // already wrapped return err // already wrapped