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

Fix #175

Browse Source
This commit is contained in:
Quentin McGaw
2020-06-18 18:05:51 +00:00
parent 5a6cf0fe3a
commit cdbb7bf771
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/settings/openvpn.go
View File

@@ -18,14 +18,14 @@ type OpenVPN struct {
}
// GetOpenVPNSettings obtains the OpenVPN settings using the params functions
func GetOpenVPNSettings(paramsReader params.Reader) (settings OpenVPN, err error) {
func GetOpenVPNSettings(paramsReader params.Reader, passwordRequired bool) (settings OpenVPN, err error) {
settings.User, err = paramsReader.GetUser()
if err != nil {
return settings, err
}
// Remove spaces in user ID to simplify user's life, thanks @JeordyR
settings.User = strings.ReplaceAll(settings.User, " ", "")
settings.Password, err = paramsReader.GetPassword()
settings.Password, err = paramsReader.GetPassword(passwordRequired)
if err != nil {
return settings, err
}

5
internal/settings/settings.go
View File

@@ -59,11 +59,12 @@ func GetAllSettings(paramsReader params.Reader) (settings Settings, err error) {
if err != nil {
return settings, err
}
settings.OpenVPN, err = GetOpenVPNSettings(paramsReader)
isMullvad := settings.VPNSP == constants.Mullvad
settings.OpenVPN, err = GetOpenVPNSettings(paramsReader, !isMullvad)
if err != nil {
return settings, err
}
if settings.VPNSP == constants.Mullvad {
if isMullvad {
settings.OpenVPN.Password = "m"
}
settings.DNS, err = GetDNSSettings(paramsReader)