Commits December 2006

commits@gajim.org

6 participants
160 discussions

[commit-gajim] r7734 - in trunk: data/other src/common src/common/xmpp
by junglecow＠gajim.org 29 Dec '06

29 Dec '06

Author: junglecow Date: 2006-12-29 02:46:46 +0100 (Fri, 29 Dec 2006) New Revision: 7734 Modified: trunk/data/other/servers.xml trunk/src/common/connection.py trunk/src/common/xmpp/transports_nb.py Log: - Fix TB on fingerprint mismatch - Add debug message on import failure of PyOpenSSL - Update gajim.org digest after migration to new server Modified: trunk/data/other/servers.xml =================================================================== --- trunk/data/other/servers.xml 2006-12-28 19:03:55 UTC (rev 7733) +++ trunk/data/other/servers.xml 2006-12-29 01:46:46 UTC (rev 7734) @@ -374,6 +374,6 @@ </item> <item jid="gajim.org" name="Official server of Gajim" hidden="True"> <active port="5222"/> - <digest algo="sha1" value="78:CE:51:E9:0D:56:5D:8B:16:9C:10:9E:24:ED:5C:F8:46:59:B1:19"/> + <digest algo="sha1" value="25:79:5D:AC:3A:62:C0:96:5A:C9:36:76:D8:B0:78:1F:AA:DA:79:18"/> </item> </query> Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-12-28 19:03:55 UTC (rev 7733) +++ trunk/src/common/connection.py 2006-12-29 01:46:46 UTC (rev 7734) @@ -436,7 +436,6 @@ fpr_good = self._check_fingerprint(con, con_type) if fpr_good == False: - log.error(_("Fingerprint mismatch for %s: Got %s, expected %s"), hostname, got, expected) self.disconnect(on_purpose = True) self.dispatch('STATUS', 'offline') self.dispatch('CONNECTION_LOST', @@ -495,6 +494,9 @@ else: log.debug("Connection to %s doesn't seem to have a fingerprint:", hostname, exc_info=True) + if fpr_good == False: + log.error(_("Fingerprint mismatch for %s: Got %s, expected %s"), hostname, got, expected) + return fpr_good def _register_handlers(self, con, con_type): Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2006-12-28 19:03:55 UTC (rev 7733) +++ trunk/src/common/xmpp/transports_nb.py 2006-12-29 01:46:46 UTC (rev 7734) @@ -41,6 +41,8 @@ USE_PYOPENSSL = True log.info("PyOpenSSL loaded") except ImportError: + log.debug("Import of PyOpenSSL failed:", exc_info=True) + # FIXME: Remove these prints before release, replace with a warning dialog. print >> sys.stderr, "=" * 79 print >> sys.stderr, "PyOpenSSL not found, falling back to Python builtin SSL objects (insecure)."

1 0

[commit-gajim] r7733 - trunk/src/common
by asterix＠gajim.org 28 Dec '06

28 Dec '06

Author: asterix Date: 2006-12-28 20:03:55 +0100 (Thu, 28 Dec 2006) New Revision: 7733 Modified: trunk/src/common/passwords.py Log: prevent TB. fixes #2843 Modified: trunk/src/common/passwords.py =================================================================== --- trunk/src/common/passwords.py 2006-12-28 16:27:41 UTC (rev 7732) +++ trunk/src/common/passwords.py 2006-12-28 19:03:55 UTC (rev 7733) @@ -40,7 +40,7 @@ class SimplePasswordStorage(PasswordStorage): def get_password(self, account_name): passwd = gajim.config.get_per('accounts', account_name, 'password') - if passwd.startswith('gnomekeyring:'): + if passwd and passwd.startswith('gnomekeyring:'): return None # this is not a real password, it's a gnome keyring token else: return passwd

1 0

[commit-gajim] r7732 - in trunk/src/common: . xmpp
by asterix＠gajim.org 28 Dec '06

28 Dec '06

Author: asterix Date: 2006-12-28 17:27:41 +0100 (Thu, 28 Dec 2006) New Revision: 7732 Modified: trunk/src/common/connection_handlers.py trunk/src/common/xmpp/protocol.py Log: [misc] XEP-0202 (Entity Time) support. fixes #2830 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2006-12-28 14:11:03 UTC (rev 7731) +++ trunk/src/common/connection_handlers.py 2006-12-28 16:27:41 UTC (rev 7732) @@ -24,7 +24,7 @@ import socket import sys -from time import localtime, strftime, gmtime +from time import localtime, strftime, gmtime, timezone from calendar import timegm import socks5 @@ -1314,7 +1314,15 @@ self.connection.send(iq_obj) raise common.xmpp.NodeProcessed - + def _TimeRevisedCB(self, con, iq_obj): + gajim.log.debug('TimeRevisedCB') + iq_obj = iq_obj.buildReply('result') + qp = iq_obj.setTag('time') + qp.setTagData('utc', strftime("%Y-%m-%dT%TZ", gmtime())) + qp.setTagData('tzo', "%+03d:00"% (time.timezone/(60*60))) + self.connection.send(iq_obj) + raise common.xmpp.NodeProcessed + def _gMailNewMailCB(self, con, gm): '''Called when we get notified of new mail messages in gmail account''' if not gm.getTag('new-mail'): @@ -1962,6 +1970,8 @@ common.xmpp.NS_VERSION) con.RegisterHandler('iq', self._TimeCB, 'get', common.xmpp.NS_TIME) + con.RegisterHandler('iq', self._TimeRevisedCB, 'get', + common.xmpp.NS_TIME_REVISED) con.RegisterHandler('iq', self._LastCB, 'get', common.xmpp.NS_LAST) con.RegisterHandler('iq', self._LastResultCB, 'result', Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2006-12-28 14:11:03 UTC (rev 7731) +++ trunk/src/common/xmpp/protocol.py 2006-12-28 16:27:41 UTC (rev 7732) @@ -85,6 +85,7 @@ NS_STREAM ='http://affinix.com/jabber/stream' NS_STREAMS ='http://etherx.jabber.org/streams' NS_TIME ='jabber:iq:time' # JEP-0900 +NS_TIME_REVISED ='http://www.xmpp.org/extensions/xep-0202.html#ns' # JEP-0202 NS_TLS ='urn:ietf:params:xml:ns:xmpp-tls' NS_VACATION ='http://jabber.org/protocol/vacation' NS_VCARD ='vcard-temp'

1 0

[commit-gajim] r7731 - in trunk/data/iconsets/transports: aim/16x16 aim/32x32 gadu-gadu/16x16 gadu-gadu/32x32 icq/16x16 icq/32x32 irc/16x16 irc/32x32 msn/16x16 msn/32x32 tlen/16x16 tlen/32x32 yahoo/16x16 yahoo/32x32
by cornelius＠gajim.org 28 Dec '06

28 Dec '06

Author: cornelius Date: 2006-12-28 15:11:03 +0100 (Thu, 28 Dec 2006) New Revision: 7731 Added: trunk/data/iconsets/transports/aim/16x16/not_in_roster.png trunk/data/iconsets/transports/aim/32x32/not_in_roster.png trunk/data/iconsets/transports/gadu-gadu/16x16/not_in_roster.png trunk/data/iconsets/transports/gadu-gadu/32x32/not_in_roster.png trunk/data/iconsets/transports/icq/16x16/not_in_roster.png trunk/data/iconsets/transports/icq/32x32/not_in_roster.png trunk/data/iconsets/transports/irc/16x16/not_in_roster.png trunk/data/iconsets/transports/irc/32x32/not_in_roster.png trunk/data/iconsets/transports/msn/16x16/not_in_roster.png trunk/data/iconsets/transports/msn/32x32/not_in_roster.png trunk/data/iconsets/transports/tlen/16x16/not_in_roster.png trunk/data/iconsets/transports/tlen/32x32/not_in_roster.png trunk/data/iconsets/transports/yahoo/16x16/not_in_roster.png trunk/data/iconsets/transports/yahoo/32x32/not_in_roster.png Log: Icons for not-in-roster contacts for relevant transports (see ticket #2829) Added: trunk/data/iconsets/transports/aim/16x16/not_in_roster.png =================================================================== (Binary files differ) Property changes on: trunk/data/iconsets/transports/aim/16x16/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/iconsets/transports/aim/32x32/not_in_roster.png =================================================================== (Binary files differ) Property changes on: trunk/data/iconsets/transports/aim/32x32/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/iconsets/transports/gadu-gadu/16x16/not_in_roster.png =================================================================== (Binary files differ) Property changes on: trunk/data/iconsets/transports/gadu-gadu/16x16/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/iconsets/transports/gadu-gadu/32x32/not_in_roster.png =================================================================== (Binary files differ) Property changes on: trunk/data/iconsets/transports/gadu-gadu/32x32/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/iconsets/transports/icq/16x16/not_in_roster.png =================================================================== (Binary files differ) Property changes on: trunk/data/iconsets/transports/icq/16x16/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/iconsets/transports/icq/32x32/not_in_roster.png =================================================================== (Binary files differ) Property changes on: trunk/data/iconsets/transports/icq/32x32/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/iconsets/transports/irc/16x16/not_in_roster.png =================================================================== (Binary files differ) Property changes on: trunk/data/iconsets/transports/irc/16x16/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/iconsets/transports/irc/32x32/not_in_roster.png =================================================================== (Binary files differ) Property changes on: trunk/data/iconsets/transports/irc/32x32/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/iconsets/transports/msn/16x16/not_in_roster.png =================================================================== (Binary files differ) Property changes on: trunk/data/iconsets/transports/msn/16x16/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/iconsets/transports/msn/32x32/not_in_roster.png =================================================================== (Binary files differ) Property changes on: trunk/data/iconsets/transports/msn/32x32/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/iconsets/transports/tlen/16x16/not_in_roster.png =================================================================== (Binary files differ) Property changes on: trunk/data/iconsets/transports/tlen/16x16/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/iconsets/transports/tlen/32x32/not_in_roster.png =================================================================== (Binary files differ) Property changes on: trunk/data/iconsets/transports/tlen/32x32/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/iconsets/transports/yahoo/16x16/not_in_roster.png =================================================================== (Binary files differ) Property changes on: trunk/data/iconsets/transports/yahoo/16x16/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/iconsets/transports/yahoo/32x32/not_in_roster.png =================================================================== (Binary files differ) Property changes on: trunk/data/iconsets/transports/yahoo/32x32/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

[commit-gajim] r7730 - in trunk/src/common: . xmpp
by junglecow＠gajim.org 28 Dec '06

28 Dec '06

Author: junglecow Date: 2006-12-28 12:15:44 +0100 (Thu, 28 Dec 2006) New Revision: 7730 Modified: trunk/src/common/connection.py trunk/src/common/xmpp/transports_nb.py Log: - Removed unnecessary import - Fixed name of transport_nb's logger Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-12-28 10:01:15 UTC (rev 7729) +++ trunk/src/common/connection.py 2006-12-28 11:15:44 UTC (rev 7730) @@ -461,7 +461,6 @@ fpr_good = None # None: Unable to check fpr, False: mismatch, True: match # FIXME: not tidy - import common.xmpp.transports_nb if not common.xmpp.transports_nb.USE_PYOPENSSL: return None # FIXME: find a more permanent place for loading servers.xml Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2006-12-28 10:01:15 UTC (rev 7729) +++ trunk/src/common/xmpp/transports_nb.py 2006-12-28 11:15:44 UTC (rev 7730) @@ -30,7 +30,7 @@ import thread import logging -log = logging.getLogger('gajim.c.x.transports') +log = logging.getLogger('gajim.c.x.transports_nb') USE_PYOPENSSL = False

1 0

[commit-gajim] r7729 - in trunk/src: . common
by asterix＠gajim.org 28 Dec '06

28 Dec '06

Author: asterix Date: 2006-12-28 11:01:15 +0100 (Thu, 28 Dec 2006) New Revision: 7729 Modified: trunk/src/common/passwords.py trunk/src/roster_window.py Log: show a message to user when gnomekeyring is installed but not well started. fixes #2834 Modified: trunk/src/common/passwords.py =================================================================== --- trunk/src/common/passwords.py 2006-12-27 23:28:47 UTC (rev 7728) +++ trunk/src/common/passwords.py 2006-12-28 10:01:15 UTC (rev 7729) @@ -21,8 +21,10 @@ try: import gnomekeyring except ImportError: + USER_HAS_GNOMEKEYRING = False USER_USES_GNOMEKEYRING = False else: + USER_HAS_GNOMEKEYRING = True if gnomekeyring.is_available(): USER_USES_GNOMEKEYRING = True else: Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-12-27 23:28:47 UTC (rev 7728) +++ trunk/src/roster_window.py 2006-12-28 10:01:15 UTC (rev 7729) @@ -2669,9 +2669,11 @@ if not gajim.connections[account].password: passphrase = '' - w = dialogs.PassphraseDialog( - _('Password Required'), - _('Enter your password for account %s') % account, + text = _('Enter your password for account %s') % account + if passwords.USER_HAS_GNOMEKEYRING and \ + not passwords.USER_USES_GNOMEKEYRING: + text += '\n' + _('Gnomekeyring is installed but not correctly started (environment variable probably not correctly set)') + w = dialogs.PassphraseDialog(_('Password Required'), text, _('Save password')) passphrase, save = w.run() if passphrase == -1:

1 0

[commit-gajim] r7728 - trunk/src/common
by junglecow＠gajim.org 27 Dec '06

27 Dec '06

Author: junglecow Date: 2006-12-28 00:28:47 +0100 (Thu, 28 Dec 2006) New Revision: 7728 Modified: trunk/src/common/connection.py Log: - More accurate description of None outcome of _check_fingerprint - Check for presence of PyOpenSSL in fingerprint check. Fixes #2841. Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-12-27 23:25:32 UTC (rev 7727) +++ trunk/src/common/connection.py 2006-12-27 23:28:47 UTC (rev 7728) @@ -448,7 +448,7 @@ return if fpr_good == None: - log.warning(_("No fingerprint in database for %s. Connection could be insecure."), hostname) + log.warning(_("Unable to check fingerprint for %s. Connection could be insecure."), hostname) if fpr_good == True: log.info("Fingerprint found and matched for %s.", hostname) @@ -458,8 +458,12 @@ return True def _check_fingerprint(self, con, con_type): - fpr_good = None # None: No fpr in database, False: mismatch, True: match + fpr_good = None # None: Unable to check fpr, False: mismatch, True: match + # FIXME: not tidy + import common.xmpp.transports_nb + if not common.xmpp.transports_nb.USE_PYOPENSSL: return None + # FIXME: find a more permanent place for loading servers.xml servers_xml = os.path.join(gajim.DATA_DIR, 'other', 'servers.xml') servers = gtkgui_helpers.parse_server_xml(servers_xml)

1 0

[commit-gajim] r7727 - trunk/src/common
by junglecow＠gajim.org 27 Dec '06

27 Dec '06

Author: junglecow Date: 2006-12-28 00:25:32 +0100 (Thu, 28 Dec 2006) New Revision: 7727 Modified: trunk/src/common/connection.py Log: Move fingerprint check into its own function. Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-12-27 22:45:23 UTC (rev 7726) +++ trunk/src/common/connection.py 2006-12-27 23:25:32 UTC (rev 7727) @@ -434,12 +434,39 @@ resource = gajim.config.get_per('accounts', self.name, 'resource') self.connection = con + fpr_good = self._check_fingerprint(con, con_type) + if fpr_good == False: + log.error(_("Fingerprint mismatch for %s: Got %s, expected %s"), hostname, got, expected) + self.disconnect(on_purpose = True) + self.dispatch('STATUS', 'offline') + self.dispatch('CONNECTION_LOST', + (_('Security error connecting to "%s"') % self._hostname, + _("The server's key has changed, or someone is trying to hack your connection."))) + if self.on_connect_auth: + self.on_connect_auth(None) + self.on_connect_auth = None + return + + if fpr_good == None: + log.warning(_("No fingerprint in database for %s. Connection could be insecure."), hostname) + + if fpr_good == True: + log.info("Fingerprint found and matched for %s.", hostname) + + con.auth(name, self.password, resource, 1, self.__on_auth) + + return True + + def _check_fingerprint(self, con, con_type): + fpr_good = None # None: No fpr in database, False: mismatch, True: match + # FIXME: find a more permanent place for loading servers.xml servers_xml = os.path.join(gajim.DATA_DIR, 'other', 'servers.xml') servers = gtkgui_helpers.parse_server_xml(servers_xml) servers = dict(map(lambda e: (e[0], e), servers)) - fpr_good = None # None: No fpr in database, False: mismatch, True: match + hostname = gajim.config.get_per('accounts', self.name, 'hostname') + try: log.debug("con: %s", con) log.debug("con.Connection: %s", con.Connection) @@ -465,28 +492,8 @@ else: log.debug("Connection to %s doesn't seem to have a fingerprint:", hostname, exc_info=True) - if fpr_good == False: - log.error(_("Fingerprint mismatch for %s: Got %s, expected %s"), hostname, got, expected) - self.disconnect(on_purpose = True) - self.dispatch('STATUS', 'offline') - self.dispatch('CONNECTION_LOST', - (_('Security error connecting to "%s"') % self._hostname, - _("The server's key has changed, or someone is trying to hack your connection."))) - if self.on_connect_auth: - self.on_connect_auth(None) - self.on_connect_auth = None - return + return fpr_good - if fpr_good == None: - log.warning(_("No fingerprint in database for %s. Connection could be insecure."), hostname) - - if fpr_good == True: - log.info("Fingerprint found and matched for %s.", hostname) - - con.auth(name, self.password, resource, 1, self.__on_auth) - - return True - def _register_handlers(self, con, con_type): self.peerhost = con.get_peerhost() # notify the gui about con_type

1 0

[commit-gajim] r7726 - trunk/src/common/xmpp
by junglecow＠gajim.org 27 Dec '06

27 Dec '06

Author: junglecow Date: 2006-12-27 23:45:23 +0100 (Wed, 27 Dec 2006) New Revision: 7726 Modified: trunk/src/common/xmpp/transports_nb.py Log: Catch socket.gaierror. Fixes #2840. Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2006-12-27 21:13:42 UTC (rev 7725) +++ trunk/src/common/xmpp/transports_nb.py 2006-12-27 22:45:23 UTC (rev 7726) @@ -300,24 +300,31 @@ self._server = server self.printed_error = False self.state = 0 + success = False try: for ai in socket.getaddrinfo(server[0],server[1],socket.AF_UNSPEC,socket.SOCK_STREAM): try: self._sock=socket.socket(*ai[:3]) self._sock.setblocking(False) self._server=ai[4] + success = True break except: if sys.exc_value[0] == errno.EINPROGRESS: + success = True break #for all errors, we try other addresses continue + except socket.gaierror, e: + log.info("Lookup failure for %s: %s[%s]", self.getName(), e[1], repr(e[0]), exc_info=True) except: log.error("Exception trying to connect to %s:", self.getName(), exc_info=True) - #traceback.print_exc() + + if not success: if self.on_connect_failure: self.on_connect_failure() return False + self.fd = self._sock.fileno() self.idlequeue.plug_idle(self, True, False) self.set_timeout(CONNECT_TIMEOUT_SECONDS)

1 0

[commit-gajim] r7725 - trunk/src/common
by asterix＠gajim.org 27 Dec '06

27 Dec '06

Author: asterix Date: 2006-12-27 22:13:42 +0100 (Wed, 27 Dec 2006) New Revision: 7725 Modified: trunk/src/common/passwords.py Log: [gjc] ask password when gnomekeyring isn't available. fixes #2834 Modified: trunk/src/common/passwords.py =================================================================== --- trunk/src/common/passwords.py 2006-12-27 20:44:21 UTC (rev 7724) +++ trunk/src/common/passwords.py 2006-12-27 21:13:42 UTC (rev 7725) @@ -37,7 +37,11 @@ class SimplePasswordStorage(PasswordStorage): def get_password(self, account_name): - return gajim.config.get_per('accounts', account_name, 'password') + passwd = gajim.config.get_per('accounts', account_name, 'password') + if passwd.startswith('gnomekeyring:'): + return None # this is not a real password, it's a gnome keyring token + else: + return passwd def save_password(self, account_name, password): gajim.config.set_per('accounts', account_name, 'password', password) @@ -45,15 +49,15 @@ class GnomePasswordStorage(PasswordStorage): - def __init__(self): - # self.keyring = gnomekeyring.get_default_keyring_sync() - - ## above line commented and code below inserted as workaround - ## for the bug http://bugzilla.gnome.org/show_bug.cgi?id=363019 - self.keyring = "default" - try: - gnomekeyring.create_sync(self.keyring, None) - except gnomekeyring.AlreadyExistsError: + def __init__(self): + # self.keyring = gnomekeyring.get_default_keyring_sync() + + ## above line commented and code below inserted as workaround + ## for the bug http://bugzilla.gnome.org/show_bug.cgi?id=363019 + self.keyring = "default" + try: + gnomekeyring.create_sync(self.keyring, None) + except gnomekeyring.AlreadyExistsError: pass def get_password(self, account_name):

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 December 2006