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

Code maintenance: GetPassword signature changed

Browse Source
This commit is contained in:
Quentin McGaw
2020-12-29 20:06:24 +00:00
parent 96f2b2b617
commit 258e150ebf
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/params/openvpn.go
View File

@@ -18,15 +18,13 @@ func (r *reader) GetUser() (user string, err error) {
} }
// GetPassword obtains the password to use to connect to the VPN servers. // GetPassword obtains the password to use to connect to the VPN servers.
func (r *reader) GetPassword(required bool) (s string, err error) { func (r *reader) GetPassword() (s string, err error) {
options := []libparams.GetEnvSetter{ options := []libparams.GetEnvSetter{
libparams.CaseSensitiveValue(), libparams.CaseSensitiveValue(),
libparams.Unset(), libparams.Unset(),
libparams.Compulsory(),
libparams.RetroKeys([]string{"PASSWORD"}, r.onRetroActive), libparams.RetroKeys([]string{"PASSWORD"}, r.onRetroActive),
} }
if required {
options = append(options, libparams.Compulsory())
}
return r.envParams.GetEnv("OPENVPN_PASSWORD", options...) return r.envParams.GetEnv("OPENVPN_PASSWORD", options...)
} }

2
internal/params/params.go
View File

@@ -47,7 +47,7 @@ type Reader interface {
// VPN getters // VPN getters
GetUser() (s string, err error) GetUser() (s string, err error)
GetPassword(required bool) (s string, err error) GetPassword() (s string, err error)
GetNetworkProtocol() (protocol models.NetworkProtocol, err error) GetNetworkProtocol() (protocol models.NetworkProtocol, err error)
GetOpenVPNVerbosity() (verbosity int, err error) GetOpenVPNVerbosity() (verbosity int, err error)
GetOpenVPNRoot() (root bool, err error) GetOpenVPNRoot() (root bool, err error)

9
internal/settings/openvpn.go
View File

@@ -28,12 +28,13 @@ func GetOpenVPNSettings(paramsReader params.Reader, vpnProvider models.VPNProvid
} }
// Remove spaces in user ID to simplify user's life, thanks @JeordyR // Remove spaces in user ID to simplify user's life, thanks @JeordyR
settings.User = strings.ReplaceAll(settings.User, " ", "") settings.User = strings.ReplaceAll(settings.User, " ", "")
isMullvad := vpnProvider == constants.Mullvad if vpnProvider == constants.Mullvad {
settings.Password, err = paramsReader.GetPassword(!isMullvad) settings.Password = "m"
} else {
settings.Password, err = paramsReader.GetPassword()
if err != nil { if err != nil {
return settings, err return settings, err
} else if isMullvad { }
settings.Password = "m"
} }
settings.Verbosity, err = paramsReader.GetOpenVPNVerbosity() settings.Verbosity, err = paramsReader.GetOpenVPNVerbosity()
if err != nil { if err != nil {