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

Feat: OPENVPN_INTERFACE defaulting to tun0

Browse Source 
- Fix: custom config with custom network interface name for firewall
- Keep VPN tunnel interface in firewall state
- Vul fix: only allow traffic through vpn interface when needed
- Adapt code to adapt to network interface name
- Remove outdated TUN and TAP constants
This commit is contained in:
Quentin McGaw (desktop)
2021-08-19 23:22:55 +00:00
parent 7191d4e911
commit bec8ff27ae
20 changed files with 219 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/vpn/openvpn.go
View File

@@ -29,14 +29,16 @@ func setupOpenVPN(ctx context.Context, fw firewall.VPNConnectionSetter,
settings configuration.VPN, starter command.Starter, logger logging.Logger) (
runner vpnRunner, serverName string, err error) {
var connection models.Connection
var netInterface string
var lines []string
if settings.OpenVPN.Config == "" {
netInterface = settings.OpenVPN.Interface
connection, err = providerConf.GetConnection(settings.Provider.ServerSelection)
if err == nil {
lines = providerConf.BuildConf(connection, settings.OpenVPN)
}
} else {
lines, connection, err = custom.BuildConfig(settings.OpenVPN)
lines, connection, netInterface, err = custom.BuildConfig(settings.OpenVPN)
}
if err != nil {
return nil, "", fmt.Errorf("%w: %s", errBuildConfig, err)
@@ -53,7 +55,7 @@ func setupOpenVPN(ctx context.Context, fw firewall.VPNConnectionSetter,
}
}
if err := fw.SetVPNConnection(ctx, connection); err != nil {
if err := fw.SetVPNConnection(ctx, connection, netInterface); err != nil {
return nil, "", fmt.Errorf("%w: %s", errFirewall, err)
}