Commits March 2014

commits@gajim.org

3 participants
103 discussions

gajim: Set parent for server error dialog in disco
by Gajim 27 Mar '14

27 Mar '14

changeset eac03906371e in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=eac03906371e description: Set parent for server error dialog in disco diffstat: src/disco.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 0cb55c12b4b0 -r eac03906371e src/disco.py --- a/src/disco.py Tue Jan 14 22:48:51 2014 +0100 +++ b/src/disco.py Sat Jan 18 11:44:25 2014 +0400 @@ -832,7 +832,8 @@ jid = helpers.parse_jid(jid) except helpers.InvalidFormat as s: pritext = _('Invalid Server Name') - dialogs.ErrorDialog(pritext, str(s)) + dialogs.ErrorDialog(pritext, str(s), + transient_for=self.window) return if jid == self.jid: # jid has not changed return

1 0

gajim: Support for sha256 fingerprint.
by Gajim 27 Mar '14

27 Mar '14

changeset 21e37fe416a6 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=21e37fe416a6 description: Support for sha256 fingerprint. Fixes #7628 diffstat: src/common/config.py | 1 + src/common/connection.py | 38 ++++++++++++++++++++++++------- src/common/connection_handlers_events.py | 6 +++- src/config.py | 12 ++++++--- src/dialogs.py | 8 +++++- src/gui_interface.py | 30 ++++++++++++++++-------- 6 files changed, 68 insertions(+), 27 deletions(-) diffs (232 lines): diff -r eac03906371e -r 21e37fe416a6 src/common/config.py --- a/src/common/config.py Sat Jan 18 11:44:25 2014 +0400 +++ b/src/common/config.py Tue Jan 21 15:27:41 2014 +0100 @@ -354,6 +354,7 @@ '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.') ], 'ssl_fingerprint_sha1': [ opt_str, '', '', True ], + 'ssl_fingerprint_sha256': [ opt_str, '', '', True ], 'ignore_ssl_errors': [ opt_str, '', _('Space separated list of ssl errors to ignore.') ], 'use_srv': [ opt_bool, True, '', True ], 'use_custom_host': [ opt_bool, False, '', True ], diff -r eac03906371e -r 21e37fe416a6 src/common/connection.py --- a/src/common/connection.py Sat Jan 18 11:44:25 2014 +0400 +++ b/src/common/connection.py Tue Jan 21 15:27:41 2014 +0100 @@ -1408,27 +1408,46 @@ text += _('\nSSL Error: %s') % ssl_error[errnum] else: text += _('\nUnknown SSL error: %d') % errnum - fingerprint = cert.digest('sha1').decode('utf-8') + fingerprint_sha1 = cert.digest('sha1').decode('utf-8') + fingerprint_sha256 = cert.digest('sha256').decode('utf-8') pem = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8') gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, error_text=text, error_num=errnum, cert=pem, - fingerprint=fingerprint, certificate=cert)) + fingerprint_sha1=fingerprint_sha1, + fingerprint_sha256=fingerprint_sha256, certificate=cert)) return True if cert: - fingerprint = cert.digest('sha1').decode('utf-8') - saved_fingerprint = gajim.config.get_per('accounts', self.name, + fingerprint_sha1 = cert.digest('sha1').decode('utf-8') + fingerprint_sha256 = cert.digest('sha256').decode('utf-8') + saved_fingerprint_sha1 = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1') - if saved_fingerprint: + if saved_fingerprint_sha1: # Check sha1 fingerprint - if fingerprint != saved_fingerprint: + if fingerprint_sha1 != saved_fingerprint_sha1: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, conn=self, certificate=cert, - new_fingerprint=fingerprint)) + new_fingerprint_sha1=fingerprint_sha1, + new_fingerprint_sha256=fingerprint_sha256)) return True else: gajim.config.set_per('accounts', self.name, - 'ssl_fingerprint_sha1', fingerprint) + 'ssl_fingerprint_sha1', fingerprint_sha1) + + saved_fingerprint_sha256 = gajim.config.get_per('accounts', self.name, + 'ssl_fingerprint_sha256') + if saved_fingerprint_sha256: + # Check sha256 fingerprint + if fingerprint_sha256 != saved_fingerprint_sha256: + gajim.nec.push_incoming_event(FingerprintErrorEvent(None, + conn=self, certificate=con.Connection.ssl_certificate, + new_fingerprint_sha1=fingerprint_sha1, + new_fingerprint_sha256=fingerprint_sha256)) + return True + else: + gajim.config.set_per('accounts', self.name, + 'ssl_fingerprint_sha256', fingerprint_sha256) + if not check_X509.check_certificate(cert, hostname) and \ '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): @@ -1439,7 +1458,8 @@ hostname gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, error_text=txt, error_num=100, cert=pem, - fingerprint=fingerprint, certificate=cert)) + fingerprint_sha1=fingerprint_sha1, + fingerprint_sha256=fingerprint_sha256, certificate=cert)) return True self._register_handlers(con, con_type) diff -r eac03906371e -r 21e37fe416a6 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Jan 18 11:44:25 2014 +0400 +++ b/src/common/connection_handlers_events.py Tue Jan 21 15:27:41 2014 +0100 @@ -1639,12 +1639,14 @@ self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ self.errnum) self.ssl_cert = '' - self.ssl_fingerprint = '' + self.ssl_fingerprint_sha1 = '' + self.ssl_fingerprint_sha256 = '' if self.conn.connection.Connection.ssl_certificate: cert = self.conn.connection.Connection.ssl_certificate self.ssl_cert = OpenSSL.crypto.dump_certificate( OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8') - self.ssl_fingerprint = cert.digest('sha1').decode('utf-8') + self.ssl_fingerprint_sha1 = cert.digest('sha1').decode('utf-8') + self.ssl_fingerprint_sha256 = cert.digest('sha256').decode('utf-8') return True class NewAccountNotConnectedEvent(nec.NetworkIncomingEvent): diff -r eac03906371e -r 21e37fe416a6 src/config.py --- a/src/config.py Sat Jan 18 11:44:25 2014 +0400 +++ b/src/config.py Tue Jan 21 15:27:41 2014 +0100 @@ -3784,7 +3784,9 @@ f.write(self.ssl_cert + '\n\n') f.close() gajim.connections[self.account].new_account_info[ - 'ssl_fingerprint_sha1'] = self.ssl_fingerprint + 'ssl_fingerprint_sha1'] = self.ssl_fingerprint_sha1 + gajim.connections[self.account].new_account_info[ + 'ssl_fingerprint_sha256'] = self.ssl_fingerprint_sha256 self.notebook.set_current_page(4) # show fom page elif cur_page == 4: if self.is_form: @@ -3859,7 +3861,8 @@ self.forward_button.set_sensitive(False) self.notebook.set_current_page(4) # show form page return - self.ssl_fingerprint = obj.ssl_fingerprint + self.ssl_fingerprint_sha1 = obj.ssl_fingerprint_sha1 + self.ssl_fingerprint_sha256 = obj.ssl_fingerprint_sha256 self.ssl_cert = obj.ssl_cert if obj.ssl_msg: # An SSL warning occured, show it @@ -3873,8 +3876,9 @@ 'hostname': hostname, 'error': obj.ssl_msg}) if obj.errnum in (18, 27): text = _('Add this certificate to the list of trusted ' - 'certificates.\nSHA1 fingerprint of the certificate:\n%s') \ - % obj.ssl_fingerprint + 'certificates.\nSHA1 fingerprint of the certificate:\n%s' + '\nSHA256 fingerprint of the certificate:\n%s') \ + % (obj.ssl_fingerprint_sha1, obj.ssl_fingerprint_sha256) self.xml.get_object('ssl_checkbutton').set_label(text) else: self.xml.get_object('ssl_checkbutton').set_no_show_all(True) diff -r eac03906371e -r 21e37fe416a6 src/dialogs.py --- a/src/dialogs.py Sat Jan 18 11:44:25 2014 +0400 +++ b/src/dialogs.py Tue Jan 21 15:27:41 2014 +0100 @@ -5448,14 +5448,18 @@ Expires on: %(eo)s Fingerprint -SHA1 Fingerprint: %(sha1)s''') % { +SHA1 Fingerprint: %(sha1)s + +SHA256 Fingerprint: %(sha256)s +''') % { 'scn': subject.commonName, 'sorg': subject.organizationName, 'sou': subject.organizationalUnitName, 'sn': cert.get_serial_number(), 'icn': issuer.commonName, 'iorg': issuer.organizationName, 'iou': issuer.organizationalUnitName, 'io': cert.get_notBefore(), 'eo': cert.get_notAfter(), - 'sha1': cert.digest('sha1')}) + 'sha1': cert.digest('sha1'), + 'sha256': cert.digest('sha256')}) self.set_transient_for(parent) self.set_title(_('Certificate for account %s') % account) diff -r eac03906371e -r 21e37fe416a6 src/gui_interface.py --- a/src/gui_interface.py Sat Jan 18 11:44:25 2014 +0400 +++ b/src/gui_interface.py Tue Jan 21 15:27:41 2014 +0100 @@ -1300,7 +1300,7 @@ obj.exchange_items_list, obj.fjid) def handle_event_ssl_error(self, obj): - # ('SSL_ERROR', account, (text, errnum, cert, sha1_fingerprint)) + # ('SSL_ERROR', account, (text, errnum, cert, sha1_fingerprint, sha256_fingerprint)) account = obj.conn.name server = gajim.config.get_per('accounts', account, 'hostname') @@ -1323,7 +1323,9 @@ f.write(obj.cert + '\n\n') f.close() gajim.config.set_per('accounts', account, 'ssl_fingerprint_sha1', - obj.fingerprint) + obj.fingerprint_sha1) + gajim.config.set_per('accounts', account, 'ssl_fingerprint_sha256', + obj.fingerprint_sha256) if is_checked[1]: ignore_ssl_errors = gajim.config.get_per('accounts', account, 'ignore_ssl_errors').split() @@ -1344,8 +1346,9 @@ 'server?') % {'error': obj.error_text} if obj.error_num in (18, 27): checktext1 = _('Add this certificate to the list of trusted ' - 'certificates.\nSHA1 fingerprint of the certificate:\n%s') % \ - obj.fingerprint + 'certificates.\nSHA1 fingerprint of the certificate:\n%s' + '\nSHA256 fingerprint of the certificate:\n%s') % \ + (obj.fingerprint_sha1, obj.fingerprint_sha256) else: checktext1 = '' checktext2 = _('Ignore this error for this certificate.') @@ -1359,12 +1362,14 @@ _('SSL Certificate Verification for %s') % account) def handle_event_fingerprint_error(self, obj): - # ('FINGERPRINT_ERROR', account, (new_fingerprint,)) + # ('FINGERPRINT_ERROR', account, (new_fingerprint_sha1,new_fingerprint_sha256,)) account = obj.conn.name def on_yes(is_checked): del self.instances[account]['online_dialog']['fingerprint_error'] gajim.config.set_per('accounts', account, 'ssl_fingerprint_sha1', - obj.new_fingerprint) + obj.new_fingerprint_sha1) + gajim.config.set_per('accounts', account, 'ssl_fingerprint_sha256', + obj.new_fingerprint_sha256) # Reset the ignored ssl errors gajim.config.set_per('accounts', account, 'ignore_ssl_errors', '') obj.conn.ssl_certificate_accepted() @@ -1377,11 +1382,16 @@ pritext = _('SSL certificate error') sectext = _('It seems the SSL certificate of account %(account)s has ' - 'changed or your connection is being hacked.\nOld fingerprint: ' - '%(old)s\nNew fingerprint: %(new)s\n\nDo you still want to connect ' + 'changed or your connection is being hacked.\n\nOld SHA-1 fingerprint: ' + '%(old_sha1)s\nOld SHA-256 fingerprint: %(old_sha256)s\n\n' + 'New SHA-1 fingerprint: %(new_sha1)s\nNew SHA-256 fingerprint: ' + '%(new_sha256)s\n\nDo you still want to connect ' 'and update the fingerprint of the certificate?') % \ - {'account': account, 'old': gajim.config.get_per('accounts', - account, 'ssl_fingerprint_sha1'), 'new': obj.new_fingerprint} + {'account': account, + 'old_sha1': gajim.config.get_per('accounts', account, 'ssl_fingerprint_sha1'), + 'old_sha256': gajim.config.get_per('accounts', account, 'ssl_fingerprint_sha256'), + 'new_sha1': obj.new_fingerprint_sha1, + 'new_sha256': obj.new_fingerprint_sha256} if 'fingerprint_error' in self.instances[account]['online_dialog']: self.instances[account]['online_dialog']['fingerprint_error'].\ destroy()

1 0

gajim: Reformat the servers.xml using HTML Tidy tool
by Gajim 27 Mar '14

27 Mar '14

changeset 1218cf009513 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1218cf009513 description: Reformat the servers.xml using HTML Tidy tool http://tidy.sourceforge.net/ diffstat: data/other/servers.xml | 107 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 105 insertions(+), 2 deletions(-) diffs (118 lines): diff -r 21e37fe416a6 -r 1218cf009513 data/other/servers.xml --- a/data/other/servers.xml Tue Jan 21 15:27:41 2014 +0100 +++ b/data/other/servers.xml Thu Jan 23 15:29:27 2014 +0100 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="utf-8"?>  -<query xmlns:reg="urn:xmpp:vcard:registration:1"><item jid="0nl1ne.at"/><item jid="blah.im"/><item jid="boese-ban.de"/><item jid="brauchen.info"/><item jid="chatme.im"/><item jid="chrome.pl"/><item jid="climm.org"/><item jid="coderollers.com"/><item jid="codingteam.net"/><item jid="comm.unicate.me"/><item jid="deshalbfrei.org"/><item jid="draugr.de"/><item jid="einfachjabber.de"/><item jid="forumanalogue.fr"/><item jid="im.apinc.org"/><item jid="im.flosoft.biz"/><item jid="internet-exception.de"/><item jid="jabb3r.net"/><item jid="jabber-br.org"/><item jid="jabber-hosting.de"/><item jid="jabber.at"/><item jid="jabber.ccc.de"/><item jid="jabber.chaotic.de"/><item jid="jabber.co.nz"/><item jid="jabber.cz"/><item jid="jabber.de"/><item jid="jabber.earth.li"/><item jid="jabber.etighichat.com"/><item jid="jabber.fourecks.de"/><item jid="jabber.gate31.net"/><item jid="jabber.hot-chilli.net"/><item jid="jabber.i-pobox.net"/><item jid="jabber.iitsp.com"/><item jid="jabber.loudas.com"/><item jid="jabber.me"/><item jid="jabber.meta.net.nz"/><item jid="jabber.minus273.org"/><item jid="jabber.no-sense.net"/><item jid="jabber.no"/><item jid="jabber.rootbash.com"/><item jid="jabber.rueckgr.at"/><item jid="jabber.scha.de"/><item jid="jabber.schnied.net"/><item jid="jabber.second-home.de"/><item jid="jabber.smash-net.org"/><item jid="jabber.sow.as"/><item jid="jabber.theforest.us"/><item jid="jabber.tmkis.com"/><item jid="jabber.yeahnah.co.nz"/><item jid="jabberd.eu"/><item jid="jabberes.org"/><item jid="jabbim.com"/><item jid="jabbim.cz"/><item jid="jabbim.pl"/><item jid="jabbim.sk"/><item jid="jabin.org"/><item jid="jabme.de"/><item jid="jabster.pl"/><item jid="jaim.at"/><item jid="jappix.com"/><item jid="jisshi.com"/><item jid="labnote.org"/><item jid="lightwitch.org"/><item jid="limun.org"/><item jid="macjabber.de"/><item jid="mayplaces.com"/><item jid="na-di.de"/><item jid="neko.im"/><item jid="netmindz.net"/><item jid="njs.netlab.cz"/><item jid="palita.net"/><item jid="pandion.im"/><item jid="pidgin.su"/><item jid="programmer-art.org"/><item jid="prosody.de"/><item jid="richim.org"/><item jid="rkquery.de"/><item jid="sss.chaoslab.ru"/><item jid="sternenschweif.de"/><item jid="swissjabber.ch"/><item jid="swissjabber.de"/><item jid="swissjabber.eu"/><item jid="swissjabber.li"/><item jid="swissjabber.org"/><item jid="tcweb.org"/><item jid="tekst.me"/><item jid="thiessen.im"/><item jid="thiessen.it"/><item jid="thiessen.org"/><item jid="tigase.im"/><item jid="twattle.net"/><item jid="ubuntu-jabber.de"/><item jid="ubuntu-jabber.net"/><item jid="univers-libre.net"/><item jid="verdammung.org"/><item jid="wtfismyip.com"/><item jid="xabber.de"/><item jid="xmpp-hosting.de"/><item jid="xmpp.jp"/><item jid="xmppnet.de"/><item jid="zauris.ru"/><item jid="zsim.de"/></query> +<query xmlns:reg="urn:xmpp:vcard:registration:1"> + <item jid="0nl1ne.at" /> + <item jid="blah.im" /> + <item jid="boese-ban.de" /> + <item jid="brauchen.info" /> + <item jid="chatme.im" /> + <item jid="chrome.pl" /> + <item jid="climm.org" /> + <item jid="coderollers.com" /> + <item jid="codingteam.net" /> + <item jid="comm.unicate.me" /> + <item jid="deshalbfrei.org" /> + <item jid="draugr.de" /> + <item jid="einfachjabber.de" /> + <item jid="forumanalogue.fr" /> + <item jid="im.apinc.org" /> + <item jid="im.flosoft.biz" /> + <item jid="internet-exception.de" /> + <item jid="jabb3r.net" /> + <item jid="jabber-br.org" /> + <item jid="jabber-hosting.de" /> + <item jid="jabber.at" /> + <item jid="jabber.ccc.de" /> + <item jid="jabber.chaotic.de" /> + <item jid="jabber.co.nz" /> + <item jid="jabber.cz" /> + <item jid="jabber.de" /> + <item jid="jabber.earth.li" /> + <item jid="jabber.etighichat.com" /> + <item jid="jabber.fourecks.de" /> + <item jid="jabber.gate31.net" /> + <item jid="jabber.hot-chilli.net" /> + <item jid="jabber.i-pobox.net" /> + <item jid="jabber.iitsp.com" /> + <item jid="jabber.loudas.com" /> + <item jid="jabber.me" /> + <item jid="jabber.meta.net.nz" /> + <item jid="jabber.minus273.org" /> + <item jid="jabber.no-sense.net" /> + <item jid="jabber.no" /> + <item jid="jabber.rootbash.com" /> + <item jid="jabber.rueckgr.at" /> + <item jid="jabber.scha.de" /> + <item jid="jabber.schnied.net" /> + <item jid="jabber.second-home.de" /> + <item jid="jabber.smash-net.org" /> + <item jid="jabber.sow.as" /> + <item jid="jabber.theforest.us" /> + <item jid="jabber.tmkis.com" /> + <item jid="jabber.yeahnah.co.nz" /> + <item jid="jabberd.eu" /> + <item jid="jabberes.org" /> + <item jid="jabbim.com" /> + <item jid="jabbim.cz" /> + <item jid="jabbim.pl" /> + <item jid="jabbim.sk" /> + <item jid="jabin.org" /> + <item jid="jabme.de" /> + <item jid="jabster.pl" /> + <item jid="jaim.at" /> + <item jid="jappix.com" /> + <item jid="jisshi.com" /> + <item jid="labnote.org" /> + <item jid="lightwitch.org" /> + <item jid="limun.org" /> + <item jid="macjabber.de" /> + <item jid="mayplaces.com" /> + <item jid="na-di.de" /> + <item jid="neko.im" /> + <item jid="netmindz.net" /> + <item jid="njs.netlab.cz" /> + <item jid="palita.net" /> + <item jid="pandion.im" /> + <item jid="pidgin.su" /> + <item jid="programmer-art.org" /> + <item jid="prosody.de" /> + <item jid="richim.org" /> + <item jid="rkquery.de" /> + <item jid="sss.chaoslab.ru" /> + <item jid="sternenschweif.de" /> + <item jid="swissjabber.ch" /> + <item jid="swissjabber.de" /> + <item jid="swissjabber.eu" /> + <item jid="swissjabber.li" /> + <item jid="swissjabber.org" /> + <item jid="tcweb.org" /> + <item jid="tekst.me" /> + <item jid="thiessen.im" /> + <item jid="thiessen.it" /> + <item jid="thiessen.org" /> + <item jid="tigase.im" /> + <item jid="twattle.net" /> + <item jid="ubuntu-jabber.de" /> + <item jid="ubuntu-jabber.net" /> + <item jid="univers-libre.net" /> + <item jid="verdammung.org" /> + <item jid="wtfismyip.com" /> + <item jid="xabber.de" /> + <item jid="xmpp-hosting.de" /> + <item jid="xmpp.jp" /> + <item jid="xmppnet.de" /> + <item jid="zauris.ru" /> + <item jid="zsim.de" /> +</query>

1 0

gajim: Sort entries in servers.xml
by Gajim 27 Mar '14

27 Mar '14

changeset 4a34aa6756ed in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4a34aa6756ed description: Sort entries in servers.xml diffstat: data/other/servers.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 1218cf009513 -r 4a34aa6756ed data/other/servers.xml --- a/data/other/servers.xml Thu Jan 23 15:29:27 2014 +0100 +++ b/data/other/servers.xml Thu Jan 23 16:18:32 2014 +0100 @@ -44,8 +44,8 @@ <item jid="jabber.me" /> <item jid="jabber.meta.net.nz" /> <item jid="jabber.minus273.org" /> + <item jid="jabber.no" /> <item jid="jabber.no-sense.net" /> - <item jid="jabber.no" /> <item jid="jabber.rootbash.com" /> <item jid="jabber.rueckgr.at" /> <item jid="jabber.scha.de" />

1 0

gajim: don't crash when we cannot connect to avahi. Fixes #7607
by Gajim 27 Mar '14

27 Mar '14

changeset 8b2649920d66 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8b2649920d66 description: don't crash when we cannot connect to avahi. Fixes #7607 diffstat: src/common/zeroconf/connection_zeroconf.py | 1 + src/common/zeroconf/zeroconf_avahi.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diffs (28 lines): diff -r 816e8c24c6db -r 8b2649920d66 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Wed Mar 26 18:23:58 2014 +0100 +++ b/src/common/zeroconf/connection_zeroconf.py Tue Dec 31 14:28:24 2013 +0100 @@ -296,6 +296,7 @@ show=show)) else: # show notification that avahi or system bus is down + self.connected = 0 gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) self.status = 'offline' diff -r 816e8c24c6db -r 8b2649920d66 src/common/zeroconf/zeroconf_avahi.py --- a/src/common/zeroconf/zeroconf_avahi.py Wed Mar 26 18:23:58 2014 +0100 +++ b/src/common/zeroconf/zeroconf_avahi.py Tue Dec 31 14:28:24 2013 +0100 @@ -277,9 +277,10 @@ state = self.server.GetState() if state == self.avahi.SERVER_RUNNING: - self.create_service() - self.announced = True - return True + if self.create_service(): + self.announced = True + return True + return False def remove_announce(self): if self.announced == False:

1 0

gajim: add a <private> element to message stanza when message ca...
by Gajim 27 Mar '14

27 Mar '14

changeset b133c7299af2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b133c7299af2 description: add a <private> element to message stanza when message carbons is enabled and message is encrypted. Fixes #7616 diffstat: src/common/connection.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diffs (40 lines): diff -r 8b2649920d66 -r b133c7299af2 src/common/connection.py --- a/src/common/connection.py Tue Dec 31 14:28:24 2013 +0100 +++ b/src/common/connection.py Wed Jan 01 20:49:53 2014 +0100 @@ -164,6 +164,7 @@ self.roster_supported = True self.blocking_supported = False self.addressing_supported = False + self.carbons_enabled = False self.muc_jid = {} # jid of muc server for each transport type self._stun_servers = [] # STUN servers of our jabber server @@ -420,6 +421,8 @@ if msgenc: msg_iq.setTag(nbxmpp.NS_ENCRYPTED + ' x').setData(msgenc) + if self.carbons_enabled: + msg_iq.addChild(name='private', namespace=nbxmpp.NS_CARBONS) if form_node: msg_iq.addChild(node=form_node) @@ -492,6 +495,9 @@ # XEP-0200 if session.enable_encryption: msg_iq = session.encrypt_stanza(msg_iq) + if self.carbons_enabled: + msg_iq.addChild(name='private', + namespace=nbxmpp.NS_CARBONS) if callback: callback(jid, msg, keyID, forward_from, session, original_message, @@ -1937,7 +1943,8 @@ if nbxmpp.NS_ADDRESS in obj.features: self.addressing_supported = True if nbxmpp.NS_CARBONS in obj.features and gajim.config.get_per( - 'accounts', self.name, 'enable_message_carbons'): + 'accounts', self.name, 'enable_message_carbons'): + self.carbons_enabled = True # Server supports carbons, activate it iq = nbxmpp.Iq('set') iq.setTag('enable', namespace=nbxmpp.NS_CARBONS)

1 0

gajim: send jabber:iq:last to bare jid when contact is offline. ...
by Gajim 27 Mar '14

27 Mar '14

changeset 4a28b4224af1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4a28b4224af1 description: send jabber:iq:last to bare jid when contact is offline. Fixes #7610 diffstat: src/vcard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b133c7299af2 -r 4a28b4224af1 src/vcard.py --- a/src/vcard.py Wed Jan 01 20:49:53 2014 +0100 +++ b/src/vcard.py Wed Jan 01 22:32:00 2014 +0100 @@ -439,7 +439,7 @@ self.contact.jid) else: gajim.connections[self.account].request_last_status_time( - self.contact.jid, self.contact.resource) + self.contact.jid, '') # do not wait for os_info if contact is not connected or has error # additional check for observer is needed, as show is offline for him

1 0

27 Mar '14

changeset 1b1d2c5425a0 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1b1d2c5425a0 description: Copyright 2013>2014 diffstat: setup_win32.py | 2 +- src/adhoc_commands.py | 2 +- src/advanced_configuration_window.py | 2 +- src/atom_window.py | 2 +- src/cell_renderer_image.py | 2 +- src/chat_control.py | 2 +- src/common/atom.py | 2 +- src/common/caps_cache.py | 2 +- src/common/check_paths.py | 2 +- src/common/commands.py | 2 +- src/common/config.py | 2 +- src/common/configpaths.py | 2 +- src/common/connection.py | 2 +- src/common/connection_handlers.py | 2 +- src/common/connection_handlers_events.py | 2 +- src/common/contacts.py | 2 +- src/common/dataforms.py | 2 +- src/common/dbus_support.py | 2 +- src/common/defs.py | 2 +- src/common/dh.py | 2 +- src/common/events.py | 2 +- src/common/exceptions.py | 2 +- src/common/fuzzyclock.py | 2 +- src/common/gajim.py | 2 +- src/common/gnupg.py | 4 ++-- src/common/gpg.py | 2 +- src/common/helpers.py | 2 +- src/common/i18n.py | 2 +- src/common/location_listener.py | 2 +- src/common/logger.py | 2 +- src/common/optparser.py | 2 +- src/common/passwords.py | 2 +- src/common/pep.py | 2 +- src/common/protocol/bytestream.py | 2 +- src/common/proxy65_manager.py | 2 +- src/common/pubsub.py | 2 +- src/common/rst_xhtml_generator.py | 2 +- src/common/sleepy.py | 2 +- src/common/socks5.py | 2 +- src/common/stanza_session.py | 2 +- src/common/zeroconf/connection_zeroconf.py | 2 +- src/config.py | 2 +- src/conversation_textview.py | 2 +- src/dataforms_widget.py | 2 +- src/dialogs.py | 4 ++-- src/disco.py | 2 +- src/features_window.py | 2 +- src/filetransfers_window.py | 2 +- src/gajim-remote.py | 2 +- src/gajim.py | 2 +- src/gajim_themes_window.py | 2 +- src/groupchat_control.py | 2 +- src/groups.py | 2 +- src/gtkexcepthook.py | 2 +- src/gtkgui_helpers.py | 2 +- src/gui_interface.py | 2 +- src/gui_menu_builder.py | 2 +- src/history_manager.py | 2 +- src/history_window.py | 2 +- src/htmltextview.py | 2 +- src/ipython_view.py | 2 +- src/logind_listener.py | 2 +- src/message_control.py | 2 +- src/message_textview.py | 2 +- src/message_window.py | 2 +- src/music_track_listener.py | 2 +- src/negotiation.py | 2 +- src/network_manager_listener.py | 2 +- src/notify.py | 2 +- src/profile_window.py | 2 +- src/remote_control.py | 2 +- src/roster_window.py | 2 +- src/search_window.py | 2 +- src/session.py | 2 +- src/statusicon.py | 2 +- src/tooltips.py | 2 +- src/upower_listener.py | 2 +- src/vcard.py | 2 +- 78 files changed, 80 insertions(+), 80 deletions(-) diffs (truncated from 950 to 300 lines): diff -r 4a28b4224af1 -r 1b1d2c5425a0 setup_win32.py --- a/setup_win32.py Wed Jan 01 22:32:00 2014 +0100 +++ b/setup_win32.py Thu Jan 02 12:33:54 2014 +0400 @@ -1,6 +1,6 @@ ## setup_win32.py (run me as python setup_win32.py py2exe -O2) ## -## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/adhoc_commands.py --- a/src/adhoc_commands.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/adhoc_commands.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2006 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## Stephan Erb <steve-e AT h3c.de> ## diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/advanced_configuration_window.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2005 Travis Shirk <travis AT pobox.com> ## Vincent Hanquez <tab AT snarc.org> -## Copyright (C) 2005-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2006-2007 Jean-Marie Traissard <jim AT lapin.org> diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/atom_window.py --- a/src/atom_window.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/atom_window.py Thu Jan 02 12:33:54 2014 +0400 @@ -2,7 +2,7 @@ ## src/atom_window.py ## ## Copyright (C) 2006 Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/cell_renderer_image.py --- a/src/cell_renderer_image.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/cell_renderer_image.py Thu Jan 02 12:33:54 2014 +0400 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/cell_renderer_image.py ## -## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006 Travis Shirk <travis AT pobox.com> diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/chat_control.py --- a/src/chat_control.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/chat_control.py Thu Jan 02 12:33:54 2014 +0400 @@ -2,7 +2,7 @@ ## src/chat_control.py ## ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Nikos Kouremenos <kourem AT gmail.com> ## Travis Shirk <travis AT pobox.com> diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/atom.py --- a/src/common/atom.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/atom.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## ## This file is part of Gajim. ## diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/caps_cache.py --- a/src/common/caps_cache.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/caps_cache.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org> ## Travis Shirk <travis AT pobox.com> -## Copyright (C) 2007-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> ## Jonathan Schleifer <js-gajim AT webkeks.org> ## Copyright (C) 2008-2009 Stephan Erb <steve-e AT h3c.de> diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/check_paths.py --- a/src/common/check_paths.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/check_paths.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2005-2006 Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2005-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org> ## Copyright (C) 2008 Jean-Marie Traissard <jim AT lapin.org> diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/commands.py --- a/src/common/commands.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/commands.py Thu Jan 02 12:33:54 2014 +0400 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/commands.py ## -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/config.py --- a/src/common/config.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/config.py Thu Jan 02 12:33:54 2014 +0400 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/config.py ## -## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2005 Stéphan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/configpaths.py --- a/src/common/configpaths.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/configpaths.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Junglecow J <junglecow AT gmail.com> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Brendan Taylor <whateley AT gmail.com> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/connection.py --- a/src/common/connection.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/connection.py Thu Jan 02 12:33:54 2014 +0400 @@ -2,7 +2,7 @@ ## src/common/connection.py ## ## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> -## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> ## Stéphan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/connection_handlers.py Thu Jan 02 12:33:54 2014 +0400 @@ -6,7 +6,7 @@ ## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> ## Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> ## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> ## Jean-Marie Traissard <jim AT lapin.org> diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/connection_handlers_events.py Thu Jan 02 12:33:54 2014 +0400 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/connection_handlers_events.py ## -## Copyright (C) 2010-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2010-2014 Yann Leboulanger <asterix AT lagaule.org> ## ## This file is part of Gajim. ## diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/contacts.py --- a/src/common/contacts.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/contacts.py Thu Jan 02 12:33:54 2014 +0400 @@ -4,7 +4,7 @@ ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> ## Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> ## Tomasz Melcer <liori AT exroot.org> diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/dataforms.py --- a/src/common/dataforms.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/dataforms.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## src/common/dataforms.py ## ## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> ## ## This file is part of Gajim. diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/dbus_support.py --- a/src/common/dbus_support.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/dbus_support.py Thu Jan 02 12:33:54 2014 +0400 @@ -4,7 +4,7 @@ ## Copyright (C) 2005 Andrew Sayman <lorien420 AT myrealbox.com> ## Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2005-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Stefan Bethge <stefan AT lanpartei.de> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/defs.py --- a/src/common/defs.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/defs.py Thu Jan 02 12:33:54 2014 +0400 @@ -2,7 +2,7 @@ ## src/common/defs.py ## ## Copyright (C) 2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Brendan Taylor <whateley AT gmail.com> ## Tomasz Melcer <liori AT exroot.org> diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/dh.py --- a/src/common/dh.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/dh.py Thu Jan 02 12:33:54 2014 +0400 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/dh.py ## -## Copyright (C) 2007-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> ## ## This file is part of Gajim. diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/events.py --- a/src/common/events.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/events.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> ## Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/exceptions.py --- a/src/common/exceptions.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/exceptions.py Thu Jan 02 12:33:54 2014 +0400 @@ -2,7 +2,7 @@ ## src/common/exceptions.py ## ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2005-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Brendan Taylor <whateley AT gmail.com> ## diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/fuzzyclock.py --- a/src/common/fuzzyclock.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/fuzzyclock.py Thu Jan 02 12:33:54 2014 +0400 @@ -2,7 +2,7 @@ ## src/common/fuzzyclock.py ## ## Copyright (C) 2006 Christoph Neuroth <delmonico AT gmx.net> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2009 Benjamin Richter ## diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/gajim.py --- a/src/common/gajim.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/gajim.py Thu Jan 02 12:33:54 2014 +0400 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/gajim.py ## -## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> diff -r 4a28b4224af1 -r 1b1d2c5425a0 src/common/gnupg.py --- a/src/common/gnupg.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/gnupg.py Thu Jan 02 12:33:54 2014 +0400 @@ -27,7 +27,7 @@ and so does not work on Windows). Renamed to gnupg.py to avoid confusion with the previous versions. -Modifications Copyright (C) 2008-2013 Vinay Sajip. All rights reserved. +Modifications Copyright (C) 2008-2014 Vinay Sajip. All rights reserved. A unittest harness (test_gnupg.py) has also been added. """ @@ -35,7 +35,7 @@

1 0

python-nbxmpp: SCRAM-SHA-1-PLUS authentication mechanism
by Fedor Brunner 27 Mar '14

27 Mar '14

changeset cbe73e43ed82 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=cbe73e43ed82 description: SCRAM-SHA-1-PLUS authentication mechanism Fixes #16 diffstat: nbxmpp/auth_nb.py | 38 ++++++++++++++++++++++++++++---------- nbxmpp/client_nb.py | 10 +++++++++- nbxmpp/tls_nb.py | 10 ++++++++++ 3 files changed, 47 insertions(+), 11 deletions(-) diffs (152 lines): diff -r fb32c66edf77 -r cbe73e43ed82 nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Mon Dec 30 21:22:56 2013 +0100 +++ b/nbxmpp/auth_nb.py Wed Feb 26 10:18:08 2014 +0100 @@ -88,7 +88,7 @@ return dict_ def _scram_parse(chatter): - """Helper function. Used for SCRAM-SHA-1 authentication""" + """Helper function. Used for SCRAM-SHA-1, SCRAM-SHA-1-PLUS authentication""" return dict(s.split('=', 1) for s in chatter.split(',')) class SASL(PlugIn): @@ -97,16 +97,19 @@ to start authentication """ - def __init__(self, username, password, on_sasl): + def __init__(self, username, password, on_sasl, channel_binding): """ :param username: XMPP username :param password: XMPP password :param on_sasl: Callback, will be called after each SASL auth-step. + :param channel_binding: TLS channel binding data, None if the + binding data is not available """ PlugIn.__init__(self) self.username = username self.password = password self.on_sasl = on_sasl + self.channel_binding = channel_binding self.realm = None def plugin(self, owner): @@ -213,6 +216,13 @@ raise NodeProcessed except kerberos.GSSError as e: log.info('GSSAPI authentication failed: %s' % str(e)) + if 'SCRAM-SHA-1-PLUS' in self.mecs and self.channel_binding != None: + self.mecs.remove('SCRAM-SHA-1-PLUS') + self.mechanism = 'SCRAM-SHA-1-PLUS' + self._owner._caller.get_password(self.set_password, self.mechanism) + self.scram_step = 0 + self.startsasl = SASL_IN_PROCESS + raise NodeProcessed if 'SCRAM-SHA-1' in self.mecs: self.mecs.remove('SCRAM-SHA-1') self.mechanism = 'SCRAM-SHA-1' @@ -241,8 +251,9 @@ self.startsasl = SASL_IN_PROCESS raise NodeProcessed self.startsasl = SASL_FAILURE - log.info('I can only use EXTERNAL, SCRAM-SHA-1, DIGEST-MD5, GSSAPI and ' - 'PLAIN mecanisms.') + log.info('I can only use ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS,' + ' SCRAM-SHA-1, DIGEST-MD5, PLAIN and X-MESSENGER-OAUTH2' + ' mechanisms.') if self.on_sasl: self.on_sasl() return @@ -288,7 +299,7 @@ reason = challenge on_auth_fail(reason) elif challenge.getName() == 'success': - if self.mechanism == 'SCRAM-SHA-1': + if self.mechanism in ('SCRAM-SHA-1', 'SCRAM-SHA-1-PLUS'): # check data-with-success data = _scram_parse(data) if data['v'] != scram_base64(self.scram_ServerSignature): @@ -332,7 +343,7 @@ self._owner.send(Node('response', attrs={'xmlns': NS_SASL}, payload=response).__str__()) raise NodeProcessed - if self.mechanism == 'SCRAM-SHA-1': + if self.mechanism in ('SCRAM-SHA-1', 'SCRAM-SHA-1-PLUS'): hashfn = hashlib.sha1 def HMAC(k, s): @@ -368,8 +379,12 @@ if (data['r'][:len(self.client_nonce)] != self.client_nonce): on_auth_fail('Server nonce is incorrect') raise NodeProcessed - # TODO: Channel binding data goes in here too. - r = 'c=' + scram_base64(self.scram_gs2) + if self.mechanism == 'SCRAM-SHA-1': + r = 'c=' + scram_base64(self.scram_gs2) + else: + # Channel binding data goes in here too. + r = 'c=' + scram_base64(self.scram_gs2 + + self.channel_binding) r += ',r=' + data['r'] self.scram_soup += r self.scram_soup = self.scram_soup.encode('utf-8') @@ -444,10 +459,13 @@ def set_password(self, password): self.password = '' if password is None else password - if self.mechanism == 'SCRAM-SHA-1': + if self.mechanism in ('SCRAM-SHA-1', 'SCRAM-SHA-1-PLUS'): self.client_nonce = '%x' % rndg.getrandbits(196) self.scram_soup = 'n=' + self.username + ',r=' + self.client_nonce - self.scram_gs2 = 'n,,' # No CB yet. + if self.mechanism == 'SCRAM-SHA-1': + self.scram_gs2 = 'n,,' # No CB yet. + else: + self.scram_gs2 = 'p=tls-unique,,' sasl_data = base64.b64encode((self.scram_gs2 + self.scram_soup).\ encode('utf-8')).decode('utf-8').replace('\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, diff -r fb32c66edf77 -r cbe73e43ed82 nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Mon Dec 30 21:22:56 2013 +0100 +++ b/nbxmpp/client_nb.py Wed Feb 26 10:18:08 2014 +0100 @@ -485,6 +485,14 @@ """ self._User, self._Password = user, password self._Resource, self._sasl = resource, sasl + self._channel_binding = None + if self.connected in ('ssl', 'tls'): + try: + self._channel_binding = self.Connection.NonBlockingTLS.get_channel_binding() + # TLS handshake is finished so channel binding data muss exist + assert (self._channel_binding != None) + except NotImplementedError: + pass self.on_auth = on_auth self._on_doc_attrs() return @@ -516,7 +524,7 @@ """ if self._sasl: auth_nb.SASL.get_instance(self._User, self._Password, - self._on_start_sasl).PlugIn(self) + self._on_start_sasl, self._channel_binding).PlugIn(self) if not hasattr(self, 'SASL'): return if not self._sasl or self.SASL.startsasl == 'not-supported': diff -r fb32c66edf77 -r cbe73e43ed82 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Mon Dec 30 21:22:56 2013 +0100 +++ b/nbxmpp/tls_nb.py Wed Feb 26 10:18:08 2014 +0100 @@ -493,3 +493,13 @@ log.error("Exception caught in _ssl_info_callback:", exc_info=True) # Make sure something is printed, even if log is disabled. traceback.print_exc() + + def get_channel_binding(self): + """ + Get channel binding data. RFC 5929 + """ + sslObj = self._owner._sslObj + try: + return sslObj.get_channel_binding() + except AttributeError: + raise NotImplementedError

1 0

python-nbxmpp: Detect downgrade attacks from SCRAM-SHA-1-PLUS to...
by Fedor Brunner 27 Mar '14

27 Mar '14

changeset 0d37fed94c68 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=0d37fed94c68 description: Detect downgrade attacks from SCRAM-SHA-1-PLUS to SCRAM-SHA-1. Fixes #16 diffstat: nbxmpp/auth_nb.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (17 lines): diff -r cbe73e43ed82 -r 0d37fed94c68 nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Wed Feb 26 10:18:08 2014 +0100 +++ b/nbxmpp/auth_nb.py Wed Feb 26 11:22:41 2014 +0100 @@ -463,7 +463,12 @@ self.client_nonce = '%x' % rndg.getrandbits(196) self.scram_soup = 'n=' + self.username + ',r=' + self.client_nonce if self.mechanism == 'SCRAM-SHA-1': - self.scram_gs2 = 'n,,' # No CB yet. + if self.channel_binding == None: + # Client doesn't support Channel Binding + self.scram_gs2 = 'n,,' # No CB yet. + else: + # Client supports CB, but server doesn't support CB + self.scram_gs2 = 'y,,' else: self.scram_gs2 = 'p=tls-unique,,' sasl_data = base64.b64encode((self.scram_gs2 + self.scram_soup).\

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2014