Commits February 2013

commits@gajim.org

3 participants
86 discussions

gajim: fix config names. Fixes #7276
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 56c9cc2925c9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=56c9cc2925c9 description: fix config names. Fixes #7276 diffstat: src/common/connection.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r d34a996f87b8 -r 56c9cc2925c9 src/common/connection.py --- a/src/common/connection.py Wed Feb 13 16:12:41 2013 +0100 +++ b/src/common/connection.py Tue Dec 25 18:56:05 2012 +0100 @@ -2389,7 +2389,7 @@ if not change_nick: t = p.setTag(common.xmpp.NS_MUC + ' x') tags = {} - timeout = gajim.config.get_per('room', room_jid, + timeout = gajim.config.get_per('rooms', room_jid, 'muc_restore_timeout') if timeout is None or timeout == -2: timeout = gajim.config.get('muc_restore_timeout') @@ -2403,7 +2403,7 @@ last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime( last_date)) tags['since'] = last_date - nb = gajim.config.get_per('room', room_jid, 'muc_restore_lines') + nb = gajim.config.get_per('rooms', room_jid, 'muc_restore_lines') if nb is None or nb == -2: nb = gajim.config.get('muc_restore_lines') if nb >= 0:

1 0

gajim: prevent traceback
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 385f8a1fad66 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=385f8a1fad66 description: prevent traceback diffstat: src/common/xmpp/client_nb.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r a4a38d790182 -r 385f8a1fad66 src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Wed Feb 13 16:10:05 2013 +0100 +++ b/src/common/xmpp/client_nb.py Wed Feb 13 16:10:44 2013 +0100 @@ -94,6 +94,7 @@ self.NonBlockingNonSASL.PlugOut() if 'SASL' in self.__dict__: if 'startsasl' in self.SASL.__dict__ and \ + 'startsasl' in self.SASL.__dict__ and \ self.SASL.startsasl == 'failure-in-process': sasl_failed = True self.SASL.startsasl = 'failure'

1 0

gajim: store all SSL errors
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset d34a996f87b8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d34a996f87b8 description: store all SSL errors diffstat: src/common/xmpp/tls_nb.py | 12 ++++++------ src/common/xmpp/transports_nb.py | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diffs (45 lines): diff -r 385f8a1fad66 -r d34a996f87b8 src/common/xmpp/tls_nb.py --- a/src/common/xmpp/tls_nb.py Wed Feb 13 16:10:44 2013 +0100 +++ b/src/common/xmpp/tls_nb.py Wed Feb 13 16:12:41 2013 +0100 @@ -393,7 +393,7 @@ flags |= 16384 tcpsock._sslContext.set_options(flags) - tcpsock.ssl_errnum = 0 + tcpsock.ssl_errnum = [0] tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, self._ssl_verify_callback) try: @@ -449,11 +449,11 @@ def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): # Exceptions can't propagate up through this callback, so print them here. try: - self._owner.ssl_fingerprint_sha1 = cert.digest('sha1') - self._owner.ssl_certificate = cert - self._owner.ssl_errnum = errnum - self._owner.ssl_cert_pem = OpenSSL.crypto.dump_certificate( - OpenSSL.crypto.FILETYPE_PEM, cert) + self._owner.ssl_fingerprint_sha1.ppend(cert.digest('sha1')) + self._owner.ssl_certificate.append(cert) + self._owner.ssl_errnum.append(errnum) + self._owner.ssl_cert_pem.append(OpenSSL.crypto.dump_certificate( + OpenSSL.crypto.FILETYPE_PEM, cert)) return True except: log.error("Exception caught in _ssl_info_callback:", exc_info=True) diff -r 385f8a1fad66 -r d34a996f87b8 src/common/xmpp/transports_nb.py --- a/src/common/xmpp/transports_nb.py Wed Feb 13 16:10:44 2013 +0100 +++ b/src/common/xmpp/transports_nb.py Wed Feb 13 16:12:41 2013 +0100 @@ -311,6 +311,12 @@ self.proxy_dict = proxy_dict self.on_remote_disconnect = self.disconnect + # ssl variables + self.ssl_fingerprint_sha1 = [] + self.ssl_certificate = [] + self.ssl_errnum = [] + self.ssl_cert_pem = [] + # FIXME: transport should not be aware xmpp def start_disconnect(self): NonBlockingTransport.start_disconnect(self)

1 0

gajim: do TLS handshake without blocking.
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset a4a38d790182 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a4a38d790182 description: do TLS handshake without blocking. diffstat: src/common/xmpp/tls_nb.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (19 lines): diff -r 6ab8ea2313aa -r a4a38d790182 src/common/xmpp/tls_nb.py --- a/src/common/xmpp/tls_nb.py Tue Dec 25 18:18:39 2012 +0100 +++ b/src/common/xmpp/tls_nb.py Wed Feb 13 16:10:05 2013 +0100 @@ -418,13 +418,13 @@ tcpsock._send = wrapper.send log.debug("Initiating handshake...") - tcpsock._sslObj.setblocking(True) try: tcpsock._sslObj.do_handshake() + except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError), e: + pass except: log.error('Error while TLS handshake: ', exc_info=True) return False - tcpsock._sslObj.setblocking(False) self._owner.ssl_lib = PYOPENSSL return True

1 0

gajim: correctly get SSL certificate from nbxmpp. Fixes #7283
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 6ab8ea2313aa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6ab8ea2313aa description: correctly get SSL certificate from nbxmpp. Fixes #7283 diffstat: src/common/connection.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (32 lines): diff -r 1d8caae49a31 -r 6ab8ea2313aa src/common/connection.py --- a/src/common/connection.py Sun Dec 23 17:48:11 2012 +0100 +++ b/src/common/connection.py Tue Dec 25 18:18:39 2012 +0100 @@ -1337,7 +1337,7 @@ if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, conn=self, - certificate=con.Connection.ssl_certificate, + certificate=con.Connection.ssl_certificate[-1], new_fingerprint=con.Connection.ssl_fingerprint_sha1[ -1])) return True @@ -1345,8 +1345,8 @@ gajim.config.set_per('accounts', self.name, 'ssl_fingerprint_sha1', con.Connection.ssl_fingerprint_sha1[-1]) - if not check_X509.check_certificate(con.Connection.ssl_certificate, - hostname) and '100' not in gajim.config.get_per('accounts', + if not check_X509.check_certificate(con.Connection.ssl_certificate[ + -1], hostname) and '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): txt = _('The authenticity of the %s certificate could be ' 'invalid.\nThe certificate does not cover this domain.') % \ @@ -1355,7 +1355,7 @@ error_text=txt, error_num=100, cert=con.Connection.ssl_cert_pem[-1], fingerprint=con.Connection.ssl_fingerprint_sha1[-1], - certificate=con.Connection.ssl_certificate)) + certificate=con.Connection.ssl_certificate[-1])) return True self._register_handlers(con, con_type)

1 0

gajim: correctly handle SSL errors. Fixes #7252
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 1d8caae49a31 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1d8caae49a31 description: correctly handle SSL errors. Fixes #7252 diffstat: src/common/connection.py | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diffs (74 lines): diff -r ac643f0a9bd1 -r 1d8caae49a31 src/common/connection.py --- a/src/common/connection.py Tue Jan 01 17:56:24 2013 +0400 +++ b/src/common/connection.py Sun Dec 23 17:48:11 2012 +0100 @@ -1311,34 +1311,40 @@ try: errnum = con.Connection.ssl_errnum except AttributeError: - errnum = -1 # we don't have an errnum - if errnum > 0 and str(errnum) not in gajim.config.get_per('accounts', - self.name, 'ignore_ssl_errors').split(): - text = _('The authenticity of the %s certificate could be invalid.' - ) % hostname - if errnum in ssl_error: - text += _('\nSSL Error: <b>%s</b>') % ssl_error[errnum] - else: - text += _('\nUnknown SSL error: %d') % errnum - gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_text=text, error_num=errnum, - cert=con.Connection.ssl_cert_pem, - fingerprint=con.Connection.ssl_fingerprint_sha1, - certificate=con.Connection.ssl_certificate)) - return True + errnum = [] # we don't have an errnum + i = 0 + for er in errnum: + if er > 0 and str(er) not in gajim.config.get_per('accounts', + self.name, 'ignore_ssl_errors').split(): + text = _('The authenticity of the %s certificate could be ' + 'invalid.') % hostname + if er in ssl_error: + text += _('\nSSL Error: <b>%s</b>') % ssl_error[er] + else: + text += _('\nUnknown SSL error: %d') % er + gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, + error_text=text, error_num=er, + cert=con.Connection.ssl_cert_pem[i], + fingerprint=con.Connection.ssl_fingerprint_sha1[i], + certificate=con.Connection.ssl_certificate[i])) + return True + i += 1 if hasattr(con.Connection, 'ssl_fingerprint_sha1'): saved_fingerprint = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1') if saved_fingerprint: # Check sha1 fingerprint - if con.Connection.ssl_fingerprint_sha1 != saved_fingerprint: + if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, - conn=self, certificate=con.Connection.ssl_certificate, - new_fingerprint=con.Connection.ssl_fingerprint_sha1)) + conn=self, + certificate=con.Connection.ssl_certificate, + new_fingerprint=con.Connection.ssl_fingerprint_sha1[ + -1])) return True else: gajim.config.set_per('accounts', self.name, - 'ssl_fingerprint_sha1', con.Connection.ssl_fingerprint_sha1) + 'ssl_fingerprint_sha1', + con.Connection.ssl_fingerprint_sha1[-1]) if not check_X509.check_certificate(con.Connection.ssl_certificate, hostname) and '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): @@ -1347,8 +1353,8 @@ hostname gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, error_text=txt, error_num=100, - cert=con.Connection.ssl_cert_pem, - fingerprint=con.Connection.ssl_fingerprint_sha1, + cert=con.Connection.ssl_cert_pem[-1], + fingerprint=con.Connection.ssl_fingerprint_sha1[-1], certificate=con.Connection.ssl_certificate)) return True

1 0

gajim: fix status treeview
by Denis Fomin 13 Feb '13

13 Feb '13

changeset ac643f0a9bd1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ac643f0a9bd1 description: fix status treeview diffstat: src/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a1313c0308ca -r ac643f0a9bd1 src/config.py --- a/src/config.py Thu Dec 13 10:07:51 2012 +0100 +++ b/src/config.py Tue Jan 01 17:56:24 2013 +0400 @@ -438,7 +438,7 @@ renderer.set_property('editable', True) self.fill_msg_treeview() buf = self.xml.get_object('msg_textview').get_buffer() - buf.connect('changed', self.on_msg_textview_changed) + buf.connect('end-user-action', self.on_msg_textview_changed) ### Audio / Video tab ### def create_av_combobox(opt_name, device_dict, config_name=None,

1 0

gajim: keep in config file room.JID.muc_restore_*. Fixes #7276
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset a1313c0308ca in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a1313c0308ca description: keep in config file room.JID.muc_restore_*. Fixes #7276 diffstat: src/common/config.py | 2 ++ src/common/connection.py | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diffs (38 lines): diff -r d68dac387bb8 -r a1313c0308ca src/common/config.py --- a/src/common/config.py Wed Dec 12 22:03:13 2012 +0100 +++ b/src/common/config.py Thu Dec 13 10:07:51 2012 +0100 @@ -463,6 +463,8 @@ }, {}), 'rooms': ({ 'speller_language': [ opt_str, '', _('Language for which we want to check misspelled words')], + 'muc_restore_lines': [opt_int, -2, _('How many lines to request from server when entering a groupchat. -1 means no limit, -2 means global value')], + 'muc_restore_timeout': [opt_int, -2, _('How many minutes back to request logs when a entering a groupchat. -1 means no limit, -2 means global value')], }, {}), 'plugins': ({ 'active': [opt_bool, False, _('State whether plugins should be activated on exit (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], diff -r d68dac387bb8 -r a1313c0308ca src/common/connection.py --- a/src/common/connection.py Wed Dec 12 22:03:13 2012 +0100 +++ b/src/common/connection.py Thu Dec 13 10:07:51 2012 +0100 @@ -2385,10 +2385,9 @@ tags = {} timeout = gajim.config.get_per('room', room_jid, 'muc_restore_timeout') - if timeout is None: - timeout = gajim.config.get('muc_restore_timeout') * 60 - else: - timeout *= 60 + if timeout is None or timeout == -2: + timeout = gajim.config.get('muc_restore_timeout') + timeout *= 60 if timeout >= 0: last_date = self.last_history_time[room_jid] if last_date == 0: @@ -2399,7 +2398,7 @@ last_date)) tags['since'] = last_date nb = gajim.config.get_per('room', room_jid, 'muc_restore_lines') - if nb is None: + if nb is None or nb == -2: nb = gajim.config.get('muc_restore_lines') if nb >= 0: tags['maxstanzas'] = nb

1 0

gajim: don't reconnect a disabled account. Fixes #7265
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset d68dac387bb8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d68dac387bb8 description: don't reconnect a disabled account. Fixes #7265 diffstat: src/common/connection.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r f7d75c53873f -r d68dac387bb8 src/common/connection.py --- a/src/common/connection.py Sun Dec 09 17:07:50 2012 +0100 +++ b/src/common/connection.py Wed Dec 12 22:03:13 2012 +0100 @@ -2641,6 +2641,9 @@ self.connection.send(message) def check_pingalive(self): + if not gajim.config.get_per('accounts', self.name, 'active'): + # Account may have been disabled + return if self.awaiting_xmpp_ping_id: # We haven't got the pong in time, disco and reconnect log.warn("No reply received for keepalive ping. Reconnecting.")

1 0

gajim: ability to store muc_restore_* per room JID. Fixes #7276
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset f7d75c53873f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f7d75c53873f description: ability to store muc_restore_* per room JID. Fixes #7276 diffstat: src/common/connection.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diffs (28 lines): diff -r 962da38dadfa -r f7d75c53873f src/common/connection.py --- a/src/common/connection.py Sun Dec 09 11:51:36 2012 +0100 +++ b/src/common/connection.py Sun Dec 09 17:07:50 2012 +0100 @@ -2383,7 +2383,12 @@ if not change_nick: t = p.setTag(common.xmpp.NS_MUC + ' x') tags = {} - timeout = gajim.config.get('muc_restore_timeout') * 60 + timeout = gajim.config.get_per('room', room_jid, + 'muc_restore_timeout') + if timeout is None: + timeout = gajim.config.get('muc_restore_timeout') * 60 + else: + timeout *= 60 if timeout >= 0: last_date = self.last_history_time[room_jid] if last_date == 0: @@ -2393,7 +2398,9 @@ last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime( last_date)) tags['since'] = last_date - nb = gajim.config.get('muc_restore_lines') + nb = gajim.config.get_per('room', room_jid, 'muc_restore_lines') + if nb is None: + nb = gajim.config.get('muc_restore_lines') if nb >= 0: tags['maxstanzas'] = nb if tags:

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2013