Changeset 9655

Timestamp:

05/18/08 19:35:00 (8 months ago)

Author:

bct

Message:

don't create sessions for pubsub and xep-0070 messages

Files:

• trunk/src/common/connection_handlers.py (modified) (3 diffs)

trunk/src/common/connection_handlers.py

@@ -1600 +1600 @@
 
                 frm = helpers.get_full_jid_from_iq(msg)
-                mtype = msg.getType()
-                thread_id = msg.getThread()
-
-                if not mtype:
-                        mtype = 'normal'
-
-                game_invite = msg.getTag('invite', namespace='http://jabber.org/protocol/games')
-                if game_invite:
-                        game = game_invite.getTag('game')
-
-                        if game.getAttr('var') == \
-                        'http://jabber.org/protocol/games/tictactoe':
-                                klass = tictactoe.TicTacToeSession
-
-                        # this assumes that the invitation came with a thread_id we haven't
-                        # seen
-                        session = self.make_new_session(frm, thread_id, klass=klass)
-
-                        session.invited(msg)
-
-                        return
-                elif mtype != 'groupchat':
-                        session = self.get_or_create_session(frm, thread_id)
-
-                        if thread_id and not session.received_thread_id:
-                                session.received_thread_id = True
 
                 # check if the message is pubsub#event
@@ -1636 +1610 @@
                         self._HttpAuthCB(con, msg)
                         return
-
-                # check if the message is a XEP-0020 feature negotiation request
-                if msg.getTag('feature', namespace=common.xmpp.NS_FEATURE):
-                        if gajim.HAVE_PYCRYPTO:
-                                self._FeatureNegCB(con, msg, session)
-                        return
-                if msg.getTag('init', namespace=common.xmpp.NS_ESESSION_INIT):
-                        self._InitE2ECB(con, msg, session)
-
-                encrypted = False
-                tim = msg.getTimestamp()
-                tim = helpers.datetime_tuple(tim)
-                tim = localtime(timegm(tim))
-
-                if msg.getTag('c', namespace=common.xmpp.NS_STANZA_CRYPTO):
-                        encrypted = True
-
-                        try:
-                                msg = session.decrypt_stanza(msg)
-                        except:
-                                self.dispatch('FAILED_DECRYPT', (frm, tim, session))
-
-                msgtxt = msg.getBody()
-                subject = msg.getSubject() # if not there, it's None
-
-                frm = helpers.get_full_jid_from_iq(msg)
-                jid = helpers.get_jid_from_iq(msg)
-
-                addressTag = msg.getTag('addresses', namespace = common.xmpp.NS_ADDRESS)
-
-                # Be sure it comes from one of our resource, else ignore address element
-                if addressTag and jid == gajim.get_jid_from_account(self.name):
-                        address = addressTag.getTag('address', attrs={'type': 'ofrom'})
-                        if address:
-                                frm = address.getAttr('jid')
-                                jid = gajim.get_jid_without_resource(frm)
 
                 # invitations
@@ -1695 +1633 @@
                                         is_continued))
                                 return
+
+                mtype = msg.getType()
+                thread_id = msg.getThread()
+
+                if not mtype:
+                        mtype = 'normal'
+
+                game_invite = msg.getTag('invite', namespace='http://jabber.org/protocol/games')
+                if game_invite:
+                        game = game_invite.getTag('game')
+
+                        if game.getAttr('var') == \
+                        'http://jabber.org/protocol/games/tictactoe':
+                                klass = tictactoe.TicTacToeSession
+
+                        # this assumes that the invitation came with a thread_id we haven't
+                        # seen
+                        session = self.make_new_session(frm, thread_id, klass=klass)
+
+                        session.invited(msg)
+
+                        return
+                elif mtype != 'groupchat':
+                        session = self.get_or_create_session(frm, thread_id)
+
+                        if thread_id and not session.received_thread_id:
+                                session.received_thread_id = True
+
+                # check if the message is a XEP-0020 feature negotiation request
+                if msg.getTag('feature', namespace=common.xmpp.NS_FEATURE):
+                        if gajim.HAVE_PYCRYPTO:
+                                self._FeatureNegCB(con, msg, session)
+                        return
+                if msg.getTag('init', namespace=common.xmpp.NS_ESESSION_INIT):
+                        self._InitE2ECB(con, msg, session)
+
+                encrypted = False
+                tim = msg.getTimestamp()
+                tim = helpers.datetime_tuple(tim)
+                tim = localtime(timegm(tim))
+
+                if msg.getTag('c', namespace=common.xmpp.NS_STANZA_CRYPTO):
+                        encrypted = True
+
+                        try:
+                                msg = session.decrypt_stanza(msg)
+                        except:
+                                self.dispatch('FAILED_DECRYPT', (frm, tim, session))
+
+                msgtxt = msg.getBody()
+                subject = msg.getSubject() # if not there, it's None
+
+                jid = helpers.get_jid_from_iq(msg)
+
+                addressTag = msg.getTag('addresses', namespace = common.xmpp.NS_ADDRESS)
+
+                # Be sure it comes from one of our resource, else ignore address element
+                if addressTag and jid == gajim.get_jid_from_account(self.name):
+                        address = addressTag.getTag('address', attrs={'type': 'ofrom'})
+                        if address:
+                                frm = address.getAttr('jid')
+                                jid = gajim.get_jid_without_resource(frm)
 
                 if encTag and self.USE_GPG: