diff --git a/internal/provider/custom/openvpnconf.go b/internal/provider/custom/openvpnconf.go index 4b7edba9..7e124cb4 100644 --- a/internal/provider/custom/openvpnconf.go +++ b/internal/provider/custom/openvpnconf.go @@ -41,6 +41,7 @@ func modifyConfig(lines []string, connection models.Connection, line == "auth-retry nointeract", line == "suppress-timestamps", line == "persist-tun", + line == "persist-key", // Remove values always modified strings.HasPrefix(line, "verb "), strings.HasPrefix(line, "auth-user-pass "), @@ -90,6 +91,7 @@ func modifyConfig(lines []string, connection models.Connection, if !settings.Root { modified = append(modified, "user "+settings.ProcUser) modified = append(modified, "persist-tun") + modified = append(modified, "persist-key") } modified = append(modified, "") // trailing line diff --git a/internal/provider/custom/openvpnconf_test.go b/internal/provider/custom/openvpnconf_test.go index 2b025b9d..d8664a42 100644 --- a/internal/provider/custom/openvpnconf_test.go +++ b/internal/provider/custom/openvpnconf_test.go @@ -64,6 +64,7 @@ func Test_modifyConfig(t *testing.T) { "pull-filter ignore \"ifconfig-ipv6\"", "user procuser", "persist-tun", + "persist-key", "", }, }, diff --git a/internal/provider/cyberghost/openvpnconf.go b/internal/provider/cyberghost/openvpnconf.go index aaf0c4d5..8ee2d159 100644 --- a/internal/provider/cyberghost/openvpnconf.go +++ b/internal/provider/cyberghost/openvpnconf.go @@ -24,7 +24,6 @@ func (c *Cyberghost) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "remote-cert-tls server", "ping 10", "ping-exit 60", @@ -60,6 +59,7 @@ func (c *Cyberghost) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if settings.MSSFix > 0 { diff --git a/internal/provider/fastestvpn/openvpnconf.go b/internal/provider/fastestvpn/openvpnconf.go index d3660d60..b842710f 100644 --- a/internal/provider/fastestvpn/openvpnconf.go +++ b/internal/provider/fastestvpn/openvpnconf.go @@ -25,7 +25,6 @@ func (f *Fastestvpn) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "ping 15", "ping-exit 60", "tls-exit", @@ -59,6 +58,7 @@ func (f *Fastestvpn) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if !settings.IPv6 { diff --git a/internal/provider/hidemyass/openvpnconf.go b/internal/provider/hidemyass/openvpnconf.go index d6ff2c5b..50dccceb 100644 --- a/internal/provider/hidemyass/openvpnconf.go +++ b/internal/provider/hidemyass/openvpnconf.go @@ -19,7 +19,6 @@ func (h *HideMyAss) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "ping 5", "ping-exit 30", "tls-exit", @@ -55,6 +54,7 @@ func (h *HideMyAss) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if !settings.IPv6 { diff --git a/internal/provider/ipvanish/openvpnconf.go b/internal/provider/ipvanish/openvpnconf.go index 68a476e2..673b7b8a 100644 --- a/internal/provider/ipvanish/openvpnconf.go +++ b/internal/provider/ipvanish/openvpnconf.go @@ -22,7 +22,6 @@ func (i *Ipvanish) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "tls-exit", // Ipvanish specific @@ -53,6 +52,7 @@ func (i *Ipvanish) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if !settings.IPv6 { diff --git a/internal/provider/ivpn/openvpnconf.go b/internal/provider/ivpn/openvpnconf.go index 31a895f4..c83503e5 100644 --- a/internal/provider/ivpn/openvpnconf.go +++ b/internal/provider/ivpn/openvpnconf.go @@ -22,7 +22,6 @@ func (i *Ivpn) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "ping 5", "ping-exit 30", "tls-exit", @@ -60,6 +59,7 @@ func (i *Ivpn) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if !settings.IPv6 { diff --git a/internal/provider/mullvad/openvpnconf.go b/internal/provider/mullvad/openvpnconf.go index caf7a2d0..8f0aced2 100644 --- a/internal/provider/mullvad/openvpnconf.go +++ b/internal/provider/mullvad/openvpnconf.go @@ -19,7 +19,6 @@ func (m *Mullvad) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "remote-cert-tls server", "ping 10", "ping-exit 60", @@ -62,6 +61,7 @@ func (m *Mullvad) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if settings.MSSFix > 0 { diff --git a/internal/provider/nordvpn/openvpnconf.go b/internal/provider/nordvpn/openvpnconf.go index 496c8e35..f308905f 100644 --- a/internal/provider/nordvpn/openvpnconf.go +++ b/internal/provider/nordvpn/openvpnconf.go @@ -27,7 +27,6 @@ func (n *Nordvpn) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "remote-cert-tls server", "tls-exit", @@ -64,6 +63,7 @@ func (n *Nordvpn) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if !settings.IPv6 { diff --git a/internal/provider/privado/openvpnconf.go b/internal/provider/privado/openvpnconf.go index 3e2381b9..aaac31b3 100644 --- a/internal/provider/privado/openvpnconf.go +++ b/internal/provider/privado/openvpnconf.go @@ -23,7 +23,6 @@ func (p *Privado) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "ping 10", "ping-exit 60", "tls-exit", @@ -52,6 +51,7 @@ func (p *Privado) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if settings.MSSFix > 0 { diff --git a/internal/provider/privateinternetaccess/openvpnconf.go b/internal/provider/privateinternetaccess/openvpnconf.go index aeccbe5e..a4fa7d2a 100644 --- a/internal/provider/privateinternetaccess/openvpnconf.go +++ b/internal/provider/privateinternetaccess/openvpnconf.go @@ -42,7 +42,6 @@ func (p *PIA) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "remote-cert-tls server", // PIA specific @@ -74,6 +73,7 @@ func (p *PIA) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if settings.MSSFix > 0 { diff --git a/internal/provider/privatevpn/openvpnconf.go b/internal/provider/privatevpn/openvpnconf.go index 46f6aea6..8aa02709 100644 --- a/internal/provider/privatevpn/openvpnconf.go +++ b/internal/provider/privatevpn/openvpnconf.go @@ -23,7 +23,6 @@ func (p *Privatevpn) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "remote-cert-tls server", "tls-exit", @@ -53,6 +52,7 @@ func (p *Privatevpn) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if settings.MSSFix > 0 { diff --git a/internal/provider/protonvpn/openvpnconf.go b/internal/provider/protonvpn/openvpnconf.go index 727c7000..5ce9e4da 100644 --- a/internal/provider/protonvpn/openvpnconf.go +++ b/internal/provider/protonvpn/openvpnconf.go @@ -28,7 +28,6 @@ func (p *Protonvpn) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "remote-cert-tls server", "tls-exit", @@ -64,6 +63,7 @@ func (p *Protonvpn) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if !settings.IPv6 { diff --git a/internal/provider/purevpn/openvpnconf.go b/internal/provider/purevpn/openvpnconf.go index b7bc38c3..c00fb82d 100644 --- a/internal/provider/purevpn/openvpnconf.go +++ b/internal/provider/purevpn/openvpnconf.go @@ -19,7 +19,6 @@ func (p *Purevpn) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "remote-cert-tls server", "ping 10", "ping-exit 60", @@ -61,6 +60,7 @@ func (p *Purevpn) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if !settings.IPv6 { diff --git a/internal/provider/surfshark/openvpnconf.go b/internal/provider/surfshark/openvpnconf.go index 4e5b3652..8c03b047 100644 --- a/internal/provider/surfshark/openvpnconf.go +++ b/internal/provider/surfshark/openvpnconf.go @@ -28,7 +28,6 @@ func (s *Surfshark) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "remote-cert-tls server", "ping 15", "tls-exit", @@ -61,6 +60,7 @@ func (s *Surfshark) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if !settings.IPv6 { diff --git a/internal/provider/torguard/openvpnconf.go b/internal/provider/torguard/openvpnconf.go index 6ad227d0..98680828 100644 --- a/internal/provider/torguard/openvpnconf.go +++ b/internal/provider/torguard/openvpnconf.go @@ -28,7 +28,6 @@ func (t *Torguard) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "remote-cert-tls server", "tls-exit", @@ -62,6 +61,7 @@ func (t *Torguard) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if connection.Protocol == constants.UDP { diff --git a/internal/provider/vpnunlimited/openvpnconf.go b/internal/provider/vpnunlimited/openvpnconf.go index ff4b685c..0b533b4a 100644 --- a/internal/provider/vpnunlimited/openvpnconf.go +++ b/internal/provider/vpnunlimited/openvpnconf.go @@ -15,7 +15,6 @@ func (p *Provider) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "tls-exit", "remote-cert-tls server", @@ -53,6 +52,7 @@ func (p *Provider) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if !settings.IPv6 { diff --git a/internal/provider/vyprvpn/openvpnconf.go b/internal/provider/vyprvpn/openvpnconf.go index f33a7e88..91841d2b 100644 --- a/internal/provider/vyprvpn/openvpnconf.go +++ b/internal/provider/vyprvpn/openvpnconf.go @@ -23,7 +23,6 @@ func (v *Vyprvpn) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "remote-cert-tls server", "ping 10", "ping-exit 60", @@ -53,6 +52,7 @@ func (v *Vyprvpn) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if settings.MSSFix > 0 { diff --git a/internal/provider/windscribe/openvpnconf.go b/internal/provider/windscribe/openvpnconf.go index 8ba70d2b..80a03048 100644 --- a/internal/provider/windscribe/openvpnconf.go +++ b/internal/provider/windscribe/openvpnconf.go @@ -24,7 +24,6 @@ func (w *Windscribe) BuildConf(connection models.Connection, "client", "dev " + settings.Interface, "nobind", - "persist-key", "remote-cert-tls server", "ping 10", "ping-exit 60", @@ -59,6 +58,7 @@ func (w *Windscribe) BuildConf(connection models.Connection, if !settings.Root { lines = append(lines, "user "+settings.ProcUser) lines = append(lines, "persist-tun") + lines = append(lines, "persist-key") } if settings.MSSFix > 0 {