Changes in [82:276bc45eb40b:83:255aae0cf8c5] in ralphm-patches

File:

• server-stream-manager.patch (modified) (26 diffs)

server-stream-manager.patch

@@ -1 +1 @@
 # HG changeset patch
 # Parent 3f3fe954b1975c2d9115e0fa8177ae7b28a708a8
-# Parent  e198cebf36146a768eda902efa5ee741e947fda8
 Generalize StreamManager and add ServerStreamManager.
 
@@ -33 +32 @@
  
      def initializationFailed(self, reason):
+diff --git a/wokkel/component.py b/wokkel/component.py
+--- a/wokkel/component.py
++++ b/wokkel/component.py
+@@ -36,7 +36,7 @@
+         StreamManager.__init__(self, factory)
+ 
+ 
+-    def _authd(self, xs):
++    def connectionInitialized(self, xs):
+         """
+         Called when stream initialization has completed.
+ 
+@@ -53,7 +53,7 @@
+             old_send(obj)
+ 
+         xs.send = send
+-        StreamManager._authd(self, xs)
++        StreamManager.connectionInitialized(self, xs)
+ 
+ 
+     def initializationFailed(self, reason):
 diff --git a/wokkel/subprotocols.py b/wokkel/subprotocols.py
 --- a/wokkel/subprotocols.py
 +++ b/wokkel/subprotocols.py
-@@ -122,7 +122,7 @@
+@@ -118,7 +118,7 @@
  
  
@@ -45 +65 @@
      Business logic representing a managed XMPP connection.
  
-@@ -133,43 +133,39 @@
+@@ -129,43 +129,39 @@
  
      @ivar xmlstream: currently managed XML stream
@@ -96 +116 @@
              from twisted.internet import reactor
          self._reactor = reactor
-@@ -195,7 +191,7 @@
+@@ -191,7 +187,7 @@
              handler.connectionInitialized()
  
@@ -105 +125 @@
          Called when the transport connection has been established.
  
-@@ -213,13 +209,17 @@
+@@ -209,13 +205,17 @@
              xs.rawDataInFn = logDataIn
              xs.rawDataOutFn = logDataOut
@@ -124 +144 @@
          Called when the stream has been initialized.
  
-@@ -242,21 +242,8 @@
+@@ -238,21 +238,8 @@
              e.connectionInitialized()
  
@@ -147 +167 @@
          Called when the stream has been closed.
  
-@@ -468,6 +455,60 @@
+@@ -379,6 +366,60 @@
  
  
@@ -231 +251 @@
  
  
+diff --git a/wokkel/test/test_component.py b/wokkel/test/test_component.py
+--- a/wokkel/test/test_component.py
++++ b/wokkel/test/test_component.py
+@@ -49,11 +49,18 @@
+     def __init__(self, *args, **kwargs):
+         component.Component.__init__(self, *args, **kwargs)
+         self.factory.clock = Clock()
++        self.output = []
+ 
+ 
+     def _getConnection(self):
+         c = FakeConnector(self.factory, None, None)
+         c.connect()
++        xs = self.factory.buildProtocol(None)
++        xs.send = self.output.append
++        xs.connectionMade()
++        self.makeConnection(xs)
++        xs.thisEntity = xs.otherEntity
++        xs.dispatch(xs, xmlstream.STREAM_AUTHD_EVENT)
+         return c
+ 
+ 
+@@ -104,6 +111,21 @@
+         self.assertEqual(1, connector.connects)
+ 
+ 
++    def test_stampFrom(self):
++        """
++        Outgoing elements with missing sender address get component JID.
++        """
++        comp = TestableComponent('example.org', 5347,
++                                 'test.example.org', 'secret')
++        comp.startService()
++
++        element = domish.Element((component.NS_COMPONENT_ACCEPT, "message"))
++        element["to"] = "test@example.org"
++        comp.xmlstream.send(element)
++
++        self.assertEqual('test.example.org', element.getAttribute("from"))
++
++
+ 
+ class InternalComponentTest(unittest.TestCase):
+     """
 diff --git a/wokkel/test/test_subprotocols.py b/wokkel/test/test_subprotocols.py
 --- a/wokkel/test/test_subprotocols.py
 +++ b/wokkel/test/test_subprotocols.py
-@@ -190,22 +190,7 @@
+@@ -189,22 +189,7 @@
  
  
@@ -258 +322 @@
      def _streamStarted(self):
          """
-@@ -219,25 +204,14 @@
+@@ -216,25 +203,14 @@
          self.xmlstream.dispatch(self.xmlstream, "//event/stream/authd")
  
@@ -288 +352 @@
          Test that protocol handlers have their connectionMade method called
          when the XML stream is connected.
-@@ -245,27 +219,27 @@
+@@ -242,27 +218,27 @@
          sm = self.streamManager
          handler = DummyXMPPHandler()
@@ -322 +386 @@
          Test raw data functions set when logTraffic is set to True.
          """
-@@ -273,13 +247,13 @@
+@@ -270,13 +246,13 @@
          sm.logTraffic = True
          handler = DummyXMPPHandler()
@@ -339 +403 @@
          Test that protocol handlers have their connectionInitialized method
          called when the XML stream is initialized.
-@@ -287,27 +261,27 @@
+@@ -284,27 +260,27 @@
          sm = self.streamManager
          handler = DummyXMPPHandler()
@@ -372 +436 @@
          A L{STREAM_END_EVENT} results in L{StreamManager} firing the handlers
          L{connectionLost} methods, passing a L{failure.Failure} reason.
-@@ -316,7 +290,7 @@
+@@ -313,7 +289,7 @@
          handler = FailureReasonXMPPHandler()
          handler.setHandlerParent(sm)
@@ -381 +445 @@
  
  
-@@ -338,8 +312,8 @@
+@@ -335,8 +311,8 @@
          Adding a handler when connected doesn't call connectionInitialized.
          """
@@ -392 +456 @@
          handler.setHandlerParent(sm)
  
-@@ -361,10 +335,10 @@
+@@ -358,10 +334,10 @@
                  self.nestedHandler.setHandlerParent(self.parent)
  
@@ -405 +469 @@
          self.assertEquals(1, handler.doneMade)
          self.assertEquals(0, handler.doneInitialized)
-@@ -386,9 +360,9 @@
+@@ -383,9 +359,9 @@
          called.
          """
@@ -418 +482 @@
          handler.setHandlerParent(sm)
  
-@@ -410,11 +384,11 @@
+@@ -407,11 +383,11 @@
                  self.nestedHandler.setHandlerParent(self.parent)
  
@@ -433 +497 @@
          self.assertEquals(1, handler.doneMade)
          self.assertEquals(1, handler.doneInitialized)
-@@ -438,12 +412,12 @@
+@@ -435,12 +411,12 @@
                  self.nestedHandler.setHandlerParent(self.parent)
  
@@ -450 +514 @@
          self.assertEquals(1, handler.doneMade)
          self.assertEquals(1, handler.doneInitialized)
-@@ -473,16 +447,13 @@
+@@ -470,16 +446,13 @@
  
          The data should be sent directly over the XML stream.
@@ -469 +533 @@
  
  
-@@ -493,12 +464,11 @@
+@@ -490,12 +463,11 @@
          The data should be cached until an XML stream has been established and
          initialized.
@@ -484 +548 @@
          sm.send("<presence/>")
          self.assertEquals("", xs.transport.value())
-@@ -525,7 +495,7 @@
+@@ -522,7 +494,7 @@
          """
          factory = xmlstream.XmlStreamFactory(xmlstream.Authenticator())
@@ -493 +557 @@
          xs.connectionMade()
          xs.dataReceived("<stream:stream xmlns='jabber:client' "
-@@ -548,7 +518,7 @@
+@@ -545,7 +517,7 @@
          handler = DummyXMPPHandler()
          sm.addHandler(handler)
@@ -502 +566 @@
          xs.transport = proto_helpers.StringTransport()
          xs.connectionLost(None)
-@@ -720,6 +690,7 @@
+@@ -677,6 +649,7 @@
          """
          d = self.streamManager.request(self.request)
@@ -510 +574 @@
          self.assertFailure(d, ConnectionDone)
          return d
-@@ -735,6 +706,7 @@
+@@ -692,6 +665,7 @@
              d = xmlstream.IQ(self.xmlstream).send()
              d.addErrback(eb)
@@ -518 +582 @@
          d.addErrback(eb)
          self.xmlstream.connectionLost(failure.Failure(ConnectionDone()))
-@@ -780,6 +752,7 @@
+@@ -736,6 +710,7 @@
          self.request.timeout = 60
          d = self.streamManager.request(self.request)
@@ -526 +590 @@
          self.assertFailure(d, ConnectionDone)
          self.assertFalse(self.clock.calls)
-@@ -822,6 +795,58 @@
+@@ -778,6 +753,58 @@