447a7c9891
- Fix CLI operation not setting DNS server - Fix periodic operation not setting DNS server - Set DNS address for resolution once at start for both CLI and periodic operation - Inject resolver to each provider instead of creating it within - Use resolver settings on every call to `.Resolve` method, instead of passing it to constructor - Move out minServers check from resolver
66 lines
1.6 KiB
Go
66 lines
1.6 KiB
Go
package cli
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/qdm12/gluetun/internal/configuration/sources"
|
|
"github.com/qdm12/gluetun/internal/constants"
|
|
"github.com/qdm12/gluetun/internal/provider"
|
|
"github.com/qdm12/gluetun/internal/storage"
|
|
"github.com/qdm12/gluetun/internal/updater/resolver"
|
|
)
|
|
|
|
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][]net.IP, warnings []string, err error)
|
|
}
|
|
|
|
func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, source sources.Source) error {
|
|
storage, err := storage.New(logger, constants.ServersData)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
allSettings, err := source.Read()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if err = allSettings.Validate(storage); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Unused by this CLI command
|
|
unzipper := (Unzipper)(nil)
|
|
client := (*http.Client)(nil)
|
|
warner := (Warner)(nil)
|
|
parallelResolver := (ParallelResolver)(nil)
|
|
|
|
providers := provider.NewProviders(storage, time.Now, warner, client, unzipper, parallelResolver)
|
|
providerConf := providers.Get(*allSettings.VPN.Provider.Name)
|
|
connection, err := providerConf.GetConnection(allSettings.VPN.Provider.ServerSelection)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
lines := providerConf.OpenVPNConfig(connection, allSettings.VPN.OpenVPN)
|
|
|
|
fmt.Println(strings.Join(lines, "\n"))
|
|
return nil
|
|
}
|