Maintenance: split each provider in a package

- Fix VyprVPN port
- Fix missing Auth overrides

internal/provider/nordvpn/connection.go

@@ -0,0 +1,39 @@
+package nordvpn
+
+import (
+	"github.com/qdm12/gluetun/internal/configuration"
+	"github.com/qdm12/gluetun/internal/constants"
+	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
+)
+
+func (n *Nordvpn) GetOpenVPNConnection(selection configuration.ServerSelection) (
+	connection models.OpenVPNConnection, err error) {
+	var port uint16 = 1194
+	protocol := constants.UDP
+	if selection.TCP {
+		port = 443
+		protocol = constants.TCP
+	}
+
+	servers, err := n.filterServers(selection)
+	if err != nil {
+		return connection, err
+	}
+
+	connections := make([]models.OpenVPNConnection, len(servers))
+	for i := range servers {
+		connection := models.OpenVPNConnection{
+			IP:       servers[i].IP,
+			Port:     port,
+			Protocol: protocol,
+		}
+		connections[i] = connection
+	}
+
+	if selection.TargetIP != nil {
+		return utils.GetTargetIPConnection(connections, selection.TargetIP)
+	}
+
+	return utils.PickRandomConnection(connections, n.randSource), nil
+}

internal/provider/nordvpn/filter.go

@@ -0,0 +1,38 @@
+package nordvpn
+
+import (
+	"strconv"
+
+	"github.com/qdm12/gluetun/internal/configuration"
+	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
+)
+
+func (n *Nordvpn) filterServers(selection configuration.ServerSelection) (
+	servers []models.NordvpnServer, err error) {
+	selectedNumbers := make([]string, len(selection.Numbers))
+	for i := range selection.Numbers {
+		selectedNumbers[i] = strconv.Itoa(int(selection.Numbers[i]))
+	}
+
+	for _, server := range n.servers {
+		serverNumber := strconv.Itoa(int(server.Number))
+		switch {
+		case
+			utils.FilterByPossibilities(server.Region, selection.Regions),
+			utils.FilterByPossibilities(server.Hostname, selection.Hostnames),
+			utils.FilterByPossibilities(server.Name, selection.Names),
+			utils.FilterByPossibilities(serverNumber, selectedNumbers),
+			selection.TCP && !server.TCP,
+			!selection.TCP && !server.UDP:
+		default:
+			servers = append(servers, server)
+		}
+	}
+
+	if len(servers) == 0 {
+		return nil, utils.NoServerFoundError(selection)
+	}
+
+	return servers, nil
+}

internal/provider/nordvpn/openvpnconf.go

@@ -0,0 +1,75 @@
+package nordvpn
+
+import (
+	"strconv"
+
+	"github.com/qdm12/gluetun/internal/configuration"
+	"github.com/qdm12/gluetun/internal/constants"
+	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
+)
+
+func (n *Nordvpn) BuildConf(connection models.OpenVPNConnection,
+	username string, settings configuration.OpenVPN) (lines []string) {
+	if settings.Cipher == "" {
+		settings.Cipher = constants.AES256cbc
+	}
+
+	if settings.Auth == "" {
+		settings.Auth = constants.SHA512
+	}
+
+	if settings.MSSFix == 0 {
+		settings.MSSFix = 1450
+	}
+
+	lines = []string{
+		"client",
+		"dev tun",
+		"nobind",
+		"persist-key",
+		"remote-cert-tls server",
+		"ping-timer-rem",
+		"tls-exit",
+
+		// Nordvpn specific
+		"tun-mtu 1500",
+		"tun-mtu-extra 32",
+		"mssfix " + strconv.Itoa(int(settings.MSSFix)),
+		"reneg-sec 0",
+		"comp-lzo no",
+		"fast-io",
+		"key-direction 1",
+		"ping 15",
+		"ping-restart 0",
+
+		// Added constant values
+		"auth-nocache",
+		"mute-replay-warnings",
+		"pull-filter ignore \"auth-token\"", // prevent auth failed loops
+		"auth-retry nointeract",
+		"suppress-timestamps",
+
+		// Modified variables
+		"verb " + strconv.Itoa(settings.Verbosity),
+		"auth-user-pass " + constants.OpenVPNAuthConf,
+		connection.ProtoLine(),
+		connection.RemoteLine(),
+		"data-ciphers-fallback " + settings.Cipher,
+		"data-ciphers " + settings.Cipher,
+		"auth " + settings.Auth,
+	}
+
+	if !settings.Root {
+		lines = append(lines, "user "+username)
+	}
+
+	lines = append(lines, utils.WrapOpenvpnCA(
+		constants.NordvpnCertificate)...)
+	lines = append(lines, utils.WrapOpenvpnTLSAuth(
+		constants.NordvpnOpenvpnStaticKeyV1)...)
+
+	lines = append(lines, "")
+
+	return lines
+}

internal/provider/nordvpn/portforward.go

@@ -0,0 +1,17 @@
+package nordvpn
+
+import (
+	"context"
+	"net"
+	"net/http"
+
+	"github.com/qdm12/gluetun/internal/firewall"
+	"github.com/qdm12/golibs/logging"
+	"github.com/qdm12/golibs/os"
+)
+
+func (n *Nordvpn) PortForward(ctx context.Context, client *http.Client,
+	openFile os.OpenFileFunc, pfLogger logging.Logger, gateway net.IP,
+	fw firewall.Configurator, syncState func(port uint16) (pfFilepath string)) {
+	panic("port forwarding is not supported for NordVPN")
+}

internal/provider/nordvpn/provider.go

@@ -0,0 +1,19 @@
+package nordvpn
+
+import (
+	"math/rand"
+
+	"github.com/qdm12/gluetun/internal/models"
+)
+
+type Nordvpn struct {
+	servers    []models.NordvpnServer
+	randSource rand.Source
+}
+
+func New(servers []models.NordvpnServer, randSource rand.Source) *Nordvpn {
+	return &Nordvpn{
+		servers:    servers,
+		randSource: randSource,
+	}
+}