fix: asynch getAuthSecret

crossbario · Oct 27, 2012 · 3b2cd64 · 3b2cd64
1 parent 7bd6df9
commit 3b2cd64
Showing 1 changed file with 59 additions and 49 deletions.
diff --git a/autobahn/autobahn/wamp.py b/autobahn/autobahn/wamp.py
@@ -25,7 +25,10 @@
 
 from twisted.python import log
 from twisted.internet import reactor
-from twisted.internet.defer import Deferred, maybeDeferred
+from twisted.internet.defer import Deferred, \
+                                   maybeDeferred, \
+                                   returnValue, \
+                                   inlineCallbacks
 
 import autobahn
 
@@ -169,7 +172,7 @@ class WampProtocol:
    """
    Server-to-client message providing the event of a (subscribed) topic.
    """
-   
+
    def connectionMade(self):
       self.debugWamp = self.factory.debugWamp
       self.debugApp = self.factory.debugApp
@@ -239,7 +242,7 @@ def _serialize(self, obj):
       Default object serializer.
       """
       return json.dumps(obj)
-   
+
 
    def _unserialize(self, bytes):
       """
@@ -1802,16 +1805,6 @@ def authRequest(self, authKey = None, extra = None):
       if self._clientPendingAuth is not None:
          raise Exception(self.shrink(WampProtocol.URI_WAMP_ERROR + "authentication-already-requested"), "authentication request already issues - authentication pending")
 
-      ## check authKey
-      ##
-      if authKey is None and not self.clientAuthAllowAnonymous:
-         raise Exception(self.shrink(WampProtocol.URI_WAMP_ERROR + "anyonymous-auth-forbidden"), "authentication as anonymous forbidden")
-
-      if type(authKey) not in [str, unicode, types.NoneType]:
-         raise Exception(self.shrink(WampProtocol.URI_WAMP_ERROR + "invalid-argument"), "authentication key must be a string (was %s)" % str(type(authKey)))
-      if authKey is not None and self.getAuthSecret(authKey) is None:
-         raise Exception(self.shrink(WampProtocol.URI_WAMP_ERROR + "no-such-authkey"), "authentication key '%s' does not exist." % authKey)
-
       ## check extra
       ##
       if extra:
@@ -1823,47 +1816,64 @@ def authRequest(self, authKey = None, extra = None):
       #   if type(extra[k]) not in [str, unicode, int, long, float, bool, types.NoneType]:
       #      raise Exception(self.shrink(WampProtocol.URI_WAMP_ERROR + "invalid-argument"), "attribute '%s' in extra not a primitive type (was %s)" % (k, str(type(extra[k]))))
 
-      ## each authentication request gets a unique authid, which can only be used (later) once!
+      ## check authKey
       ##
-      authid = newid()
+      if authKey is None and not self.clientAuthAllowAnonymous:
+         raise Exception(self.shrink(WampProtocol.URI_WAMP_ERROR + "anonymous-auth-forbidden"), "authentication as anonymous forbidden")
 
-      ## create authentication challenge
-      ##
-      info = {}
-      info['authid'] = authid
-      info['authkey'] = authKey
-      info['timestamp'] = utcnow()
-      info['sessionid'] = self.session_id
-      info['extra'] = extra
-
-      pp = maybeDeferred(self.getAuthPermissions, authKey, extra)
-
-      def onAuthPermissionsOk(res):
-         if res is None:
-            res = {'permissions': {}}
-            res['permissions'] = {'pubsub': [], 'rpc': []}
-         info['permissions'] = res['permissions']
-
-         if authKey:
-            ## authenticated
-            ##
-            infoser = self.factory._serialize(info)
-            sig = self.authSignature(infoser, self.getAuthSecret(authKey))
+      if type(authKey) not in [str, unicode, types.NoneType]:
+         raise Exception(self.shrink(WampProtocol.URI_WAMP_ERROR + "invalid-argument"), "authentication key must be a string (was %s)" % str(type(authKey)))
 
-            self._clientPendingAuth = (info, sig, res)
-            return infoser
-         else:
-            ## anonymous
-            ##
-            self._clientPendingAuth = (info, None, res)
-            return None
+      d = maybeDeferred(self.getAuthSecret, authKey)
+
+      def onGetAuthSecretOk(authSecret, authKey, extra):
+         if authKey is not None and authSecret is None:
+            raise Exception(self.shrink(WampProtocol.URI_WAMP_ERROR + "no-such-authkey"), "authentication key '%s' does not exist." % authKey)
+
+         ## each authentication request gets a unique authid, which can only be used (later) once!
+         ##
+         authid = newid()
+
+         ## create authentication challenge
+         ##
+         info = {}
+         info['authid'] = authid
+         info['authkey'] = authKey
+         info['timestamp'] = utcnow()
+         info['sessionid'] = self.session_id
+         info['extra'] = extra
+
+         pp = maybeDeferred(self.getAuthPermissions, authKey, extra)
+
+         def onAuthPermissionsOk(res):
+            if res is None:
+               res = {'permissions': {}}
+               res['permissions'] = {'pubsub': [], 'rpc': []}
+            info['permissions'] = res['permissions']
+
+            if authKey:
+               ## authenticated session
+               ##
+               infoser = self.factory._serialize(info)
+               sig = self.authSignature(infoser, authSecret)
 
-      def onAuthPermissionsError(e):
-         raise Exception(self.shrink(WampProtocol.URI_WAMP_ERROR + "auth-permissions-error"), str(e))
+               self._clientPendingAuth = (info, sig, res)
+               return infoser
+            else:
+               ## anonymous session
+               ##
+               self._clientPendingAuth = (info, None, res)
+               return None
 
-      pp.addCallbacks(onAuthPermissionsOk, onAuthPermissionsError)
+         def onAuthPermissionsError(e):
+            raise Exception(self.shrink(WampProtocol.URI_WAMP_ERROR + "auth-permissions-error"), str(e))
 
-      return pp
+         pp.addCallbacks(onAuthPermissionsOk, onAuthPermissionsError)
+
+         return pp
+
+      d.addCallback(onGetAuthSecretOk, authKey, extra)
+      return d
 
 
    @exportRpc("auth")
@@ -1872,7 +1882,7 @@ def auth(self, signature = None):
       RPC endpoint for clients to actually authenticate after requesting authentication and computing
       a signature from the authentication challenge.
 
-      :param signature: Authenticatin signature computed by the client.
+      :param signature: Authentication signature computed by the client.
       :type signature: str
 
       :returns list -- A list of permissions the client is granted when authentication was successful.