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

@@ -14,18 +14,22 @@ var (
)
func BuildConfig(settings configuration.OpenVPN) (
lines []string, connection models.Connection, err error) {
lines []string, connection models.Connection, intf string, err error) {
lines, err = readCustomConfigLines(settings.Config)
if err != nil {
return nil, connection, fmt.Errorf("%w: %s", ErrReadCustomConfig, err)
return nil, connection, "", fmt.Errorf("%w: %s", ErrReadCustomConfig, err)
}
connection, err = extractConnectionFromLines(lines)
connection, intf, err = extractDataFromLines(lines)
if err != nil {
return nil, connection, fmt.Errorf("%w: %s", ErrExtractConnection, err)
return nil, connection, "", fmt.Errorf("%w: %s", ErrExtractConnection, err)
}
lines = modifyCustomConfig(lines, settings, connection)
if intf == "" {
intf = settings.Interface
}
return lines, connection, nil
lines = modifyCustomConfig(lines, settings, connection, intf)
return lines, connection, intf, nil
}