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

Read some values with case sensitivity

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2020-02-22 15:43:33 +00:00
parent 83e8bb780a
commit ab5d60754f
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/params/openvpn.go
View File

@@ -15,7 +15,7 @@ func (p *paramsReader) GetUser() (s string, err error) {
err = unsetenvErr err = unsetenvErr
} }
}() }()
s, err = p.envParams.GetEnv("USER") s, err = p.envParams.GetEnv("USER", libparams.CaseSensitiveValue())
if err != nil { if err != nil {
return "", err return "", err
} else if len(s) == 0 { } else if len(s) == 0 {
@@ -32,7 +32,7 @@ func (p *paramsReader) GetPassword() (s string, err error) {
err = unsetenvErr err = unsetenvErr
} }
}() }()
s, err = p.envParams.GetEnv("PASSWORD") s, err = p.envParams.GetEnv("PASSWORD", libparams.CaseSensitiveValue())
if err != nil { if err != nil {
return "", err return "", err
} else if len(s) == 0 { } else if len(s) == 0 {

2
internal/params/pia.go
View File

@@ -28,7 +28,7 @@ func (p *paramsReader) GetPortForwarding() (activated bool, err error) {
// GetPortForwardingStatusFilepath obtains the port forwarding status file path // GetPortForwardingStatusFilepath obtains the port forwarding status file path
// from the environment variable PORT_FORWARDING_STATUS_FILE // from the environment variable PORT_FORWARDING_STATUS_FILE
func (p *paramsReader) GetPortForwardingStatusFilepath() (filepath models.Filepath, err error) { 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 return models.Filepath(filepathStr), err
} }

2
internal/params/shadowsocks.go
View File

@@ -36,5 +36,5 @@ func (p *paramsReader) GetShadowSocksPort() (port uint16, err error) {
// SHADOWSOCKS_PASSWORD // SHADOWSOCKS_PASSWORD
func (p *paramsReader) GetShadowSocksPassword() (password string, err error) { func (p *paramsReader) GetShadowSocksPassword() (password string, err error) {
defer p.unsetEnv("SHADOWSOCKS_PASSWORD") defer p.unsetEnv("SHADOWSOCKS_PASSWORD")
return p.envParams.GetEnv("SHADOWSOCKS_PASSWORD") return p.envParams.GetEnv("SHADOWSOCKS_PASSWORD", libparams.CaseSensitiveValue())
} }

8
internal/params/tinyproxy.go
View File

@@ -65,7 +65,7 @@ func (p *paramsReader) GetTinyProxyUser() (user string, err error) {
defer p.unsetEnv("PROXY_USER") defer p.unsetEnv("PROXY_USER")
defer p.unsetEnv("TINYPROXY_USER") defer p.unsetEnv("TINYPROXY_USER")
// Retro-compatibility // Retro-compatibility
user, err = p.envParams.GetEnv("PROXY_USER") user, err = p.envParams.GetEnv("PROXY_USER", libparams.CaseSensitiveValue())
if err != nil { if err != nil {
return user, err 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") p.logger.Warn("You are using the old environment variable PROXY_USER, please consider changing it to TINYPROXY_USER")
return user, nil 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 // 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("PROXY_PASSWORD")
defer p.unsetEnv("TINYPROXY_PASSWORD") defer p.unsetEnv("TINYPROXY_PASSWORD")
// Retro-compatibility // Retro-compatibility
password, err = p.envParams.GetEnv("PROXY_PASSWORD") password, err = p.envParams.GetEnv("PROXY_PASSWORD", libparams.CaseSensitiveValue())
if err != nil { if err != nil {
return password, err 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") p.logger.Warn("You are using the old environment variable PROXY_PASSWORD, please consider changing it to TINYPROXY_PASSWORD")
return password, nil return password, nil
} }
return p.envParams.GetEnv("TINYPROXY_PASSWORD") return p.envParams.GetEnv("TINYPROXY_PASSWORD", libparams.CaseSensitiveValue())
} }

7
internal/params/version.go
View File

@@ -2,19 +2,20 @@ package params
import ( import (
"github.com/qdm12/golibs/params" "github.com/qdm12/golibs/params"
libparams "github.com/qdm12/golibs/params"
) )
func (p *paramsReader) GetVersion() string { func (p *paramsReader) GetVersion() string {
version, _ := p.envParams.GetEnv("VERSION", params.Default("?")) version, _ := p.envParams.GetEnv("VERSION", params.Default("?"), libparams.CaseSensitiveValue())
return version return version
} }
func (p *paramsReader) GetBuildDate() string { 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 return buildDate
} }
func (p *paramsReader) GetVcsRef() string { 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 return buildDate
} }