mirror of
https://github.com/qdm12/gluetun.git
synced 2026-07-27 12:56:24 +02:00
Quentin McGaw
d9cc7dcffb
- new directory structure containing manifest.json and one json file per provider, by default. - the manifest.json file can specify a filepath for each vpn provider - each vpn provider json data file can contain the `"preferred": true` field to enforce it is used even if outdated, unless there is a version mismatch - `STORAGE_SERVERS_DIRECTORY_PATH` replaces `STORAGE_FILEPATH` (which is now a migration source only). It sets the directory where server manifest and per-provider JSON files are stored (default: `/gluetun/servers/`). - First-run migration: On startup, gluetun checks for the old /gluetun/servers.json file; if found and no new manifest exists, it automatically migrates all data to /gluetun/servers/ directory structure - Silent fallback: If legacy file isn't found, uses the new directory path normally - Legacy cleanup: After successful migration, attempts to remove the old fat JSON file (logs warning only if removal fails, e.g., read-only bind mounts)
112 lines
3.0 KiB
Go
112 lines
3.0 KiB
Go
package ivpn
|
|
|
|
import (
|
|
"errors"
|
|
"net/http"
|
|
"net/netip"
|
|
"testing"
|
|
|
|
"github.com/golang/mock/gomock"
|
|
"github.com/qdm12/gluetun-servers/pkg/constants"
|
|
umodels "github.com/qdm12/gluetun-servers/pkg/models"
|
|
updaters "github.com/qdm12/gluetun-servers/pkg/updaters/common"
|
|
"github.com/qdm12/gluetun/internal/configuration/settings"
|
|
"github.com/qdm12/gluetun/internal/constants/providers"
|
|
"github.com/qdm12/gluetun/internal/models"
|
|
"github.com/qdm12/gluetun/internal/provider/common"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func Test_Provider_GetConnection(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
const provider = providers.Ivpn
|
|
|
|
testCases := map[string]struct {
|
|
filteredServers []umodels.Server
|
|
storageErr error
|
|
selection settings.ServerSelection
|
|
ipv6Supported bool
|
|
connection models.Connection
|
|
errMessage string
|
|
}{
|
|
"error": {
|
|
storageErr: errors.New("test error"),
|
|
errMessage: "filtering servers: test error",
|
|
},
|
|
"default OpenVPN TCP port": {
|
|
filteredServers: []umodels.Server{
|
|
{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}},
|
|
},
|
|
selection: settings.ServerSelection{
|
|
OpenVPN: settings.OpenVPNSelection{
|
|
Protocol: constants.TCP,
|
|
},
|
|
}.WithDefaults(provider),
|
|
connection: models.Connection{
|
|
Type: constants.OpenVPN,
|
|
IP: netip.AddrFrom4([4]byte{1, 1, 1, 1}),
|
|
Port: 443,
|
|
Protocol: constants.TCP,
|
|
},
|
|
},
|
|
"default OpenVPN UDP port": {
|
|
filteredServers: []umodels.Server{
|
|
{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}},
|
|
},
|
|
selection: settings.ServerSelection{
|
|
OpenVPN: settings.OpenVPNSelection{
|
|
Protocol: constants.UDP,
|
|
},
|
|
}.WithDefaults(provider),
|
|
connection: models.Connection{
|
|
Type: constants.OpenVPN,
|
|
IP: netip.AddrFrom4([4]byte{1, 1, 1, 1}),
|
|
Port: 1194,
|
|
Protocol: constants.UDP,
|
|
},
|
|
},
|
|
"default Wireguard port": {
|
|
filteredServers: []umodels.Server{
|
|
{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}, WgPubKey: "x"},
|
|
},
|
|
selection: settings.ServerSelection{
|
|
VPN: constants.Wireguard,
|
|
}.WithDefaults(provider),
|
|
connection: models.Connection{
|
|
Type: constants.Wireguard,
|
|
IP: netip.AddrFrom4([4]byte{1, 1, 1, 1}),
|
|
Port: 58237,
|
|
Protocol: constants.UDP,
|
|
PubKey: "x",
|
|
},
|
|
},
|
|
}
|
|
|
|
for name, testCase := range testCases {
|
|
t.Run(name, func(t *testing.T) {
|
|
t.Parallel()
|
|
ctrl := gomock.NewController(t)
|
|
|
|
storage := common.NewMockStorage(ctrl)
|
|
storage.EXPECT().FilterServers(provider, testCase.selection).
|
|
Return(testCase.filteredServers, testCase.storageErr)
|
|
|
|
client := (*http.Client)(nil)
|
|
warner := (updaters.Warner)(nil)
|
|
parallelResolver := (updaters.ParallelResolver)(nil)
|
|
provider := New(storage, client, warner, parallelResolver)
|
|
|
|
connection, err := provider.GetConnection(testCase.selection, testCase.ipv6Supported)
|
|
|
|
if testCase.errMessage != "" {
|
|
assert.EqualError(t, err, testCase.errMessage)
|
|
} else {
|
|
assert.NoError(t, err)
|
|
}
|
|
|
|
assert.Equal(t, testCase.connection, connection)
|
|
})
|
|
}
|
|
}
|