Changes in on-demand Firewall settings

- Divide 'On-demand firewall' configuration on two options: activate on
connect, deactivate on disconnect
https://privatus.atlassian.net/browse/WC-1091

- Remove from settings "Deactivate IVPN Firewall on IVPN Client exit"
https://privatus.atlassian.net/browse/WC-1090

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ivpn-ui",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "IVPN Client",
   "author": "IVPN Limited",
   "license": "GPL-3.0",

src/background.js

@@ -200,8 +200,39 @@ if (gotTheLock) {
   app.on("before-quit", async event => {
     // if disconnected -> close application immediately
     if (store.getters["vpnState/isDisconnected"]) {
-      if (store.state.settings.firewallOffOnExit) {
-        await daemonClient.EnableFirewall(false);
+      if (
+        store.state.vpnState.firewallState.IsPersistent == false &&
+        store.state.vpnState.firewallState.IsEnabled == true
+      ) {
+        let actionNo = dialog.showMessageBoxSync({
+          type: "question",
+          message: "Deactivate Firewall?",
+          detail:
+            "The IVPN Firewall is active.\nDo you want to deactivate it before exiting the application?",
+          buttons: [
+            "Cancel",
+            "Keep Firewall activated & Quit",
+            "Deactivate Firewall & Quit"
+          ]
+        });
+
+        switch (actionNo) {
+          case 0: // Cancel
+            // discard exiting
+            event.preventDefault();
+            // show app window back (if not minimizing to tray)
+            if (store.state.settings.minimizeToTray !== true)
+              setTimeout(menuOnShow, 0);
+            break;
+
+          case 1: // Keep Firewall activate & Quit
+            // do nothing here
+            break;
+
+          case 2: // Deactivate Firewall & Quit
+            await daemonClient.EnableFirewall(false);
+            break;
+        }
       }
       return;
     }
@@ -240,7 +271,7 @@ if (gotTheLock) {
         setTimeout(async () => {
           try {
             if (
-              store.state.settings.firewallOnOffOnConnect ||
+              store.state.settings.firewallDeactivateOnDisconnect ||
               store.state.settings.disconnectOnQuit
             )
               await daemonClient.EnableFirewall(false);

src/components/settings/settings-firewall.vue

@@ -48,27 +48,27 @@
     <div class="settingsBoldFont">
       On-demand Firewall:
     </div>
+
     <div class="param">
       <input
         type="checkbox"
-        id="firewallOnOffOnConnect"
+        id="firewallActivateOnConnect"
         :disabled="firewallPersistent === true"
-        v-model="firewallOnOffOnConnect"
+        v-model="firewallActivateOnConnect"
       />
-      <label class="defColor" for="firewallOnOffOnConnect"
-        >Activate on connect to VPN and deactivate on disconnect</label
+      <label class="defColor" for="firewallActivateOnConnect"
+        >Activate IVPN Firewall on connect to VPN</label
       >
     </div>
     <div class="param">
       <input
         type="checkbox"
-        id="firewallOffOnExit"
+        id="firewallDeactivateOnDisconnect"
         :disabled="firewallPersistent === true"
-        v-model="firewallOffOnExit"
+        v-model="firewallDeactivateOnDisconnect"
       />
-      <label class="defColor" for="firewallOffOnExit"
-        >Deactivate IVPN Firewall on IVPN Client exit (when VPN
-        disconnected)</label
+      <label class="defColor" for="firewallDeactivateOnDisconnect"
+        >Deactivate IVPN Firewall on disconnect from VPN</label
       >
     </div>
 
@@ -142,20 +142,20 @@ export default {
       }
     },
 
-    firewallOnOffOnConnect: {
+    firewallActivateOnConnect: {
       get() {
-        return this.$store.state.settings.firewallOnOffOnConnect;
+        return this.$store.state.settings.firewallActivateOnConnect;
       },
       set(value) {
-        this.$store.dispatch("settings/firewallOnOffOnConnect", value);
+        this.$store.dispatch("settings/firewallActivateOnConnect", value);
       }
     },
-    firewallOffOnExit: {
+    firewallDeactivateOnDisconnect: {
       get() {
-        return this.$store.state.settings.firewallOffOnExit;
+        return this.$store.state.settings.firewallDeactivateOnDisconnect;
       },
       set(value) {
-        this.$store.dispatch("settings/firewallOffOnExit", value);
+        this.$store.dispatch("settings/firewallDeactivateOnDisconnect", value);
       }
     }
   }

src/daemon-client/index.js

@@ -344,7 +344,7 @@ async function processResponse(response) {
     case daemonResponses.DisconnectedResp:
       store.dispatch("vpnState/pauseState", PauseStateEnum.Resumed);
       store.commit(`vpnState/disconnected`, obj.ReasonDescription);
-      if (store.state.settings.firewallOnOffOnConnect === true) {
+      if (store.state.settings.firewallDeactivateOnDisconnect === true) {
         await EnableFirewall(false);
       }
       requestGeoLookupAsync();
@@ -779,7 +779,7 @@ async function Connect(entryServer, exitServer) {
     }
   }
 
-  if (store.state.settings.firewallOnOffOnConnect === true) {
+  if (store.state.settings.firewallActivateOnConnect === true) {
     await EnableFirewall(true);
   }
 

src/store/module-settings.js

@@ -68,8 +68,8 @@ const getDefaultState = () => {
     ovpnProxyPass: "",
 
     // firewall
-    firewallOnOffOnConnect: true,
-    firewallOffOnExit: true,
+    firewallActivateOnConnect: true,
+    firewallDeactivateOnDisconnect: true,
 
     // antitracker
     isAntitracker: false,
@@ -225,11 +225,11 @@ export default {
     },
 
     // firewall
-    firewallOnOffOnConnect(state, val) {
-      state.firewallOnOffOnConnect = val;
+    firewallActivateOnConnect(state, val) {
+      state.firewallActivateOnConnect = val;
     },
-    firewallOffOnExit(state, val) {
-      state.firewallOffOnExit = val;
+    firewallDeactivateOnDisconnect(state, val) {
+      state.firewallDeactivateOnDisconnect = val;
     },
 
     // antitracker
@@ -393,11 +393,11 @@ export default {
     },
 
     // firewall
-    firewallOnOffOnConnect(context, val) {
-      context.commit("firewallOnOffOnConnect", val);
+    firewallActivateOnConnect(context, val) {
+      context.commit("firewallActivateOnConnect", val);
     },
-    firewallOffOnExit(context, val) {
-      context.commit("firewallOffOnExit", val);
+    firewallDeactivateOnDisconnect(context, val) {
+      context.commit("firewallDeactivateOnDisconnect", val);
     },
 
     // antitracker