Commits July 2007

commits@gajim.org

8 participants
98 discussions

[commit-gajim] r8396 - branches/e2e_encryption/src/common
by bct＠gajim.org 13 Jul '07

13 Jul '07

Author: bct Date: 2007-07-14 00:52:23 +0200 (Sat, 14 Jul 2007) New Revision: 8396 Modified: branches/e2e_encryption/src/common/check_paths.py branches/e2e_encryption/src/common/configpaths.py branches/e2e_encryption/src/common/gajim.py Log: a file for pickling retained secrets Modified: branches/e2e_encryption/src/common/check_paths.py =================================================================== --- branches/e2e_encryption/src/common/check_paths.py 2007-07-13 14:44:01 UTC (rev 8395) +++ branches/e2e_encryption/src/common/check_paths.py 2007-07-13 22:52:23 UTC (rev 8396) @@ -20,6 +20,8 @@ from common import gajim import logger +import pickle + # DO NOT MOVE ABOVE OF import gajim try: import sqlite3 as sqlite # python 2.5 @@ -84,6 +86,7 @@ LOG_DB_PATH = logger.LOG_DB_PATH VCARD_PATH = gajim.VCARD_PATH AVATAR_PATH = gajim.AVATAR_PATH + SECRETS_PATH = gajim.SECRETS_PATH dot_gajim = os.path.dirname(VCARD_PATH) if os.path.isfile(dot_gajim): print _('%s is a file but it should be a directory') % dot_gajim @@ -115,6 +118,13 @@ print _('%s is a directory but should be a file') % LOG_DB_PATH print _('Gajim will now exit') sys.exit() + + if not os.path.exists(SECRETS_PATH): + pickle.dump({}, SECRETS_PATH) + elif os.path.isdir(SECRETS_PATH): + print _('%s is a directory but should be a file') % SECRETS_PATH + print _('Gajim will now exit') + sys.exit() else: # dot_gajim doesn't exist if dot_gajim: # is '' on win9x so avoid that @@ -126,6 +136,8 @@ if not os.path.isfile(LOG_DB_PATH): create_log_db() gajim.logger.init_vars() + if not os.path.isfile(SECRETS_PATH): + pickle.dump({}, SECRETS_PATH) def create_path(directory): print _('creating %s directory') % directory Modified: branches/e2e_encryption/src/common/configpaths.py =================================================================== --- branches/e2e_encryption/src/common/configpaths.py 2007-07-13 14:44:01 UTC (rev 8395) +++ branches/e2e_encryption/src/common/configpaths.py 2007-07-13 22:52:23 UTC (rev 8396) @@ -77,8 +77,8 @@ paths = ConfigPaths() # LOG is deprecated - k = ( 'LOG', 'LOG_DB', 'VCARD', 'AVATAR', 'MY_EMOTS' ) - v = (u'logs', u'logs.db', u'vcards', u'avatars', u'emoticons') + k = ( 'LOG', 'LOG_DB', 'VCARD', 'AVATAR', 'MY_EMOTS', 'SECRETS' ) + v = (u'logs', u'logs.db', u'vcards', u'avatars', u'emoticons', u'secrets') if os.name == 'nt': v = map(lambda x: x.capitalize(), v) Modified: branches/e2e_encryption/src/common/gajim.py =================================================================== --- branches/e2e_encryption/src/common/gajim.py 2007-07-13 14:44:01 UTC (rev 8395) +++ branches/e2e_encryption/src/common/gajim.py 2007-07-13 22:52:23 UTC (rev 8396) @@ -71,6 +71,7 @@ VCARD_PATH = gajimpaths['VCARD'] AVATAR_PATH = gajimpaths['AVATAR'] MY_EMOTS_PATH = gajimpaths['MY_EMOTS'] +SECRETS_PATH = gajimpaths['SECRETS'] TMP = gajimpaths['TMP'] DATA_DIR = gajimpaths['DATA'] HOME_DIR = gajimpaths['HOME']

1 0

[commit-gajim] r8395 - in trunk: . src/common
by liori＠gajim.org 13 Jul '07

13 Jul '07

Author: liori Date: 2007-07-13 16:44:01 +0200 (Fri, 13 Jul 2007) New Revision: 8395 Modified: trunk/configure.ac trunk/src/common/defs.py trunk/src/common/logger.py trunk/src/common/optparser.py Log: caps: Real fix for [3295] -- changing separator from ' ' to '\0'. Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-07-13 13:02:42 UTC (rev 8394) +++ trunk/configure.ac 2007-07-13 14:44:01 UTC (rev 8395) @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.11.1.4],[http://trac.gajim.org/],[gajim]) + [0.11.1.5],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AM_INIT_AUTOMAKE([1.8]) AC_CONFIG_HEADER(config.h) Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2007-07-13 13:02:42 UTC (rev 8394) +++ trunk/src/common/defs.py 2007-07-13 14:44:01 UTC (rev 8395) @@ -2,7 +2,7 @@ datadir = '../' -version = '0.11.1.4' +version = '0.11.1.5' import sys, os.path for base in ('.', 'common'): Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2007-07-13 13:02:42 UTC (rev 8394) +++ trunk/src/common/logger.py 2007-07-13 14:44:01 UTC (rev 8395) @@ -664,7 +664,7 @@ # (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 function - data=GzipFile(fileobj=StringIO(str(data))).read().split(' ') # (2) -- note above + data=GzipFile(fileobj=StringIO(str(data))).read().split('\0') # (2) -- note above i=0 identities=set() features=set() @@ -694,7 +694,7 @@ data.extend(identity) data.append('FEAT') data.extend(features) - data = ' '.join(data) + data = '\0'.join(data) string = StringIO() # if there's a need to do more gzip, put that to a function gzip=GzipFile(fileobj=string, mode='w') gzip.write(data) Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2007-07-13 13:02:42 UTC (rev 8394) +++ trunk/src/common/optparser.py 2007-07-13 14:44:01 UTC (rev 8395) @@ -161,6 +161,8 @@ self.update_config_to_01113() if old < [0, 11, 1, 4] and new >= [0, 11, 1, 4]: self.update_config_to_01114() + if old < [0, 11, 1, 5] and new >= [0, 11, 1, 5]: + self.update_config_to_01115() gajim.logger.init_vars() gajim.config.set('version', new_version) @@ -455,3 +457,22 @@ for o in d: gajim.config.set_per('themes', theme_name, o, theme[d.index(o)]) gajim.config.set('version', '0.11.1.4') + + def update_config_to_01115(self): + # copy&pasted from update_config_to_01013, possibly 'FIXME see #2812' applies too + back = os.getcwd() + os.chdir(logger.LOG_DB_FOLDER) + con = sqlite.connect(logger.LOG_DB_FILE) + os.chdir(back) + cur = con.cursor() + try: + cur.executescript( + ''' + DELETE FROM caps_cache; + ''' + ) + con.commit() + except sqlite.OperationalError, e: + pass + con.close() + gajim.config.set('version', '0.11.1.5')

1 0

[commit-gajim] r8394 - trunk/src/common
by roidelapluie＠gajim.org 13 Jul '07

13 Jul '07

Author: roidelapluie Date: 2007-07-13 15:02:42 +0200 (Fri, 13 Jul 2007) New Revision: 8394 Modified: trunk/src/common/logger.py Log: [davux] correct a loop in logger.py. Fix #3295. Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2007-07-13 10:11:49 UTC (rev 8393) +++ trunk/src/common/logger.py 2007-07-13 13:02:42 UTC (rev 8394) @@ -668,7 +668,7 @@ i=0 identities=set() features=set() - while i<len(data) and data[i]!='FEAT': + while i<(len(data)-2) and data[i]!='FEAT': category=data[i] type=data[i+1] name=data[i+2]

1 0

[commit-gajim] r8393 - in trunk: data/iconsets/crystal/16x16 data/iconsets/dcraven/16x16 data/iconsets/dcraven/32x32 data/iconsets/gnome/16x16 data/iconsets/goojim/16x16 data/iconsets/goojim/32x32 data/iconsets/gossip/16x16 data/iconsets/gota/16x16 data/iconsets/gota/32x32 data/iconsets/jabberbulb/16x16 data/iconsets/nuvola/16x16 data/iconsets/simplebulb/16x16 data/iconsets/stellar/16x16 data/iconsets/sun/16x16 src src/common
by roidelapluie＠gajim.org 13 Jul '07

13 Jul '07

Author: roidelapluie Date: 2007-07-13 12:11:49 +0200 (Fri, 13 Jul 2007) New Revision: 8393 Added: trunk/data/iconsets/crystal/16x16/event.gif trunk/data/iconsets/dcraven/16x16/event.png trunk/data/iconsets/dcraven/32x32/event.png trunk/data/iconsets/gnome/16x16/event.gif trunk/data/iconsets/goojim/16x16/event.png trunk/data/iconsets/goojim/32x32/event.png trunk/data/iconsets/gossip/16x16/event.png trunk/data/iconsets/gota/16x16/event.gif trunk/data/iconsets/gota/32x32/event.gif trunk/data/iconsets/jabberbulb/16x16/event.gif trunk/data/iconsets/nuvola/16x16/event.gif trunk/data/iconsets/simplebulb/16x16/event.png trunk/data/iconsets/stellar/16x16/event.gif trunk/data/iconsets/sun/16x16/event.gif Removed: trunk/data/iconsets/crystal/16x16/message.gif trunk/data/iconsets/dcraven/16x16/message.png trunk/data/iconsets/dcraven/32x32/message.png trunk/data/iconsets/gnome/16x16/message.gif trunk/data/iconsets/goojim/16x16/message.png trunk/data/iconsets/goojim/32x32/message.png trunk/data/iconsets/gossip/16x16/message.png trunk/data/iconsets/gota/16x16/message.gif trunk/data/iconsets/gota/32x32/message.gif trunk/data/iconsets/jabberbulb/16x16/message.gif trunk/data/iconsets/nuvola/16x16/message.gif trunk/data/iconsets/simplebulb/16x16/message.png trunk/data/iconsets/stellar/16x16/message.gif trunk/data/iconsets/sun/16x16/message.gif Modified: trunk/src/chat_control.py trunk/src/common/helpers.py trunk/src/groupchat_control.py trunk/src/roster_window.py trunk/src/statusicon.py trunk/src/systray.py Log: [Lukas and I] use 'event' instead of 'message' as icons names ans states. Fix #2755. Copied: trunk/data/iconsets/crystal/16x16/event.gif (from rev 8392, trunk/data/iconsets/crystal/16x16/message.gif) =================================================================== (Binary files differ) Deleted: trunk/data/iconsets/crystal/16x16/message.gif =================================================================== (Binary files differ) Copied: trunk/data/iconsets/dcraven/16x16/event.png (from rev 8392, trunk/data/iconsets/dcraven/16x16/message.png) =================================================================== (Binary files differ) Deleted: trunk/data/iconsets/dcraven/16x16/message.png =================================================================== (Binary files differ) Copied: trunk/data/iconsets/dcraven/32x32/event.png (from rev 8392, trunk/data/iconsets/dcraven/32x32/message.png) =================================================================== (Binary files differ) Deleted: trunk/data/iconsets/dcraven/32x32/message.png =================================================================== (Binary files differ) Copied: trunk/data/iconsets/gnome/16x16/event.gif (from rev 8392, trunk/data/iconsets/gnome/16x16/message.gif) =================================================================== (Binary files differ) Deleted: trunk/data/iconsets/gnome/16x16/message.gif =================================================================== (Binary files differ) Copied: trunk/data/iconsets/goojim/16x16/event.png (from rev 8392, trunk/data/iconsets/goojim/16x16/message.png) =================================================================== (Binary files differ) Deleted: trunk/data/iconsets/goojim/16x16/message.png =================================================================== (Binary files differ) Copied: trunk/data/iconsets/goojim/32x32/event.png (from rev 8392, trunk/data/iconsets/goojim/32x32/message.png) =================================================================== (Binary files differ) Deleted: trunk/data/iconsets/goojim/32x32/message.png =================================================================== (Binary files differ) Copied: trunk/data/iconsets/gossip/16x16/event.png (from rev 8392, trunk/data/iconsets/gossip/16x16/message.png) =================================================================== (Binary files differ) Deleted: trunk/data/iconsets/gossip/16x16/message.png =================================================================== (Binary files differ) Copied: trunk/data/iconsets/gota/16x16/event.gif (from rev 8392, trunk/data/iconsets/gota/16x16/message.gif) =================================================================== (Binary files differ) Deleted: trunk/data/iconsets/gota/16x16/message.gif =================================================================== (Binary files differ) Copied: trunk/data/iconsets/gota/32x32/event.gif (from rev 8392, trunk/data/iconsets/gota/32x32/message.gif) =================================================================== (Binary files differ) Deleted: trunk/data/iconsets/gota/32x32/message.gif =================================================================== (Binary files differ) Copied: trunk/data/iconsets/jabberbulb/16x16/event.gif (from rev 8392, trunk/data/iconsets/jabberbulb/16x16/message.gif) =================================================================== (Binary files differ) Deleted: trunk/data/iconsets/jabberbulb/16x16/message.gif =================================================================== (Binary files differ) Copied: trunk/data/iconsets/nuvola/16x16/event.gif (from rev 8392, trunk/data/iconsets/nuvola/16x16/message.gif) =================================================================== (Binary files differ) Deleted: trunk/data/iconsets/nuvola/16x16/message.gif =================================================================== (Binary files differ) Copied: trunk/data/iconsets/simplebulb/16x16/event.png (from rev 8392, trunk/data/iconsets/simplebulb/16x16/message.png) =================================================================== (Binary files differ) Deleted: trunk/data/iconsets/simplebulb/16x16/message.png =================================================================== (Binary files differ) Copied: trunk/data/iconsets/stellar/16x16/event.gif (from rev 8392, trunk/data/iconsets/stellar/16x16/message.gif) =================================================================== (Binary files differ) Deleted: trunk/data/iconsets/stellar/16x16/message.gif =================================================================== (Binary files differ) Copied: trunk/data/iconsets/sun/16x16/event.gif (from rev 8392, trunk/data/iconsets/sun/16x16/message.gif) =================================================================== (Binary files differ) Deleted: trunk/data/iconsets/sun/16x16/message.gif =================================================================== (Binary files differ) Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-07-12 22:19:21 UTC (rev 8392) +++ trunk/src/chat_control.py 2007-07-13 10:11:49 UTC (rev 8393) @@ -1457,13 +1457,13 @@ jid = self.contact.jid num_unread = len(gajim.events.get_events(self.account, jid, ['printed_' + self.type_id, self.type_id])) - # Set tab image (always 16x16); unread messages show the 'message' image + # Set tab image (always 16x16); unread messages show the 'event' image tab_img = None if num_unread and gajim.config.get('show_unread_tab_icon'): img_16 = gajim.interface.roster.get_appropriate_state_images( - self.contact.jid, icon_name = 'message') - tab_img = img_16['message'] + self.contact.jid, icon_name = 'event') + tab_img = img_16['event'] else: contact = gajim.contacts.get_contact_with_highest_priority( self.account, self.contact.jid) Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2007-07-12 22:19:21 UTC (rev 8392) +++ trunk/src/common/helpers.py 2007-07-13 10:11:49 UTC (rev 8393) @@ -547,14 +547,14 @@ def get_icon_name_to_show(contact, account = None): '''Get the icon name to show in online, away, requested, ...''' if account and gajim.events.get_nb_roster_events(account, contact.jid): - return 'message' + return 'event' if account and gajim.events.get_nb_roster_events(account, contact.get_full_jid()): - return 'message' + return 'event' if account and gajim.interface.minimized_controls.has_key(account) and \ contact.jid in gajim.interface.minimized_controls[account] and gajim.interface.\ minimized_controls[account][contact.jid].get_nb_unread_pm() > 0: - return 'message' + return 'event' if account and gajim.gc_connected[account].has_key(contact.jid): if gajim.gc_connected[account][contact.jid]: return 'muc_active' Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-07-12 22:19:21 UTC (rev 8392) +++ trunk/src/groupchat_control.py 2007-07-13 10:11:49 UTC (rev 8393) @@ -10,6 +10,7 @@ ## Copyright (C) 2006 Travis Shirk <travis(a)pobox.com> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem(a)gmail.com> ## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> +## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published @@ -552,8 +553,8 @@ model = self.list_treeview.get_model() state_images =\ gajim.interface.roster.get_appropriate_state_images( - self.room_jid, icon_name = 'message') - image = state_images['message'] + self.room_jid, icon_name = 'event') + image = state_images['event'] model[iter][C_IMG] = image if self.parent_win: self.parent_win.show_title() @@ -836,7 +837,7 @@ nick) state_images = gajim.interface.roster.jabber_state_images['16'] if len(gajim.events.get_events(self.account, self.room_jid + '/' + nick)): - image = state_images['message'] + image = state_images['event'] else: image = state_images[gc_contact.show] Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-07-12 22:19:21 UTC (rev 8392) +++ trunk/src/roster_window.py 2007-07-13 10:11:49 UTC (rev 8393) @@ -677,13 +677,13 @@ # look if another resource has awaiting events for c in contact_instances: c_icon_name = helpers.get_icon_name_to_show(c, account) - if c_icon_name in ('message', 'muc_active', 'muc_inactive'): + if c_icon_name in ('event', 'muc_active', 'muc_inactive'): icon_name = c_icon_name break path = model.get_path(iter) if model.iter_has_child(iter): if not self.tree.row_expanded(path) and \ - icon_name not in ('message', 'muc_active', 'muc_inactive'): + icon_name not in ('event', 'muc_active', 'muc_inactive'): child_iter = model.iter_children(iter) if icon_name in ('error', 'offline'): # get the icon from the first child as they are sorted by show @@ -700,7 +700,7 @@ child_jid = model[child_iter][C_JID].decode('utf-8') child_account = model[child_iter][C_ACCOUNT].decode('utf-8') if len(gajim.events.get_events(child_account, child_jid)): - icon_name = 'message' + icon_name = 'event' break child_iter = model.iter_next(child_iter) if self.tree.row_expanded(path): @@ -4292,11 +4292,11 @@ 'not in roster') else: list = ('connecting', 'online', 'chat', 'away', 'xa', 'dnd', - 'invisible', 'offline', 'error', 'requested', 'message', 'opened', + 'invisible', 'offline', 'error', 'requested', 'event', 'opened', 'closed', 'not in roster', 'muc_active', 'muc_inactive') if pixbuf2: list = ('connecting', 'online', 'chat', 'away', 'xa', 'dnd', - 'offline', 'error', 'requested', 'message', 'not in roster') + 'offline', 'error', 'requested', 'event', 'not in roster') return self._load_icon_list(list, path, pixbuf2) def load_icon(self, icon_name): Modified: trunk/src/statusicon.py =================================================================== --- trunk/src/statusicon.py 2007-07-12 22:19:21 UTC (rev 8392) +++ trunk/src/statusicon.py 2007-07-13 10:11:49 UTC (rev 8393) @@ -1,6 +1,7 @@ ## statusicon.py ## ## Copyright (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> ## ## This program is free software; you can redistribute it and/or ## modify it under the terms of the GNU General Public License @@ -56,7 +57,7 @@ text = helpers.get_notification_icon_tooltip_text() self.status_icon.set_tooltip(text) if gajim.events.get_nb_systray_events(): - state = 'message' # FIXME: this state should be called event, not message + state = 'event' self.status_icon.props.blinking = True else: state = self.status Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2007-07-12 22:19:21 UTC (rev 8392) +++ trunk/src/systray.py 2007-07-13 10:11:49 UTC (rev 8393) @@ -6,6 +6,7 @@ ## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> ## Copyright (C) 2005-2006 Travis Shirk <travis(a)pobox.com> ## Copyright (C) 2005 Norman Rasmussen <norman(a)rasmussen.co.za> +## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published @@ -82,7 +83,7 @@ if not gajim.interface.systray_enabled: return if gajim.events.get_nb_systray_events(): - state = 'message' + state = 'event' else: state = self.status image = gajim.interface.roster.jabber_state_images['16'][state]

1 0

[commit-gajim] r8392 - trunk/src
by steve-e＠gajim.org 12 Jul '07

12 Jul '07

Author: steve-e Date: 2007-07-13 00:19:21 +0200 (Fri, 13 Jul 2007) New Revision: 8392 Modified: trunk/src/notify.py Log: Fix messeage preview if USER_HAS_PYNOTIFY Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2007-07-12 22:09:24 UTC (rev 8391) +++ trunk/src/notify.py 2007-07-12 22:19:21 UTC (rev 8392) @@ -123,7 +123,6 @@ do_popup = False do_sound = False do_cmd = False - do_preview = True # defaults to true: do not reset emtpy text in new_message if event == 'status_change': new_show = parameters[0] status_message = parameters[1] @@ -158,7 +157,7 @@ if gajim.config.get('notification_preview_message'): message = parameters[3] else: - do_preview = False + # We don't want message preview, do_preview = False message = '' if helpers.allow_showing_notification(account, 'notify_on_new_message', advanced_notif_num, is_first_message): @@ -240,7 +239,7 @@ img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events', 'priv_msg_recv.png') title = _('New Private Message from group chat %s') % room_name - if do_preview: + if message: text = _('%(nickname)s: %(message)s') % {'nickname': nickname, 'message': message} else: @@ -308,7 +307,8 @@ gajim.log.debug(str(e)) # we failed to speak to notification daemon via D-Bus if USER_HAS_PYNOTIFY: # try via libnotify - if not text and do_preview: + if not text and event_type == 'new_message': + # empty text for new_message means do_preview = False text = gajim.get_name_from_jid(account, jid) # default value of text if not title: title = event_type

1 0

[commit-gajim] r8391 - trunk/src
by steve-e＠gajim.org 12 Jul '07

12 Jul '07

Author: steve-e Date: 2007-07-13 00:09:24 +0200 (Fri, 13 Jul 2007) New Revision: 8391 Modified: trunk/src/config.py Log: Prevent TB in new ACC window, fix typo. Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-07-12 20:45:43 UTC (rev 8390) +++ trunk/src/config.py 2007-07-12 22:09:24 UTC (rev 8391) @@ -1409,7 +1409,7 @@ # Select previous row sel = self.accounts_treeview.get_selection() (model, iter) = sel.get_selected() - if self.need_relogin and self.current_account == gajim.ZEROCONF_ACCT_NAME: + if self.need_relogin and self.current_account == gajim.ZEROCONF_ACC_NAME: if gajim.connections.has_key(gajim.ZEROCONF_ACC_NAME): gajim.connections[gajim.ZEROCONF_ACC_NAME].update_details() return

1 0

[commit-gajim] r8390 - trunk/src/common
by asterix＠gajim.org 12 Jul '07

12 Jul '07

Author: asterix Date: 2007-07-12 22:45:43 +0200 (Thu, 12 Jul 2007) New Revision: 8390 Modified: trunk/src/common/contacts.py Log: reverting [8388] for the moment Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2007-07-12 20:38:56 UTC (rev 8389) +++ trunk/src/common/contacts.py 2007-07-12 20:45:43 UTC (rev 8390) @@ -395,48 +395,48 @@ answers.append(data) return answers - def compare_metacontacts(self, data1, data2): - '''compare 2 metacontacts. - Data is {'jid': jid, 'account': account, 'order': order} - order is optional''' - if 'order' in data1 and 'order' in data2: - if data1['order'] > data2['order']: - return 1 - if data1['order'] < data2['order']: - return -1 - jid1 = data1['jid'] - jid2 = data2['jid'] - transport1 = common.gajim.get_transport_name_from_jid(jid1) - transport2 = common.gajim.get_transport_name_from_jid(jid2) - if transport2 and not transport1: - return 1 - if transport1 and not transport2: - return -1 - contact1 = self.get_contact_with_highest_priority(data1['account'], jid1) - contact2 = self.get_contact_with_highest_priority(data2['account'], jid2) - if contact1.priority > contact2.priority: - return 1 - if contact2.priority > contact1.priority: - return -1 - show_list = ['not in roster', 'error', 'offline', 'invisible', 'dnd', - 'xa', 'away', 'chat', 'online', 'requested', 'message'] - show1 = show_list.index(contact1.show) - show2 = show_list.index(contact2.show) - if show1 > show2: - return 1 - if show2 > show1: - return -1 - if jid1 > jid2: - return 1 - if jid2 > jid1: - return -1 - return 0 + def _get_data_score(self, data): + '''compute thescore of a gived data + data is {'jid': jid, 'account': account, 'order': order} + order is optional + score = (max_order - order)*10000 + is_jabber*priority*10 + status''' + jid = data['jid'] + account = data['account'] + max_order = 0 + order = 0 + if data.has_key('order'): + order = data['order'] + if order: + family = self.get_metacontacts_family(account, jid) + for data_ in family: + if data_.has_key('order') and data_['order'] > max_order: + max_order = data_['order'] + contact = self.get_contact_with_highest_priority(account, jid) + score = (max_order - order)*10000 + + if common.gajim.get_transport_name_from_jid(jid) is None and \ + contact.show not in ('error', 'offline'): + score += 10 + if contact.priority > 0: + score += contact.priority * 10 + score += ['not in roster', 'error', 'offline', 'invisible', 'dnd', 'xa', + 'away', 'chat', 'online', 'requested', 'message'].index(contact.show) + if contact.show == 'offline' and contact.status: + # Offline contacts with a status message have highest score + score += 1 + return score def get_metacontacts_big_brother(self, family): '''which of the family will be the big brother under wich all others will be ?''' - family.sort(cmp=self.compare_metacontacts) - return family[-1] + max_score = 0 + max_data = family[0] + for data in family: + score = self._get_data_score(data) + if score > max_score: + max_score = score + max_data = data + return max_data def is_pm_from_jid(self, account, jid): '''Returns True if the given jid is a private message jid'''

1 0

[commit-gajim] r8389 - trunk/src
by roidelapluie＠gajim.org 12 Jul '07

12 Jul '07

Author: roidelapluie Date: 2007-07-12 22:38:56 +0200 (Thu, 12 Jul 2007) New Revision: 8389 Modified: trunk/src/groupchat_control.py Log: Don't print xhtml in history messages. So all the messages are grayed. Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-07-12 11:15:59 UTC (rev 8388) +++ trunk/src/groupchat_control.py 2007-07-12 20:38:56 UTC (rev 8389) @@ -521,7 +521,9 @@ else: # message from someone if has_timestamp: - self.print_old_conversation(msg, nick, tim, xhtml) + # don't print xhtml if it's an old message. + # Like that xhtml messages are grayed too. + self.print_old_conversation(msg, nick, tim, None) else: self.print_conversation(msg, nick, tim, xhtml)

1 0

[commit-gajim] r8388 - trunk/src/common
by asterix＠gajim.org 12 Jul '07

12 Jul '07

Author: asterix Date: 2007-07-12 13:15:59 +0200 (Thu, 12 Jul 2007) New Revision: 8388 Modified: trunk/src/common/contacts.py Log: compute metacontact big brother by comparing them instead of computing an absolute score for each one. fixes #2781 and #2156 Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2007-07-12 06:25:05 UTC (rev 8387) +++ trunk/src/common/contacts.py 2007-07-12 11:15:59 UTC (rev 8388) @@ -395,48 +395,48 @@ answers.append(data) return answers - def _get_data_score(self, data): - '''compute thescore of a gived data - data is {'jid': jid, 'account': account, 'order': order} - order is optional - score = (max_order - order)*10000 + is_jabber*priority*10 + status''' - jid = data['jid'] - account = data['account'] - max_order = 0 - order = 0 - if data.has_key('order'): - order = data['order'] - if order: - family = self.get_metacontacts_family(account, jid) - for data_ in family: - if data_.has_key('order') and data_['order'] > max_order: - max_order = data_['order'] - contact = self.get_contact_with_highest_priority(account, jid) - score = (max_order - order)*10000 - - if common.gajim.get_transport_name_from_jid(jid) is None and \ - contact.show not in ('error', 'offline'): - score += 10 - if contact.priority > 0: - score += contact.priority * 10 - score += ['not in roster', 'error', 'offline', 'invisible', 'dnd', 'xa', - 'away', 'chat', 'online', 'requested', 'message'].index(contact.show) - if contact.show == 'offline' and contact.status: - # Offline contacts with a status message have highest score - score += 1 - return score + def compare_metacontacts(self, data1, data2): + '''compare 2 metacontacts. + Data is {'jid': jid, 'account': account, 'order': order} + order is optional''' + if 'order' in data1 and 'order' in data2: + if data1['order'] > data2['order']: + return 1 + if data1['order'] < data2['order']: + return -1 + jid1 = data1['jid'] + jid2 = data2['jid'] + transport1 = common.gajim.get_transport_name_from_jid(jid1) + transport2 = common.gajim.get_transport_name_from_jid(jid2) + if transport2 and not transport1: + return 1 + if transport1 and not transport2: + return -1 + contact1 = self.get_contact_with_highest_priority(data1['account'], jid1) + contact2 = self.get_contact_with_highest_priority(data2['account'], jid2) + if contact1.priority > contact2.priority: + return 1 + if contact2.priority > contact1.priority: + return -1 + show_list = ['not in roster', 'error', 'offline', 'invisible', 'dnd', + 'xa', 'away', 'chat', 'online', 'requested', 'message'] + show1 = show_list.index(contact1.show) + show2 = show_list.index(contact2.show) + if show1 > show2: + return 1 + if show2 > show1: + return -1 + if jid1 > jid2: + return 1 + if jid2 > jid1: + return -1 + return 0 def get_metacontacts_big_brother(self, family): '''which of the family will be the big brother under wich all others will be ?''' - max_score = 0 - max_data = family[0] - for data in family: - score = self._get_data_score(data) - if score > max_score: - max_score = score - max_data = data - return max_data + family.sort(cmp=self.compare_metacontacts) + return family[-1] def is_pm_from_jid(self, account, jid): '''Returns True if the given jid is a private message jid'''

1 0

[commit-gajim] r8387 - in branches/e2e_encryption/src: . common
by bct＠gajim.org 12 Jul '07

12 Jul '07

Author: bct Date: 2007-07-12 08:25:05 +0200 (Thu, 12 Jul 2007) New Revision: 8387 Modified: branches/e2e_encryption/src/common/exceptions.py branches/e2e_encryption/src/common/stanza_session.py branches/e2e_encryption/src/gajim.py Log: refactored and corrected identity testing, prompt user when a session is initiated by an unsubscribed jid Modified: branches/e2e_encryption/src/common/exceptions.py =================================================================== --- branches/e2e_encryption/src/common/exceptions.py 2007-07-11 21:39:27 UTC (rev 8386) +++ branches/e2e_encryption/src/common/exceptions.py 2007-07-12 06:25:05 UTC (rev 8387) @@ -45,8 +45,16 @@ def __str__(self): return _('Session bus is not available.\nTry reading http://trac.gajim.org/wiki/GajimDBus') +class NegotiationError(Exception): + '''A session negotiation failed''' + pass + +class DecryptionError(Exception): + '''A message couldn't be decrypted into usable XML''' + pass + class GajimGeneralException(Exception): - '''This exception ir our general exception''' + '''This exception is our general exception''' def __init__(self, text=''): Exception.__init__(self) self.text = text Modified: branches/e2e_encryption/src/common/stanza_session.py =================================================================== --- branches/e2e_encryption/src/common/stanza_session.py 2007-07-11 21:39:27 UTC (rev 8386) +++ branches/e2e_encryption/src/common/stanza_session.py 2007-07-12 06:25:05 UTC (rev 8387) @@ -2,6 +2,7 @@ from common import xmpp from common import helpers +from common import exceptions import random import string @@ -47,14 +48,15 @@ return "".join([random.choice(string.letters) for x in xrange(0,32)]) def send(self, msg): - if self.thread_id: + if self.thread_id and isinstance(msg, xmpp.Message): msg.setThread(self.thread_id) msg.setAttr('to', self.jid) self.conn.send_stanza(msg) + + if isinstance(msg, xmpp.Message): + self.last_send = time.time() - self.last_send = time.time() - def reject_negotiation(self, body = None): msg = xmpp.Message() feature = msg.NT.feature @@ -291,7 +293,7 @@ try: parsed = xmpp.Node(node='<node>' + plaintext + '</node>') except: - raise DecryptionError + raise exceptions.DecryptionError for child in parsed.getChildren(): stanza.addChild(node=child) @@ -446,7 +448,7 @@ self.n_o = base64.b64decode(form['my_nonce']) dhhashes = form.getField('dhhashes').getValues() - self.He = dhhashes[group_order].encode("utf8") + self.He = base64.b64decode(dhhashes[group_order].encode("utf8")) bytes = int(self.n / 8) @@ -586,13 +588,8 @@ e = self.decode_mpi(base64.b64decode(form['dhkeys'])) p = dh.primes[self.modp] - if (not self.sha256(self.encode_mpi(e)) == self.He): or \ - (not e > 1 and e < (p - 1)): - err = xmpp.Error(response, xmpp.ERR_FEATURE_NOT_IMPLEMENTED) - err.T.error.T.text.setData("invalid DH value 'e'") - self.send(err) - self.status = None - return + if (self.sha256(self.encode_mpi(e)) != self.He) or (not 1 < e < (p - 1)): + raise exceptions.NegotiationError, "invalid DH value 'e'" k = self.sha256(self.encode_mpi(self.powmod(e, self.y, p))) @@ -605,11 +602,7 @@ m_a_calculated = self.hmac(self.km_o, self.encode_mpi(self.c_o) + id_a) if m_a_calculated != m_a: - err = xmpp.Error(response, xmpp.ERR_FEATURE_NOT_IMPLEMENTED) - err.T.error.T.text.setData('calculated m_a differs from received m_a') - self.send(err) - self.status = None - return + raise exceptions.NegotiationError, 'calculated m_a differs from received m_a' mac_a = self.decrypt(id_a) @@ -619,11 +612,7 @@ mac_a_calculated = self.hmac(self.ks_o, self.n_s + self.n_o + self.encode_mpi(e) + self.form_a + form_a2) if mac_a_calculated != mac_a: - err = xmpp.Error(response, xmpp.ERR_FEATURE_NOT_IMPLEMENTED) - err.T.error.T.text.setData('calculated mac_a differs from received mac_a') - self.send(err) - self.status = None - return + raise exceptions.NegotiationError, 'calculated mac_a differs from received mac_a' # 4.5.4 generating bob's final session keys self.srs = '' @@ -653,7 +642,8 @@ form_b2 = ''.join(map(lambda el: xmpp.c14n.c14n(el), x.getChildren())) old_c_s = self.c_s - mac_b = self.hmac(self.n_o + self.n_s + self.encode_mpi(self.d) + self.form_b + form_b2, self.ks_s) + + mac_b = self.hmac(self.ks_s, self.n_o + self.n_s + self.encode_mpi(self.d) + self.form_b + form_b2) id_b = self.encrypt(mac_b) m_b = self.hmac(self.km_s, self.encode_mpi(old_c_s) + id_b) @@ -703,27 +693,20 @@ m_b = base64.b64decode(form['mac']) id_b = base64.b64decode(form['identity']) - m_b_calculated = self.hmac(self.encode_mpi(self.c_o) + id_b, self.km_o) + m_b_calculated = self.hmac(self.km_o, self.encode_mpi(self.c_o) + id_b) if m_b_calculated != m_b: - err = xmpp.Error(response, xmpp.ERR_FEATURE_NOT_IMPLEMENTED) - err.T.error.T.text.setData('calculated m_b differs from received m_b') - self.send(err) - self.status = None - return + raise exceptions.NegotiationError, 'calculated m_b differs from received m_b' mac_b = self.decrypt(id_b) - form_b2 = ''.join(map(lambda el: xmpp.c14n.c14n(el), form.getChildren())) + macable_children = filter(lambda x: x.getVar() not in ('mac', 'identity'), form.getChildren()) + form_b2 = ''.join(map(lambda el: xmpp.c14n.c14n(el), macable_children)) - mac_b_calculated = self.hmac(self.n_s + self.n_o + self.encode_mpi(self.d) + self.form_b + form_b2, self.ks_o) + mac_b_calculated = self.hmac(self.ks_o, self.n_s + self.n_o + self.encode_mpi(self.d) + self.form_b + form_b2) if mac_b_calculated != mac_b: - err = xmpp.Error(response, xmpp.ERR_FEATURE_NOT_IMPLEMENTED) - err.T.error.T.text.setData('calculated mac_b differs from received mac_b') - self.send(err) - self.status = None - return + raise exceptions.NegotiationError, 'calculated mac_b differs from received mac_b' # Note: If Alice discovers an error then she SHOULD ignore any encrypted content she received in the stanza. @@ -782,6 +765,13 @@ self.enable_encryption = False + def fail_bad_negotiation(self, reason): + '''they've tried to feed us a bogus value, send an error and cancel everything.''' + err = xmpp.Error(xmpp.Message(), xmpp.ERR_FEATURE_NOT_IMPLEMENTED) + err.T.error.T.text.setData(reason) + self.send(err) + self.status = None + def is_loggable(self): name = self.conn.name no_log_for = gajim.config.get_per('accounts', name, 'no_log_for') Modified: branches/e2e_encryption/src/gajim.py =================================================================== --- branches/e2e_encryption/src/gajim.py 2007-07-11 21:39:27 UTC (rev 8386) +++ branches/e2e_encryption/src/gajim.py 2007-07-12 06:25:05 UTC (rev 8387) @@ -1669,38 +1669,50 @@ # bob responds if form.getType() == 'form' and u'e2e' in \ map(lambda x: x[1], form.getField('security').getOptions()): - contact = gajim.contacts.get_contact(account, jid.getStripped(), jid.getResource()) + def continue_with_negotiation(*args): + if len(args): + self.dialog.destroy() - if gajim.SHOW_LIST[gajim.connections[account].connected] == 'invisible' or \ - contact.sub not in ('from', 'both'): - return + negotiated, not_acceptable, ask_user = session.verify_options_bob(form) - negotiated, not_acceptable, ask_user = session.verify_options_bob(form) + if ask_user: + def accept_nondefault_options(widget): + self.dialog.destroy() + negotiated.update(ask_user) + session.respond_e2e_bob(form, negotiated, not_acceptable) - 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): + self.dialog.destroy() + for key in ask_user.keys(): + not_acceptable.append(key) + session.respond_e2e_bob(form, negotiated, not_acceptable) - def reject_nondefault_options(widget): - for key in ask_user.keys(): - not_acceptable.append(key) - session.respond_e2e_bob(form, negotiated, not_acceptable) + self.dialog = dialogs.YesNoDialog(_('Confirm these session options'), + _('''The remote client wants to negotiate an session with these features: - dialog.destroy() + %s - dialog = dialogs.YesNoDialog(_('Confirm these session options'), - _('''The remote client wants to negotiate an session with these features: + Are these options acceptable?''') % (negotiation.describe_features(ask_user)), + on_response_yes = accept_nondefault_options, + on_response_no = reject_nondefault_options) + else: + session.respond_e2e_bob(form, negotiated, not_acceptable) -%s - -Are these options acceptable?''') % (negotiation.describe_features(ask_user)), - on_response_yes = accept_nondefault_options, - on_response_no = reject_nondefault_options) + def ignore_negotiation(widget): + self.dialog.destroy() + return + + contact = gajim.contacts.get_contact_with_highest_priority(account, str(jid)) + + if gajim.SHOW_LIST[gajim.connections[account].connected] == 'invisible' or not contact or\ + contact.sub not in ('from', 'both'): + self.dialog = dialogs.YesNoDialog(_('Start session?'), + _('''%s would like to start a session with you. Should I respond?''') % jid, + on_response_yes = continue_with_negotiation, + on_response_no = ignore_negotiation, + ) else: - session.respond_e2e_bob(form, negotiated, not_acceptable) + continue_with_negotiation() return @@ -1727,16 +1739,24 @@ on_response_no = reject_nondefault_options) else: session.accept_e2e_alice(form, negotiated) - negotiation.show_sas_dialog(jid, session.sas) return elif session.status == 'responded-e2e' and form.getType() == 'result': - session.accept_e2e_bob(form) - negotiation.show_sas_dialog(jid, session.sas) + try: + session.accept_e2e_bob(form) + except exceptions.NegotiationError, details: + session.fail_bad_negotiation(details) + else: + negotiation.show_sas_dialog(jid, session.sas) + return elif session.status == 'identified-alice' and form.getType() == 'result': - session.final_steps_alice(form) + try: + session.final_steps_alice(form) + except exceptions.NegotiationError, details: + session.fail_bad_negotiation(details) + return if form.getField('terminate'):

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2007