mirror of
https://github.com/qdm12/gluetun.git
synced 2026-05-07 04:20:12 +02:00
Quentin McGaw
25f67cd170
- 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) Co-authored-by: Copilot <copilot@github.com>
96 lines
2.6 KiB
Go
96 lines
2.6 KiB
Go
package cli
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"net/netip"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/qdm12/gluetun/internal/configuration/settings"
|
|
"github.com/qdm12/gluetun/internal/models"
|
|
"github.com/qdm12/gluetun/internal/netlink"
|
|
"github.com/qdm12/gluetun/internal/openvpn/extract"
|
|
"github.com/qdm12/gluetun/internal/provider"
|
|
"github.com/qdm12/gluetun/internal/updater/resolver"
|
|
"github.com/qdm12/gosettings/reader"
|
|
)
|
|
|
|
type OpenvpnConfigLogger interface {
|
|
Info(s string)
|
|
Warn(s string)
|
|
}
|
|
|
|
type Unzipper interface {
|
|
FetchAndExtract(ctx context.Context, url string) (
|
|
contents map[string][]byte, err error)
|
|
}
|
|
|
|
type ParallelResolver interface {
|
|
Resolve(ctx context.Context, settings resolver.ParallelSettings) (
|
|
hostToIPs map[string][]netip.Addr, warnings []string, err error)
|
|
}
|
|
|
|
type IPFetcher interface {
|
|
String() string
|
|
CanFetchAnyIP() bool
|
|
FetchInfo(ctx context.Context, ip netip.Addr) (data models.PublicIP, err error)
|
|
}
|
|
|
|
type IPv6Checker interface {
|
|
FindIPv6SupportLevel(ctx context.Context,
|
|
checkAddresses []netip.AddrPort, firewall netlink.Firewall,
|
|
) (level netlink.IPv6SupportLevel, err error)
|
|
}
|
|
|
|
func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, reader *reader.Reader,
|
|
ipv6Checker IPv6Checker,
|
|
) error {
|
|
storage, err := setupStorage(newNoopLogger())
|
|
if err != nil {
|
|
return fmt.Errorf("setting up storage: %w", err)
|
|
}
|
|
|
|
var allSettings settings.Settings
|
|
err = allSettings.Read(reader, logger)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
allSettings.SetDefaults()
|
|
|
|
ipv6SupportLevel, err := ipv6Checker.FindIPv6SupportLevel(context.Background(),
|
|
allSettings.IPv6.CheckAddresses, &noopFirewall{})
|
|
if err != nil {
|
|
return fmt.Errorf("checking for IPv6 support: %w", err)
|
|
}
|
|
|
|
err = allSettings.Validate(storage, ipv6SupportLevel.IsSupported(), logger)
|
|
if err != nil {
|
|
return fmt.Errorf("validating settings: %w", err)
|
|
}
|
|
|
|
// Unused by this CLI command
|
|
unzipper := (Unzipper)(nil)
|
|
client := (*http.Client)(nil)
|
|
warner := (Warner)(nil)
|
|
parallelResolver := (ParallelResolver)(nil)
|
|
ipFetcher := (IPFetcher)(nil)
|
|
openvpnFileExtractor := extract.New()
|
|
|
|
providers := provider.NewProviders(storage, time.Now, warner, client,
|
|
unzipper, parallelResolver, ipFetcher, openvpnFileExtractor, allSettings.Updater)
|
|
providerConf := providers.Get(allSettings.VPN.Provider.Name)
|
|
connection, err := providerConf.GetConnection(
|
|
allSettings.VPN.Provider.ServerSelection, ipv6SupportLevel == netlink.IPv6Internet)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
lines := providerConf.OpenVPNConfig(connection,
|
|
allSettings.VPN.OpenVPN, ipv6SupportLevel.IsSupported())
|
|
|
|
fmt.Println(strings.Join(lines, "\n"))
|
|
return nil
|
|
}
|