Commits

commits@gajim.org

17632 discussions

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

gajim: Copyright 2013>2014
by Gajim 27 Mar '14

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 <br AT waldteufel-online.net> ## 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

python-nbxmpp: Add possibility to restrict authentication mechan...
by Fedor Brunner 27 Mar '14

27 Mar '14

changeset d77b742c84cb in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=d77b742c84cb description: Add possibility to restrict authentication mechanisms used during login. Fixes #20 diffstat: nbxmpp/auth_nb.py | 36 +++++++++++++++++++++++++++++------- nbxmpp/client_nb.py | 19 ++++++++++++++++--- 2 files changed, 45 insertions(+), 10 deletions(-) diffs (144 lines): diff -r 0d37fed94c68 -r d77b742c84cb nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Wed Feb 26 11:22:41 2014 +0100 +++ b/nbxmpp/auth_nb.py Sat Mar 01 20:53:52 2014 +0100 @@ -91,25 +91,35 @@ """Helper function. Used for SCRAM-SHA-1, SCRAM-SHA-1-PLUS authentication""" return dict(s.split('=', 1) for s in chatter.split(',')) +SASL_AUTHENTICATION_MECHANISMS = \ + set(['ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', + 'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2']) + class SASL(PlugIn): """ Implements SASL authentication. Can be plugged into NonBlockingClient to start authentication """ - def __init__(self, username, password, on_sasl, channel_binding): + def __init__(self, username, password, on_sasl, channel_binding, + auth_mechs): """ :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 + :param auth_mechs: Set of valid authentication mechanisms. + Possible entries are: + 'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', + 'SCRAM-SHA-1', 'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' """ PlugIn.__init__(self) self.username = username self.password = password self.on_sasl = on_sasl self.channel_binding = channel_binding + self.enabled_auth_mechs = auth_mechs self.realm = None def plugin(self, owner): @@ -146,7 +156,7 @@ Start authentication. Result can be obtained via "SASL.startsasl" attribute and will be either SASL_SUCCESS or SASL_FAILURE - Note that successfull auth will take at least two Dispatcher.Process() + Note that successful auth will take at least two Dispatcher.Process() calls. """ if self.startsasl: @@ -169,10 +179,22 @@ self.startsasl='not-supported' log.info('SASL not supported by server') return - self.mecs = [] - for mec in feats.getTag('mechanisms', namespace=NS_SASL).getTags( - 'mechanism'): - self.mecs.append(mec.getData()) + + self.mecs = set( + mec.getData() + for mec + in feats.getTag('mechanisms', namespace=NS_SASL).getTags('mechanism') + ) & self.enabled_auth_mechs + + # 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') + 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:]: + self.mecs.discard(m) + break self._owner.RegisterHandler('challenge', self.SASLHandler, xmlns=NS_SASL) @@ -519,7 +541,7 @@ class NonBlockingNonSASL(PlugIn): """ - Implements old Non-SASL (JEP-0078) authentication used in jabberd1.4 and + Implements old Non-SASL (XEP-0078) authentication used in jabberd1.4 and transport authentication """ diff -r 0d37fed94c68 -r d77b742c84cb nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Wed Feb 26 11:22:41 2014 +0100 +++ b/nbxmpp/client_nb.py Sat Mar 01 20:53:52 2014 +0100 @@ -23,6 +23,7 @@ import socket from . import transports_nb, dispatcher_nb, auth_nb, roster_nb, protocol, bosh from .protocol import NS_TLS +from .auth_nb import SASL_AUTHENTICATION_MECHANISMS import logging log = logging.getLogger('nbxmpp.client_nb') @@ -471,7 +472,8 @@ ### follows code for authentication, resource bind, session and roster download ############################################################################### - def auth(self, user, password, resource='', sasl=True, on_auth=None): + def auth(self, user, password, resource='', sasl=True, on_auth=None, + auth_mechs=None): """ Authenticate connnection and bind resource. If resource is not provided random one or library name used @@ -482,6 +484,11 @@ :param sasl: Boolean indicating if SASL shall be used. (default: True) :param on_auth: Callback, called after auth. On auth failure, argument is None. + :param auth_mechs: Set of valid authentification mechanisms. If None all + authentification mechanisms will be allowed. Possible entries are: + 'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', + 'SCRAM-SHA-1', 'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2', + 'XEP-0078' """ self._User, self._Password = user, password self._Resource, self._sasl = resource, sasl @@ -493,6 +500,10 @@ assert (self._channel_binding != None) except NotImplementedError: pass + if auth_mechs == None: + self._auth_mechs = SASL_AUTHENTICATION_MECHANISMS | set(['XEP-0078']) + else: + self._auth_mechs = auth_mechs self.on_auth = on_auth self._on_doc_attrs() return @@ -524,10 +535,12 @@ """ if self._sasl: auth_nb.SASL.get_instance(self._User, self._Password, - self._on_start_sasl, self._channel_binding).PlugIn(self) + self._on_start_sasl, self._channel_binding, + self._auth_mechs).PlugIn(self) if not hasattr(self, 'SASL'): return - if not self._sasl or self.SASL.startsasl == 'not-supported': + if ('XEP-0078' in self._auth_mechs + and (not self._sasl or self.SASL.startsasl == 'not-supported')): if not self._Resource: self._Resource = 'xmpppy' auth_nb.NonBlockingNonSASL.get_instance(self._User, self._Password,

1 0

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

27 Mar '14

changeset 589f0e14b5c0 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=589f0e14b5c0 description: update version number diffstat: nbxmpp/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (9 lines): diff -r d77b742c84cb -r 589f0e14b5c0 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

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