Ticket #3083: xmpppy.diff

src/common/xmpp/dispatcher_nb.py

@@ -49 +49 @@
                 self.RegisterHandlerOnce, self.UnregisterHandler, self.RegisterProtocol, \
                 self.SendAndWaitForResponse, self.send,self.disconnect, \
                 self.SendAndCallForResponse, self.getAnID, self.Event]
+                self.previous_size = 0
 
         def getAnID(self):
                 global ID
@@ -131 +132 @@
                 if len(self._pendingExceptions) > 0:
                         _pendingException = self._pendingExceptions.pop()
                         raise _pendingException[0], _pendingException[1], _pendingException[2]
+                # test incomming stanza before we parse it to avoid disconnections
+                size = len(data)
+                # 16384 is the maximum size of a SSL packet
+                # This mean this stanza or previous stanza is incomplete. Don't check it
+                if size != 16384 and self.previous_size != 16384:
+                        if data.find('stream:') < 0:
+                                try:
+                                        simplexml.NodeBuilder(data)
+                                except ExpatError:
+                                        self.DEBUG(10*'=' + '<<MALFORMED XML>>' + 10*'=')
+                                        self.DEBUG(data)
+                                        self.DEBUG(10*'=' + '<< END MALFORMED XML>>' + 10*'=')
+                                        self.previous_size = size
+                                        return '0'
+                self.previous_size = size
                 try:
                         self.Stream.Parse(data)
                         # end stream:stream tag received