diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-07-08 11:47:18 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-07-08 11:47:18 -0300 |
commit | dcc9de08fcec2ff1b7a5da7d93df2fc138dcc0a5 (patch) | |
tree | 66d47efc6d7883176c8c5c86caa09b4ba65288a4 /src | |
parent | addf58efe589fa7d85779eb05c3738f23c2e715e (diff) | |
parent | b084a26373c6a1ecdb96008655232fae694595d0 (diff) |
Merge remote-tracking branch 'kali/bug/fix-srpauth-extract-data' into develop
Diffstat (limited to 'src')
-rw-r--r-- | src/leap/crypto/srpauth.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/leap/crypto/srpauth.py b/src/leap/crypto/srpauth.py index 8e228e79..6474bdbb 100644 --- a/src/leap/crypto/srpauth.py +++ b/src/leap/crypto/srpauth.py @@ -51,18 +51,21 @@ class SRPAuthConnectionError(SRPAuthenticationError): """ pass + class SRPAuthUnknownUser(SRPAuthenticationError): """ Exception raised when trying to authenticate an unknown user """ pass + class SRPAuthBadStatusCode(SRPAuthenticationError): """ Exception raised when we received an unknown bad status code """ pass + class SRPAuthNoSalt(SRPAuthenticationError): """ Exception raised when we don't receive the salt param at a @@ -70,6 +73,7 @@ class SRPAuthNoSalt(SRPAuthenticationError): """ pass + class SRPAuthNoB(SRPAuthenticationError): """ Exception raised when we don't receive the B param at a specific @@ -77,12 +81,14 @@ class SRPAuthNoB(SRPAuthenticationError): """ pass + class SRPAuthBadDataFromServer(SRPAuthenticationError): """ Generic exception when we receive bad data from the server. """ pass + class SRPAuthJSONDecodeError(SRPAuthenticationError): """ Exception raised when there's a problem decoding the JSON content @@ -90,12 +96,14 @@ class SRPAuthJSONDecodeError(SRPAuthenticationError): """ pass + class SRPAuthBadPassword(SRPAuthenticationError): """ Exception raised when the user provided a bad password to auth. """ pass + class SRPAuthVerificationFailed(SRPAuthenticationError): """ Exception raised when we can't verify the SRP data received from @@ -103,6 +111,7 @@ class SRPAuthVerificationFailed(SRPAuthenticationError): """ pass + class SRPAuthNoSessionId(SRPAuthenticationError): """ Exception raised when we don't receive a session id from the @@ -110,6 +119,7 @@ class SRPAuthNoSessionId(SRPAuthenticationError): """ pass + class SRPAuth(QtCore.QObject): """ SRPAuth singleton @@ -451,8 +461,7 @@ class SRPAuth(QtCore.QObject): username=username) d.addCallback( partial(self._threader, - self._extract_data), - username=username) + self._extract_data)) d.addCallback(partial(self._threader, self._verify_session)) |