diff --git a/internal/params/openvpn.go b/internal/params/openvpn.go index d4c51432..88b47183 100644 --- a/internal/params/openvpn.go +++ b/internal/params/openvpn.go @@ -15,7 +15,7 @@ func (p *paramsReader) GetUser() (s string, err error) { err = unsetenvErr } }() - s, err = p.envParams.GetEnv("USER") + s, err = p.envParams.GetEnv("USER", libparams.CaseSensitiveValue()) if err != nil { return "", err } else if len(s) == 0 { @@ -32,7 +32,7 @@ func (p *paramsReader) GetPassword() (s string, err error) { err = unsetenvErr } }() - s, err = p.envParams.GetEnv("PASSWORD") + s, err = p.envParams.GetEnv("PASSWORD", libparams.CaseSensitiveValue()) if err != nil { return "", err } else if len(s) == 0 { diff --git a/internal/params/pia.go b/internal/params/pia.go index 8ddf1472..d2f876f1 100644 --- a/internal/params/pia.go +++ b/internal/params/pia.go @@ -28,7 +28,7 @@ func (p *paramsReader) GetPortForwarding() (activated bool, err error) { // GetPortForwardingStatusFilepath obtains the port forwarding status file path // from the environment variable PORT_FORWARDING_STATUS_FILE func (p *paramsReader) GetPortForwardingStatusFilepath() (filepath models.Filepath, err error) { - filepathStr, err := p.envParams.GetPath("PORT_FORWARDING_STATUS_FILE", libparams.Default("/forwarded_port")) + filepathStr, err := p.envParams.GetPath("PORT_FORWARDING_STATUS_FILE", libparams.Default("/forwarded_port"), libparams.CaseSensitiveValue()) return models.Filepath(filepathStr), err } diff --git a/internal/params/shadowsocks.go b/internal/params/shadowsocks.go index aee2f340..aef7157c 100644 --- a/internal/params/shadowsocks.go +++ b/internal/params/shadowsocks.go @@ -36,5 +36,5 @@ func (p *paramsReader) GetShadowSocksPort() (port uint16, err error) { // SHADOWSOCKS_PASSWORD func (p *paramsReader) GetShadowSocksPassword() (password string, err error) { defer p.unsetEnv("SHADOWSOCKS_PASSWORD") - return p.envParams.GetEnv("SHADOWSOCKS_PASSWORD") + return p.envParams.GetEnv("SHADOWSOCKS_PASSWORD", libparams.CaseSensitiveValue()) } diff --git a/internal/params/tinyproxy.go b/internal/params/tinyproxy.go index f98e4f2b..134a4045 100644 --- a/internal/params/tinyproxy.go +++ b/internal/params/tinyproxy.go @@ -65,7 +65,7 @@ func (p *paramsReader) GetTinyProxyUser() (user string, err error) { defer p.unsetEnv("PROXY_USER") defer p.unsetEnv("TINYPROXY_USER") // Retro-compatibility - user, err = p.envParams.GetEnv("PROXY_USER") + user, err = p.envParams.GetEnv("PROXY_USER", libparams.CaseSensitiveValue()) if err != nil { return user, err } @@ -73,7 +73,7 @@ func (p *paramsReader) GetTinyProxyUser() (user string, err error) { p.logger.Warn("You are using the old environment variable PROXY_USER, please consider changing it to TINYPROXY_USER") return user, nil } - return p.envParams.GetEnv("TINYPROXY_USER") + return p.envParams.GetEnv("TINYPROXY_USER", libparams.CaseSensitiveValue()) } // GetTinyProxyPassword obtains the TinyProxy server password from the environment variable @@ -82,7 +82,7 @@ func (p *paramsReader) GetTinyProxyPassword() (password string, err error) { defer p.unsetEnv("PROXY_PASSWORD") defer p.unsetEnv("TINYPROXY_PASSWORD") // Retro-compatibility - password, err = p.envParams.GetEnv("PROXY_PASSWORD") + password, err = p.envParams.GetEnv("PROXY_PASSWORD", libparams.CaseSensitiveValue()) if err != nil { return password, err } @@ -90,5 +90,5 @@ func (p *paramsReader) GetTinyProxyPassword() (password string, err error) { p.logger.Warn("You are using the old environment variable PROXY_PASSWORD, please consider changing it to TINYPROXY_PASSWORD") return password, nil } - return p.envParams.GetEnv("TINYPROXY_PASSWORD") + return p.envParams.GetEnv("TINYPROXY_PASSWORD", libparams.CaseSensitiveValue()) } diff --git a/internal/params/version.go b/internal/params/version.go index 02780887..876b57dc 100644 --- a/internal/params/version.go +++ b/internal/params/version.go @@ -2,19 +2,20 @@ package params import ( "github.com/qdm12/golibs/params" + libparams "github.com/qdm12/golibs/params" ) func (p *paramsReader) GetVersion() string { - version, _ := p.envParams.GetEnv("VERSION", params.Default("?")) + version, _ := p.envParams.GetEnv("VERSION", params.Default("?"), libparams.CaseSensitiveValue()) return version } func (p *paramsReader) GetBuildDate() string { - buildDate, _ := p.envParams.GetEnv("BUILD_DATE", params.Default("?")) + buildDate, _ := p.envParams.GetEnv("BUILD_DATE", params.Default("?"), libparams.CaseSensitiveValue()) return buildDate } func (p *paramsReader) GetVcsRef() string { - buildDate, _ := p.envParams.GetEnv("VCS_REF", params.Default("?")) + buildDate, _ := p.envParams.GetEnv("VCS_REF", params.Default("?"), libparams.CaseSensitiveValue()) return buildDate }