summaryrefslogtreecommitdiff
path: root/src/leap/crypto
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-06-12 02:05:05 +0900
committerkali <kali@leap.se>2013-06-12 02:05:05 +0900
commit86add779c3e5f869b4bffbb482a4659db30e2cbc (patch)
treefc9053fc2af73ac8e6ca6d914f6e69d258fa127e /src/leap/crypto
parent90fe21d31858f894dfec9bf37f432a7f39dd2b6f (diff)
parent029b4c2ac07fab41dbed9ab90e04e477938c3c05 (diff)
Merge remote-tracking branch 'chiiph/feature/merge_systray' into develop
Conflicts: src/leap/gui/mainwindow.py
Diffstat (limited to 'src/leap/crypto')
-rw-r--r--src/leap/crypto/srpauth.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/leap/crypto/srpauth.py b/src/leap/crypto/srpauth.py
index 3e47f679..52267b3b 100644
--- a/src/leap/crypto/srpauth.py
+++ b/src/leap/crypto/srpauth.py
@@ -255,9 +255,14 @@ class SRPAuth(QtCore.QObject):
(auth_result.status_code,))
json_content = json.loads(content)
- M2 = json_content.get("M2", None)
- uid = json_content.get("id", None)
- token = json_content.get("token", None)
+
+ try:
+ M2 = json_content.get("M2", None)
+ uid = json_content.get("id", None)
+ token = json_content.get("token", None)
+ except Exception as e:
+ logger.error(e)
+ raise Exception("Something went wrong with the login")
events_signal(proto.CLIENT_UID, content=uid)