admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/provider/fastestvpn/connection.go
View File

@@ -1,17 +1,17 @@
package fastestvpn
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 (f *Fastestvpn) GetConnection(selection configuration.ServerSelection) (
func (f *Fastestvpn) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
const port = 4443
protocol := constants.UDP
if selection.OpenVPN.TCP {
if *selection.OpenVPN.TCP {
protocol = constants.TCP
}

4
internal/provider/fastestvpn/filter.go
View File

@@ -1,12 +1,12 @@
package fastestvpn
import (
"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 (f *Fastestvpn) filterServers(selection configuration.ServerSelection) (
func (f *Fastestvpn) filterServers(selection settings.ServerSelection) (
servers []models.FastestvpnServer, err error) {
for _, server := range f.servers {
switch {

25
internal/provider/fastestvpn/openvpnconf.go
View File

@@ -3,22 +3,25 @@ package fastestvpn
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 (f *Fastestvpn) 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.SHA256
auth := *settings.Auth
if auth == "" {
auth = constants.SHA256
}
if settings.MSSFix == 0 {
settings.MSSFix = 1450
mssFix := *settings.MSSFix
if mssFix == 0 {
mssFix = 1450
}
lines = []string{
@@ -26,14 +29,14 @@ func (f *Fastestvpn) BuildConf(connection models.Connection,
"nobind",
"tls-exit",
"dev " + settings.Interface,
"verb " + strconv.Itoa(settings.Verbosity),
"verb " + strconv.Itoa(*settings.Verbosity),
// Fastestvpn specific
"mssfix " + strconv.Itoa(int(settings.MSSFix)), // defaults to 1450
"mssfix " + strconv.Itoa(int(mssFix)), // defaults to 1450
"tls-cipher TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-256-CBC-SHA256:TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA:TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-CAMELLIA-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA", //nolint:lll
"key-direction 1",
"auth-user-pass " + constants.OpenVPNAuthConf,
"auth " + settings.Auth,
"auth " + auth,
"comp-lzo",
"reneg-sec 0",
@@ -58,13 +61,13 @@ func (f *Fastestvpn) BuildConf(connection models.Connection,
lines = append(lines, "ping 15") // FastestVPN specific
}
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"`)
}