From 1b670d268ee26fc06115702aff055884327f85ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 14 Jun 2013 11:08:39 -0300
Subject: Improve error messages in login

---
 src/leap/crypto/srpauth.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/leap/crypto')

diff --git a/src/leap/crypto/srpauth.py b/src/leap/crypto/srpauth.py
index bcd24de3..d089fa50 100644
--- a/src/leap/crypto/srpauth.py
+++ b/src/leap/crypto/srpauth.py
@@ -459,7 +459,8 @@ class SRPAuth(QtCore.QObject):
         :type failure: twisted.python.failure.Failure
         """
         logger.error("Error logging in %s" % (failure,))
-        self.authentication_finished.emit(False, "%s" % (failure,))
+        self.authentication_finished.emit(False, "%s" % (failure.value,))
+        failure.trap(Exception)
 
     def get_session_id(self):
         return self.__instance.get_session_id()
-- 
cgit v1.2.3


From 8bee5f4e9a1bb0f7069fe41ab37dfec000487d7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 14 Jun 2013 12:45:08 -0300
Subject: Actually deferToThread all the things we expect to do in parallel

---
 src/leap/crypto/srpauth.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'src/leap/crypto')

diff --git a/src/leap/crypto/srpauth.py b/src/leap/crypto/srpauth.py
index d089fa50..0e95ae64 100644
--- a/src/leap/crypto/srpauth.py
+++ b/src/leap/crypto/srpauth.py
@@ -24,6 +24,7 @@ import json
 
 #this error is raised from requests
 from simplejson.decoder import JSONDecodeError
+from functools import partial
 
 from PySide import QtCore
 from twisted.internet import threads
@@ -321,6 +322,9 @@ class SRPAuth(QtCore.QObject):
 
             self.set_session_id(session_id)
 
+        def _threader(self, cb, res, *args, **kwargs):
+            return threads.deferToThread(cb, res, *args, **kwargs)
+
         def authenticate(self, username, password):
             """
             Executes the whole authentication process for a user
@@ -341,10 +345,17 @@ class SRPAuth(QtCore.QObject):
                                       username=username,
                                       password=password)
 
-            d.addCallback(self._start_authentication, username=username,
-                          password=password)
-            d.addCallback(self._process_challenge, username=username)
-            d.addCallback(self._verify_session)
+            d.addCallback(
+                partial(self._threader,
+                        self._start_authentication),
+                username=username,
+                password=password)
+            d.addCallback(
+                partial(self._threader,
+                        self._process_challenge),
+                username=username)
+            d.addCallback(partial(self._threader,
+                                  self._verify_session))
 
             return d
 
-- 
cgit v1.2.3