chore(settings): refactor settings processing (#756)

- Better settings tree structure logged using `qdm12/gotree`
- Read settings from environment variables, then files, then secret files
- Settings methods to default them, merge them and override them
- `DNS_PLAINTEXT_ADDRESS` default changed to `127.0.0.1` to use DoT. Warning added if set to something else.
- `HTTPPROXY_LISTENING_ADDRESS` instead of `HTTPPROXY_PORT` (with retro-compatibility)
This commit is contained in:
Quentin McGaw
2022-01-06 06:40:23 -05:00
committed by GitHub
parent 46738b2934
commit 7d824a5179
275 changed files with 7167 additions and 6328 deletions

View File

@@ -1,20 +1,20 @@
package protonvpn
import (
"github.com/qdm12/gluetun/internal/configuration"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Protonvpn) GetConnection(selection configuration.ServerSelection) (
func (p *Protonvpn) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
protocol := constants.UDP
if selection.OpenVPN.TCP {
if *selection.OpenVPN.TCP {
protocol = constants.TCP
}
port, err := getPort(selection.OpenVPN.TCP, selection.OpenVPN.CustomPort)
port, err := getPort(*selection.OpenVPN.TCP, *selection.OpenVPN.CustomPort)
if err != nil {
return connection, err
}

View File

@@ -3,12 +3,12 @@ package protonvpn
import (
"strings"
"github.com/qdm12/gluetun/internal/configuration"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Protonvpn) filterServers(selection configuration.ServerSelection) (
func (p *Protonvpn) filterServers(selection settings.ServerSelection) (
servers []models.ProtonvpnServer, err error) {
for _, server := range p.servers {
switch {
@@ -18,7 +18,7 @@ func (p *Protonvpn) filterServers(selection configuration.ServerSelection) (
utils.FilterByPossibilities(server.City, selection.Cities),
utils.FilterByPossibilities(server.Hostname, selection.Hostnames),
utils.FilterByPossibilities(server.Name, selection.Names),
selection.FreeOnly && !strings.Contains(strings.ToLower(server.Name), "free"):
*selection.FreeOnly && !strings.Contains(strings.ToLower(server.Name), "free"):
default:
servers = append(servers, server)
}

View File

@@ -3,25 +3,27 @@ package protonvpn
import (
"strconv"
"github.com/qdm12/gluetun/internal/configuration"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Protonvpn) BuildConf(connection models.Connection,
settings configuration.OpenVPN) (lines []string, err error) {
settings settings.OpenVPN) (lines []string, err error) {
if len(settings.Ciphers) == 0 {
settings.Ciphers = []string{constants.AES256cbc}
}
if settings.Auth == "" {
settings.Auth = constants.SHA512
auth := *settings.Auth
if auth == "" {
auth = constants.SHA512
}
const defaultMSSFix = 1450
if settings.MSSFix == 0 {
settings.MSSFix = defaultMSSFix
mssFix := *settings.MSSFix
if mssFix == 0 {
const defaultMSSFix = 1450
mssFix = defaultMSSFix
}
lines = []string{
@@ -29,16 +31,16 @@ func (p *Protonvpn) BuildConf(connection models.Connection,
"nobind",
"tls-exit",
"dev " + settings.Interface,
"verb " + strconv.Itoa(settings.Verbosity),
"verb " + strconv.Itoa(*settings.Verbosity),
// Protonvpn specific
"remote-cert-tls server",
"tun-mtu-extra 32",
"mssfix " + strconv.Itoa(int(settings.MSSFix)),
"mssfix " + strconv.Itoa(int(mssFix)),
"reneg-sec 0",
"key-direction 1",
"auth-user-pass " + constants.OpenVPNAuthConf,
"auth " + settings.Auth,
"auth " + auth,
// Added constant values
"auth-nocache",
@@ -59,13 +61,13 @@ func (p *Protonvpn) BuildConf(connection models.Connection,
lines = append(lines, "explicit-exit-notify")
}
if !settings.Root {
if !*settings.Root {
lines = append(lines, "user "+settings.ProcUser)
lines = append(lines, "persist-tun")
lines = append(lines, "persist-key")
}
if !settings.IPv6 {
if !*settings.IPv6 {
lines = append(lines, `pull-filter ignore "route-ipv6"`)
lines = append(lines, `pull-filter ignore "ifconfig-ipv6"`)
}