Commits

commits@gajim.org

17632 discussions

gajim: catch errors that could appear when running plugins gui e...
by Gajim 09 Mar '14

09 Mar '14

changeset de9353e7061b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=de9353e7061b description: catch errors that could appear when running plugins gui extention points diffstat: src/plugins/pluginmanager.py | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diffs (43 lines): diff -r 3e240cdafaca -r de9353e7061b src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sat Mar 08 12:19:15 2014 +0100 +++ b/src/plugins/pluginmanager.py Sun Mar 09 10:19:24 2014 +0100 @@ -255,7 +255,11 @@ if gui_extpoint_name in self.gui_extension_points_handlers: for handlers in self.gui_extension_points_handlers[ gui_extpoint_name]: - handlers[0](*args) + try: + handlers[0](*args) + except Exception, e: + log.warning('Error executing %s', handlers[0], + exc_info=True) def _register_events_handlers_in_ged(self, plugin): for event_name, handler in plugin.events_handlers.iteritems(): @@ -326,7 +330,11 @@ gui_extpoint_name]: handler = gui_extpoint_handlers[1] if handler: - handler(*gui_extension_point_args) + try: + handler(*gui_extension_point_args) + except Exception, e: + log.warning('Error executing %s', handler, + exc_info=True) self._remove_events_handler_from_ged(plugin) self._remove_network_events_from_nec(plugin) @@ -357,7 +365,12 @@ gui_extpoint_name]: handler = gui_extpoint_handlers[0] if handler: - handler(*gui_extension_point_args) + try: + handler(*gui_extension_point_args) + except Exception, e: + log.warning('Error executing %s', handler, + exc_info=True) + @log_calls('PluginManager') def _activate_all_plugins(self):

1 0

gajim-website: do not underline titles
by Gajim Website 09 Mar '14

09 Mar '14

changeset 212bc003bf0f in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=212bc003bf0f description: do not underline titles diffstat: css/main.css | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 07bd6ab3f68f -r 212bc003bf0f css/main.css --- a/css/main.css Thu Feb 27 09:32:27 2014 +0100 +++ b/css/main.css Sun Mar 09 09:51:22 2014 +0100 @@ -120,7 +120,6 @@ h4 { color:#26667E; - text-decoration: underline; } .translation-status {

1 0

gajim: fix var name. Fixes #7668
by Gajim 08 Mar '14

08 Mar '14

changeset 3e240cdafaca in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=3e240cdafaca description: fix var name. Fixes #7668 diffstat: src/common/connection_handlers_events.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r ba7b1db9ad7d -r 3e240cdafaca src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Mar 08 10:07:40 2014 +0100 +++ b/src/common/connection_handlers_events.py Sat Mar 08 12:19:15 2014 +0100 @@ -1637,8 +1637,8 @@ self.ssl_msg = '' if self.errnum > 0: from common.connection import ssl_error - self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ - self.errnum) + self.ssl_msg = ssl_error.get(self.errnum, + _('Unknown SSL error: %d') % self.errnum) self.ssl_cert = '' self.ssl_fingerprint = '' if self.conn.connection.Connection.ssl_certificate:

1 0

gajim: use sys.stderr.isatty() to decide if we use colors in log...
by Gajim 08 Mar '14

08 Mar '14

changeset ba7b1db9ad7d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ba7b1db9ad7d description: use sys.stderr.isatty() to decide if we use colors in log output or not. diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r dabb86f96777 -r ba7b1db9ad7d src/gajim.py --- a/src/gajim.py Sun Mar 02 11:26:52 2014 +0100 +++ b/src/gajim.py Sat Mar 08 10:07:40 2014 +0100 @@ -115,7 +115,7 @@ sys.path.append('.') from common import logging_helpers -logging_helpers.init('TERM' in os.environ) +logging_helpers.init(sys.stderr.isatty()) import logging # gajim.gui or gajim.gtk more appropriate ?

1 0

python-nbxmpp: Disable session resumption, protection against Tr...
by Fedor Brunner 04 Mar '14

04 Mar '14

changeset e5f4043c4990 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=e5f4043c4990 description: Disable session resumption, protection against Triple Handshakes TLS attack. Session resumption is currently not supported in Gajim, because Connection.get_session, Connection.set_session are not used. But in case someone will try to use them in future disable session cache using Context.set_session_cache_mode(OpenSSL.SSL.SESS_CACHE_OFF) Fixes #21 diffstat: nbxmpp/tls_nb.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r 25b4cf13cadb -r e5f4043c4990 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Tue Mar 04 17:46:08 2014 +0100 +++ b/nbxmpp/tls_nb.py Tue Mar 04 17:58:52 2014 +0100 @@ -387,6 +387,12 @@ tcpsock._sslContext.set_options(flags) + try: # Supported only pyOpenSSL >= 0.14 + # Disable session resumption, protection against Triple Handshakes TLS attack + tcpsock._sslContext.set_session_cache_mode(OpenSSL.SSL.SESS_CACHE_OFF) + except AttributeError, e: + pass + # NonBlockingHTTPBOSH instance has no attribute _owner if hasattr(tcpsock, '_owner') and tcpsock._owner._caller.client_cert \ and os.path.exists(tcpsock._owner._caller.client_cert):

1 0

python-nbxmpp: Disable SCRAM-SHA-1-PLUS if channel binding is no...
by Fedor Brunner 04 Mar '14

04 Mar '14

changeset 25b4cf13cadb in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=25b4cf13cadb description: Disable SCRAM-SHA-1-PLUS if channel binding is not supported. Fixes #20 diffstat: nbxmpp/auth_nb.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 30c2e6474c1d -r 25b4cf13cadb nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Sat Mar 01 21:26:17 2014 +0100 +++ b/nbxmpp/auth_nb.py Tue Mar 04 17:46:08 2014 +0100 @@ -188,8 +188,10 @@ # Password based authentication mechanism ordered by strength. # If the server supports a mechanism disable all weaker mechanisms. - password_auth_mechs_strength = ('SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', - 'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2') + password_auth_mechs_strength = ['SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', + 'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2'] + if self.channel_binding == None: + password_auth_mechs_strength.remove('SCRAM-SHA-1-PLUS') for i in range(0, len(password_auth_mechs_strength)): if password_auth_mechs_strength[i] in self.mecs: for m in password_auth_mechs_strength[i + 1:]:

1 0

gajim: print message to console in correct encoding. Fixes #7652
by Gajim 02 Mar '14

02 Mar '14

changeset dabb86f96777 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=dabb86f96777 description: print message to console in correct encoding. Fixes #7652 diffstat: src/gajim.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (20 lines): diff -r dede4d2cb554 -r dabb86f96777 src/gajim.py --- a/src/gajim.py Sat Mar 01 21:29:46 2014 +0100 +++ b/src/gajim.py Sun Mar 02 11:26:52 2014 +0100 @@ -141,7 +141,7 @@ sys.exit(2) for o, a in opts: if o in ('-h', '--help'): - print _('Usage:') + \ + out = _('Usage:') + \ '\n gajim [options] filename\n\n' + \ _('Options:') + \ '\n -h, --help ' + \ @@ -156,6 +156,7 @@ _('Set configuration directory') + \ '\n -l, --loglevel ' + \ _('Configure logging system') + '\n' + print out.encode(locale.getpreferredencoding()) sys.exit() elif o in ('-q', '--quiet'): logging_helpers.set_quiet()

1 0

gajim: we now require python-nbxmpp 0.3.3
by Gajim 01 Mar '14

01 Mar '14

changeset dede4d2cb554 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=dede4d2cb554 description: we now require python-nbxmpp 0.3.3 diffstat: src/gajim.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (18 lines): diff -r ed16c3055b3a -r dede4d2cb554 src/gajim.py --- a/src/gajim.py Sat Mar 01 21:16:24 2014 +0100 +++ b/src/gajim.py Sat Mar 01 21:29:46 2014 +0100 @@ -70,11 +70,11 @@ try: from distutils.version import LooseVersion as V - if V(nbxmpp.__version__) < V("0.3.1"): - print 'Gajim needs python-nbxmpp > 0.3.1 to run. Quiting...' + if V(nbxmpp.__version__) < V("0.3.3"): + print 'Gajim needs python-nbxmpp > 0.3.3 to run. Quiting...' sys.exit() except: - print 'Gajim needs python-nbxmpp > 0.3.1 to run. Quiting...' + print 'Gajim needs python-nbxmpp > 0.3.3 to run. Quiting...' sys.exit() from common import demandimport

1 0

python-nbxmpp: update version number
by Yann Leboulanger 01 Mar '14

01 Mar '14

changeset 30c2e6474c1d in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=30c2e6474c1d description: update version number diffstat: nbxmpp/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (9 lines): diff -r 544859c64f78 -r 30c2e6474c1d nbxmpp/__init__.py --- a/nbxmpp/__init__.py Sat Mar 01 20:53:52 2014 +0100 +++ b/nbxmpp/__init__.py Sat Mar 01 21:26:17 2014 +0100 @@ -17,4 +17,4 @@ from plugin import PlugIn from smacks import Smacks -__version__ = "0.3.2" +__version__ = "0.3.3"

1 0

gajim: New option 'authentication_mechanisms'
by Gajim 01 Mar '14

01 Mar '14

changeset ed16c3055b3a in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ed16c3055b3a description: New option 'authentication_mechanisms' Fixes #7671 diffstat: src/common/config.py | 1 + src/common/connection.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diffs (31 lines): diff -r 744f04e46576 -r ed16c3055b3a src/common/config.py --- a/src/common/config.py Fri Feb 28 11:02:26 2014 +0100 +++ b/src/common/config.py Sat Mar 01 21:16:24 2014 +0100 @@ -351,6 +351,7 @@ 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], 'tls_version': [ opt_str, '1.0', '' ], 'cipher_list': [ opt_str, 'HIGH:!aNULL:RC4-SHA', '' ], + 'authentication_mechanisms': [ opt_str, '', _('List (space separated) of authentication mechanisms to try. Can contain ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, PLAIN, X-MESSENGER-OAUTH2 or XEP-0078') ], 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], 'warn_when_insecure_password': [ opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain connection.') ], diff -r 744f04e46576 -r ed16c3055b3a src/common/connection.py --- a/src/common/connection.py Fri Feb 28 11:02:26 2014 +0100 +++ b/src/common/connection.py Sat Mar 01 21:16:24 2014 +0100 @@ -1447,8 +1447,15 @@ return True self._register_handlers(con, con_type) + auth_mechs = gajim.config.get_per('accounts', self.name, 'authentication_mechanisms') + auth_mechs = auth_mechs.split() + for mech in auth_mechs: + if mech not in nbxmpp.auth_nb.SASL_AUTHENTICATION_MECHANISMS | set(['XEP-0078']): + log.warning("Unknown authentication mechanisms %s" % mech) + if len(auth_mechs) == 0: + auth_mechs = None con.auth(user=name, password=self.password, - resource=self.server_resource, sasl=1, on_auth=self.__on_auth) + resource=self.server_resource, sasl=True, on_auth=self.__on_auth, auth_mechs=auth_mechs) def ssl_certificate_accepted(self): if not self.connection:

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