summaryrefslogtreecommitdiff
path: root/src/leap/bitmask
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-21 10:20:44 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-21 10:32:14 -0300
commitd6bcf278e8257460f68ca86a20bfa278ac436c1f (patch)
tree55d7693c1d8bac9e2286cba8a9bbac01ce0389f9 /src/leap/bitmask
parent1662a500c8367478cac54e71feae9c239cec4bd3 (diff)
Use DELETE /1/logout to properly logout
Diffstat (limited to 'src/leap/bitmask')
-rw-r--r--src/leap/bitmask/crypto/srpauth.py7
-rw-r--r--src/leap/bitmask/gui/mainwindow.py3
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py3
3 files changed, 10 insertions, 3 deletions
diff --git a/src/leap/bitmask/crypto/srpauth.py b/src/leap/bitmask/crypto/srpauth.py
index 2d34bb74..b3a305f1 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(),
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 9e150226..b973418e 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.