From bdf3ee2957a3f2177911f2652626c52856ef9869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Wed, 21 Aug 2013 10:20:44 -0300
Subject: Use DELETE /1/logout to properly logout

---
 changes/bug_properly_logout                           |  1 +
 src/leap/bitmask/crypto/srpauth.py                    | 19 ++++++++++---------
 src/leap/bitmask/gui/mainwindow.py                    |  3 +++
 .../bitmask/services/soledad/soledadbootstrapper.py   |  3 +++
 4 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 changes/bug_properly_logout

diff --git a/changes/bug_properly_logout b/changes/bug_properly_logout
new file mode 100644
index 00000000..a5d0d972
--- /dev/null
+++ b/changes/bug_properly_logout
@@ -0,0 +1 @@
+  o Use DELETE /1/logout to properly logout. Fixes #3510.
\ No newline at end of file
diff --git a/src/leap/bitmask/crypto/srpauth.py b/src/leap/bitmask/crypto/srpauth.py
index 2d34bb74..55fff82b 100644
--- a/src/leap/bitmask/crypto/srpauth.py
+++ b/src/leap/bitmask/crypto/srpauth.py
@@ -478,13 +478,14 @@ class SRPAuth(QtCore.QObject):
             """
             logger.debug("Starting logout...")
 
-            leap_assert(self.get_session_id(),
-                        "Cannot logout an unexisting session")
+            if self.get_session_id() is None:
+                logger.debug("Already logged out")
+                return
 
             logout_url = "%s/%s/%s/" % (self._provider_config.get_api_uri(),
                                         self._provider_config.
                                         get_api_version(),
-                                        "sessions")
+                                        "logout")
             try:
                 self._session.delete(logout_url,
                                      data=self.get_session_id(),
@@ -494,12 +495,12 @@ class SRPAuth(QtCore.QObject):
             except Exception as e:
                 logger.warning("Something went wrong with the logout: %r" %
                                (e,))
-
-            self.set_session_id(None)
-            self.set_uid(None)
-            # Also reset the session
-            self._session = self._fetcher.session()
-            logger.debug("Successfully logged out.")
+            else:
+                self.set_session_id(None)
+                self.set_uid(None)
+                # Also reset the session
+                self._session = self._fetcher.session()
+                logger.debug("Successfully logged out.")
 
         def set_session_id(self, session_id):
             QtCore.QMutexLocker(self._session_id_lock)
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index e84b7a7b..9b9359bd 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1343,6 +1343,9 @@ class MainWindow(QtGui.QMainWindow):
 
         Starts the logout sequence
         """
+
+        self._soledad_bootstrapper.cancel_bootstrap()
+
         # XXX: If other defers are doing authenticated stuff, this
         # might conflict with those. CHECK!
         threads.deferToThread(self._srp_auth.logout)
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index a481df4e..2419fc0d 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -89,6 +89,9 @@ class SoledadBootstrapper(AbstractBootstrapper):
 
     # retries
 
+    def cancel_bootstrap(self):
+        self._soledad_retries = self.MAX_INIT_RETRIES
+
     def should_retry_initialization(self):
         """
         Returns True if we should retry the initialization.
-- 
cgit v1.2.3