Torguard support (#387)

See discussion on #374

internal/configuration/openvpn.go

@@ -56,7 +56,7 @@ var (
 
 func (settings *OpenVPN) read(r reader) (err error) {
 	vpnsp, err := r.env.Inside("VPNSP", []string{
-		"pia", "private internet access", "mullvad", "windscribe", "surfshark",
+		"pia", "private internet access", "mullvad", "windscribe", "surfshark", "torguard",
 		"cyberghost", "vyprvpn", "nordvpn", "purevpn", "privado"},
 		params.Default("private internet access"))
 	if err != nil {
@@ -130,6 +130,8 @@ func (settings *OpenVPN) read(r reader) (err error) {
 		readProvider = settings.Provider.readPurevpn
 	case constants.Privado:
 		readProvider = settings.Provider.readPrivado
+	case constants.Torguard:
+		readProvider = settings.Provider.readTorguard
 	default:
 		return fmt.Errorf("%w: %s", ErrInvalidVPNProvider, settings.Provider.Name)
 	}

internal/configuration/provider.go

@@ -43,6 +43,8 @@ func (settings *Provider) lines() (lines []string) {
 		providerLines = settings.purevpnLines()
 	case "surfshark":
 		providerLines = settings.surfsharkLines()
+	case "torguard":
+		providerLines = settings.torguardLines()
 	case "vyprvpn":
 		providerLines = settings.vyprvpnLines()
 	case "windscribe":

internal/configuration/provider_test.go

@@ -152,6 +152,24 @@ func Test_Provider_lines(t *testing.T) {
 				"   |--Regions: a, b",
 			},
 		},
+		"torguard": {
+			settings: Provider{
+				Name: constants.Torguard,
+				ServerSelection: ServerSelection{
+					Protocol:  constants.UDP,
+					Countries: []string{"a", "b"},
+					Cities:    []string{"c", "d"},
+					Hostnames: []string{"e"},
+				},
+			},
+			lines: []string{
+				"|--Torguard settings:",
+				"   |--Network protocol: udp",
+				"   |--Countries: a, b",
+				"   |--Cities: c, d",
+				"   |--Hostnames: e",
+			},
+		},
 		"vyprvpn": {
 			settings: Provider{
 				Name: constants.Vyprvpn,

internal/configuration/selection.go

@@ -8,7 +8,7 @@ type ServerSelection struct {
 	// Common
 	Protocol string `json:"network_protocol"`
 	TargetIP net.IP `json:"target_ip,omitempty"`
-
+	// TODO comments
 	// Cyberghost, PIA, Surfshark, Windscribe, Vyprvpn, NordVPN
 	Regions []string `json:"regions"`
 

internal/configuration/torguard.go

@@ -0,0 +1,52 @@
+package configuration
+
+import (
+	"github.com/qdm12/gluetun/internal/constants"
+)
+
+func (settings *Provider) torguardLines() (lines []string) {
+	if len(settings.ServerSelection.Countries) > 0 {
+		lines = append(lines, lastIndent+"Countries: "+commaJoin(settings.ServerSelection.Countries))
+	}
+
+	if len(settings.ServerSelection.Cities) > 0 {
+		lines = append(lines, lastIndent+"Cities: "+commaJoin(settings.ServerSelection.Cities))
+	}
+
+	if len(settings.ServerSelection.Hostnames) > 0 {
+		lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames))
+	}
+
+	return lines
+}
+
+func (settings *Provider) readTorguard(r reader) (err error) {
+	settings.Name = constants.Torguard
+
+	settings.ServerSelection.Protocol, err = readProtocol(r.env)
+	if err != nil {
+		return err
+	}
+
+	settings.ServerSelection.TargetIP, err = readTargetIP(r.env)
+	if err != nil {
+		return err
+	}
+
+	settings.ServerSelection.Countries, err = r.env.CSVInside("COUNTRY", constants.TorguardCountryChoices())
+	if err != nil {
+		return err
+	}
+
+	settings.ServerSelection.Cities, err = r.env.CSVInside("CITY", constants.TorguardCityChoices())
+	if err != nil {
+		return err
+	}
+
+	settings.ServerSelection.Hostnames, err = r.env.CSVInside("SERVER_HOSTNAME", constants.TorguardHostnamesChoices())
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/configuration/updater.go

@@ -17,6 +17,7 @@ type Updater struct {
 	Privado    bool          `json:"privado"`
 	Purevpn    bool          `json:"purevpn"`
 	Surfshark  bool          `json:"surfshark"`
+	Torguard   bool          `json:"torguard"`
 	Vyprvpn    bool          `json:"vyprvpn"`
 	Windscribe bool          `json:"windscribe"`
 	// The two below should be used in CLI mode only
@@ -47,6 +48,7 @@ func (settings *Updater) read(r reader) (err error) {
 	settings.PIA = true
 	settings.Purevpn = true
 	settings.Surfshark = true
+	settings.Torguard = true
 	settings.Vyprvpn = true
 	settings.Windscribe = true
 	settings.Stdout = false