From 687e1a87da9321b27ad966907db0f58f1c25b157 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Mon, 2 Jun 2014 15:45:06 -0500
Subject: add restore clearnet button. Closes: #5726

---
 src/leap/bitmask/backend.py | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'src/leap/bitmask/backend.py')

diff --git a/src/leap/bitmask/backend.py b/src/leap/bitmask/backend.py
index 4ec20be7..a18dffef 100644
--- a/src/leap/bitmask/backend.py
+++ b/src/leap/bitmask/backend.py
@@ -80,13 +80,13 @@ class ILEAPService(ILEAPComponent):
     Interface that every Service needs to implement
     """
 
-    def start(self):
+    def start(self, *args, **kwargs):
         """
         Start the service.
         """
         pass
 
-    def stop(self):
+    def stop(self, *args, **kwargs):
         """
         Stops the service.
         """
@@ -378,7 +378,7 @@ class EIP(object):
         if d is not None:
             d.cancel()
 
-    def _start_eip(self):
+    def _start_eip(self, restart=False):
         """
         Start EIP
         """
@@ -404,9 +404,10 @@ class EIP(object):
         host, port = get_openvpn_management()
         self._vpn.start(eipconfig=eip_config,
                         providerconfig=provider_config,
-                        socket_host=host, socket_port=port)
+                        socket_host=host, socket_port=port,
+                        restart=restart)
 
-    def start(self):
+    def start(self, *args, **kwargs):
         """
         Start the service.
         """
@@ -419,7 +420,7 @@ class EIP(object):
             return
 
         try:
-            self._start_eip()
+            self._start_eip(*args, **kwargs)
         except vpnprocess.OpenVPNAlreadyRunning:
             signaler.signal(signaler.EIP_OPENVPN_ALREADY_RUNNING)
         except vpnprocess.AlienOpenVPNAlreadyRunning:
@@ -440,11 +441,6 @@ class EIP(object):
             logger.error("Unexpected problem: {0!r}".format(e))
         else:
             logger.debug('EIP: no errors')
-            # TODO: are we connected here?
-            # kali -- no, we are not! CONNECTED should be passed only
-            # by the vpn observer. Currently handled by the state updater
-            # in eip_status
-            #signaler.signal(signaler.EIP_CONNECTED)
 
     def _do_stop(self, shutdown=False, restart=False):
         """
@@ -539,6 +535,12 @@ class EIP(object):
             self._signaler.signal(self._signaler.EIP_GET_INITIALIZED_PROVIDERS,
                                   filtered_domains)
 
+    def tear_fw_down(self):
+        """
+        Tear the firewall down.
+        """
+        self._vpn.tear_down_firewall()
+
     def get_gateways_list(self, domain):
         """
         Signal a list of gateways for the given provider.
@@ -1181,6 +1183,7 @@ class Signaler(QtCore.QObject):
     eip_state_changed = QtCore.Signal(dict)
     eip_status_changed = QtCore.Signal(dict)
     eip_process_finished = QtCore.Signal(int)
+    eip_tear_fw_down = QtCore.Signal(object)
 
     # signals whether the needed files to start EIP exist or not
     eip_can_start = QtCore.Signal(object)
@@ -1282,6 +1285,7 @@ class Signaler(QtCore.QObject):
     EIP_STATE_CHANGED = "eip_state_changed"
     EIP_STATUS_CHANGED = "eip_status_changed"
     EIP_PROCESS_FINISHED = "eip_process_finished"
+    EIP_TEAR_FW_DOWN = "eip_tear_fw_down"
 
     EIP_CAN_START = "eip_can_start"
     EIP_CANNOT_START = "eip_cannot_start"
@@ -1717,7 +1721,7 @@ class Backend(object):
         """
         self._call_queue.put(("eip", "cancel_setup_eip", None))
 
-    def eip_start(self):
+    def eip_start(self, restart=False):
         """
         Start the EIP service.
 
@@ -1739,7 +1743,7 @@ class Backend(object):
             eip_status_changed -> tuple of str (download, upload)
             eip_vpn_launcher_exception
         """
-        self._call_queue.put(("eip", "start", None))
+        self._call_queue.put(("eip", "start", None, restart))
 
     def eip_stop(self, shutdown=False, restart=False, failed=False):
         """
@@ -1805,6 +1809,12 @@ class Backend(object):
         self._call_queue.put(("eip", "can_start",
                               None, domain))
 
+    def tear_fw_down(self):
+        """
+        Signal the need to tear the fw down.
+        """
+        self._call_queue.put(("eip", "tear_fw_down", None))
+
     def user_login(self, provider, username, password):
         """
         Execute the whole authentication process for a user
-- 
cgit v1.2.3


From aba3ea21d83e6e073baf01643b68832530a6f4d0 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 4 Jun 2014 12:18:18 -0500
Subject: tear down fw on cold starts. Closes: ##5727

---
 src/leap/bitmask/backend.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/leap/bitmask/backend.py')

diff --git a/src/leap/bitmask/backend.py b/src/leap/bitmask/backend.py
index a18dffef..3c97c797 100644
--- a/src/leap/bitmask/backend.py
+++ b/src/leap/bitmask/backend.py
@@ -381,6 +381,9 @@ class EIP(object):
     def _start_eip(self, restart=False):
         """
         Start EIP
+
+        :param restart: whether is is a restart.
+        :type restart: bool
         """
         provider_config = self._provider_config
         eip_config = eipconfig.EIPConfig()
@@ -1742,6 +1745,9 @@ class Backend(object):
             eip_state_changed -> str
             eip_status_changed -> tuple of str (download, upload)
             eip_vpn_launcher_exception
+
+        :param restart: whether is is a restart.
+        :type restart: bool
         """
         self._call_queue.put(("eip", "start", None, restart))
 
-- 
cgit v1.2.3