admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(models): common Server & Servers for all providers (#943)

Browse Source
This commit is contained in:
Quentin McGaw
2022-04-16 22:25:36 +02:00
parent aa729515b9
commit 5d66c193aa
148 changed files with 27081 additions and 27795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/provider/mullvad/connection_test.go
View File

@@ -18,7 +18,7 @@ func Test_Mullvad_GetConnection(t *testing.T) {
t.Parallel()
testCases := map[string]struct {
servers []models.MullvadServer
servers []models.Server
selection settings.ServerSelection
connection models.Connection
err error
@@ -28,7 +28,7 @@ func Test_Mullvad_GetConnection(t *testing.T) {
err: errors.New("no server found: for VPN openvpn; protocol udp"),
},
"no filter": {
servers: []models.MullvadServer{
servers: []models.Server{
{VPN: constants.OpenVPN, IPs: []net.IP{net.IPv4(1, 1, 1, 1)}},
{VPN: constants.OpenVPN, IPs: []net.IP{net.IPv4(2, 2, 2, 2)}},
{VPN: constants.OpenVPN, IPs: []net.IP{net.IPv4(3, 3, 3, 3)}},
@@ -45,7 +45,7 @@ func Test_Mullvad_GetConnection(t *testing.T) {
selection: settings.ServerSelection{
TargetIP: net.IPv4(2, 2, 2, 2),
}.WithDefaults(providers.Mullvad),
servers: []models.MullvadServer{
servers: []models.Server{
{VPN: constants.OpenVPN, IPs: []net.IP{net.IPv4(1, 1, 1, 1)}},
{VPN: constants.OpenVPN, IPs: []net.IP{net.IPv4(2, 2, 2, 2)}},
{VPN: constants.OpenVPN, IPs: []net.IP{net.IPv4(3, 3, 3, 3)}},
@@ -61,7 +61,7 @@ func Test_Mullvad_GetConnection(t *testing.T) {
selection: settings.ServerSelection{
Hostnames: []string{"b"},
}.WithDefaults(providers.Mullvad),
servers: []models.MullvadServer{
servers: []models.Server{
{VPN: constants.OpenVPN, Hostname: "a", IPs: []net.IP{net.IPv4(1, 1, 1, 1)}},
{VPN: constants.OpenVPN, Hostname: "b", IPs: []net.IP{net.IPv4(2, 2, 2, 2)}},
{VPN: constants.OpenVPN, Hostname: "a", IPs: []net.IP{net.IPv4(3, 3, 3, 3)}},

2
internal/provider/mullvad/filter.go
View File

@@ -7,7 +7,7 @@ import (
)
func (m *Mullvad) filterServers(selection settings.ServerSelection) (
servers []models.MullvadServer, err error) {
servers []models.Server, err error) {
for _, server := range m.servers {
switch {
case

32
internal/provider/mullvad/filter_test.go
View File

@@ -19,9 +19,9 @@ func Test_Mullvad_filterServers(t *testing.T) {
t.Parallel()
testCases := map[string]struct {
servers []models.MullvadServer
servers []models.Server
selection settings.ServerSelection
filtered []models.MullvadServer
filtered []models.Server
err error
}{
"no server available": {
@@ -29,13 +29,13 @@ func Test_Mullvad_filterServers(t *testing.T) {
err: errors.New("no server found: for VPN openvpn; protocol udp"),
},
"no filter": {
servers: []models.MullvadServer{
servers: []models.Server{
{VPN: constants.OpenVPN, Hostname: "a"},
{VPN: constants.OpenVPN, Hostname: "b"},
{VPN: constants.OpenVPN, Hostname: "c"},
},
selection: settings.ServerSelection{}.WithDefaults(providers.Mullvad),
filtered: []models.MullvadServer{
filtered: []models.Server{
{VPN: constants.OpenVPN, Hostname: "a"},
{VPN: constants.OpenVPN, Hostname: "b"},
{VPN: constants.OpenVPN, Hostname: "c"},
@@ -45,12 +45,12 @@ func Test_Mullvad_filterServers(t *testing.T) {
selection: settings.ServerSelection{
VPN: constants.Wireguard,
}.WithDefaults(providers.Mullvad),
servers: []models.MullvadServer{
servers: []models.Server{
{VPN: constants.OpenVPN, Hostname: "a"},
{VPN: constants.Wireguard, Hostname: "b"},
{VPN: constants.OpenVPN, Hostname: "c"},
},
filtered: []models.MullvadServer{
filtered: []models.Server{
{VPN: constants.Wireguard, Hostname: "b"},
},
},
@@ -58,12 +58,12 @@ func Test_Mullvad_filterServers(t *testing.T) {
selection: settings.ServerSelection{
Countries: []string{"b"},
}.WithDefaults(providers.Mullvad),
servers: []models.MullvadServer{
servers: []models.Server{
{VPN: constants.OpenVPN, Country: "a"},
{VPN: constants.OpenVPN, Country: "b"},
{VPN: constants.OpenVPN, Country: "c"},
},
filtered: []models.MullvadServer{
filtered: []models.Server{
{VPN: constants.OpenVPN, Country: "b"},
},
},
@@ -71,12 +71,12 @@ func Test_Mullvad_filterServers(t *testing.T) {
selection: settings.ServerSelection{
Cities: []string{"b"},
}.WithDefaults(providers.Mullvad),
servers: []models.MullvadServer{
servers: []models.Server{
{VPN: constants.OpenVPN, City: "a"},
{VPN: constants.OpenVPN, City: "b"},
{VPN: constants.OpenVPN, City: "c"},
},
filtered: []models.MullvadServer{
filtered: []models.Server{
{VPN: constants.OpenVPN, City: "b"},
},
},
@@ -84,12 +84,12 @@ func Test_Mullvad_filterServers(t *testing.T) {
selection: settings.ServerSelection{
ISPs: []string{"b"},
}.WithDefaults(providers.Mullvad),
servers: []models.MullvadServer{
servers: []models.Server{
{VPN: constants.OpenVPN, ISP: "a"},
{VPN: constants.OpenVPN, ISP: "b"},
{VPN: constants.OpenVPN, ISP: "c"},
},
filtered: []models.MullvadServer{
filtered: []models.Server{
{VPN: constants.OpenVPN, ISP: "b"},
},
},
@@ -97,12 +97,12 @@ func Test_Mullvad_filterServers(t *testing.T) {
selection: settings.ServerSelection{
Hostnames: []string{"b"},
}.WithDefaults(providers.Mullvad),
servers: []models.MullvadServer{
servers: []models.Server{
{VPN: constants.OpenVPN, Hostname: "a"},
{VPN: constants.OpenVPN, Hostname: "b"},
{VPN: constants.OpenVPN, Hostname: "c"},
},
filtered: []models.MullvadServer{
filtered: []models.Server{
{VPN: constants.OpenVPN, Hostname: "b"},
},
},
@@ -110,12 +110,12 @@ func Test_Mullvad_filterServers(t *testing.T) {
selection: settings.ServerSelection{
OwnedOnly: boolPtr(true),
}.WithDefaults(providers.Mullvad),
servers: []models.MullvadServer{
servers: []models.Server{
{VPN: constants.OpenVPN, Hostname: "a"},
{VPN: constants.OpenVPN, Hostname: "b", Owned: true},
{VPN: constants.OpenVPN, Hostname: "c"},
},
filtered: []models.MullvadServer{
filtered: []models.Server{
{VPN: constants.OpenVPN, Hostname: "b", Owned: true},
},
},

4
internal/provider/mullvad/provider.go
View File

@@ -9,12 +9,12 @@ import (
)
type Mullvad struct {
servers []models.MullvadServer
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.MullvadServer, randSource rand.Source) *Mullvad {
func New(servers []models.Server, randSource rand.Source) *Mullvad {
return &Mullvad{
servers: servers,
randSource: randSource,