diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-05-19 16:33:54 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-06-28 15:52:13 +0200 |
| commit | 3626d6059633e598459444f91646c8bf499029d0 (patch) | |
| tree | 656f6441207d09abd399ab6c122e7c1cd619e3d5 | |
| parent | fe734f6509d7445fdd3b80fd36c98b101d6f2ba1 (diff) | |
| download | mullvadvpn-3626d6059633e598459444f91646c8bf499029d0.tar.xz mullvadvpn-3626d6059633e598459444f91646c8bf499029d0.zip | |
Unconditionally destroy firewall filters in the installer
| -rw-r--r-- | dist-assets/windows/installer.nsh | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 4f967f0196..9a9a8a59dd 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -688,10 +688,6 @@ # !macro customInstall - Var /GLOBAL BlockFilterResult - Var /GLOBAL PersistentBlockFilterResult - - Push $1 Push $R0 log::SetLogTarget ${LOG_INSTALL} @@ -759,29 +755,14 @@ # Delete "$INSTDIR\mullvad vpn.exe" - nsExec::ExecToStack '"$SYSDIR\netsh.exe" wfp show security FILTER ${BLOCK_OUTBOUND_IPV4_FILTER_GUID}' - Pop $BlockFilterResult - Pop $1 - - nsExec::ExecToStack '"$SYSDIR\netsh.exe" wfp show security FILTER ${PERSISTENT_BLOCK_OUTBOUND_IPV4_FILTER_GUID}' - Pop $PersistentBlockFilterResult - Pop $1 - - ${If} $BlockFilterResult == 0 - ${OrIf} $PersistentBlockFilterResult == 0 - MessageBox MB_ICONEXCLAMATION|MB_YESNO "Do you wish to unblock your internet access? Doing so will leave you with an unsecure connection." IDNO customInstall_abort_installation_skip_firewall_revert - ${ExtractMullvadSetup} - ${ClearFirewallRules} - ${EndIf} - - customInstall_abort_installation_skip_firewall_revert: + ${ExtractMullvadSetup} + ${ClearFirewallRules} Abort customInstall_skip_abort: Pop $R0 - Pop $1 !macroend |