Commits June 2007

commits@gajim.org

7 participants
163 discussions

[commit-gajim] r8348 - trunk/src/common
by liori＠gajim.org 30 Jun '07

30 Jun '07

Author: liori Date: 2007-06-30 19:31:27 +0200 (Sat, 30 Jun 2007) New Revision: 8348 Modified: trunk/src/common/caps.py trunk/src/common/connection_handlers.py trunk/src/common/contacts.py Log: Caps: caps are queried, results are stored in cache. Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2007-06-30 08:40:14 UTC (rev 8347) +++ trunk/src/common/caps.py 2007-06-30 17:31:27 UTC (rev 8348) @@ -53,10 +53,8 @@ True >>> chatstates in cc[caps] False - >>> cc[caps].category - 'client' - >>> cc[caps].type - 'pc' + >>> cc[caps].identities + set({'category':'client', 'type':'pc'}) >>> x=cc[caps] # more efficient if making several queries for one set of caps ATypicalBlackBoxObject >>> muc in x @@ -71,14 +69,12 @@ # setting data >>> newcaps=('http://exodus.jabberstudio.org/caps', '0.9a', None) - >>> cc[newcaps].category='client' - >>> cc[newcaps].type='pc' + >>> cc[newcaps].identities.add({'category':'client', 'type':'pc', 'name':'Gajim'}) >>> cc[newcaps].features+=muc # same as: >>> cc[newcaps]+=muc >>> cc[newcaps]['csn']+=chatstates # adding data as if ext was 'csn' # warning: no feature removal! ''' -# __metaclass__ = VerboseClassType def __init__(self, logger=None): ''' Create a cache for entity capabilities. ''' # our containers: @@ -93,18 +89,9 @@ # client (node/version pair) self.__names = {} self.__cache = {} - class CacheQuery(object): -# __metaclass__ = VerboseClassType - 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)) - class CacheItem(object): ''' TODO: logging data into db ''' -# __metaclass__ = VerboseClassType def __init__(ciself, node, version, ext=None): # cached into db ciself.node = node @@ -113,10 +100,9 @@ ciself.exts = {} # set of tuples: (category, type, name) + # (dictionaries are not hashable, so cannot be in sets) ciself.identities = set() - ciself.cache = self - # not cached into db: # have we sent the query? # 0 == not queried @@ -128,8 +114,16 @@ newfeature=self.__names.setdefault(newfeature, newfeature) ciself.features.add(newfeature) + 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 len(exts)==0: + if not exts: # (), [], None, False, whatever return ciself if len(exts)==1: ext=exts[0] @@ -140,8 +134,7 @@ return x proxied = [ciself] proxied.extend(ciself[(e,)] for e in exts) - return CacheQuery(proxied) - + return ciself.CacheQuery(proxied) self.__CacheItem = CacheItem # prepopulate data which we are sure of; note: we do not log these info @@ -180,38 +173,25 @@ self.__cache[(node, version)]=x return x - def preload(self, con, jid, node, ver, exts): + def preload(self, account, jid, node, ver, exts): ''' 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 - def callback(identities, features): - try: - qq.identities=set( - (i['category'], i['type'], i.get('name')) - for i in identities) - qq.features=set(self.__names[f] for f in features) - qq.queried=2 - print 'Got features!' - print '%s/%s:' % (qq.node, qq.version) - print '%s\n%s' % (qq.identities, qq.features) - except KeyError: # improper answer, ignore - qq.queried=0 if q.queried==0: # do query for bare node+version pair # this will create proper object q.queried=1 - xmpp.features_nb.discoverInfo(con, jid, '%s#%s' % (node, ver), callback) + 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 - xmpp.features_nb.discoverInfo(con, jid, - '%s#%s' % (node, ext), callback) + account.discoverInfo(jid, '%s#%s' % (node, ext)) capscache = CapsCache() @@ -243,7 +223,7 @@ jid=str(presence.getFrom()) # start disco query... - capscache.preload(con, jid, node, ver, exts) + capscache.preload(self, jid, node, ver, exts) contact=gajim.contacts.get_contact_from_full_jid(self.name, jid) if contact in [None, []]: @@ -255,3 +235,27 @@ contact.caps_node=node contact.caps_ver=ver contact.caps_exts=exts + + def _capsDiscoCB(self, jid, node, identities, features, data): + gajim.log.debug('capsDiscoCB(jid=%r, node=%r, identities=%r, features=%r, data=%r)' %\ + (jid, node, identities, features, data)) + contact=gajim.contacts.get_contact_from_full_jid(self.name, jid) + gajim.log.debug(' contact=%r' % contact) + 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('#') + if ext==contact.caps_ver: # this can be also version (like '0.9') + exts=None + else: + exts=(ext,) + + # if we don't have this info already... + caps=capscache[(node, contact.caps_ver, exts)] + if caps.queried==2: return + + caps.identities=set((i['category'], i['type'], i.get('name')) for i in identities) + caps.features=set(features) + + gajim.log.debug('capsDiscoCB: added caps for %r:\n identities=%r\n features=%r'\ + % ((node, contact.caps_ver, exts), caps.identities, caps.features)) Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-06-30 08:40:14 UTC (rev 8347) +++ trunk/src/common/connection_handlers.py 2007-06-30 17:31:27 UTC (rev 8348) @@ -776,11 +776,13 @@ attr = {} for key in i.getAttrs().keys(): attr[key] = i.getAttr(key) - if attr.has_key('category') and attr['category'] in ('gateway', 'headline')\ - and attr.has_key('type'): + if attr.has_key('category') and \ + 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': + if attr.has_key('category') and \ + attr['category'] == 'conference' and \ + attr.has_key('type') and attr['type'] == 'text': is_muc = True identities.append(attr) elif i.getName() == 'feature': @@ -812,8 +814,10 @@ self.available_transports[transport_type].append(jid) else: self.available_transports[transport_type] = [jid] + self.dispatch('AGENT_INFO_INFO', (jid, node, identities, features, data)) + self._capsDiscoCB(jid, node, identities, features, data) class ConnectionVcard: def __init__(self): Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2007-06-30 08:40:14 UTC (rev 8347) +++ trunk/src/common/contacts.py 2007-06-30 17:31:27 UTC (rev 8348) @@ -234,10 +234,14 @@ return [] def get_contact_from_full_jid(self, account, fjid): - '''we will split the jid into bare jid and resource part, - then get proper contact.''' + ''' Get Contact object for specific resource of given jid''' barejid, resource = common.gajim.get_room_and_nick_from_fjid(fjid) - return self.get_contact(account, barejid, resource) + if barejid in self._contacts[account]: + contacts = self._contacts[account][barejid] + for c in contacts: + if c.resource==resource: + return c + return None def get_highest_prio_contact_from_contacts(self, contacts): if not contacts:

1 0

[commit-gajim] r8347 - trunk/src/common
by asterix＠gajim.org 30 Jun '07

30 Jun '07

Author: asterix Date: 2007-06-30 10:40:14 +0200 (Sat, 30 Jun 2007) New Revision: 8347 Modified: trunk/src/common/connection.py Log: redo substitution when we get resource from config. fixes #3060 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-06-29 22:25:50 UTC (rev 8346) +++ trunk/src/common/connection.py 2007-06-30 08:40:14 UTC (rev 8347) @@ -747,6 +747,12 @@ self.on_purpose = False self.server_resource = gajim.config.get_per('accounts', self.name, 'resource') + # All valid resource substitution strings should be added to this hash. + if self.server_resource: + self.server_resource = Template(self.server_resource).\ + safe_substitute({ + 'hostname': socket.gethostname() + }) self.connect_and_init(show, msg, signed) elif show == 'offline':

1 0

[commit-gajim] r8346 - trunk/src
by asterix＠gajim.org 29 Jun '07

29 Jun '07

Author: asterix Date: 2007-06-30 00:25:50 +0200 (Sat, 30 Jun 2007) New Revision: 8346 Modified: trunk/src/roster_window.py Log: don't try to do Awn code if it's not available Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-06-29 21:21:08 UTC (rev 8345) +++ trunk/src/roster_window.py 2007-06-29 22:25:50 UTC (rev 8346) @@ -3538,6 +3538,13 @@ if not dbus_support.supported: # do nothing if user doesn't have D-Bus bindings return + bus = dbus.SessionBus() + try: + if not 'com.google.code.Awn' in bus.list_names(): + # Awn is not installed + return + except: + pass iconset = gajim.config.get('iconset') prefix = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '32x32') if status in ('chat', 'away', 'xa', 'dnd', 'invisible', 'offline'): @@ -3547,7 +3554,6 @@ status = 'gajim.png' path = os.path.join(prefix, status) try: - bus = dbus.SessionBus() obj = bus.get_object('com.google.code.Awn', '/com/google/code/Awn') awn = dbus.Interface(obj, 'com.google.code.Awn') awn.SetTaskIconByName('Gajim', os.path.abspath(path))

1 0

[commit-gajim] r8345 - in trunk/src/common: . zeroconf
by nicfit＠gajim.org 29 Jun '07

29 Jun '07

Author: nicfit Date: 2007-06-29 23:21:08 +0200 (Fri, 29 Jun 2007) New Revision: 8345 Modified: trunk/src/common/connection_handlers.py trunk/src/common/helpers.py trunk/src/common/zeroconf/connection_handlers_zeroconf.py Log: Handle malformed timestamps (which would cause an unhandled exception and hork the connection) and XEP-82 (dashes in timestamps). Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-06-29 21:19:47 UTC (rev 8344) +++ trunk/src/common/connection_handlers.py 2007-06-29 21:21:08 UTC (rev 8345) @@ -24,7 +24,7 @@ import sys from time import (altzone, daylight, gmtime, localtime, mktime, strftime, - strptime, time as time_time, timezone, tzname) + time as time_time, timezone, tzname) from calendar import timegm import socks5 @@ -1424,7 +1424,7 @@ mtype = msg.getType() subject = msg.getSubject() # if not there, it's None tim = msg.getTimestamp() - tim = strptime(tim, '%Y%m%dT%H:%M:%S') + tim = helpers.datetime_tuple(tim) tim = localtime(timegm(tim)) frm = helpers.get_full_jid_from_iq(msg) jid = helpers.get_jid_from_iq(msg) @@ -1614,7 +1614,7 @@ elif namespace == common.xmpp.NS_DELAY: # XEP-0091 tim = prs.getTimestamp() - tim = strptime(tim, '%Y%m%dT%H:%M:%S') + tim = helpers.datetime_tuple(tim) timestamp = localtime(timegm(tim)) elif namespace == 'http://delx.cjb.net/protocol/roster-subsync': # see http://trac.gajim.org/ticket/326 Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2007-06-29 21:19:47 UTC (rev 8344) +++ trunk/src/common/helpers.py 2007-06-29 21:21:08 UTC (rev 8345) @@ -970,3 +970,15 @@ if os.path.exists(file_): return file_ return None + +def datetime_tuple(timestamp): + '''Converts timestamp using strptime and the format: %Y%m%dT%H:%M:%S + Because of various datetime formats are used the following exceptions + are handled: + - Optional milliseconds appened to the string are removed + - XEP-082 datetime strings have all '-' cahrs removed to meet + the above format.''' + timestamp = timestamp.split('.')[0] + timestamp = timestamp.replace('-', '') + from time import strptime + return strptime(timestamp, '%Y%m%dT%H:%M:%S') Modified: trunk/src/common/zeroconf/connection_handlers_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2007-06-29 21:19:47 UTC (rev 8344) +++ trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2007-06-29 21:21:08 UTC (rev 8345) @@ -640,7 +640,7 @@ mtype = msg.getType() subject = msg.getSubject() # if not there, it's None tim = msg.getTimestamp() - tim = time.strptime(tim, '%Y%m%dT%H:%M:%S') + tim = helpers.datetime_tuple(tim) tim = time.localtime(timegm(tim)) frm = msg.getFrom() if frm == None:

1 0

[commit-gajim] r8344 - trunk/src/common
by nicfit＠gajim.org 29 Jun '07

29 Jun '07

Author: nicfit Date: 2007-06-29 23:19:47 +0200 (Fri, 29 Jun 2007) New Revision: 8344 Modified: trunk/src/common/caps.py Log: Fixed a traceback. Not sure how correct the contact=contact[0] is, but it handles the multiple return types from get_contact_from_full_jid Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2007-06-29 16:25:05 UTC (rev 8343) +++ trunk/src/common/caps.py 2007-06-29 21:19:47 UTC (rev 8344) @@ -246,8 +246,10 @@ capscache.preload(con, jid, node, ver, exts) contact=gajim.contacts.get_contact_from_full_jid(self.name, jid) - if contact is None: + if contact in [None, []]: return # TODO: a way to put contact not-in-roster into Contacts + elif isinstance(contact, list): + contact = contact[0] # overwriting old data contact.caps_node=node

1 0

[commit-gajim] r8343 - trunk/src/common
by asterix＠gajim.org 29 Jun '07

29 Jun '07

Author: asterix Date: 2007-06-29 18:25:05 +0200 (Fri, 29 Jun 2007) New Revision: 8343 Modified: trunk/src/common/contacts.py Log: use helper function. fixes #3263 Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2007-06-29 09:39:13 UTC (rev 8342) +++ trunk/src/common/contacts.py 2007-06-29 16:25:05 UTC (rev 8343) @@ -233,14 +233,11 @@ return contacts_instances return [] - def get_contact_from_full_jid(self, account, jid): + def get_contact_from_full_jid(self, account, fjid): '''we will split the jid into bare jid and resource part, then get proper contact.''' - try: - barejid, resource=jid.split('/',1) - return self.get_contact(account, barejid, resource) - except ValueError: # no resource causes split to fail - return None # how to handle that case? + barejid, resource = common.gajim.get_room_and_nick_from_fjid(fjid) + return self.get_contact(account, barejid, resource) def get_highest_prio_contact_from_contacts(self, contacts): if not contacts:

1 0

[commit-gajim] r8342 - trunk/src
by asterix＠gajim.org 29 Jun '07

29 Jun '07

Author: asterix Date: 2007-06-29 11:39:13 +0200 (Fri, 29 Jun 2007) New Revision: 8342 Modified: trunk/src/dialogs.py Log: automaticaly fill password entry in groupchat invitation dialog if we get it. fixes #3271 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-06-29 08:19:13 UTC (rev 8341) +++ trunk/src/dialogs.py 2007-06-29 09:39:13 UTC (rev 8342) @@ -1209,7 +1209,8 @@ class JoinGroupchatWindow: - def __init__(self, account, room_jid = '', nick = '', automatic = False): + def __init__(self, account, room_jid = '', nick = '', password = '', + automatic = False): '''automatic is a dict like {'invities': []} If automatic is not empty, this means room must be automaticaly configured and when done, invities must be automatically invited''' @@ -1233,9 +1234,12 @@ self.window = self.xml.get_widget('join_groupchat_window') self._room_jid_entry = self.xml.get_widget('room_jid_entry') self._nickname_entry = self.xml.get_widget('nickname_entry') + self._password_entry = self.xml.get_widget('password_entry') self._room_jid_entry.set_text(room_jid) self._nickname_entry.set_text(nick) + if password: + self._password_entry.set_text(password) self.xml.signal_autoconnect(self) gajim.interface.instances[account]['join_gc'] = self #now add us to open windows if len(gajim.connections) > 1: @@ -1303,8 +1307,7 @@ '''When Join button is clicked''' nickname = self._nickname_entry.get_text().decode('utf-8') room_jid = self._room_jid_entry.get_text().decode('utf-8') - password = self.xml.get_widget('password_entry').get_text().decode( - 'utf-8') + password = self._password_entry.get_text().decode('utf-8') user, server, resource = helpers.decompose_jid(room_jid) if not user or not server or resource: ErrorDialog(_('Invalid group chat Jabber ID'), @@ -2565,6 +2568,7 @@ self.room_jid = room_jid self.account = account + self.password = password xml = gtkgui_helpers.get_glade('invitation_received_dialog.glade') self.dialog = xml.get_widget('invitation_received_dialog') @@ -2598,7 +2602,8 @@ def on_accept_button_clicked(self, widget): self.dialog.destroy() try: - JoinGroupchatWindow(self.account, self.room_jid) + JoinGroupchatWindow(self.account, self.room_jid, + password=self.password) except GajimGeneralException: pass

1 0

[commit-gajim] r8341 - trunk/src
by asterix＠gajim.org 29 Jun '07

29 Jun '07

Author: asterix Date: 2007-06-29 10:19:13 +0200 (Fri, 29 Jun 2007) New Revision: 8341 Modified: trunk/src/dialogs.py trunk/src/gajim.py Log: make the ask password for groupchat window async and entry visibility to False. fixes #3265 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-06-29 04:12:08 UTC (rev 8340) +++ trunk/src/dialogs.py 2007-06-29 08:19:13 UTC (rev 8341) @@ -1073,6 +1073,7 @@ def on_okbutton_clicked(self, widget): user_input = self.input_entry.get_text().decode('utf-8') + self.cancel_handler = None self.dialog.destroy() if isinstance(self.ok_handler, tuple): self.ok_handler[0](user_input, *self.ok_handler[1:]) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-06-29 04:12:08 UTC (rev 8340) +++ trunk/src/gajim.py 2007-06-29 08:19:13 UTC (rev 8341) @@ -1219,15 +1219,12 @@ #('GC_PASSWORD_REQUIRED', account, (room_jid, nick)) room_jid = array[0] nick = array[1] - dlg = dialogs.InputDialog(_('Password Required'), - _('A Password is required to join the room %s. Please type it') % \ - room_jid, is_modal = True) - response = dlg.get_response() - if response == gtk.RESPONSE_OK: - password = dlg.input_entry.get_text() - gajim.connections[account].join_gc(nick, room_jid, password) - gajim.gc_passwords[room_jid] = password - else: + + def on_ok(text): + gajim.connections[account].join_gc(nick, room_jid, text) + gajim.gc_passwords[room_jid] = text + + def on_cancel(): # get and destroy window if room_jid in gajim.interface.minimized_controls[account]: self.roster.on_disconnect(None, room_jid, account) @@ -1236,6 +1233,11 @@ ctrl = win.get_control(room_jid, account) win.remove_tab(ctrl, 3) + dlg = dialogs.InputDialog(_('Password Required'), + _('A Password is required to join the room %s. Please type it') % \ + room_jid, is_modal=False, ok_handler=on_ok, cancel_handler=on_cancel) + dlg.input_entry.set_visibility(False) + def handle_event_gc_invitation(self, account, array): #('GC_INVITATION', (room_jid, jid_from, reason, password)) jid = gajim.get_jid_without_resource(array[1])

1 0

[commit-gajim] r8340 - in branches/e2e_encryption/src: . common
by bct＠gajim.org 29 Jun '07

29 Jun '07

Author: bct Date: 2007-06-29 06:12:08 +0200 (Fri, 29 Jun 2007) New Revision: 8340 Modified: branches/e2e_encryption/src/chat_control.py branches/e2e_encryption/src/common/connection.py branches/e2e_encryption/src/common/connection_handlers.py branches/e2e_encryption/src/common/stanza_session.py branches/e2e_encryption/src/gajim.py branches/e2e_encryption/src/message_control.py Log: disable logs in encrypted sessions. Modified: branches/e2e_encryption/src/chat_control.py =================================================================== --- branches/e2e_encryption/src/chat_control.py 2007-06-28 21:22:27 UTC (rev 8339) +++ branches/e2e_encryption/src/chat_control.py 2007-06-29 04:12:08 UTC (rev 8340) @@ -1948,10 +1948,13 @@ def _on_toggle_e2e_menuitem_activate(self, widget): if self.session.enable_encryption: - self.session.enable_encryption = False self.session.terminate_e2e() + + jid = str(self.session.jid) + + gajim.connections[self.account].delete_session(jid, self.session.thread_id) + self.session = gajim.connections[self.account].make_new_session(jid) else: - self.session.enable_encryption = True self.session.negotiate_e2e() def got_connected(self): Modified: branches/e2e_encryption/src/common/connection.py =================================================================== --- branches/e2e_encryption/src/common/connection.py 2007-06-28 21:22:27 UTC (rev 8339) +++ branches/e2e_encryption/src/common/connection.py 2007-06-29 04:12:08 UTC (rev 8340) @@ -921,10 +921,7 @@ self.connection.send(msg_iq) - no_log_for = gajim.config.get_per('accounts', self.name, 'no_log_for')\ - .split() - ji = gajim.get_jid_without_resource(jid) - if self.name not in no_log_for and ji not in no_log_for: + if session.is_loggable(): log_msg = msg if subject: log_msg = _('Subject: %s\n%s') % (subject, msg) Modified: branches/e2e_encryption/src/common/connection_handlers.py =================================================================== --- branches/e2e_encryption/src/common/connection_handlers.py 2007-06-28 21:22:27 UTC (rev 8339) +++ branches/e2e_encryption/src/common/connection_handlers.py 2007-06-29 04:12:08 UTC (rev 8340) @@ -1461,11 +1461,6 @@ tim = time.strptime(tim, '%Y%m%dT%H:%M:%S') tim = time.localtime(timegm(tim)) jid = helpers.get_jid_from_iq(msg) - no_log_for = gajim.config.get_per('accounts', self.name, - 'no_log_for') - if not no_log_for: - no_log_for = '' - no_log_for = no_log_for.split() encrypted = False chatstate = None encTag = msg.getTag('x', namespace = common.xmpp.NS_ENCRYPTED) @@ -1525,7 +1520,7 @@ if not error_msg: error_msg = msgtxt msgtxt = None - if self.name not in no_log_for: + if session.is_loggable(): gajim.logger.write('error', frm, error_msg, tim = tim, subject = subject) self.dispatch('MSGERROR', (frm, msg.getErrorCode(), error_msg, msgtxt, @@ -1544,15 +1539,14 @@ 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(time.mktime(tim)))\ + if session.is_loggable() and not int(float(time.mktime(tim)))\ <= self.last_history_line[jid] and msgtxt: gajim.logger.write('gc_msg', frm, msgtxt, tim = tim) return elif mtype == 'chat': # it's type 'chat' 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: msg_id = gajim.logger.write('chat_msg_recv', frm, msgtxt, tim = tim, subject = subject) else: # it's single message @@ -1564,7 +1558,7 @@ password = invite.getTagData('password') self.dispatch('GC_INVITATION',(frm, jid_from, reason, password)) return - if self.name not in no_log_for and jid not in no_log_for and msgtxt: + if session.is_loggable()and msgtxt: gajim.logger.write('single_msg_recv', frm, msgtxt, tim = tim, subject = subject) mtype = 'normal' @@ -1576,7 +1570,7 @@ # END messageCB def get_session(self, jid, thread_id, type): - '''returns an existing session between this connection and 'jid' or starts a new one.''' + '''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: @@ -1588,6 +1582,7 @@ if bare_jid != jid: session = self.find_session(bare_jid, thread_id, type) if session: + print repr(bare_jid), repr(thread_id), repr(jid.split("/")[1]) self.move_session(bare_jid, thread_id, jid.split("/")[1]) return session @@ -1609,6 +1604,7 @@ del self.sessions[jid] def move_session(self, original_jid, thread_id, to_resource): + '''moves a session to another resource.''' session = self.sessions[original_jid][thread_id] del self.sessions[original_jid][thread_id] @@ -1622,14 +1618,16 @@ self.sessions[new_jid][thread_id] = session def find_null_session(self, jid): - '''returns the session between this connecting and 'jid' that we last sent a message in. -this is needed to handle clients that don't support threads; see XEP-0201.''' - all = self.sessions[jid].values() - null_sessions = filter(lambda s: not s.received_thread_id, all) - null_sessions.sort(key=lambda s: s.last_send) + '''finds all of the sessions between us and jid that jid hasn't sent a thread_id in yet. - return null_sessions[-1] +returns the session that we last sent a message to.''' + + sessions_with_jid = self.sessions[jid].values() + no_threadid_sessions = filter(lambda s: not s.received_thread_id, sessions_with_jid) + no_threadid_sessions.sort(key=lambda s: s.last_send) + return no_threadid_sessions[-1] + def make_new_session(self, jid, thread_id = None, type = 'chat'): sess = EncryptedStanzaSession(self, jid, thread_id, type) Modified: branches/e2e_encryption/src/common/stanza_session.py =================================================================== --- branches/e2e_encryption/src/common/stanza_session.py 2007-06-28 21:22:27 UTC (rev 8339) +++ branches/e2e_encryption/src/common/stanza_session.py 2007-06-29 04:12:08 UTC (rev 8340) @@ -41,7 +41,7 @@ self.last_send = 0 self.status = None - self.features = {} + self.negotiated = {} def generate_thread_id(self): return "".join([random.choice(string.letters) for x in xrange(0,32)]) @@ -55,6 +55,29 @@ self.last_send = time.time() + def reject_negotiation(self, body = None): + msg = xmpp.Message() + feature = msg.NT.feature + feature.setNamespace(xmpp.NS_FEATURE) + + x = xmpp.DataForm(typ='submit') + x.addChild(node=xmpp.DataField(name='FORM_TYPE', value='urn:xmpp:ssn')) + x.addChild(node=xmpp.DataField(name='accept', value='0')) + + feature.addChild(node=x) + + if body: + msg.setBody(body) + + self.send(msg) + + self.cancelled_negotiation() + + def cancelled_negotiation(self): + '''A negotiation has been cancelled, so reset this session to its default state.''' + self.status = None + self.negotiated = {} + def terminate(self): msg = xmpp.Message() feature = msg.NT.feature @@ -101,6 +124,8 @@ def __init__(self, conn, jid, thread_id, type = 'chat'): StanzaSession.__init__(self, conn, jid, thread_id, type = 'chat') + self.loggable = True + self.xes = {} self.es = {} @@ -195,12 +220,24 @@ def hmac(self, key, content): return HMAC.new(key, content, self.hash_alg).digest() - # this should be more generic? def sha256(self, string): sh = SHA256.new() sh.update(string) return sh.digest() + base28_chr = "acdefghikmopqruvwxy123456789" + + def sas_28x5(self, m_a, form_b): + sha = self.sha256(m_a + form_b + 'Short Authentication String') + lsb24 = self.decode_mpi(sha[-3:]) + return self.base28(lsb24) + + def base28(self, n): + if n >= 28: + return self.base28(n / 28) + self.base28_chr[n % 28] + else: + return self.base28_chr[n] + def generate_initiator_keys(self, k): return (self.hmac(k, 'Initiator Cipher Key'), self.hmac(k, 'Initiator MAC Key'), @@ -265,7 +302,15 @@ def decrypt(self, ciphertext): return self.decrypter.decrypt(ciphertext) + def logging_preference(self): + if gajim.config.get('log_encrypted_sessions'): + return ["may", "mustnot"] + else: + return ["mustnot", "may"] + def negotiate_e2e(self): + self.negotiated = {} + request = xmpp.Message() feature = request.NT.feature feature.setNamespace(xmpp.NS_FEATURE) @@ -276,8 +321,7 @@ x.addChild(node=xmpp.DataField(name='accept', value='1', typ='boolean', required=True)) # this field is incorrectly called 'otr' in XEPs 0116 and 0217 - # unsupported options: 'mustnot' - x.addChild(node=xmpp.DataField(name='logging', typ='list-single', options=['may'], required=True)) + x.addChild(node=xmpp.DataField(name='logging', typ='list-single', options=self.logging_preference(), required=True)) # unsupported options: 'disabled', 'enabled' x.addChild(node=xmpp.DataField(name='disclosure', typ='list-single', options=['never'], required=True)) @@ -317,13 +361,11 @@ self.send(request) # 4.3 esession response (bob) - def respond_e2e_bob(self, request_form): - response = xmpp.Message() - feature = response.NT.feature - feature.setNamespace(xmpp.NS_FEATURE) + def verify_options_bob(self, form): + negotiated = {} + not_acceptable = [] + ask_user = {} - x = xmpp.DataForm(typ='submit') - fixed = { 'disclosure': 'never', 'security': 'e2e', 'crypt_algs': 'aes128-ctr', @@ -333,21 +375,16 @@ 'init_pubkey': 'none', 'resp_pubkey': 'none', 'ver': '1.0', - 'sas_algs': 'sas28x5', - 'logging': 'may' } + 'sas_algs': 'sas28x5' } - not_acceptable = [] + self.encryptable_stanzas = ['message'] - self.encryptable_stanzas = ['message'] self.sas_algs = 'sas28x5' self.cipher = AES self.hash_alg = SHA256 self.compression = None - x.addChild(node=xmpp.DataField(name='FORM_TYPE', value='urn:xmpp:ssn')) - x.addChild(node=xmpp.DataField(name='accept', value='true')) - - for name, field in map(lambda name: (name, request_form.getField(name)), request_form.asDict().keys()): + for name, field in map(lambda name: (name, form.getField(name)), form.asDict().keys()): options = map(lambda x: x[1], field.getOptions()) values = field.getValues() @@ -356,29 +393,62 @@ if name in fixed: if fixed[name] in options: - x.addChild(node=xmpp.DataField(name=name, value=fixed[name])) + negotiated[name] = fixed[name] else: not_acceptable.append(name) - elif name == 'modp': - # the offset of the group we chose (need it to match up with the dhhash) - group_order = 0 - self.modp = int(options[group_order]) - x.addChild(node=xmpp.DataField(name='modp', value=self.modp)) - - g = dh.generators[self.modp] - p = dh.primes[self.modp] elif name == 'rekey_freq': preferred = int(options[0]) - x.addChild(node=xmpp.DataField(name='rekey_freq', value=preferred)) - + negotiated['rekey_freq'] = preferred self.rekey_freq = preferred - elif name == 'my_nonce': - self.n_o = base64.b64decode(field.getValue()) + elif name == 'logging': + my_prefs = self.logging_preference() - # XXX do something with not_acceptable + if my_prefs[0] in options: + pref = my_prefs[0] + negotiated['logging'] = pref + else: + for pref in my_prefs: + if pref in options: + ask_user['logging'] = pref + break - self.He = request_form.getField('dhhashes').getValues()[group_order].encode("utf8") + if not 'logging' in ask_user: + not_acceptable.append(name) + else: + # some things are handled elsewhere, some things are not-implemented + pass + return (negotiated, not_acceptable, ask_user) + + # 4.3 esession response (bob) + def respond_e2e_bob(self, form, negotiated, not_acceptable): + response = xmpp.Message() + feature = response.NT.feature + feature.setNamespace(xmpp.NS_FEATURE) + + x = xmpp.DataForm(typ='submit') + + x.addChild(node=xmpp.DataField(name='FORM_TYPE', value='urn:xmpp:ssn')) + x.addChild(node=xmpp.DataField(name='accept', value='true')) + + for name in negotiated: + x.addChild(node=xmpp.DataField(name=name, value=negotiated[name])) + + self.negotiated = negotiated + + # the offset of the group we chose (need it to match up with the dhhash) + group_order = 0 + self.modp = int(form.getField('modp').getOptions()[group_order][1]) + x.addChild(node=xmpp.DataField(name='modp', value=self.modp)) + + g = dh.generators[self.modp] + p = dh.primes[self.modp] + + self.n_o = base64.b64decode(form['my_nonce']) + + dhhashes = form.getField('dhhashes').getValues() + self.He = dhhashes[group_order].encode("utf8") + bytes = int(self.n / 8) self.n_s = self.generate_nonce() @@ -389,30 +459,61 @@ self.y = self.srand(2 ** (2 * self.n - 1), p - 1) self.d = self.powmod(g, self.y, p) - to_add = { 'my_nonce': self.n_s, 'dhkeys': self.encode_mpi(self.d), 'counter': self.encode_mpi(self.c_o), 'nonce': self.n_o } + to_add = { 'my_nonce': self.n_s, + 'dhkeys': self.encode_mpi(self.d), + 'counter': self.encode_mpi(self.c_o), + 'nonce': self.n_o } for name in to_add: b64ed = base64.b64encode(to_add[name]) x.addChild(node=xmpp.DataField(name=name, value=b64ed)) - self.form_a = ''.join(map(lambda el: xmpp.c14n.c14n(el), request_form.getChildren())) + self.form_a = ''.join(map(lambda el: xmpp.c14n.c14n(el), form.getChildren())) self.form_b = ''.join(map(lambda el: xmpp.c14n.c14n(el), x.getChildren())) self.status = 'responded-e2e' feature.addChild(node=x) + + if not_acceptable: + pass +# XXX +# <error code='406' type='modify'> +# <not-acceptable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> +# <feature xmlns='http://jabber.org/protocol/feature-neg'> +# <field var='security'/> +# </feature> +# </error> + self.send(response) # 'Alice Accepts' - def accept_e2e_alice(self, form): + def verify_options_alice(self, form): # 1. Verify that the ESession options selected by Bob are acceptable + negotiated = {} + ask_user = {} + not_acceptable = [] + + if not form['logging'] in self.logging_preference(): + not_acceptable.append(form['logging']) + elif form['logging'] != self.logging_preference()[0]: + ask_user['logging'] = form['logging'] + else: + negotiated['logging'] = self.logging_preference()[0] + + return (negotiated, not_acceptable, ask_user) + + # 'Alice Accepts', continued + def accept_e2e_alice(self, form, negotiated): self.encryptable_stanzas = ['message'] self.sas_algs = 'sas28x5' self.cipher = AES self.hash_alg = SHA256 self.compression = None + self.negotiated = negotiated + # 2. Return a <not-acceptable/> error to Bob unless: 1 < d < p - 1 self.form_b = ''.join(map(lambda el: xmpp.c14n.c14n(el), form.getChildren())) @@ -457,6 +558,11 @@ m_a = self.hmac(self.km_s, self.encode_mpi(old_c_s) + id_a) + # check for a retained secret + # if none exists, prompt the user with the SAS + if self.sas_algs == 'sas28x5': + print "sas: %s" % self.sas_28x5(m_a, self.form_b) + result.addChild(node=xmpp.DataField(name='identity', value=base64.b64encode(id_a))) result.addChild(node=xmpp.DataField(name='mac', value=base64.b64encode(m_a))) @@ -520,6 +626,11 @@ self.srs = '' oss = '' + # check for a retained secret + # if none exists, prompt the user with the SAS + if self.sas_algs == 'sas28x5': + print "sas: %s" % self.sas_28x5(m_a, self.form_b) + k = self.sha256(k + self.srs + oss) # XXX I can skip generating ks_o here @@ -556,6 +667,10 @@ self.srs = self.hmac(k, 'New Retained Secret') # destroy k + + if self.negotiated['logging'] == 'mustnot': + self.loggable = False + self.status = 'active' self.enable_encryption = True @@ -594,6 +709,9 @@ # Note: If Alice discovers an error then she SHOULD ignore any encrypted content she received in the stanza. # XXX check for MAC equality? + + if self.negotiated['logging'] == 'mustnot': + self.loggable = False self.status = 'active' self.enable_encryption = True @@ -647,3 +765,14 @@ StanzaSession.acknowledge_termination(self) self.enable_encryption = False + + def is_loggable(self): + name = self.conn.name + no_log_for = gajim.config.get_per('accounts', name, 'no_log_for') + + if not no_log_for: + no_log_for = '' + + no_log_for = no_log_for.split() + + return self.loggable and name not in no_log_for and self.jid not in no_log_for Modified: branches/e2e_encryption/src/gajim.py =================================================================== --- branches/e2e_encryption/src/gajim.py 2007-06-28 21:22:27 UTC (rev 8339) +++ branches/e2e_encryption/src/gajim.py 2007-06-29 04:12:08 UTC (rev 8340) @@ -1657,13 +1657,64 @@ def handle_session_negotiation(self, account, data): jid, session, form = data - - # encrypted session states + + if form.getField('accept') and not form['accept'] in ('1', 'true'): + dialogs.InformationDialog(_('Session negotiation cancelled.'), + _('The client at %s cancelled the session negotiation.') % (jid)) + session.cancelled_negotiation() + return + + # encrypted session states. these are descriped in stanza_session.py + + # bob responds if form.getType() == 'form' and u'e2e' in map(lambda x: x[1], form.getField('security').getOptions()): - session.respond_e2e_bob(form) + negotiated, not_acceptable, ask_user = session.verify_options_bob(form) + + if ask_user: + def accept_nondefault_options(widget): + negotiated.update(ask_user) + session.respond_e2e_bob(form, negotiated, not_acceptable) + + dialog.destroy() + + def reject_nondefault_options(widget): + for key in ask_user.keys(): + not_acceptable.append(key) # XXX for some reason I can't concatenate using += here? + session.respond_e2e_bob(form, negotiated, not_acceptable) + + dialog.destroy() + + dialog = dialogs.ConfirmationDialog(_('confirm these negotiation options'), + _('are the following options acceptable? %s') % (ask_user), + on_response_ok = accept_nondefault_options, + on_response_cancel = reject_nondefault_options) + else: + session.respond_e2e_bob(form, negotiated, not_acceptable) + return + + # alice accepts elif session.status == 'requested-e2e' and form.getType() == 'submit': - session.accept_e2e_alice(form) + negotiated, not_acceptable, ask_user = session.verify_options_alice(form) + + if ask_user: + def accept_nondefault_options(widget): + negotiated.update(ask_user) + session.accept_e2e_alice(form, negotiated) + + dialog.destroy() + + def reject_nondefault_options(widget): + session.reject_negotiation() + dialog.destroy() + + dialog = dialogs.ConfirmationDialog(_('confirm these negotiation options'), + _('are the following options acceptable? %s') % (ask_user), + on_response_ok = accept_nondefault_options, + on_response_cancel = reject_nondefault_options) + else: + session.accept_e2e_alice(form, negotiated) + return elif session.status == 'responded-e2e' and form.getType() == 'result': session.accept_e2e_bob(form) @@ -1671,7 +1722,19 @@ elif session.status == 'identified-alice' and form.getType() == 'result': session.final_steps_alice(form) return + + if form.getField('terminate'): + if form.getField('terminate').getValue() in ('1', 'true'): + session.acknowledge_termination() + gajim.connections[account].delete_session(str(jid), session.thread_id) + + ctrl = gajim.interface.msg_win_mgr.get_control(str(jid), account) + if ctrl: + ctrl.session = gajim.connections[self.account].make_new_session(str(jid)) + + return + # non-esession negotiation. this isn't very useful, but i'm keeping it around # to test my test suite. if form.getType() == 'form': Modified: branches/e2e_encryption/src/message_control.py =================================================================== --- branches/e2e_encryption/src/message_control.py 2007-06-28 21:22:27 UTC (rev 8339) +++ branches/e2e_encryption/src/message_control.py 2007-06-29 04:12:08 UTC (rev 8340) @@ -115,6 +115,8 @@ return if self.session: print "starting a new session, forgetting about the old one!" + gajim.connections[self.account].delete_session(self.contact.jid, self.session.thread_id) + self.session = session def send_message(self, message, keyID = '', type = 'chat',

1 0

[commit-gajim] r8339 - trunk/src
by asterix＠gajim.org 28 Jun '07

28 Jun '07

Author: asterix Date: 2007-06-28 23:22:27 +0200 (Thu, 28 Jun 2007) New Revision: 8339 Modified: trunk/src/gajim.py Log: fix TB when we remove an account. Fixes #3268 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-06-28 21:09:29 UTC (rev 8338) +++ trunk/src/gajim.py 2007-06-28 21:22:27 UTC (rev 8339) @@ -482,8 +482,11 @@ model[self.roster.status_message_menuitem_iter][3] = True # Inform all controls for this account of the connection state change - for ctrl in self.msg_win_mgr.get_controls() + \ - self.minimized_controls[account].values(): + ctrls = self.msg_win_mgr.get_controls() + if self.minimized_controls.has_key(account): + # Can not be the case when we remove account + ctrls += self.minimized_controls[account].values() + for ctrl in ctrls: if ctrl.account == account: if status == 'offline' or (status == 'invisible' and \ gajim.connections[account].is_zeroconf):

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2007