vanja/gluetun
1
0
Fork 0
mirror of https://github.com/qdm12/gluetun.git synced 2026-05-07 04:20:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

hotfix(sources/secrets): fix wireguard/amnezia mixup

Browse Source 
- Fix #3228
This commit is contained in:
Quentin McGaw
2026-03-13 14:48:11 +00:00
parent b5b0e01376
commit 00d1592899
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/configuration/sources/secrets/reader.go
+10 -10
View File
@@ -62,26 +62,26 @@ func (s *Source) Get(key string) (value string, isSet bool) {
s.warner.Warnf("skipping %s: parsing PEM: %s", path, err) s.warner.Warnf("skipping %s: parsing PEM: %s", path, err)
} }
return value, isSet return value, isSet
case "wireguard_private_key", "amneziawg_private_key": case "wireguard_private_key":
privateKey := s.lazyLoadWireguardConf().PrivateKey privateKey := s.lazyLoadWireguardConf().PrivateKey
if privateKey != nil { if privateKey != nil {
return *privateKey, true return *privateKey, true
} // else continue to read from individual secret file } // else continue to read from individual secret file
case "wireguard_preshared_key", "amneziawg_preshared_key": case "wireguard_preshared_key":
preSharedKey := s.lazyLoadWireguardConf().PreSharedKey preSharedKey := s.lazyLoadWireguardConf().PreSharedKey
if preSharedKey != nil { if preSharedKey != nil {
return *preSharedKey, true return *preSharedKey, true
} // else continue to read from individual secret file } // else continue to read from individual secret file
case "wireguard_addresses", "amneziawg_addresses": case "wireguard_addresses":
addresses := s.lazyLoadWireguardConf().Addresses addresses := s.lazyLoadWireguardConf().Addresses
if addresses != nil { if addresses != nil {
return *addresses, true return *addresses, true
} // else continue to read from individual secret file } // else continue to read from individual secret file
case "wireguard_public_key", "amneziawg_public_key": case "wireguard_public_key":
return strPtrToStringIsSet(s.lazyLoadWireguardConf().PublicKey) return strPtrToStringIsSet(s.lazyLoadWireguardConf().PublicKey)
case "wireguard_endpoint_ip", "amneziawg_endpoint_ip": case "wireguard_endpoint_ip":
return strPtrToStringIsSet(s.lazyLoadWireguardConf().EndpointIP) return strPtrToStringIsSet(s.lazyLoadWireguardConf().EndpointIP)
case "wireguard_endpoint_port", "amneziawg_endpoint_port": case "wireguard_endpoint_port":
return strPtrToStringIsSet(s.lazyLoadWireguardConf().EndpointPort) return strPtrToStringIsSet(s.lazyLoadWireguardConf().EndpointPort)
} }
@@ -118,13 +118,13 @@ func (s *Source) getAmneziaWg(key string) (value string, isSet, matched bool) {
value, isSet = strPtrToStringIsSet(s.lazyLoadAmneziawgConf().Wireguard.PrivateKey) value, isSet = strPtrToStringIsSet(s.lazyLoadAmneziawgConf().Wireguard.PrivateKey)
case "amneziawg_preshared_key": case "amneziawg_preshared_key":
value, isSet = strPtrToStringIsSet(s.lazyLoadAmneziawgConf().Wireguard.PreSharedKey) value, isSet = strPtrToStringIsSet(s.lazyLoadAmneziawgConf().Wireguard.PreSharedKey)
case "wireguard_addresses", "amneziawg_addresses": case "amneziawg_addresses":
value, isSet = strPtrToStringIsSet(s.lazyLoadAmneziawgConf().Wireguard.Addresses) value, isSet = strPtrToStringIsSet(s.lazyLoadAmneziawgConf().Wireguard.Addresses)
case "wireguard_public_key", "amneziawg_public_key": case "amneziawg_public_key":
value, isSet = strPtrToStringIsSet(s.lazyLoadAmneziawgConf().Wireguard.PublicKey) value, isSet = strPtrToStringIsSet(s.lazyLoadAmneziawgConf().Wireguard.PublicKey)
case "wireguard_endpoint_ip", "amneziawg_endpoint_ip": case "amneziawg_endpoint_ip":
value, isSet = strPtrToStringIsSet(s.lazyLoadAmneziawgConf().Wireguard.EndpointIP) value, isSet = strPtrToStringIsSet(s.lazyLoadAmneziawgConf().Wireguard.EndpointIP)
case "wireguard_endpoint_port", "amneziawg_endpoint_port": case "amneziawg_endpoint_port":
value, isSet = strPtrToStringIsSet(s.lazyLoadAmneziawgConf().Wireguard.EndpointPort) value, isSet = strPtrToStringIsSet(s.lazyLoadAmneziawgConf().Wireguard.EndpointPort)
case "amneziawg_jc": case "amneziawg_jc":
value, isSet = strPtrToStringIsSet(s.lazyLoadAmneziawgConf().Jc) value, isSet = strPtrToStringIsSet(s.lazyLoadAmneziawgConf().Jc)