From a03041cfea85b670c1c84d6cfbee3a60fdde55b1 Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Fri, 26 Jul 2024 08:42:32 +0000 Subject: [PATCH] hotfix(config): do not log retro-compat warning when using OPENVPN_USER or OPENVPN_PASSWORD --- .../configuration/settings/portforward.go | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/internal/configuration/settings/portforward.go b/internal/configuration/settings/portforward.go index 6999d30e..156abdc0 100644 --- a/internal/configuration/settings/portforward.go +++ b/internal/configuration/settings/portforward.go @@ -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 }