mirror of
https://github.com/qdm12/gluetun.git
synced 2026-07-24 19:36:24 +02:00
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)
120 lines
3.0 KiB
Go
120 lines
3.0 KiB
Go
package purevpn
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/netip"
|
|
"sort"
|
|
"strings"
|
|
|
|
"github.com/qdm12/gluetun-servers/pkg/models"
|
|
"github.com/qdm12/gluetun-servers/pkg/publicip/api"
|
|
"github.com/qdm12/gluetun-servers/pkg/updaters/common"
|
|
"github.com/qdm12/gluetun-servers/pkg/updaters/openvpn"
|
|
)
|
|
|
|
func (u *Updater) FetchServers(ctx context.Context, minServers int) (
|
|
servers []models.Server, err error,
|
|
) {
|
|
if !u.ipFetcher.CanFetchAnyIP() {
|
|
return nil, fmt.Errorf("IP fetcher %s does not support fetching any IP", u.ipFetcher.String())
|
|
}
|
|
|
|
const url = "https://d11a57lttb2ffq.cloudfront.net/heartbleed/router/Recommended-CA2.zip"
|
|
contents, err := u.unzipper.FetchAndExtract(ctx, url)
|
|
if err != nil {
|
|
return nil, err
|
|
} else if len(contents) < minServers {
|
|
return nil, fmt.Errorf("%w: %d and expected at least %d",
|
|
common.ErrNotEnoughServers, len(contents), minServers)
|
|
}
|
|
|
|
hts := make(hostToServer)
|
|
|
|
for fileName, content := range contents {
|
|
if !strings.HasSuffix(fileName, ".ovpn") {
|
|
continue
|
|
}
|
|
|
|
tcp, udp, err := openvpn.ExtractProto(content)
|
|
if err != nil {
|
|
// treat error as warning and go to next file
|
|
u.warner.Warn(err.Error() + " in " + fileName)
|
|
continue
|
|
}
|
|
|
|
host, warning, err := openvpn.ExtractHost(content)
|
|
if warning != "" {
|
|
u.warner.Warn(warning)
|
|
}
|
|
|
|
if err != nil {
|
|
// treat error as warning and go to next file
|
|
u.warner.Warn(err.Error() + " in " + fileName)
|
|
continue
|
|
}
|
|
|
|
hts.add(host, tcp, udp)
|
|
}
|
|
|
|
if len(hts) < minServers {
|
|
return nil, fmt.Errorf("%w: %d and expected at least %d",
|
|
common.ErrNotEnoughServers, len(hts), minServers)
|
|
}
|
|
|
|
hosts := hts.toHostsSlice()
|
|
resolveSettings := parallelResolverSettings(hosts)
|
|
hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
|
|
for _, warning := range warnings {
|
|
u.warner.Warn(warning)
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if len(hostToIPs) < minServers {
|
|
return nil, fmt.Errorf("%w: %d and expected at least %d",
|
|
common.ErrNotEnoughServers, len(servers), minServers)
|
|
}
|
|
|
|
hts.adaptWithIPs(hostToIPs)
|
|
|
|
servers = hts.toServersSlice()
|
|
|
|
// Get public IP address information
|
|
ipsToGetInfo := make([]netip.Addr, len(servers))
|
|
for i := range servers {
|
|
ipsToGetInfo[i] = servers[i].IPs[0]
|
|
}
|
|
ipsInfo, err := api.FetchMultiInfo(ctx, u.ipFetcher, ipsToGetInfo)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
for i := range servers {
|
|
parsedCountry, parsedCity, warnings := parseHostname(servers[i].Hostname)
|
|
for _, warning := range warnings {
|
|
u.warner.Warn(warning)
|
|
}
|
|
servers[i].Country = parsedCountry
|
|
if servers[i].Country == "" {
|
|
servers[i].Country = ipsInfo[i].Country
|
|
}
|
|
servers[i].City = parsedCity
|
|
if servers[i].City == "" {
|
|
servers[i].City = ipsInfo[i].City
|
|
}
|
|
|
|
if (parsedCountry == "" ||
|
|
comparePlaceNames(parsedCountry, ipsInfo[i].Country)) &&
|
|
(parsedCity == "" ||
|
|
comparePlaceNames(parsedCity, ipsInfo[i].City)) {
|
|
servers[i].Region = ipsInfo[i].Region
|
|
}
|
|
}
|
|
|
|
sort.Sort(models.SortableServers(servers))
|
|
|
|
return servers, nil
|
|
}
|