Changeset 9508

Timestamp:

04/21/08 00:58:47 (4 months ago)

Author:

asterix

Message:

new XEP-0115 implementation (version 1.5)

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• src/common/caps.py (modified) (8 diffs)
• src/common/check_paths.py (modified) (1 diff)
• src/common/connection_handlers.py (modified) (3 diffs)
• src/common/contacts.py (modified) (1 diff)
• src/common/defs.py (modified) (1 diff)
• src/common/gajim.py (modified) (2 diffs)
• src/common/helpers.py (modified) (3 diffs)
• src/common/logger.py (modified) (3 diffs)
• src/common/optparser.py (modified) (2 diffs)
• src/common/xmpp/transports_nb.py (modified) (4 diffs)
• src/config.py (modified) (7 diffs)
• src/gajim.py (modified) (1 diff)

trunk/configure.ac

@@ -1 +1 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-                [0.11.4.3-svn],[http://trac.gajim.org/],[gajim])
+                [0.11.4.4-svn],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
 AM_INIT_AUTOMAKE([1.8])

trunk/src/common/caps.py

@@ -21 +21 @@
 import xmpp.features_nb
 import gajim
+import helpers
 
 class CapsCache(object):
@@ -94 +95 @@
                 class CacheItem(object):
                         ''' TODO: logging data into db '''
-                        def __init__(ciself, node, version, ext=None):
+                        def __init__(ciself, hash_method, hash):
                                 # cached into db
-                                ciself.node = node
-                                ciself.version = version
-                                ciself.features = set()
-                                ciself.ext = ext
-                                ciself.exts = {}
-
-                                # set of tuples: (category, type, name)
-                                # (dictionaries are not hashable, so cannot be in sets)
-                                ciself.identities = set()
+                                ciself.hash_method = hash_method
+                                ciself.hash = hash
+
+                                @property
+                                def features():
+                                        def fget(self):
+                                                return self.getAttr('features')
+                                        def fset(self, value):
+                                                list_ = []
+                                                for feature in value:
+                                                        list_.append(self.__names.setdefault(feature, feature))
+                                                self.setAttr('features', list_)
+
+                                @property
+                                def identities():
+                                        def fget(self):
+                                                return self.getAttr('identities')
+                                        def fset(self, value):
+                                                list_ = []
+                                                for identity in value:
+                                                        list_.append(self.__names.setdefault(identity, identity))
+                                                self.setAttr('identities', list_)
 
                                 # not cached into db:
@@ -113 +127 @@
                                 ciself.queried = 0
 
-                        class CacheQuery(object):
-                                def __init__(cqself, proxied):
-                                        cqself.proxied=proxied
-
-                                def __getattr__(cqself, obj):
-                                        if obj!='exts': return getattr(cqself.proxied[0], obj)
-                                        return set(chain(ci.features for ci in cqself.proxied))
-
-                        def __getitem__(ciself, exts):
-                                if not exts:    # (), [], None, False, whatever
-                                        return ciself
-                                if isinstance(exts, basestring):
-                                        exts=(exts,)
-                                if len(exts)==1:
-                                        ext=exts[0]
-                                        if ext in ciself.exts:
-                                                return ciself.exts[ext]
-                                        x=CacheItem(ciself.node, ciself.version, ext)
-                                        ciself.exts[ext]=x
-                                        return x
-                                proxied = [ciself]
-                                proxied.extend(ciself[(e,)] for e in exts)
-                                return ciself.CacheQuery(proxied)
-
                         def update(ciself, identities, features):
                                 # NOTE: self refers to CapsCache object, not to CacheItem
-                                self.identities=identities
-                                self.features=features
-                                self.logger.add_caps_entry(
-                                        ciself.node, ciself.version, ciself.ext,
+                                ciself.identities=identities
+                                ciself.features=features
+                                self.logger.add_caps_entry(ciself.hash_method, ciself.hash,
                                         identities, features)
 
@@ -148 +137 @@
 
                 # prepopulate data which we are sure of; note: we do not log these info
-                gajimnode = 'http://gajim.org/caps'
-
-                gajimcaps=self[(gajimnode, '0.11.1')]
-                gajimcaps.category='client'
-                gajimcaps.type='pc'
-                gajimcaps.features=set((xmpp.NS_BYTESTREAM, xmpp.NS_SI,
-                        xmpp.NS_FILE, xmpp.NS_MUC, xmpp.NS_COMMANDS,
-                        xmpp.NS_DISCO_INFO, xmpp.NS_PING, xmpp.NS_TIME_REVISED))
-                gajimcaps['cstates'].features=set((xmpp.NS_CHATSTATES,))
-                gajimcaps['xhtml'].features=set((xmpp.NS_XHTML_IM,))
-
-                # TODO: older gajim versions
+
+                gajimcaps = self[('sha-1', gajim.caps_hash)]
+                gajimcaps.identities = [gajim.gajim_identity]
+                gajimcaps.features = gajim.gajim_common_features + \
+                        gajim.gajim_optional_features
 
                 # start logging data from the net
@@ -167 +149 @@
                 # get data from logger...
                 if self.logger is not None:
-                        for node, ver, ext, identities, features in self.logger.iter_caps_data():
-                                x=self[(node, ver, ext)]
-                                x.identities=identities
-                                x.features=features
-                                x.queried=2
+                        for hash_method, hash, identities, features in \
+                        self.logger.iter_caps_data():
+                                x = self[(hash_method, hash)]
+                                x.identities = identities
+                                x.features = features
+                                x.queried = 2
 
         def __getitem__(self, caps):
-                node_version = caps[:2]
-                if node_version in self.__cache:
-                        return self.__cache[node_version][caps[2]]
-                node, version = self.__names.setdefault(caps[0], caps[0]), caps[1]
-                x=self.__CacheItem(node, version)
-                self.__cache[(node, version)]=x
+                if caps in self.__cache:
+                        return self.__cache[caps]
+                hash_method, hash = caps[0], caps[1]
+                x = self.__CacheItem(hash_method, hash)
+                self.__cache[(hash_method, hash)] = x
                 return x
 
-        def preload(self, account, jid, node, ver, exts):
+        def preload(self, con, jid, node, hash_method, hash):
                 ''' Preload data about (node, ver, exts) caps using disco
                 query to jid using proper connection. Don't query if
                 the data is already in cache. '''
-                q=self[(node, ver, ())]
-                qq=q
+                q = self[(hash_method, hash)]
 
                 if q.queried==0:
-                        # do query for bare node+version pair
+                        # do query for bare node+hash pair
                         # this will create proper object
                         q.queried=1
-                        account.discoverInfo(jid, '%s#%s' % (node, ver))
-
-                for ext in exts:
-                        qq=q[ext]
-                        if qq.queried==0:
-                                # do query for node+version+ext triple
-                                qq.queried=1
-                                account.discoverInfo(jid, '%s#%s' % (node, ext))
+                        con.discoverInfo(jid, '%s#%s' % (node, hash))
 
 gajim.capscache = CapsCache(gajim.logger)
@@ -211 +185 @@
 
                 # get the caps element
-                caps=presence.getTag('c')
-                if not caps: return
-
-                node, ver=caps['node'], caps['ver']
-                if node is None or ver is None:
+                caps = presence.getTag('c')
+                if not caps:
+                        return
+
+                hash_method, node, hash = caps['hash'], caps['node'], caps['ver']
+                if hash_method is None or node is None or hash is None:
                         # improper caps in stanza, ignoring
                         return
-
-                try:
-                        exts=caps['ext'].split(' ')
-                except AttributeError:
-                        # no exts means no exts, a perfectly valid case
-                        exts=[]
 
                 # we will put these into proper Contact object and ask
@@ -232 +201 @@
 
                 # start disco query...
-                gajim.capscache.preload(self, jid, node, ver, exts)
+                gajim.capscache.preload(self, jid, node, hash_method, hash)
 
                 contact=gajim.contacts.get_contact_from_full_jid(self.name, jid)
@@ -241 +210 @@
 
                 # overwriting old data
-                contact.caps_node=node
-                contact.caps_ver=ver
-                contact.caps_exts=exts
+                contact.caps_node = node
+                contact.caps_hash_method = hash_method
+                contact.caps_hash = hash
 
         def _capsDiscoCB(self, jid, node, identities, features, data):
-                contact=gajim.contacts.get_contact_from_full_jid(self.name, jid)
-                if not contact: return
-                if not contact.caps_node: return # we didn't asked for that?
-                if not node.startswith(contact.caps_node+'#'): return
-                node, ext = node.split('#', 1)
-                if ext==contact.caps_ver:       # this can be also version (like '0.9')
-                        exts=None
-                else:
-                        exts=(ext,)
+                contact = gajim.contacts.get_contact_from_full_jid(self.name, jid)
+                if not contact:
+                        return
+                if not contact.caps_node:
+                        return # we didn't asked for that?
+                if not node.startswith(contact.caps_node + '#'):
+                        return
+                node, hash = node.split('#', 1)
+                computed_hash = helpers.compute_caps_hash(identities, features,
+                        contact.caps_hash_method)
+                if computed_hash != hash:
+                        # wrong hash, forget it
+                        contact.caps_node = ''
+                        contact.caps_hash_method = ''
+                        contact.caps_hash = ''
+                        return
 
                 # if we don't have this info already...
-                caps=gajim.capscache[(node, contact.caps_ver, exts)]
-                if caps.queried==2: return
-
-                identities=set((i['category'], i['type'], i.get('name')) for i in identities)
+                caps = gajim.capscache[(contact.caps_hash_method, hash)]
+                if caps.queried == 2:
+                        return
+
                 caps.update(identities, features)
-

trunk/src/common/check_paths.py

@@ -83 +83 @@
 
                 CREATE TABLE caps_cache (
-                        node TEXT,
-                        ver TEXT,
-                        ext TEXT,
+                        hash_method TEXT,
+                        hash TEXT,
                         data BLOB);
 

trunk/src/common/connection_handlers.py

@@ -668 +668 @@
                 iq.setAttr('id', id)
                 query = iq.setTag('query')
-                query.setAttr('node','http://gajim.org/caps#' + gajim.version.split('-',
+                query.setAttr('node','http://gajim.org#' + gajim.version.split('-',
                         1)[0])
                 for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI,
@@ -745 +745 @@
                         if node:
                                 q.setAttr('node', node)
-                        q.addChild('identity', attrs = {'type': 'pc', 'category': 'client',
-                                'name': 'Gajim'})
+                        q.addChild('identity', attrs = gajim.gajim_identity)
                         extension = None
                         if node and node.find('#') != -1:
                                 extension = node[node.index('#') + 1:]
-                        client_version = 'http://gajim.org/caps#' + gajim.version.split('-',
-                                1)[0]
+                        client_version = 'http://gajim.org#' + gajim.caps_hash
 
                         if node in (None, client_version):
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_BYTESTREAM})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_SI})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_FILE})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_MUC})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_MUC_USER})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_MUC_ADMIN})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_MUC_OWNER})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_MUC_CONFIG})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_COMMANDS})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_DISCO_INFO})
-                                q.addChild('feature', attrs = {'var': 'ipv6'})
-                                q.addChild('feature', attrs = {'var': 'jabber:iq:gateway'})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_LAST})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_PRIVACY})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_PRIVATE})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_REGISTER})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_VERSION})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_DATA})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_ENCRYPTED})
-                                q.addChild('feature', attrs = {'var': 'msglog'})
-                                q.addChild('feature', attrs = {'var': 'sslc2s'})
-                                q.addChild('feature', attrs = {'var': 'stringprep'})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_PING})
-                                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':
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_CHATSTATES})
-
-                        if (node is None or extension == 'xhtml') and not gajim.config.get('ignore_incoming_xhtml'):
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_XHTML_IM})
-
-                        if node is None:
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_PING})
-                                q.addChild('feature', attrs = {'var': common.xmpp.NS_TIME_REVISED})
+                                for f in gajim.gajim_common_features:
+                                        q.addChild('feature', attrs = {'var': f})
+                                for f in gajim.gajim_optional_features:
+                                        q.addChild('feature', attrs = {'var': f})
 
                         if q.getChildren():
@@ -893 +855 @@
                 ''' advertise our capabilities in presence stanza (xep-0115)'''
                 c = p.setTag('c', namespace = common.xmpp.NS_CAPS)
-                c.setAttr('node', 'http://gajim.org/caps')
-                ext = []
-                if not gajim.config.get('ignore_incoming_xhtml'):
-                        ext.append('xhtml')
-                if gajim.config.get('outgoing_chat_state_notifactions') != 'disabled':
-                        ext.append('cstates')
-
-                if len(ext):
-                        c.setAttr('ext', ' '.join(ext))
-                c.setAttr('ver', gajim.version.split('-', 1)[0])
+                c.setAttr('hash', 'sha-1')
+                c.setAttr('node', 'http://gajim.org')
+                c.setAttr('ver', gajim.caps_hash)
                 return p
         

trunk/src/common/contacts.py

@@ -45 +45 @@
                 # every time it gets these from presence stanzas
                 self.caps_node = None
-                self.caps_ver = None
-                self.caps_exts = None
+                self.caps_hash_method = None
+                self.caps_hash = None
 
                 # please read xep-85 http://www.xmpp.org/extensions/xep-0085.html

trunk/src/common/defs.py

@@ -3 +3 @@
 datadir = '../'
 
-version = '0.11.4.3-svn'
+version = '0.11.4.4-svn'
 
 import sys, os.path

trunk/src/common/gajim.py

@@ -28 +28 @@
 from contacts import Contacts
 from events import Events
+import xmpp
 
 try:
@@ -164 +165 @@
         if system('gpg -h >/dev/null 2>&1'):
                 HAVE_GPG = False
+
+gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'}
+gajim_common_features = [xmpp.NS_BYTESTREAM, xmpp.NS_SI,
+        xmpp.NS_FILE, xmpp.NS_MUC, xmpp.NS_MUC_USER,
+        xmpp.NS_MUC_ADMIN, xmpp.NS_MUC_OWNER,
+        xmpp.NS_MUC_CONFIG, xmpp.NS_COMMANDS,
+        xmpp.NS_DISCO_INFO, 'ipv6', 'jabber:iq:gateway', xmpp.NS_LAST,
+        xmpp.NS_PRIVACY, xmpp.NS_PRIVATE, xmpp.NS_REGISTER,
+        xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED,
+        'msglog', 'sslc2s', 'stringprep', xmpp.NS_PING,
+        xmpp.NS_TIME_REVISED]
+# Optional features gajim supports
+gajim_optional_features = []
+
+caps_hash = ''
 
 def get_nick_from_jid(jid):

trunk/src/common/helpers.py

@@ -31 +31 @@
 import select
 import sha
+import hashlib
+import base64
 import sys
 from encodings.punycode import punycode_encode
@@ -39 +41 @@
 from i18n import ngettext
 from xmpp_stringprep import nodeprep, resourceprep, nameprep
-
+import xmpp
 
 if sys.platform == 'darwin':
@@ -1200 +1202 @@
         return keyID
 
+def sort_identities_func(i1, i2):
+        cat1 = i1['category']
+        cat2 = i2['category']
+        if cat1 < cat2:
+                return -1
+        if cat1 > cat2:
+                return 1
+        if i1.has_key('type'):
+                type1 = i1['type']
+        else:
+                type1 = ''
+        if i2.has_key('type'):
+                type2 = i2['type']
+        else:
+                type2 = ''
+        if type1 < type2:
+                return -1
+        if type1 > type2:
+                return 1
+        if i1.has_key('xml:lang'):
+                lang1 = i1['xml:lang']
+        else:
+                lang1 = ''
+        if i2.has_key('xml:lang'):
+                lang2 = i2['xml:lang']
+        else:
+                lang2 = ''
+        if lang1 < lang2:
+                return -1
+        if lang1 > lang2:
+                return 1
+        return 0
+
+def compute_caps_hash(identities, features, hash_method='sha-1'):
+        S = ''
+        identities.sort(cmp=sort_identities_func)
+        for i in identities:
+                c = i['category']
+                if i.has_key('type'):
+                        type_ = i['type']
+                else:
+                        type_ = ''
+                if i.has_key('xml:lang'):
+                        lang = i['xml:lang']
+                else:
+                        lang = ''
+                if i.has_key('name'):
+                        name = i['name']
+                else:
+                        name = ''
+                S += '%s/%s/%s/%s<' % (c, type_, lang, name)
+        features.sort()
+        for f in features:
+                S += '%s<' % f
+        if hash_method == 'sha-1':
+                hash = hashlib.sha1(S)
+        elif hash_method == 'md5':
+                hash = hashlib.md5(S)
+        else:
+                return ''
+        return base64.b64encode(hash.digest())
+
+def update_optional_features():
+        gajim.gajim_optional_features = []
+        if gajim.config.get('publish_mood'):
+                gajim.gajim_optional_features.append(xmpp.NS_MOOD)
+        if gajim.config.get('subscribe_mood'):
+                gajim.gajim_optional_features.append(xmpp.NS_MOOD + '+notify')
+        if gajim.config.get('publish_activity'):
+                gajim.gajim_optional_features.append(xmpp.NS_ACTIVITY)
+        if gajim.config.get('subscribe_activity'):
+                gajim.gajim_optional_features.append(xmpp.NS_ACTIVITY + '+notify')
+        if gajim.config.get('publish_tune'):
+                gajim.gajim_optional_features.append(xmpp.NS_TUNE)
+        if gajim.config.get('subscribe_tune'):
+                gajim.gajim_optional_features.append(xmpp.NS_TUNE + '+notify')
+        if gajim.config.get('outgoing_chat_state_notifactions') != 'disabled':
+                gajim.gajim_optional_features.append(xmpp.NS_CHATSTATES)
+        if not gajim.config.get('ignore_incoming_xhtml'):
+                gajim.gajim_optional_features.append(xmpp.NS_XHTML_IM)
+        if gajim.HAVE_PYCRYPTO:
+                gajim.gajim_optional_features.append(xmpp.NS_ESESSION_INIT)
+        gajim.caps_hash = compute_caps_hash([gajim.gajim_identity],
+                gajim.gajim_common_features + gajim.gajim_optional_features)
+        # re-send presence with new hash
+        for account in gajim.connections:
+                connected = gajim.connections[account].connected
+                if connected > 1 and gajim.SHOW_LIST[connected] != 'invisible':
+                        gajim.connections[account].change_status(gajim.SHOW_LIST[connected],
+                                gajim.connections[account].status)

trunk/src/common/logger.py

@@ -699 +699 @@
                 #tmp, self.con.text_factory = self.con.text_factory, str
                 try:
-                        self.cur.execute('''SELECT node, ver, ext, data FROM caps_cache;''');
+                        self.cur.execute('SELECT hash_method, hash, data FROM caps_cache;');
                 except sqlite.OperationalError:
                         # might happen when there's no caps_cache table yet
@@ -706 +706 @@
                         return
                 #self.con.text_factory = tmp
-
-                for node, ver, ext, data in self.cur:
+                for hash_method, hash, data in self.cur:
                         # for each row: unpack the data field
                         # (format: (category, type, name, category, type, name, ...
                         #   ..., 'FEAT', feature1, feature2, ...).join(' '))
                         # NOTE: if there's a need to do more gzip, put that to a