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

hotfix(config): do not log retro-compat warning when using OPENVPN_USER or OPENVPN_PASSWORD

Browse Source
This commit is contained in:
Quentin McGaw
2024-07-26 08:42:32 +00:00
parent e7381b3800
commit a03041cfea
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/configuration/settings/portforward.go
View File

@@ -166,10 +166,21 @@ func (p *PortForwarding) read(r *reader.Reader) (err error) {
return err
}
p.Username = r.String("VPN_PORT_FORWARDING_USERNAME",
reader.RetroKeys("USER", "OPENVPN_USER"), reader.ForceLowercase(false))
p.Password = r.String("VPN_PORT_FORWARDING_PASSWORD",
reader.RetroKeys("PASSWORD", "OPENVPN_PASSWORD"), reader.ForceLowercase(false))
usernameKeys := []string{"VPN_PORT_FORWARDING_USERNAME", "OPENVPN_USER", "USER"}
for _, key := range usernameKeys {
p.Username = r.String(key, reader.ForceLowercase(false))
if p.Username != "" {
break
}
}
passwordKeys := []string{"VPN_PORT_FORWARDING_PASSWORD", "OPENVPN_PASSWORD", "PASSWORD"}
for _, key := range passwordKeys {
p.Password = r.String(key, reader.ForceLowercase(false))
if p.Password != "" {
break
}
}
return nil
}