chore(internal/providers): simplify OpenVPN config building

internal/provider/ivpn/openvpnconf.go

@@ -1,9 +1,6 @@
 package ivpn
 
 import (
-	"strconv"
-	"strings"
-
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
@@ -11,71 +8,22 @@ import (
 )
 
 func (i *Ivpn) BuildConf(connection models.Connection,
-	settings settings.OpenVPN) (lines []string, err error) {
-	if len(settings.Ciphers) == 0 {
-		settings.Ciphers = []string{constants.AES256cbc}
+	settings settings.OpenVPN) (lines []string) {
+	//nolint:gomnd
+	providerSettings := utils.OpenVPNProviderSettings{
+		AuthUserPass: true,
+		Ciphers: []string{
+			constants.AES256cbc,
+		},
+		Ping:           5,
+		RemoteCertTLS:  true,
+		VerifyX509Type: "name-prefix",
+		TLSCipher:      "TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA",
+		CA:             constants.IvpnCA,
+		TLSAuth:        constants.IvpnTLSAuth,
+		ExtraLines: []string{
+			"key-direction 1",
+		},
 	}
-
-	namePrefix := strings.Split(connection.Hostname, ".")[0]
-
-	lines = []string{
-		"client",
-		"nobind",
-		"tls-exit",
-		"dev " + settings.Interface,
-		"verb " + strconv.Itoa(*settings.Verbosity),
-
-		// IVPN specific
-		"ping 5",
-		"remote-cert-tls server", // updated name of ns-cert-type
-		"key-direction 1",
-		"verify-x509-name " + namePrefix + " name-prefix",
-		"tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA",
-		"auth-user-pass " + constants.OpenVPNAuthConf,
-
-		// Added constant values
-		"mute-replay-warnings",
-		"auth-nocache",
-		"pull-filter ignore \"auth-token\"", // prevent auth failed loops
-		"auth-retry nointeract",
-		"suppress-timestamps",
-
-		// Connection variables
-		connection.OpenVPNProtoLine(),
-		connection.OpenVPNRemoteLine(),
-	}
-
-	lines = append(lines, utils.CipherLines(settings.Ciphers, settings.Version)...)
-
-	if *settings.Auth != "" {
-		lines = append(lines, "auth "+*settings.Auth)
-	}
-
-	if *settings.MSSFix > 0 {
-		lines = append(lines, "mssfix "+strconv.Itoa(int(*settings.MSSFix)))
-	}
-
-	if connection.Protocol == constants.UDP {
-		lines = append(lines, "explicit-exit-notify")
-	}
-
-	if settings.ProcessUser != "root" {
-		lines = append(lines, "user "+settings.ProcessUser)
-		lines = append(lines, "persist-tun")
-		lines = append(lines, "persist-key")
-	}
-
-	if !*settings.IPv6 {
-		lines = append(lines, `pull-filter ignore "route-ipv6"`)
-		lines = append(lines, `pull-filter ignore "ifconfig-ipv6"`)
-	}
-
-	lines = append(lines, utils.WrapOpenvpnCA(
-		constants.IvpnCA)...)
-	lines = append(lines, utils.WrapOpenvpnTLSAuth(
-		constants.IvpnTLSAuth)...)
-
-	lines = append(lines, "")
-
-	return lines, nil
+	return utils.OpenVPNConfig(providerSettings, connection, settings)
 }