64649039d9
- General improvements
- Parallel download of only needed files at start
- Prettier console output with all streams merged (openvpn, unbound, shadowsocks etc.)
- Simplified Docker final image
- Faster bootup
- DNS over TLS
- Finer grain blocking at DNS level: malicious, ads and surveillance
- Choose your DNS over TLS providers
- Ability to use multiple DNS over TLS providers for DNS split horizon
- Environment variables for DNS logging
- DNS block lists needed are downloaded and built automatically at start, in parallel
- PIA
- A random region is selected if the REGION parameter is left empty (thanks @rorph for your PR)
- Routing and iptables adjusted so it can work as a Kubernetes pod sidecar (thanks @rorph for your PR)
42 lines
1.6 KiB
Go
42 lines
1.6 KiB
Go
package pia
|
|
|
|
import (
|
|
"net"
|
|
|
|
"github.com/qdm12/golibs/crypto/random"
|
|
"github.com/qdm12/golibs/files"
|
|
"github.com/qdm12/golibs/logging"
|
|
"github.com/qdm12/golibs/network"
|
|
"github.com/qdm12/golibs/verification"
|
|
"github.com/qdm12/private-internet-access-docker/internal/firewall"
|
|
"github.com/qdm12/private-internet-access-docker/internal/models"
|
|
)
|
|
|
|
const logPrefix = "PIA configurator"
|
|
|
|
// Configurator contains methods to download, read and modify the openvpn configuration to connect as a client
|
|
type Configurator interface {
|
|
DownloadOvpnConfig(encryption models.PIAEncryption,
|
|
protocol models.NetworkProtocol, region models.PIARegion) (lines []string, err error)
|
|
ParseConfig(lines []string) (IPs []net.IP, port uint16, device models.VPNDevice, err error)
|
|
ModifyLines(lines []string, IPs []net.IP, port uint16) (modifiedLines []string)
|
|
GetPortForward() (port uint16, err error)
|
|
WritePortForward(filepath models.Filepath, port uint16) (err error)
|
|
AllowPortForwardFirewall(device models.VPNDevice, port uint16) (err error)
|
|
}
|
|
|
|
type configurator struct {
|
|
client network.Client
|
|
fileManager files.FileManager
|
|
firewall firewall.Configurator
|
|
logger logging.Logger
|
|
random random.Random
|
|
verifyPort func(port string) error
|
|
lookupIP func(host string) ([]net.IP, error)
|
|
}
|
|
|
|
// NewConfigurator returns a new Configurator object
|
|
func NewConfigurator(client network.Client, fileManager files.FileManager, firewall firewall.Configurator, logger logging.Logger) Configurator {
|
|
return &configurator{client, fileManager, firewall, logger, random.NewRandom(), verification.NewVerifier().VerifyPort, net.LookupIP}
|
|
}
|