f807f756eb
- Retro-compatibility: `OPENVPN_CUSTOM_CONFIG` set implies `VPNSP=custom` - Change: `up` and `down` options are not filtered out - Change: `OPENVPN_INTERFACE` overrides the network interface defined in the configuration file - Change: `PORT` overrides any port found in the configuration file - Feat: config file is read when building the OpenVPN configuration, so it's effectively reloaded on VPN restarts - Feat: extract values from custom file at start to log out valid settings - Maint: `internal/openvpn/extract` package instead of `internal/openvpn/custom` package - Maint: All providers' `BuildConf` method return an error - Maint: rename `CustomConfig` to `ConfFile` in Settings structures
80 lines
1.9 KiB
Go
80 lines
1.9 KiB
Go
package configuration
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/qdm12/gluetun/internal/constants"
|
|
"github.com/qdm12/golibs/params"
|
|
)
|
|
|
|
type VPN struct {
|
|
Type string `json:"type"`
|
|
OpenVPN OpenVPN `json:"openvpn"`
|
|
Wireguard Wireguard `json:"wireguard"`
|
|
Provider Provider `json:"provider"`
|
|
}
|
|
|
|
func (settings *VPN) String() string {
|
|
return strings.Join(settings.lines(), "\n")
|
|
}
|
|
|
|
func (settings *VPN) lines() (lines []string) {
|
|
lines = append(lines, lastIndent+"VPN:")
|
|
|
|
lines = append(lines, indent+lastIndent+"Type: "+settings.Type)
|
|
|
|
var vpnLines []string
|
|
switch settings.Type {
|
|
case constants.OpenVPN:
|
|
vpnLines = settings.OpenVPN.lines()
|
|
case constants.Wireguard:
|
|
vpnLines = settings.Wireguard.lines()
|
|
}
|
|
for _, line := range vpnLines {
|
|
lines = append(lines, indent+line)
|
|
}
|
|
|
|
for _, line := range settings.Provider.lines() {
|
|
lines = append(lines, indent+line)
|
|
}
|
|
|
|
return lines
|
|
}
|
|
|
|
var (
|
|
errReadProviderSettings = errors.New("cannot read provider settings")
|
|
errReadOpenVPNSettings = errors.New("cannot read OpenVPN settings")
|
|
errReadWireguardSettings = errors.New("cannot read Wireguard settings")
|
|
)
|
|
|
|
func (settings *VPN) read(r reader) (err error) {
|
|
vpnType, err := r.env.Inside("VPN_TYPE",
|
|
[]string{constants.OpenVPN, constants.Wireguard},
|
|
params.Default(constants.OpenVPN))
|
|
if err != nil {
|
|
return fmt.Errorf("environment variable VPN_TYPE: %w", err)
|
|
}
|
|
settings.Type = vpnType
|
|
|
|
if err := settings.Provider.read(r, vpnType); err != nil {
|
|
return fmt.Errorf("%w: %s", errReadProviderSettings, err)
|
|
}
|
|
|
|
switch settings.Type {
|
|
case constants.OpenVPN:
|
|
err = settings.OpenVPN.read(r, settings.Provider.Name)
|
|
if err != nil {
|
|
return fmt.Errorf("%w: %s", errReadOpenVPNSettings, err)
|
|
}
|
|
case constants.Wireguard:
|
|
err = settings.Wireguard.read(r)
|
|
if err != nil {
|
|
return fmt.Errorf("%w: %s", errReadWireguardSettings, err)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|