Maint: common no port forwarding implementation

internal/provider/cyberghost/portforward.go

@@ -1,16 +0,0 @@
-package cyberghost
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (c *Cyberghost) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding is not supported for Cyberghost")
-}

internal/provider/cyberghost/provider.go

@@ -3,17 +3,21 @@ package cyberghost
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Cyberghost struct {
 	servers    []models.CyberghostServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.CyberghostServer, randSource rand.Source) *Cyberghost {
 	return &Cyberghost{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.Cyberghost),
 	}
 }

internal/provider/fastestvpn/portforward.go

@@ -1,16 +0,0 @@
-package fastestvpn
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (f *Fastestvpn) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding is not supported for FastestVPN")
-}

internal/provider/fastestvpn/provider.go

@@ -3,17 +3,21 @@ package fastestvpn
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Fastestvpn struct {
 	servers    []models.FastestvpnServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.FastestvpnServer, randSource rand.Source) *Fastestvpn {
 	return &Fastestvpn{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.Fastestvpn),
 	}
 }

internal/provider/hidemyass/portforward.go

@@ -1,16 +0,0 @@
-package hidemyass
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (f *HideMyAss) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding is not supported for HideMyAss")
-}

internal/provider/hidemyass/provider.go

@@ -3,17 +3,21 @@ package hidemyass
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type HideMyAss struct {
 	servers    []models.HideMyAssServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.HideMyAssServer, randSource rand.Source) *HideMyAss {
 	return &HideMyAss{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.HideMyAss),
 	}
 }

internal/provider/ipvanish/portforward.go

@@ -1,16 +0,0 @@
-package ipvanish
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (i *Ipvanish) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding is not supported for Ipvanish")
-}

internal/provider/ipvanish/provider.go

@@ -3,17 +3,21 @@ package ipvanish
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Ipvanish struct {
 	servers    []models.IpvanishServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.IpvanishServer, randSource rand.Source) *Ipvanish {
 	return &Ipvanish{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.Ipvanish),
 	}
 }

internal/provider/ivpn/portforward.go

@@ -1,16 +0,0 @@
-package ivpn
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (i *Ivpn) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding is not supported for Ivpn")
-}

internal/provider/ivpn/provider.go

@@ -3,17 +3,21 @@ package ivpn
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Ivpn struct {
 	servers    []models.IvpnServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.IvpnServer, randSource rand.Source) *Ivpn {
 	return &Ivpn{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.Ivpn),
 	}
 }

internal/provider/mullvad/portforward.go

@@ -1,16 +0,0 @@
-package mullvad
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (m *Mullvad) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding logic is not needed for Mullvad")
-}

internal/provider/mullvad/provider.go

@@ -3,17 +3,21 @@ package mullvad
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Mullvad struct {
 	servers    []models.MullvadServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.MullvadServer, randSource rand.Source) *Mullvad {
 	return &Mullvad{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.Mullvad),
 	}
 }

internal/provider/nordvpn/portforward.go

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

internal/provider/nordvpn/provider.go

@@ -3,17 +3,21 @@ package nordvpn
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Nordvpn struct {
 	servers    []models.NordvpnServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.NordvpnServer, randSource rand.Source) *Nordvpn {
 	return &Nordvpn{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.Nordvpn),
 	}
 }

internal/provider/privado/portforward.go

@@ -1,16 +0,0 @@
-package privado
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (p *Privado) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding is not supported for Privado")
-}

internal/provider/privado/provider.go

@@ -3,17 +3,21 @@ package privado
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Privado struct {
 	servers    []models.PrivadoServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.PrivadoServer, randSource rand.Source) *Privado {
 	return &Privado{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.Privado),
 	}
 }

internal/provider/privatevpn/portforward.go

@@ -1,16 +0,0 @@
-package privatevpn
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (p *Privatevpn) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding is not supported for PrivateVPN")
-}

internal/provider/privatevpn/provider.go

@@ -3,17 +3,21 @@ package privatevpn
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Privatevpn struct {
 	servers    []models.PrivatevpnServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.PrivatevpnServer, randSource rand.Source) *Privatevpn {
 	return &Privatevpn{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.Privatevpn),
 	}
 }

internal/provider/protonvpn/portforward.go

@@ -1,16 +0,0 @@
-package protonvpn
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (p *Protonvpn) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding is not supported for ProtonVPN")
-}

internal/provider/protonvpn/provider.go

@@ -3,17 +3,21 @@ package protonvpn
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Protonvpn struct {
 	servers    []models.ProtonvpnServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.ProtonvpnServer, randSource rand.Source) *Protonvpn {
 	return &Protonvpn{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.Protonvpn),
 	}
 }

internal/provider/purevpn/portforward.go

@@ -1,16 +0,0 @@
-package purevpn
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (p *Purevpn) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding is not supported for PureVPN")
-}

internal/provider/purevpn/provider.go

@@ -3,17 +3,21 @@ package purevpn
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Purevpn struct {
 	servers    []models.PurevpnServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.PurevpnServer, randSource rand.Source) *Purevpn {
 	return &Purevpn{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.Purevpn),
 	}
 }

internal/provider/surfshark/portforward.go

@@ -1,16 +0,0 @@
-package surfshark
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (s *Surfshark) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding is not supported for Surfshark")
-}

internal/provider/surfshark/provider.go

@@ -3,17 +3,21 @@ package surfshark
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Surfshark struct {
 	servers    []models.SurfsharkServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.SurfsharkServer, randSource rand.Source) *Surfshark {
 	return &Surfshark{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.Surfshark),
 	}
 }

internal/provider/torguard/portforward.go

@@ -1,16 +0,0 @@
-package torguard
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (t *Torguard) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding is not supported for Torguard")
-}

internal/provider/torguard/provider.go

@@ -3,17 +3,21 @@ package torguard
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Torguard struct {
 	servers    []models.TorguardServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.TorguardServer, randSource rand.Source) *Torguard {
 	return &Torguard{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.Torguard),
 	}
 }

internal/provider/utils/noportforward.go

@@ -0,0 +1,32 @@
+package utils
+
+import (
+	"context"
+	"net"
+	"net/http"
+
+	"github.com/qdm12/gluetun/internal/firewall"
+	"github.com/qdm12/golibs/logging"
+)
+
+type NoPortForwarder interface {
+	PortForward(ctx context.Context, client *http.Client,
+		pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
+		syncState func(port uint16) (pfFilepath string))
+}
+
+type NoPortForwarding struct {
+	providerName string
+}
+
+func NewNoPortForwarding(providerName string) *NoPortForwarding {
+	return &NoPortForwarding{
+		providerName: providerName,
+	}
+}
+
+func (n *NoPortForwarding) PortForward(ctx context.Context, client *http.Client,
+	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
+	syncState func(port uint16) (pfFilepath string)) {
+	panic("custom port forwarding obtention is not supported for " + n.providerName)
+}

internal/provider/vpnunlimited/portforward.go

@@ -1,16 +0,0 @@
-package vpnunlimited
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (p *Provider) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding is not supported for VPN Unlimited")
-}

internal/provider/vpnunlimited/provider.go

@@ -3,17 +3,21 @@ package vpnunlimited
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Provider struct {
 	servers    []models.VPNUnlimitedServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.VPNUnlimitedServer, randSource rand.Source) *Provider {
 	return &Provider{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.VPNUnlimited),
 	}
 }

internal/provider/vyprvpn/portforward.go

@@ -1,16 +0,0 @@
-package vyprvpn
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (v *Vyprvpn) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding is not supported for Vyprvpn")
-}

internal/provider/vyprvpn/provider.go

@@ -3,17 +3,21 @@ package vyprvpn
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Vyprvpn struct {
 	servers    []models.VyprvpnServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.VyprvpnServer, randSource rand.Source) *Vyprvpn {
 	return &Vyprvpn{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.Vyprvpn),
 	}
 }

internal/provider/windscribe/portforward.go

@@ -1,16 +0,0 @@
-package windscribe
-
-import (
-	"context"
-	"net"
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/firewall"
-	"github.com/qdm12/golibs/logging"
-)
-
-func (w *Windscribe) PortForward(ctx context.Context, client *http.Client,
-	pfLogger logging.Logger, gateway net.IP, portAllower firewall.PortAllower,
-	syncState func(port uint16) (pfFilepath string)) {
-	panic("port forwarding is not supported for Windscribe")
-}

internal/provider/windscribe/provider.go

@@ -3,17 +3,21 @@ package windscribe
 import (
 	"math/rand"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 type Windscribe struct {
 	servers    []models.WindscribeServer
 	randSource rand.Source
+	utils.NoPortForwarder
 }
 
 func New(servers []models.WindscribeServer, randSource rand.Source) *Windscribe {
 	return &Windscribe{
-		servers:    servers,
+		servers:         servers,
-		randSource: randSource,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(constants.Windscribe),
 	}
 }