Maint: openvpn process user in Openvpn settings

internal/openvpn/custom.go

@@ -24,7 +24,7 @@ func (l *Loop) processCustomConfig(settings configuration.OpenVPN) (
 		return nil, connection, fmt.Errorf("%w: %s", errProcessCustomConfig, err)
 	}
 
-	lines = modifyCustomConfig(lines, l.username, settings)
+	lines = modifyCustomConfig(lines, settings)
 
 	connection, err = extractConnectionFromLines(lines)
 	if err != nil {
@@ -55,7 +55,7 @@ func readCustomConfigLines(filepath string) (
 	return strings.Split(string(b), "\n"), nil
 }
 
-func modifyCustomConfig(lines []string, username string,
+func modifyCustomConfig(lines []string,
 	settings configuration.OpenVPN) (modified []string) {
 	// Remove some lines
 	for _, line := range lines {
@@ -98,7 +98,7 @@ func modifyCustomConfig(lines []string, username string,
 		modified = append(modified, `pull-filter ignore "ifconfig-ipv6"`)
 	}
 	if !settings.Root {
-		modified = append(modified, "user "+username)
+		modified = append(modified, "user "+settings.ProcUser)
 	}
 
 	return modified

internal/openvpn/loop.go

@@ -31,7 +31,6 @@ type Loop struct {
 	statusManager loopstate.Manager
 	state         state.Manager
 	// Fixed parameters
-	username    string
 	buildInfo   models.BuildInformation
 	versionInfo bool
 	// Configurators
@@ -64,7 +63,7 @@ const (
 )
 
 func NewLoop(openVPNSettings configuration.OpenVPN,
-	providerSettings configuration.Provider, username string,
+	providerSettings configuration.Provider,
 	allServers models.AllServers, conf Configurator,
 	fw firewallConfigurer, routing routing.VPNGetter,
 	portForward portforward.StartStopper,
@@ -82,7 +81,6 @@ func NewLoop(openVPNSettings configuration.OpenVPN,
 	return &Loop{
 		statusManager: statusManager,
 		state:         state,
-		username:      username,
 		buildInfo:     buildInfo,
 		versionInfo:   versionInfo,
 		conf:          conf,

internal/openvpn/run.go

@@ -33,7 +33,7 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
 		if openVPNSettings.Config == "" {
 			connection, err = providerConf.GetOpenVPNConnection(providerSettings.ServerSelection)
 			if err == nil {
-				lines = providerConf.BuildConf(connection, l.username, openVPNSettings)
+				lines = providerConf.BuildConf(connection, openVPNSettings)
 			}
 		} else {
 			lines, connection, err = l.processCustomConfig(openVPNSettings)