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

hotfix(custom): allow empty user and password for OpenVPN

Browse Source
This commit is contained in:
Quentin McGaw
2022-01-13 15:18:39 +00:00
parent 4bdce76041
commit 7e2ea4d74d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/configuration/settings/openvpn.go
View File

@@ -86,16 +86,18 @@ func (o OpenVPN) validate(vpnProvider string) (err error) {
ErrOpenVPNVersionIsNotValid, o.Version, strings.Join(validVersions, ", ")) ErrOpenVPNVersionIsNotValid, o.Version, strings.Join(validVersions, ", "))
} }
if o.User == "" { isCustom := vpnProvider == constants.Custom
if !isCustom && o.User == "" {
return ErrOpenVPNUserIsEmpty return ErrOpenVPNUserIsEmpty
} }
if o.Password == "" { if !isCustom && o.Password == "" {
return ErrOpenVPNPasswordIsEmpty return ErrOpenVPNPasswordIsEmpty
} }
// Validate ConfFile // Validate ConfFile
if vpnProvider == constants.Custom { if isCustom {
if *o.ConfFile == "" { if *o.ConfFile == "" {
return fmt.Errorf("%w: no file path specified", ErrOpenVPNConfigFile) return fmt.Errorf("%w: no file path specified", ErrOpenVPNConfigFile)
} }