Feat: OPENVPN_INTERFACE defaulting to tun0

- 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

View File

@@ -6,9 +6,7 @@ import (
"fmt"
"time"
"github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/gluetun/internal/portforward"
"github.com/qdm12/gluetun/internal/provider"
)
var (
@@ -16,24 +14,23 @@ var (
errStartPortForwarding = errors.New("cannot start port forwarding")
)
func (l *Loop) startPortForwarding(ctx context.Context, enabled bool,
portForwarder provider.PortForwarder, serverName string) (err error) {
if !enabled {
func (l *Loop) startPortForwarding(ctx context.Context, data tunnelUpData) (err error) {
if !data.portForwarding {
return nil
}
// only used for PIA for now
gateway, err := l.routing.VPNLocalGatewayIP()
gateway, err := l.routing.VPNLocalGatewayIP(data.vpnIntf)
if err != nil {
return fmt.Errorf("%w: %s", errObtainVPNLocalGateway, err)
}
l.logger.Info("VPN gateway IP address: " + gateway.String())
pfData := portforward.StartData{
PortForwarder: portForwarder,
PortForwarder: data.portForwarder,
Gateway: gateway,
ServerName: serverName,
Interface: constants.TUN,
ServerName: data.serverName,
Interface: data.vpnIntf,
}
_, err = l.portForward.Start(ctx, pfData)
if err != nil {