chore(internal/providers): simplify OpenVPN config building

2022-04-25 07:57:45 +00:00
parent 4bde50fb3a
commit 7ff14a356c
27 changed files with 596 additions and 1438 deletions
--- a/internal/provider/perfectprivacy/openvpnconf.go
+++ b/internal/provider/perfectprivacy/openvpnconf.go
@@ -1,8 +1,6 @@
 package perfectprivacy

 import (
-	"strconv"
-
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
@@ -10,81 +8,30 @@ import (
 )

 func (p *Perfectprivacy) BuildConf(connection models.Connection,
-	settings settings.OpenVPN) (lines []string, err error) {
-	if len(settings.Ciphers) == 0 {
-		settings.Ciphers = []string{constants.AES256cbc, constants.AES256gcm}
+	settings settings.OpenVPN) (lines []string) {
+	//nolint:gomnd
+	providerSettings := utils.OpenVPNProviderSettings{
+		AuthUserPass: true,
+		Ciphers: []string{
+			constants.AES256cbc,
+			constants.AES256gcm,
+		},
+		Auth:         constants.SHA512,
+		MssFix:       1450,
+		Ping:         5,
+		CA:           constants.PerfectprivacyCA,
+		Cert:         constants.PerfectprivacyCert,
+		Key:          constants.PerfectprivacyKey,
+		TLSCrypt:     constants.PerfectprivacyTLSCrypt,
+		TLSCipher:    "TLS_CHACHA20_POLY1305_SHA256:TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-RSA-WITH-AES-128-GCM-SHA256:TLS-DHE-RSA-WITH-AES-128-CBC-SHA:TLS_AES_256_GCM_SHA384:TLS-RSA-WITH-AES-256-CBC-SHA", //nolint:lll
+		TunMTU:       1500,
+		TunMTUExtra:  32,
+		RenegSec:     3600,
+		KeyDirection: "1",
+		IPv6Lines: []string{
+			"redirect-gateway def1",
+			`pull-filter ignore "redirect-gateway def1 ipv6"`,
+		},
 	}
-
-	auth := *settings.Auth
-	if auth == "" {
-		auth = constants.SHA512
-	}
-
-	mssFix := *settings.MSSFix
-	if mssFix == 0 {
-		mssFix = 1450
-	}
-
-	lines = []string{
-		"client",
-		"nobind",
-		"tls-exit",
-		"dev " + settings.Interface,
-		"verb " + strconv.Itoa(*settings.Verbosity),
-
-		// Perfect Privacy specific
-		"ping 5",
-		"tun-mtu 1500",
-		"tun-mtu-extra 32",
-		"mssfix " + strconv.Itoa(int(mssFix)),
-		"reneg-sec 3600",
-		"key-direction 1",
-		"tls-cipher TLS_CHACHA20_POLY1305_SHA256:TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-RSA-WITH-AES-128-GCM-SHA256:TLS-DHE-RSA-WITH-AES-128-CBC-SHA:TLS_AES_256_GCM_SHA384:TLS-RSA-WITH-AES-256-CBC-SHA", //nolint:lll
-		"auth-user-pass " + constants.OpenVPNAuthConf,
-		"auth " + auth,
-
-		// Added constant values
-		"auth-nocache",
-		"mute-replay-warnings",
-		"pull-filter ignore \"auth-token\"", // prevent auth failed loops
-		"auth-retry nointeract",
-		"suppress-timestamps",
-
-		// Modified variables
-		connection.OpenVPNProtoLine(),
-		connection.OpenVPNRemoteLine(),
-	}
-
-	lines = append(lines, utils.CipherLines(settings.Ciphers, settings.Version)...)
-
-	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"`)
-		// Perfect Privacy specific IPv6
-		lines = append(lines, "redirect-gateway def1")
-		lines = append(lines, `pull-filter ignore "redirect-gateway def1 ipv6"`)
-	}
-
-	lines = append(lines, utils.WrapOpenvpnCA(
-		constants.PerfectprivacyCA)...)
-	lines = append(lines, utils.WrapOpenvpnCert(
-		constants.PerfectprivacyCert)...)
-	lines = append(lines, utils.WrapOpenvpnKey(
-		constants.PerfectprivacyKey)...)
-	lines = append(lines, utils.WrapOpenvpnTLSCrypt(
-		constants.PerfectprivacyTLSCrypt)...)
-
-	lines = append(lines, "")
-
-	return lines, nil
+	return utils.OpenVPNConfig(providerSettings, connection, settings)
 }