Changeset 68:14b59e18ecb6 in ralphm-patches

Timestamp:

Oct 21, 2012, 6:04:01 AM (7 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Checkpoint

Files:

• c2s_server_factory.patch (modified) (4 diffs)
• roster_server.patch (modified) (1 diff)
• router_unknown.patch (deleted)
• series (modified) (1 diff)
• server-stream-manager.patch (added)
• session_manager.patch (modified) (2 diffs)

c2s_server_factory.patch

@@ -1 +1 @@
 # HG changeset patch
-# Parent 23dbe722e4482b8286153d29bf87902b464f919f
+# Parent f164cc75b8337933cc6dd9c7f43424f3dbd74dee
 Add factory for accepting client connections.
 
@@ -24 +24 @@
 --- a/wokkel/client.py
 +++ b/wokkel/client.py
-@@ -21,6 +21,7 @@
+@@ -21,7 +21,9 @@
  from twisted.words.xish import domish
  
@@ -30 +30 @@
 +from wokkel.compat import XmlStreamServerFactory
  from wokkel.iwokkel import IUserSession
++from wokkel.subprotocols import ServerStreamManager
  from wokkel.subprotocols import StreamManager
  
-@@ -401,3 +402,61 @@
+ NS_CLIENT = 'jabber:client'
+@@ -442,3 +444,41 @@
              self.portal = self.portals[self.xmlstream.thisEntity]
          except KeyError:
@@ -41 +43 @@
 +class XMPPC2SServerFactory(XmlStreamServerFactory):
 +
-+    def __init__(self, portal):
-+        self.portal = portal
-+
++    def __init__(self, portals):
 +        def authenticatorFactory():
-+            return XMPPClientListenAuthenticator(portal)
++            return XMPPClientListenAuthenticator(portals)
 +
 +        XmlStreamServerFactory.__init__(self, authenticatorFactory)
 +        self.addBootstrap(xmlstream.STREAM_CONNECTED_EVENT,
 +                          self.onConnectionMade)
-+        self.addBootstrap(xmlstream.STREAM_AUTHD_EVENT,
-+                          self.onAuthenticated)
-+
-+        self.serial = 0
 +
 +
 +    def onConnectionMade(self, xs):
 +        """
-+        Called when a client-to-server connection was made.
-+
-+        This enables traffic debugging on incoming streams.
-+        """
-+        xs.serial = self.serial
-+        self.serial += 1
-+
-+        log.msg("Client connection %d made" % xs.serial)
-+
-+        def logDataIn(buf):
-+            log.msg("RECV (%d): %r" % (xs.serial, buf))
-+
-+        def logDataOut(buf):
-+            log.msg("SEND (%d): %r" % (xs.serial, buf))
-+
++        Called when a connection is made.
++
++        This creates a stream manager, calls L{setupHandlers} to attach
++        subprotocol handlers and then signals the stream manager that
++        the connection was made.
++        """
++        sm = ServerStreamManager()
++        sm.logTraffic = self.logTraffic
++
++        for handler in self.setupHandlers():
++            handler.setHandlerParent(sm)
++
++        sm.makeConnection(xs)
++
++
++    def setupHandlers(self):
++        """
++        Set up XMPP subprotocol handlers.
++        """
++        return [
++            generic.StanzaForwarder()
++        ]
+diff --git a/wokkel/generic.py b/wokkel/generic.py
+--- a/wokkel/generic.py
++++ b/wokkel/generic.py
+@@ -615,3 +615,55 @@
+ 
+         self._initializers = self.getInitializers()
+         self._initializeStream()
++
++
++
++class StanzaForwarder(XMPPHandler):
++    """
++    XMPP protocol for passing incoming stanzas to the stream avatar.
++
++    This handler adds an observer for all XML Stanzas to forward to the C{send}
++    method on the cred avatar set on the XML Stream, unless it has been handled
++    by other observers.
++
++    Stream errors are logged.
++    """
++
++    def connectionMade(self):
++        """
++        Called when a connection is made.
++        """
++        self.xmlstream.addObserver(xmlstream.STREAM_ERROR_EVENT, self.onError)
++
++
++    def connectionInitialized(self):
++        """
++        Called when the stream has been initialized.
++        """
++        self.xmlstream.addObserver(
++            '/*[@xmlns="%s"]' % self.xmlstream.namespace,
++            self.onStanza, priority=-1)
++
++
++    def onStanza(self, element):
++        """
++        Called when a stanza element was received.
++
++        Unless a stanza has already been handled, or the name of the element is
++        not one of C{'iq'}, C{'message'}, C{'presence'}, the stanza is passed
++        on to the avatar's C{send} method.
++        """
++        if element.handled:
++            return
++
++        if element.name not in ('iq', 'message', 'presence'):
++            return
++
++        self.xmlstream.avatar.send(element)
++
++
++    def onError(reason):
++        """
++        Log a stream error.
++        """
++        log.err(reason, "Stream error")
+diff --git a/wokkel/subprotocols.py b/wokkel/subprotocols.py
+--- a/wokkel/subprotocols.py
++++ b/wokkel/subprotocols.py
+@@ -142,10 +142,13 @@
+     @type timeout: C{int}
+ 
+     @ivar _reactor: A provider of L{IReactorTime} to track timeouts.
++
++    @cvar __streamCount: Global stream count for distinguishing streams.
+     """
+ 
+     timeout = None
+     _reactor = None
++    __streamCount = 0
+ 
+     logTraffic = False
+ 
+@@ -195,20 +198,24 @@
+         and call each handler's C{makeConnection} method with the L{XmlStream}
+         instance.
+         """
+-        def logDataIn(buf):
+-            log.msg("RECV: %r" % buf)
++        xs.serial = self.__streamCount
++        BaseStreamManager.__streamCount += 1
+ 
+-        def logDataOut(buf):
+-            log.msg("SEND: %r" % buf)
+ 
+         if self.logTraffic:
+-            xs.rawDataInFn = logDataIn
+-            xs.rawDataOutFn = logDataOut
++            def logData(direction, data):
++                log.msg(format="%(direction)s (%(streamID)s): %(data)r",
++                        direction=direction, streamID=xs.serial, data=data)
++
++            log.msg(format="Connection %(streamID) made", streamID=xs.serial)
++            xs.rawDataInFn = lambda data: logData("RECV", data)
++            xs.rawDataOutFn = lambda data: logData("SEND", data)
+ 
+         xs.addObserver(xmlstream.STREAM_AUTHD_EVENT,
+                        self.connectionInitialized)
+         xs.addObserver(xmlstream.STREAM_END_EVENT,
+                        self.connectionLost)
++
+         self.xmlstream = xs
+ 
+         for e in list(self):
+@@ -222,6 +229,9 @@
+         Send out cached stanzas and call each handler's
+         C{connectionInitialized} method.
+         """
 +        if self.logTraffic:
-+            xs.rawDataInFn = logDataIn
-+            xs.rawDataOutFn = logDataOut
-+
-+        xs.addObserver(xmlstream.STREAM_END_EVENT, self.onConnectionLost,
-+                                                   0, xs)
-+        xs.addObserver(xmlstream.STREAM_ERROR_EVENT, self.onError)
-+
-+
-+    def onAuthenticated(self, xs):
-+        log.msg("Client connection %d authenticated" % xs.serial)
-+
-+        xs.addObserver('/*', xs.avatar.send)
-+
-+
-+    def onConnectionLost(self, xs, reason):
-+        log.msg("Client connection %d disconnected" % xs.serial)
-+
-+
-+    def onError(self, reason):
-+        log.err(reason, "Stream Error")
++            log.msg(format="Connection %(streamID) initialized",
++                    streamID=xs.serial)
+ 
+         xs.addObserver('/iq[@type="result"]', self._onIQResponse)
+         xs.addObserver('/iq[@type="error"]', self._onIQResponse)
+@@ -247,6 +257,10 @@
+         L{XmlStream} anymore and notifies each handler that the connection
+         was lost by calling its C{connectionLost} method.
+         """
++        if self.logTraffic:
++            log.msg(format="Connection %(streamID) lost",
++                    streamID=self.xmlstream.serial)
++
+         self.xmlstream = None
+         self._initialized = False
+ 

roster_server.patch

@@ -144 +144 @@
 +
 +
-+    def getRoster(self, entity):
++    def getRoster(self, request):
 +        raise NotImplementedError()

series

@@ +1 @@
+server-stream-manager.patch
 roster_server.patch #+c2s
-router_unknown.patch #+c2s
 
 listening-authenticator-stream-features.patch #+c2s

session_manager.patch

@@ -1 +1 @@
 # HG changeset patch
-# Parent 4962500d52ed0bd4a71047c93818303accea55fd
+# Parent 53e7ea0d847e61f209fe37359380c8c58e0ece72
 
 diff --git a/wokkel/client.py b/wokkel/client.py
 --- a/wokkel/client.py
 +++ b/wokkel/client.py
-@@ -12,18 +12,21 @@
+@@ -12,19 +12,23 @@
  
  import base64
@@ -26 +26 @@
  from wokkel.compat import XmlStreamServerFactory
  from wokkel.iwokkel import IUserSession
--from wokkel.subprotocols import StreamManager
-+from wokkel.subprotocols import StreamManager, XMPPHandler
+ from wokkel.subprotocols import ServerStreamManager
+ from wokkel.subprotocols import StreamManager
++from wokkel.subprotocols import XMPPHandler
  
  NS_CLIENT = 'jabber:client'
  
-@@ -501,3 +504,161 @@
- 
-     def onError(self, reason):
-         log.err(reason, "Stream Error")
+@@ -479,3 +483,161 @@
+         return [
+             generic.StanzaForwarder()
+         ]
 +
 +