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

hotfix(config/nordvpn): do not initialize wg addresses to an empty slice

Browse Source
This commit is contained in:
Quentin McGaw
2024-04-02 14:48:40 +00:00
parent 4afbe9332f
commit 982100782c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,16 +223,18 @@ func (w *Wireguard) read(r *reader.Reader) (err error) {
w.Implementation = r.String("WIREGUARD_IMPLEMENTATION")
addressStrings := r.CSV("WIREGUARD_ADDRESSES", reader.RetroKeys("WIREGUARD_ADDRESS"))
w.Addresses = make([]netip.Prefix, len(addressStrings))
for i, addressString := range addressStrings {
// WARNING: do not initialize w.Addresses to an empty slice
// or the defaults for nordvpn will not work.
for _, addressString := range addressStrings {
if !strings.ContainsRune(addressString, '/') {
addressString += "/32"
}
addressString = strings.TrimSpace(addressString)
w.Addresses[i], err = netip.ParsePrefix(addressString)
address, err := netip.ParsePrefix(addressString)
if err != nil {
return fmt.Errorf("parsing address: %w", err)
}
w.Addresses = append(w.Addresses, address)
}
w.AllowedIPs, err = r.CSVNetipPrefixes("WIREGUARD_ALLOWED_IPS")