Changeset 9123 for branches/pep/src/common/connection_handlers.py

Timestamp:

12/12/07 09:44:46 (12 months ago)

Author:

asterix

Message:

merge diff from trunk

Files:

• branches/pep/src/common/connection_handlers.py (modified) (43 diffs)

branches/pep/src/common/connection_handlers.py

@@ -3 +3 @@
 ##
 ## Contributors for this file:
-##      - Yann Le Boulanger <asterix@lagaule.org>
+##      - Yann Leboulanger <asterix@lagaule.org>
 ##      - Nikos Kouremenos <kourem@gmail.com>
 ##      - Dimitur Kirov <dkirov@gmail.com>
 ##      - Travis Shirk <travis@pobox.com>
 ##
-## This program is free software; you can redistribute it and/or modify
+## This file is part of Gajim.
+##
+## Gajim is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 2 only.
+## by the Free Software Foundation; version 3 only.
 ##
-## This program is distributed in the hope that it will be useful,
+## Gajim is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Gajim.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
@@ -25 +30 @@
 
 from time import (altzone, daylight, gmtime, localtime, mktime, strftime,
-                  time as time_time, timezone, tzname)
+        time as time_time, timezone, tzname)
 from calendar import timegm
 
@@ -45 +50 @@
         import dbus
         from music_track_listener import MusicTrackListener
+
+from common.stanza_session import EncryptedStanzaSession 
 
 STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd',
@@ -65 +72 @@
         def __init__(self):
                 self.files_props = {}
-        
-        def is_transfer_stoped(self, file_props):
+
+        def is_transfer_stopped(self, file_props):
                 if file_props.has_key('error') and file_props['error'] != 0:
                         return True
@@ -95 +102 @@
                 ''' stop all active transfer for contact '''
                 for file_props in self.files_props.values():
-                        if self.is_transfer_stoped(file_props):
+                        if self.is_transfer_stopped(file_props):
                                 continue
                         receiver_jid = unicode(file_props['receiver']).split('/')[0]
@@ -183 +190 @@
                                 ft_add_hosts_to_send.split(','))
                         for ft_host in ft_add_hosts_to_send:
-                                try:
-                                        ft_host = socket.gethostbyname(ft_host)
-                                        ft_add_hosts.append(ft_host)
-                                except socket.gaierror:
-                                        self.dispatch('ERROR', (_('Wrong host'), _('The host %s you configured as the ft_add_hosts_to_send advanced option is not valid, so ignored.') % ft_host))
+                                ft_add_hosts.append(ft_host)
                 listener = gajim.socks5queue.start_listener(port,
                         sha_str, self._result_socks5_sid, file_props['sid'])
@@ -213 +216 @@
                         ostreamhost.setAttr('host', ft_host)
                         ostreamhost.setAttr('jid', sender)
-                for thehost in self.peerhost:
-                        try:
-                                thehost = self.peerhost[0]
-                                streamhost = common.xmpp.Node(tag = 'streamhost') # My IP
-                                query.addChild(node = streamhost)
-                                streamhost.setAttr('port', unicode(port))
-                                streamhost.setAttr('host', thehost)
-                                streamhost.setAttr('jid', sender)
-                        except socket.gaierror:
-                                self.dispatch('ERROR', (_('Wrong host'),
-                                        _('Invalid local address? :-O')))
+                try:
+                        thehost = self.peerhost[0]
+                        streamhost = common.xmpp.Node(tag = 'streamhost') # My IP
+                        query.addChild(node = streamhost)
+                        streamhost.setAttr('port', unicode(port))
+                        streamhost.setAttr('host', thehost)
+                        streamhost.setAttr('jid', sender)
+                except socket.gaierror:
+                        self.dispatch('ERROR', (_('Wrong host'),
+                                _('Invalid local address? :-O')))
 
                 if fast and proxyhosts != [] and gajim.config.get_per('accounts',
@@ -354 +356 @@
                 query = iq.setTag('query')
                 query.setNamespace(common.xmpp.NS_BYTESTREAM)
-                query.setAttr('sid',  proxy['sid'])
+                query.setAttr('sid', proxy['sid'])
                 activate = query.setTag('activate')
                 activate.setData(file_props['proxy_receiver'])
@@ -445 +447 @@
                 
                 try:
-                        streamhost =  query.getTag('streamhost-used')
+                        streamhost = query.getTag('streamhost-used')
                 except: # this bytestream result is not what we need
                         pass
@@ -474 +476 @@
 
                 if real_id[:3] == 'au_':
-                        gajim.socks5queue.send_file(file_props, self.name)
+                        if file.has_key('stopped') and file_props['stopped']:
+                                self.remove_transfer(file_props)
+                        else:
+                                gajim.socks5queue.send_file(file_props, self.name)
                         raise common.xmpp.NodeProcessed
 
@@ -496 +501 @@
 
                 else:
-                        gajim.socks5queue.send_file(file_props, self.name)
+                        if file_props.has_key('stopped') and file_props['stopped']:
+                                self.remove_transfer(file_props)
+                        else:
+                                gajim.socks5queue.send_file(file_props, self.name)
                         if file_props.has_key('fast'):
                                 fasts = file_props['fast']
@@ -658 +666 @@
                 iq.setAttr('id', id)
                 query = iq.setTag('query')
-                query.setAttr('node','http://gajim.org/caps#' + gajim.version)
+                query.setAttr('node','http://gajim.org/caps#' + gajim.version.split('-',
+                        1)[0])
                 for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, \
                                                 common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS):
@@ -710 +719 @@
         def _DiscoverItemsGetCB(self, con, iq_obj):
                 gajim.log.debug('DiscoverItemsGetCB')
+                if self.commandItemsQuery(con, iq_obj):
+                        raise common.xmpp.NodeProcessed
                 node = iq_obj.getTagAttr('query', 'node')
-                if node is None:
+                if node is None:
                         result = iq_obj.buildReply('result')
                         self.connection.send(result)
@@ -724 +735 @@
                 node = q.getAttr('node')
 
-                if self.commandQuery(con, iq_obj):
+                if self.commandInfoQuery(con, iq_obj):
                         raise common.xmpp.NodeProcessed
                 
@@ -737 +748 @@
                         if node and node.find('#') != -1:
                                 extension = node[node.index('#') + 1:]
-                        client_version = 'http://gajim.org/caps#' + gajim.version
+                        client_version = 'http://gajim.org/caps#' + gajim.version.split('-',
+                                1)[0]
 
                         if node in (None, client_version):
@@ -746 +758 @@
                                 q.addChild('feature', attrs = {'var': common.xmpp.NS_COMMANDS})
                                 q.addChild('feature', attrs = {'var': common.xmpp.NS_DISCO_INFO})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_ACTIVITY})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_ACTIVITY + '+notify'})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_TUNE})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_TUNE + '+notify'})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_MOOD})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_MOOD + '+notify'})
+                                if gajim.config.get('use_pep'):
+                                        q.addChild('feature', attrs = {'var': common.xmpp.NS_ACTIVITY})
+                                        q.addChild('feature', attrs = {'var': common.xmpp.NS_ACTIVITY + '+notify'})
+                                        q.addChild('feature', attrs = {'var': common.xmpp.NS_TUNE})
+                                        q.addChild('feature', attrs = {'var': common.xmpp.NS_TUNE + '+notify'})
+                                        q.addChild('feature', attrs = {'var': common.xmpp.NS_MOOD})
+                                        q.addChild('feature', attrs = {'var': common.xmpp.NS_MOOD + '+notify'})
+                                q.addChild('feature', attrs = {'var': common.xmpp.NS_ESESSION_INIT})
 
                         if (node is None or extension == 'cstates') and gajim.config.get('outgoing_chat_state_notifactions') != 'disabled':
@@ -793 +807 @@
                                         attr[key] = i.getAttr(key)
                                 if attr.has_key('category') and \
-                                   attr['category'] in ('gateway', 'headline') and \
-                                   attr.has_key('type'):
+                                        attr['category'] in ('gateway', 'headline') and \
+                                        attr.has_key('type'):
                                         transport_type = attr['type']
                                 if attr.has_key('category') and \
-                                   attr['category'] == 'conference' and \
-                                   attr.has_key('type') and attr['type'] == 'text':
+                                        attr['category'] == 'conference' and \
+                                        attr.has_key('type') and attr['type'] == 'text':
                                         is_muc = True
                                 identities.append(attr)
@@ -869 +883 @@
                 if len(ext):
                         c.setAttr('ext', ' '.join(ext))
-                c.setAttr('ver', gajim.version)
+                c.setAttr('ver', gajim.version.split('-', 1)[0])
                 return p
         
@@ -1083 +1097 @@
                                         data = {'jid': jid}
                                         order = meta.getAttr('order')
+                                        try:
+                                                order = int(order)
+                                        except:
+                                                order = 0
                                         if order != None:
                                                 data['order'] = order
@@ -1091 +1109 @@
                                 self.dispatch('METACONTACTS', meta_list)
                         else:
-                                self.metacontacts_supported = False
+                                if iq_obj.getErrorCode() not in ('403', '406', '404'):
+                                        self.private_storage_supported = False
                         # We can now continue connection by requesting the roster
                         self.connection.initRoster()
@@ -1208 +1227 @@
                 ConnectionCommands.__init__(self)
                 ConnectionPubSub.__init__(self)
-                self.gmail_url=None
+                self.gmail_url = None
                 # List of IDs we are waiting answers for {id: (type_of_request, data), }
                 self.awaiting_answers = {}
@@ -1217 +1236 @@
                 # SUBSCRIBED event to gui
                 self.automatically_added = []
-                # keep the latest subscribed event for each jid to prevent loop when we 
+                # keep the latest subscribed event for each jid to prevent loop when we
                 # acknoledge presences
                 self.subscribed_events = {}
+
+                # keep track of sessions this connection has with other JIDs
+                self.sessions = {}
                 try:
                         idle.init()
                 except:
                         HAS_IDLE = False
-        
+
         def build_http_auth_answer(self, iq_obj, answer):
                 if answer == 'yes':
@@ -1244 +1266 @@
                         msg = iq_obj.getTagData('body') # In case it's a message with a body
                         self.dispatch('HTTP_AUTH', (method, url, id, iq_obj, msg));
+                raise common.xmpp.NodeProcessed
+
+        def _FeatureNegCB(self, con, stanza, session):
+                gajim.log.debug('FeatureNegCB')
+                feature = stanza.getTag(name='feature', namespace=common.xmpp.NS_FEATURE)
+                form = common.xmpp.DataForm(node=feature.getTag('x'))
+
+                if form['FORM_TYPE'] == 'urn:xmpp:ssn':
+                        self.dispatch('SESSION_NEG', (stanza.getFrom(), session, form))
+                else:
+                        reply = stanza.buildReply()
+                        reply.setType('error')
+
+                        reply.addChild(feature)
+                        reply.addChild(node=xmpp.ErrorNode('service-unavailable', typ='cancel'))
+
+                        con.send(reply)
+                
+                raise common.xmpp.NodeProcessed
+
+        def _InitE2ECB(self, con, stanza, session):
+                gajim.log.debug('InitE2ECB')
+                init = stanza.getTag(name='init', namespace=common.xmpp.NS_ESESSION_INIT)
+                form = common.xmpp.DataForm(node=init.getTag('x'))
+
+                self.dispatch('SESSION_NEG', (stanza.getFrom(), session, form))
+
                 raise common.xmpp.NodeProcessed
 
@@ -1314 +1363 @@
                         ns = storage_tag.getNamespace()
                         if ns == 'storage:metacontacts':
-                                self.metacontacts_supported = False
+                                self.private_storage_supported = False
                                 # Private XML Storage (XEP49) is not supported by server
                                 # Continue connecting
@@ -1322 +1371 @@
                 gajim.log.debug('rosterSetCB')
                 for item in iq_obj.getTag('query').getChildren():
-                        jid  = helpers.parse_jid(item.getAttr('jid'))
+                        jid = helpers.parse_jid(item.getAttr('jid'))
                         name = item.getAttr('name')
-                        sub  = item.getAttr('subscription')
-                        ask  = item.getAttr('ask')
+                        sub = item.getAttr('subscription')
+                        ask = item.getAttr('ask')
                         groups = []
                         for group in item.getTags('group'):
@@ -1400 +1449 @@
                 qp.setTagData('utc', strftime('%Y%m%dT%T', gmtime()))
                 qp.setTagData('tz', tzname[daylight])
-                qp.setTagData('display', strftime('%c', localtime()))
+                qp.setTagData('display', helpers.decode_string(strftime('%c',
+                        localtime())))
                 self.connection.send(iq_obj)
                 raise common.xmpp.NodeProcessed
@@ -1408 +1458 @@
                 iq_obj = iq_obj.buildReply('result')
                 qp = iq_obj.setTag('time',
-                                   namespace=common.xmpp.NS_TIME_REVISED)
+                        namespace=common.xmpp.NS_TIME_REVISED)
                 qp.setTagData('utc', strftime('%Y-%m-%dT%TZ', gmtime()))
                 zone = -(timezone, altzone)[daylight] / 60
@@ -1461 +1511 @@
         def _messageCB(self, con, msg):
                 '''Called when we receive a message'''
+                frm = helpers.get_full_jid_from_iq(msg)
+                mtype = msg.getType()
+                thread_id = msg.getThread()
+
+                if not mtype:
+                        mtype = 'normal'
+
+                if not mtype == 'groupchat':
+                        session = self.get_session(frm, thread_id, mtype)
+
+                if thread_id and not session.received_thread_id:
+                        session.received_thread_id = True
+
                 # check if the message is pubsub#event
                 if msg.getTag('event') is not None:
@@ -1470 +1533 @@
                         self._HttpAuthCB(con, msg)
                         return
+                if msg.getTag('feature') and msg.getTag('feature').namespace == \
+                common.xmpp.NS_FEATURE:
+                        if gajim.HAVE_PYCRYPTO:
+                                self._FeatureNegCB(con, msg, session)
+                        return
+                if msg.getTag('init') and 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))
+
+                e2e_tag = msg.getTag('c', namespace = common.xmpp.NS_STANZA_CRYPTO)
+                if e2e_tag:
+                        encrypted = True
+
+                        try:
+                                msg = session.decrypt_stanza(msg)
+                        except:
+                                self.dispatch('FAILED_DECRYPT', (frm, tim))
+
                 msgtxt = msg.getBody()
                 msghtml = msg.getXHTML()
-                mtype = msg.getType()
                 subject = msg.getSubject() # if not there, it's None
                 tim = msg.getTimestamp()
@@ -1491 +1576 @@
                         no_log_for = ''
                 no_log_for = no_log_for.split()
-                encrypted = False
                 chatstate = None
                 encTag = msg.getTag('x', namespace = common.xmpp.NS_ENCRYPTED)
@@ -1511 +1595 @@
                         if xtag.getNamespace() == common.xmpp.NS_CONFERENCE and not invite:
                                 room_jid = xtag.getAttr('jid')
-                                self.dispatch('GC_INVITATION', (room_jid, frm, '', None))
+                                is_continued = False
+                                if xtag.getTag('continue'):
+                                        is_continued = True
+                                self.dispatch('GC_INVITATION', (room_jid, frm, '', None,
+                                        is_continued))
                                 return
+                form_node = None
+                for xtag in xtags:
+                        if xtag.getNamespace() == common.xmpp.NS_DATA:
+                                form_node = xtag
+                                break
                 # chatstates - look for chatstate tags in a message if not delayed
                 if not delayed:
@@ -1538 +1631 @@
                         #decrypt
                         encmsg = encTag.getData()
-                        
+
                         keyID = gajim.config.get_per('accounts', self.name, 'keyid')
                         if keyID:
                                 decmsg = self.gpg.decrypt(encmsg, keyID)
+                                # \x00 chars are not allowed in C (so in GTK)
+                                decmsg = decmsg.replace('\x00', '')
                 if decmsg:
                         msgtxt = decmsg
@@ -1550 +1645 @@
                                 error_msg = msgtxt
                                 msgtxt = None
-                        if self.name not in no_log_for:
+                        if session.is_loggable():
                                 try:
                                         gajim.logger.write('error', frm, error_msg, tim = tim,
@@ -1566 +1661 @@
                                 self.dispatch('GC_SUBJECT', (frm, subject, msgtxt, has_timestamp))
                         else:
+                                statusCode = msg.getStatusCode()
                                 if not msg.getTag('body'): #no <body>
                                         # It could be a config change. See
                                         # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify
                                         if msg.getTag('x'):
-                                                statusCode = msg.getStatusCode()
                                                 if statusCode != []:
                                                         self.dispatch('GC_CONFIG_CHANGE', (jid, statusCode))
@@ -1577 +1672 @@
                                 if not self.last_history_line.has_key(jid):
                                         return
-                                self.dispatch('GC_MSG', (frm, msgtxt, tim, has_timestamp, msghtml))
-                                if self.name not in no_log_for and not int(float(mktime(tim)))\
-                                <= self.last_history_line[jid] and msgtxt:
+                                self.dispatch('GC_MSG', (frm, msgtxt, tim, has_timestamp, msghtml,
+                                        statusCode))
+                                if self.name not in no_log_for and jid not in no_log_for and not \
+                                int(float(mktime(tim))) <= self.last_history_line[jid] and msgtxt:
                                         try:
                                                 gajim.logger.write('gc_msg', frm, msgtxt, tim = tim)
@@ -1588 +1684 @@
                         if not msg.getTag('body') and chatstate is None: #no <body>
                                 return
-                        if msg.getTag('body') and self.name not in no_log_for and jid not in\
-                                no_log_for and msgtxt:
+                        if msg.getTag('body') and session.is_loggable() and msgtxt:
                                 try:
                                         msg_id = gajim.logger.write('chat_msg_recv', frm, msgtxt,
@@ -1602 +1697 @@
                                 item = invite.getTag('password')
                                 password = invite.getTagData('password')
-                                self.dispatch('GC_INVITATION',(frm, jid_from, reason, password))
+                                is_continued = False
+                                if invite.getTag('invite').getTag('continue'):
+                                        is_continued = True
+                                self.dispatch('GC_INVITATION',(frm, jid_from, reason, password,
+                                        is_continued))
                                 return
-                        if self.name not in no_log_for and jid not in no_log_for and msgtxt:
+                        if session.is_loggable()and msgtxt:
                                 try:
                                         gajim.logger.write('single_msg_recv', frm, msgtxt, tim = tim,
@@ -1615 +1714 @@
                         mtype = treat_as
                 self.dispatch('MSG', (frm, msgtxt, tim, encrypted, mtype,
-                        subject, chatstate, msg_id, composing_xep, user_nick, msghtml))
+                        subject, chatstate, msg_id, composing_xep, user_nick, msghtml,
+                        session, form_node))
         # END messageCB
+
+        def get_session(self, jid, thread_id, type):
+                '''returns an existing session between this connection and 'jid', returns a new one if none exist.'''
+                session = self.find_session(jid, thread_id, type)
+
+                if session:
+                        return session
+                else:
+                        # it's possible we initiated a session with a bare JID and this is the
+                        # first time we've seen a resource
+                        bare_jid = gajim.get_jid_without_resource(jid)
+                        if bare_jid != jid:
+                                session = self.find_session(bare_jid, thread_id, type)
+                                if session:
+                                        if not session.received_thread_id:
+                                                thread_id = session.thread_id
+
+                                        self.move_session(bare_jid, thread_id, jid.split("/")[1])
+                                        return session
+
+                return self.make_new_session(jid, thread_id, type)
+
+        def find_session(self, jid, thread_id, type):
+                try:
+                        if type == 'chat' and not thread_id:
+                                return self.find_null_session(jid)
+                        else: