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

fix(custom): settings parsing for custom VPNSP

Browse Source
This commit is contained in:
Quentin McGaw
2022-01-07 09:23:29 +00:00
parent ae074dfb2b
commit c40c8413b5
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
internal/configuration/settings/serverselection.go
View File

@@ -68,6 +68,7 @@ func (ss *ServerSelection) validate(vpnServiceProvider string,
var countryChoices, regionChoices, cityChoices,
ispChoices, nameChoices, hostnameChoices []string
switch vpnServiceProvider {
case constants.Custom:
case constants.Cyberghost:
servers := allServers.GetCyberghost()
countryChoices = constants.CyberghostCountryChoices(servers)
@@ -177,7 +178,7 @@ func (ss *ServerSelection) validate(vpnServiceProvider string,
cityChoices = constants.WindscribeCityChoices(servers)
hostnameChoices = constants.WindscribeHostnameChoices(servers)
default:
return fmt.Errorf("%w: %s", ErrVPNProviderNameNotValid, ss.VPN)
return fmt.Errorf("%w: %s", ErrVPNProviderNameNotValid, vpnServiceProvider)
}
err = validateServerFilters(*ss, countryChoices, regionChoices, cityChoices,
@@ -186,14 +187,16 @@ func (ss *ServerSelection) validate(vpnServiceProvider string,
return err // already wrapped error
}
err = ss.OpenVPN.validate(vpnServiceProvider)
if err != nil {
return fmt.Errorf("OpenVPN server selection settings validation failed: %w", err)
}
err = ss.Wireguard.validate(vpnServiceProvider)
if err != nil {
return fmt.Errorf("Wireguard server selection settings validation failed: %w", err)
if ss.VPN == constants.OpenVPN {
err = ss.OpenVPN.validate(vpnServiceProvider)
if err != nil {
return fmt.Errorf("OpenVPN server selection settings validation failed: %w", err)
}
} else {
err = ss.Wireguard.validate(vpnServiceProvider)
if err != nil {
return fmt.Errorf("Wireguard server selection settings validation failed: %w", err)
}
}
return nil