Fix: custom openvpn config settings log
This commit is contained in:
@@ -50,10 +50,14 @@ func (settings *OpenVPN) lines() (lines []string) {
|
|||||||
lines = append(lines, indent+lastIndent+"Custom configuration: "+settings.Config)
|
lines = append(lines, indent+lastIndent+"Custom configuration: "+settings.Config)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if settings.Provider.Name == "" {
|
||||||
|
lines = append(lines, indent+lastIndent+"Provider: custom configuration")
|
||||||
|
} else {
|
||||||
lines = append(lines, indent+lastIndent+"Provider:")
|
lines = append(lines, indent+lastIndent+"Provider:")
|
||||||
for _, line := range settings.Provider.lines() {
|
for _, line := range settings.Provider.lines() {
|
||||||
lines = append(lines, indent+indent+line)
|
lines = append(lines, indent+indent+line)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return lines
|
return lines
|
||||||
}
|
}
|
||||||
@@ -81,8 +85,12 @@ func (settings *OpenVPN) read(r reader) (err error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
customConfig := settings.Config != ""
|
||||||
credentialsRequired := len(settings.Config) == 0
|
credentialsRequired := true
|
||||||
|
if customConfig {
|
||||||
|
credentialsRequired = false
|
||||||
|
settings.Provider.Name = ""
|
||||||
|
}
|
||||||
|
|
||||||
settings.User, err = r.getFromEnvOrSecretFile("OPENVPN_USER", credentialsRequired, []string{"USER"})
|
settings.User, err = r.getFromEnvOrSecretFile("OPENVPN_USER", credentialsRequired, []string{"USER"})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -134,6 +142,8 @@ func (settings *OpenVPN) read(r reader) (err error) {
|
|||||||
|
|
||||||
var readProvider func(r reader) error
|
var readProvider func(r reader) error
|
||||||
switch settings.Provider.Name {
|
switch settings.Provider.Name {
|
||||||
|
case "": // custom config
|
||||||
|
readProvider = func(r reader) error { return nil }
|
||||||
case constants.Cyberghost:
|
case constants.Cyberghost:
|
||||||
readProvider = settings.Provider.readCyberghost
|
readProvider = settings.Provider.readCyberghost
|
||||||
case constants.Fastestvpn:
|
case constants.Fastestvpn:
|
||||||
|
|||||||
Reference in New Issue
Block a user