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/expressvpn/connection_test.go
View File

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

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

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

24
internal/provider/expressvpn/filter_test.go
View File

@@ -18,9 +18,9 @@ func Test_Expressvpn_filterServers(t *testing.T) {
t.Parallel()
testCases := map[string]struct {
servers []models.ExpressvpnServer
servers []models.Server
selection settings.ServerSelection
filtered []models.ExpressvpnServer
filtered []models.Server
err error
}{
"no server available": {
@@ -28,13 +28,13 @@ func Test_Expressvpn_filterServers(t *testing.T) {
err: errors.New("no server found: for VPN openvpn; protocol udp"),
},
"no filter": {
servers: []models.ExpressvpnServer{
servers: []models.Server{
{Hostname: "a", UDP: true},
{Hostname: "b", UDP: true},
{Hostname: "c", UDP: true},
},
selection: settings.ServerSelection{}.WithDefaults(providers.Expressvpn),
filtered: []models.ExpressvpnServer{
filtered: []models.Server{
{Hostname: "a", UDP: true},
{Hostname: "b", UDP: true},
{Hostname: "c", UDP: true},
@@ -44,12 +44,12 @@ func Test_Expressvpn_filterServers(t *testing.T) {
selection: settings.ServerSelection{
Countries: []string{"b"},
}.WithDefaults(providers.Expressvpn),
servers: []models.ExpressvpnServer{
servers: []models.Server{
{Country: "a", UDP: true},
{Country: "b", UDP: true},
{Country: "c", UDP: true},
},
filtered: []models.ExpressvpnServer{
filtered: []models.Server{
{Country: "b", UDP: true},
},
},
@@ -57,12 +57,12 @@ func Test_Expressvpn_filterServers(t *testing.T) {
selection: settings.ServerSelection{
Cities: []string{"b"},
}.WithDefaults(providers.Expressvpn),
servers: []models.ExpressvpnServer{
servers: []models.Server{
{City: "a", UDP: true},
{City: "b", UDP: true},
{City: "c", UDP: true},
},
filtered: []models.ExpressvpnServer{
filtered: []models.Server{
{City: "b", UDP: true},
},
},
@@ -70,12 +70,12 @@ func Test_Expressvpn_filterServers(t *testing.T) {
selection: settings.ServerSelection{
Hostnames: []string{"b"},
}.WithDefaults(providers.Expressvpn),
servers: []models.ExpressvpnServer{
servers: []models.Server{
{Hostname: "a", UDP: true},
{Hostname: "b", UDP: true},
{Hostname: "c", UDP: true},
},
filtered: []models.ExpressvpnServer{
filtered: []models.Server{
{Hostname: "b", UDP: true},
},
},
@@ -85,12 +85,12 @@ func Test_Expressvpn_filterServers(t *testing.T) {
TCP: boolPtr(true),
},
}.WithDefaults(providers.Expressvpn),
servers: []models.ExpressvpnServer{
servers: []models.Server{
{Hostname: "a", UDP: true},
{Hostname: "b", UDP: true, TCP: true},
{Hostname: "c", UDP: true},
},
filtered: []models.ExpressvpnServer{
filtered: []models.Server{
{Hostname: "b", UDP: true, TCP: true},
},
},

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

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