Commits

commits@gajim.org

17632 discussions

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

01 Mar '14

changeset 544859c64f78 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=544859c64f78 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 c79cbe36a94e -r 544859c64f78 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) @@ -508,7 +530,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 c79cbe36a94e -r 544859c64f78 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 import transports_nb, dispatcher_nb, auth_nb, roster_nb, protocol, bosh from protocol import NS_TLS +from nbxmpp.auth_nb import SASL_AUTHENTICATION_MECHANISMS import logging log = logging.getLogger('nbxmpp.client_nb') @@ -472,7 +473,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 @@ -483,6 +485,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 @@ -494,6 +501,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 @@ -525,10 +536,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

gajim: get xid for windows correctly
by Gajim 28 Feb '14

28 Feb '14

changeset 744f04e46576 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=744f04e46576 description: get xid for windows correctly diffstat: src/chat_control.py | 15 ++++++++++++--- src/dialogs.py | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diffs (56 lines): diff -r 8e3249074a1c -r 744f04e46576 src/chat_control.py --- a/src/chat_control.py Tue Feb 25 14:37:21 2014 +0100 +++ b/src/chat_control.py Fri Feb 28 11:02:26 2014 +0100 @@ -2214,12 +2214,21 @@ fixed = self.xml.get_object('outgoing_fixed') fixed.set_no_show_all(False) video_hbox.show_all() - out_xid = self.xml.get_object('outgoing_drawingarea').\ - window.xid + if os.name == 'nt': + out_xid = self.xml.get_object( + 'outgoing_drawingarea').window.handle + else: + out_xid = self.xml.get_object( + 'outgoing_drawingarea').window.xid else: out_xid = None video_hbox.show_all() - in_xid = self.xml.get_object('incoming_drawingarea').window.xid + if os.name == 'nt': + in_xid = self.xml.get_object('incoming_drawingarea').\ + window.handle + else: + in_xid = self.xml.get_object('incoming_drawingarea').\ + window.xid sid = gajim.connections[self.account].start_video( self.contact.get_full_jid(), in_xid, out_xid) else: diff -r 8e3249074a1c -r 744f04e46576 src/dialogs.py --- a/src/dialogs.py Tue Feb 25 14:37:21 2014 +0100 +++ b/src/dialogs.py Fri Feb 28 11:02:26 2014 +0100 @@ -5345,12 +5345,21 @@ fixed = ctrl.xml.get_object('outgoing_fixed') fixed.set_no_show_all(False) video_hbox.show_all() - in_xid = ctrl.xml.get_object('incoming_drawingarea').window.xid + if os.name == 'nt': + in_xid = ctrl.xml.get_object('incoming_drawingarea').\ + window.handle + else: + in_xid = ctrl.xml.get_object('incoming_drawingarea').\ + window.xid content = session.get_content('video') # move outgoing stream to chat window if gajim.config.get('video_see_self'): - out_xid = ctrl.xml.get_object('outgoing_drawingarea').\ - window.xid + if os.name == 'nt': + out_xid = ctrl.xml.get_object('outgoing_drawingarea').\ + window.handle + else: + out_xid = ctrl.xml.get_object('outgoing_drawingarea').\ + window.xid b = content.src_bin found = False for e in b.elements():

1 0

gajim-plugins: Clients icons. Add leechcraft
by Gajim Plugins 27 Feb '14

27 Feb '14

changeset aa7eb2e686b7 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=aa7eb2e686b7 description: Clients icons. Add leechcraft diffstat: clients_icons/clients_icons.py | 2 ++ clients_icons/icons/leechcraft.png | Bin clients_icons/manifest.ini | 2 +- 3 файлов изменено, 3 вставок(+), 1 удалений(-) различия (33 строк): diff -r 7fe945b5b8af -r aa7eb2e686b7 clients_icons/clients_icons.py --- a/clients_icons/clients_icons.py Fri Feb 07 18:13:44 2014 +0400 +++ b/clients_icons/clients_icons.py Thu Feb 27 16:00:12 2014 +0400 @@ -141,6 +141,7 @@ 'http://jitsi.org' :['jitsi.png', 'Jitsi'], 'http://miranda-ng.org/caps' :['miranda_ng.png', 'Miranda NG'], 'http://monal.im/caps': ['monal.png', 'Monal'], + 'http://leechcraft.org/': ['leechcraft.png', 'Leechcraft'], # 'Poezio' :['poezio.png', 'Poezio'], 'Emacs' :['emacs.png', ''], @@ -149,6 +150,7 @@ 'Xabber' :['xabber.png', ''], 'Adium' :['adium.png', ''], 'Pidgin': ['pidgin.png', ''], + 'Leechcraft': ['leechcraft.png', ''], } diff -r 7fe945b5b8af -r aa7eb2e686b7 clients_icons/icons/leechcraft.png Binary file clients_icons/icons/leechcraft.png has changed diff -r 7fe945b5b8af -r aa7eb2e686b7 clients_icons/manifest.ini --- a/clients_icons/manifest.ini Fri Feb 07 18:13:44 2014 +0400 +++ b/clients_icons/manifest.ini Thu Feb 27 16:00:12 2014 +0400 @@ -1,7 +1,7 @@ [info] name: Clients icons short_name: clients_icons -version: 5.3 +version: 5.4 description: Shows the client icons in the roster and in groupchats. authors: Denis Fomin <fominde(a)gmail.com> Artem Klyop <art.klyop(a)gmail.com>

1 0

gajim-website: [Davide Pizzetti] updated website italian transla...
by Gajim Website 27 Feb '14

27 Feb '14

changeset 07bd6ab3f68f in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=07bd6ab3f68f description: [Davide Pizzetti] updated website italian translation diffstat: locale/it_IT/LC_MESSAGES/msg.po | 524 ++++++++++++++++++--------------------- 1 files changed, 243 insertions(+), 281 deletions(-) diffs (truncated from 1106 to 300 lines): diff -r 8ce70abb34ad -r 07bd6ab3f68f locale/it_IT/LC_MESSAGES/msg.po --- a/locale/it_IT/LC_MESSAGES/msg.po Wed Jan 01 13:39:31 2014 +0100 +++ b/locale/it_IT/LC_MESSAGES/msg.po Thu Feb 27 09:32:27 2014 +0100 @@ -1,14 +1,14 @@ # Italian translations for PACKAGE package. -# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER +# Copyright (C) 2007-2014 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as Gajim's website. -# Daniel Coppi<neoex.dc(a)gmail.com>, 2007. -# +# Daniel Coppi <neoex.dc(a)gmail.com>, 2007. +# Davide Pizzetti <erpizzo(a)alice.it>, 2014 msgid "" msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-29 20:03+0200\n" -"PO-Revision-Date: 2007-09-23 00:39+0100\n" +"POT-Creation-Date: 2014-02-27 09:31+0100\n" +"PO-Revision-Date: 2014-02-25 15:52+0100\n" "Last-Translator: neoex <neoex.dc(a)gmail.com>\n" "Language-Team: Italian\n" "Language: \n" @@ -16,10 +16,11 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.5.4\n" #: Design.php:85 msgid "Home" -msgstr "Home" +msgstr "Pagina iniziale" #: Design.php:86 msgid "Screenshots" @@ -86,9 +87,8 @@ msgstr "Zenwalk" #: Design.php:105 -#, fuzzy msgid "AgiliaLinux" -msgstr "Archlinux" +msgstr "AgiliaLinux" #: Design.php:106 msgid "FreeBSD" @@ -108,7 +108,7 @@ #: Design.php:110 msgid "Mercurial" -msgstr "" +msgstr "Mercurial" #: Design.php:111 msgid "Daily snapshots" @@ -160,7 +160,7 @@ #: dev.php:17 msgid " Mailing List" -msgstr " Mailing List" +msgstr " Mailing list" #: dev.php:19 msgid " You may also want to subscribe to our mailing list (low-traffic): " @@ -174,7 +174,7 @@ #: dev.php:20 msgid " List archives are available " -msgstr " Sono disponibili gli archivi della lista " +msgstr " Sono disponibili gli archivi dell'elenco" #: dev.php:20 docs.php:39 docs.php:45 downloads.php:24 downloads.php:38 #: downloads.php:161 downloads.php:163 downloads.php:173 downloads.php:211 @@ -187,9 +187,8 @@ msgstr " Repository" #: dev.php:27 -#, fuzzy msgid "To checkout hg do" -msgstr "Per eseguire il checkout svn esegui" +msgstr "Per copiare il repository nel tuo sistema esegui" #: dev.php:29 msgid " You can also" @@ -229,7 +228,7 @@ #: dev.php:44 msgid " Submitting a translation: see" -msgstr " Inviando una traduzione: vedi" +msgstr " Inviare una traduzione: vedi" #: dev.php:44 msgid "DevTranslate page" @@ -245,7 +244,7 @@ #: dev.php:50 msgid " Donating: " -msgstr "" +msgstr " Donare:" #: dev.php:62 msgid " Translations status" @@ -262,11 +261,11 @@ #: dev.php:96 dev.php:99 #, c-format msgid "%s (%s)" -msgstr "" +msgstr "%s (%s)" #: dev.php:103 msgid " We also want to thank" -msgstr " Vogliamo anche ringraziare" +msgstr " Vogliamo ringraziare anche" #: dev.php:103 msgid "these people" @@ -277,56 +276,51 @@ msgstr " Installazione\n" #: docs.php:17 -#, fuzzy msgid " Tarball and Mercurial\n" -msgstr " Tarball e Subversion\n" +msgstr " Tarball e Mercurial\n" #: docs.php:19 msgid "download" msgstr "pagina" #: docs.php:20 -#, fuzzy, c-format +#, c-format msgid " To get one of these versions, go to the %s page.\n" -msgstr " Per ottenere una di queste versioni, vai alla" +msgstr " Per ottenere una di queste versioni, vai alla pagina %s.\n" #: docs.php:22 downloads.php:176 msgid " Under GNU/Linux\n" msgstr " Sotto GNU/Linux\n" #: docs.php:24 -#, fuzzy msgid " To run this version, you have to install some packages. \n" -msgstr "" -" Per eseguire questa versione, devi installare alcuni pacchetti: " -"python2.3 python2.3-gtk2 e python2.3-glade2.\n" +msgstr " Per eseguire questa versione, devi installare alcuni pacchetti.\n" #: docs.php:25 msgid "README file" -msgstr "" +msgstr "File README" #: docs.php:26 -#, fuzzy, c-format +#, c-format msgid " See %s.\n" -msgstr " Subversion\n" +msgstr " Vedi %s\n" #: docs.php:29 msgid " Under Microsoft Windows\n" msgstr " Sotto Microsoft Windows\n" #: docs.php:31 -#, fuzzy msgid "this page" -msgstr "pagine del wiki" +msgstr "questa pagina" #: docs.php:32 #, c-format msgid "See %s to install development version under windows." -msgstr "" +msgstr "Vedi %s per installare la versione di sviluppo sotto Windows." #: docs.php:39 msgid " Please read" -msgstr " Per favore leggi" +msgstr " Per favore, leggi" #: docs.php:43 msgid " Structure\n" @@ -337,24 +331,26 @@ msgstr " Puoi capire come funziona Gajim" #: docs.php:48 -#, fuzzy, c-format +#, c-format msgid "" " Gajim uses a fork of the %s library to do the interface with Jabber " "network.\n" -msgstr "libreria per interfacciarsi con la rete Jabber.\n" +msgstr "" +" Gajim usa un fork della libreria %s per interfacciarsi alla rete " +"Jabber.\n" #: downloads.php:10 msgid " Latest version of Gajim is" -msgstr " L'ultima versione di Gajim è la" +msgstr " La versione più recente di Gajim è la versione" #: downloads.php:11 -#, fuzzy, c-format +#, c-format msgid " A %s version is in test" -msgstr " L'ultima versione di Gajim è la" +msgstr " Una versione %s è in prova" #: downloads.php:13 msgid "If your distribution doesn't have the latest version " -msgstr "Se la tua distribuzione non ha l'ultima versione " +msgstr "Se la tua distribuzione non ha la versione più recente " #: downloads.php:14 msgid "or the " @@ -373,16 +369,16 @@ msgstr " Se usi Debian unstable esegui" #: downloads.php:23 -#, fuzzy, c-format +#, c-format msgid " The Debian package of %s is " -msgstr " La versione tarball di Gajim è " +msgstr " Il pacchetto della versione %s per Debian è" #: downloads.php:25 -#, fuzzy msgid "" " A daily package from mercurial is also built. To use it, remove gajim" msgstr "" -" Viene generato un pacchetto giornaliero da svn. Per usarlo, rimuovi gajim" +" Viene generato un pacchetto giornaliero da Mercurial. Per usarlo, " +"rimuovi Gajim" #: downloads.php:25 msgid "add this line to your" @@ -401,27 +397,25 @@ "gnome-dev-keyring dallo stesso repository. Basta che esegui" #: downloads.php:38 -#, fuzzy msgid " You can get the Slackware package of Gajim" -msgstr " Puoi scaricare l'installer autopackage " +msgstr " Puoi ottenere il pacchetto di Gajim per Slackware" #: downloads.php:46 msgid " If you use Ubuntu universe repository do" msgstr " Se usi il repository universe di Ubuntu esegui" #: downloads.php:48 -#, fuzzy msgid " If you want newer version of Gajim, you can also use" -msgstr " L'ultima versione di Gajim è la" +msgstr " Se vuoi usare una versione più recente di Gajim, puoi anche usare" #: downloads.php:48 msgid "this PPA" -msgstr "" +msgstr "questo PPA" #: downloads.php:56 downloads.php:63 downloads.php:70 downloads.php:92 #: downloads.php:100 downloads.php:108 downloads.php:116 msgid " Just" -msgstr " Basta" +msgstr " Basta eseguire" #: downloads.php:60 msgid " Gentoo\n" @@ -437,24 +431,23 @@ #: downloads.php:77 msgid " One click install for openSuSE" -msgstr "" +msgstr " Installazione con un click per openSuSE" #: downloads.php:78 msgid " For other versions, " -msgstr "" +msgstr " Per altre versioni," #: downloads.php:78 msgid "get it here" -msgstr "" +msgstr "ottienile qui" #: downloads.php:82 msgid " PLD\n" msgstr " PLD\n" #: downloads.php:85 -#, fuzzy msgid " Just " -msgstr " Basta" +msgstr " Basta eseguire" #: downloads.php:89 msgid " SourceMage\n" @@ -474,7 +467,7 @@

1 0

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

26 Feb '14

changeset c79cbe36a94e in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=c79cbe36a94e 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 1f3eb954483c -r c79cbe36a94e 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 @@ -456,7 +456,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. + if self.channel_binding == None: + # Client doesn't support Channel Binding + self.scram_gs2 = 'n,,' + else: + # Client supports CB, but server doesn't support CB + self.scram_gs2 = 'y,,' else: self.scram_gs2 = 'p=tls-unique,,' sasl_data = (self.scram_gs2 + self.scram_soup).encode('base64').\

1 0

python-nbxmpp: SCRAM-SHA-1-PLUS authentication mechanism
by Fedor Brunner 26 Feb '14

26 Feb '14

changeset 1f3eb954483c in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=1f3eb954483c 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 b92ebcc55cb4 -r 1f3eb954483c nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Tue Feb 25 16:36:56 2014 +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, 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 @@ -283,7 +294,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): @@ -327,7 +338,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): @@ -363,8 +374,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 salt = data['s'].decode('base64') @@ -437,10 +452,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. + else: + self.scram_gs2 = 'p=tls-unique,,' sasl_data = (self.scram_gs2 + self.scram_soup).encode('base64').\ replace('\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, diff -r b92ebcc55cb4 -r 1f3eb954483c nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Tue Feb 25 16:36:56 2014 +0100 +++ b/nbxmpp/client_nb.py Wed Feb 26 10:18:08 2014 +0100 @@ -486,6 +486,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 @@ -517,7 +525,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 b92ebcc55cb4 -r 1f3eb954483c nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Tue Feb 25 16:36:56 2014 +0100 +++ b/nbxmpp/tls_nb.py Wed Feb 26 10:18:08 2014 +0100 @@ -478,3 +478,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: Check nonce returned from server during SCRAM-SHA...
by Fedor Brunner 25 Feb '14

25 Feb '14

changeset b92ebcc55cb4 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=b92ebcc55cb4 description: Check nonce returned from server during SCRAM-SHA-1 authentication. The first part of server nonce muss be the nonce send by client. Fixes #19 diffstat: nbxmpp/auth_nb.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diffs (35 lines): diff -r 9954a0178fe8 -r b92ebcc55cb4 nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Tue Feb 25 10:38:31 2014 +0100 +++ b/nbxmpp/auth_nb.py Tue Feb 25 16:36:56 2014 +0100 @@ -358,7 +358,11 @@ self.scram_step = 1 self.scram_soup += ',' + data + ',' data = _scram_parse(data) - # TODO: Should check cnonce here. + # Check server nonce here. + # The first part of server nonce muss be the nonce send by client. + 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) r += ',r=' + data['r'] @@ -389,6 +393,7 @@ self._owner.send(str(node)) raise NodeProcessed + # DIGEST-MD5 # magic foo... chal = _challenge_splitter(data) if not self.realm and 'realm' in chal: @@ -433,8 +438,8 @@ def set_password(self, password): self.password = '' if password is None else password if self.mechanism == 'SCRAM-SHA-1': - nonce = '%x' % rndg.getrandbits(196) - self.scram_soup = 'n=' + self.username + ',r=' + nonce + self.client_nonce = '%x' % rndg.getrandbits(196) + self.scram_soup = 'n=' + self.username + ',r=' + self.client_nonce self.scram_gs2 = 'n,,' # No CB yet. sasl_data = (self.scram_gs2 + self.scram_soup).encode('base64').\ replace('\n', '')

1 0

gajim: [Davide Pizzetti] updated italian translation
by Gajim 25 Feb '14

25 Feb '14

changeset 8e3249074a1c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=8e3249074a1c description: [Davide Pizzetti] updated italian translation diffstat: po/it.po | 362 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 190 insertions(+), 172 deletions(-) diffs (truncated from 1343 to 300 lines): diff -r 23b26bc36b11 -r 8e3249074a1c po/it.po --- a/po/it.po Mon Feb 24 23:03:04 2014 +0100 +++ b/po/it.po Tue Feb 25 14:37:21 2014 +0100 @@ -1,16 +1,17 @@ # Italian translations for gajim package # Traduzione italiana del pacchetto gajim. -# Copyright (C) 2005-06 Mauro Brenna, Andrea Ratti, Matteo Dell'Amico +# Copyright (C) 2005-14 Mauro Brenna, Andrea Ratti, Matteo Dell'Amico, Daniel Coppi, Davide Pizzetti # This file is distributed under the same license as the Gajim Package. # Mauro Brenna <malloblenne(a)gmail.com>, 2005,2006. # Andrea Ratti <scimiot(a)yahoo.it>, 2005. # Matteo Dell'Amico <della(a)linux.it>, 2005, 2006. # Daniel Coppi <neoex.dc(a)gmail.com>, 2007. +# Davide Pizzetti <erpizzo(a)alice.it>, 2014. msgid "" msgstr "" "Project-Id-Version: Gajim 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-24 16:39+0100\n" +"POT-Creation-Date: 2014-02-25 14:36+0100\n" "PO-Revision-Date: 2013-11-15 20:10+0100\n" "Last-Translator: v <noway(a)insiberia.net>\n" "Language-Team: Italian <>\n" @@ -28,43 +29,43 @@ #: ../data/gui/account_context_menu.ui.h:2 msgid "_Personal Events" -msgstr "Eventi _Personali" +msgstr "Eventi _personali" #: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 #: ../data/gui/systray_context_menu.ui.h:2 msgid "_Start Chat..." -msgstr "_Inizia Conversazione..." +msgstr "_Inizia una conversazione..." #: ../data/gui/account_context_menu.ui.h:4 #: ../data/gui/chat_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:5 #: ../data/gui/systray_context_menu.ui.h:3 msgid "Join _Group Chat" -msgstr "Entra in una Conversazione di _Gruppo" +msgstr "Entra in una conversazione di _gruppo" #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." -msgstr "_Aggiungi Contatto..." +msgstr "_Aggiungi un contatto..." #: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7 msgid "_Discover Services" -msgstr "_Ricerca Servizi" +msgstr "_Ricerca dei servizi" #: ../data/gui/account_context_menu.ui.h:7 msgid "_Execute Command..." -msgstr "_Esegui Comando..." +msgstr "_Esegui un comando..." #: ../data/gui/account_context_menu.ui.h:8 msgid "_Open Gmail Inbox" -msgstr "_Apri Posta Ricevuta Gmail" +msgstr "_Apri la posta ricevuta di Gmail" #: ../data/gui/account_context_menu.ui.h:9 #: ../data/gui/zeroconf_context_menu.ui.h:2 msgid "_Modify Account..." -msgstr "_Modifica Account..." +msgstr "_Modifica l'account..." #: ../data/gui/account_creation_wizard_window.ui.h:1 msgid "Gajim: Account Creation Wizard" -msgstr "Gajim: Assistente Creazione Account" +msgstr "Gajim: Assistente alla creazione di un account" #: ../data/gui/account_creation_wizard_window.ui.h:2 msgid "" @@ -84,11 +85,11 @@ #: ../data/gui/account_creation_wizard_window.ui.h:6 msgid "Please choose one of the options below:" -msgstr "Scegliere una delle seguenti opzioni:" +msgstr "Per piacere, scegli una delle seguenti opzioni:" #: ../data/gui/account_creation_wizard_window.ui.h:7 msgid "Please fill in the data for your existing account" -msgstr "Inserire i dati per l'account esistente" +msgstr "Per piacere, inserisci i dati per l'account esistente" #: ../data/gui/account_creation_wizard_window.ui.h:8 #: ../data/gui/accounts_window.ui.h:22 @@ -117,7 +118,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:13 msgid "Please select a server" -msgstr "Selezionare un server" +msgstr "Per piacere, seleziona un server" #: ../data/gui/account_creation_wizard_window.ui.h:14 #: ../data/gui/manage_bookmarks_window.ui.h:3 @@ -134,11 +135,11 @@ #: ../data/gui/account_creation_wizard_window.ui.h:17 msgid "Use custom hostname/port" -msgstr "Usa hostname/porta personalizzati" +msgstr "Usa nome host/porta personalizzati" #: ../data/gui/account_creation_wizard_window.ui.h:18 msgid "_Hostname:" -msgstr "_Hostname:" +msgstr "Nome _host:" #: ../data/gui/account_creation_wizard_window.ui.h:19 msgid "_Port:" @@ -291,7 +292,7 @@ #: ../data/gui/accounts_window.ui.h:24 msgid "_Client Cert File:" -msgstr "File Certificato _Client" +msgstr "File del certificato del _client" #: ../data/gui/accounts_window.ui.h:25 msgid "Browse..." @@ -345,7 +346,7 @@ #: ../data/gui/accounts_window.ui.h:35 msgid "Use file transfer proxies" -msgstr "Usa proxy per il trasferimento file" +msgstr "Usa un proxy per il trasferimento di file" #: ../data/gui/accounts_window.ui.h:36 msgid "" @@ -393,7 +394,7 @@ #: ../data/gui/accounts_window.ui.h:43 msgid "Send _keep-alive packets" -msgstr "Invia pacchetti di _keep-alive" +msgstr "Invia dei pacchetti di _keep-alive" #: ../data/gui/accounts_window.ui.h:44 msgid "" @@ -405,11 +406,11 @@ #: ../data/gui/accounts_window.ui.h:45 msgid "Use cust_om hostname/port" -msgstr "Usa hostname/porta personalizzati" +msgstr "Usa nome host/porta personalizzati" #: ../data/gui/accounts_window.ui.h:46 msgid "_Hostname: " -msgstr "_Hostname: " +msgstr "Nome dell'_host: " #: ../data/gui/accounts_window.ui.h:47 msgid "_Port: " @@ -430,7 +431,7 @@ #: ../data/gui/accounts_window.ui.h:51 msgid "Choose _Key..." -msgstr "Scegli _Chiave..." +msgstr "Scegli la _chiave..." #: ../data/gui/accounts_window.ui.h:52 msgid "Use G_PG Agent" @@ -454,7 +455,7 @@ #: ../data/gui/accounts_window.ui.h:57 msgid "Personal Information" -msgstr "Informazioni Personali" +msgstr "Informazioni personali" #: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1 msgid "Personal Information" @@ -505,11 +506,11 @@ #: ../data/gui/accounts_window.ui.h:68 msgid "Mer_ge accounts" -msgstr "_Unisci account" +msgstr "_Unisci gli account" #: ../data/gui/add_new_contact_window.ui.h:1 msgid "Add New Contact" -msgstr "Aggiungi Nuovo Contatto" +msgstr "Aggiungi un nuovo contatto" #: ../data/gui/add_new_contact_window.ui.h:2 msgid "A_ccount:" @@ -526,7 +527,7 @@ #: ../data/gui/add_new_contact_window.ui.h:5 #: ../data/gui/manage_bookmarks_window.ui.h:5 msgid "_Nickname:" -msgstr "_Nickname:" +msgstr "_Soprannome:" #: ../data/gui/add_new_contact_window.ui.h:6 msgid "_Group:" @@ -534,7 +535,7 @@ #: ../data/gui/add_new_contact_window.ui.h:7 msgid "A_llow this contact to view my status" -msgstr "_Permetti di vedere il mio stato" +msgstr "Pe_rmetti di vedere il mio stato" #: ../data/gui/add_new_contact_window.ui.h:8 msgid "_Save subscription message" @@ -566,7 +567,7 @@ #: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366 msgid "I would like to add you to my contact list." -msgstr "Vorrei aggiungerti alla mia lista contatti." +msgstr "Vorrei aggiungerti al mio elenco dei contatti." #. displaying the window #: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104 @@ -575,7 +576,7 @@ #: ../data/gui/adhoc_commands_window.ui.h:2 msgid "Please wait while retrieving command list..." -msgstr "Attendere durante il recupero della lista comandi..." +msgstr "Attendere durante il recupero dell'elenco dei comandi..." #: ../data/gui/adhoc_commands_window.ui.h:3 msgid "Choose command to execute:" @@ -587,11 +588,11 @@ #: ../data/gui/adhoc_commands_window.ui.h:5 msgid "Please wait while the command is being sent..." -msgstr "Attendere durante l'invio del comando..." +msgstr "Attendi durante l'invio del comando, per piacere..." #: ../data/gui/adhoc_commands_window.ui.h:6 msgid "Please wait..." -msgstr "Attendere..." +msgstr "Attendi, per paicere..." #: ../data/gui/adhoc_commands_window.ui.h:7 msgid "This jabber entity does not expose any commands." @@ -603,7 +604,7 @@ #: ../data/gui/adhoc_commands_window.ui.h:9 msgid "Error description..." -msgstr "Descrizione errore..." +msgstr "Descrizione dell'errore..." #: ../data/gui/adhoc_commands_window.ui.h:10 msgid "F_inish" @@ -611,7 +612,7 @@ #: ../data/gui/advanced_configuration_window.ui.h:1 msgid "Advanced Configuration Editor" -msgstr "Editor di Configurazione Avanzata" +msgstr "Editor di configurazione avanzata" #: ../data/gui/advanced_configuration_window.ui.h:2 msgid "Filter:" @@ -634,15 +635,15 @@ #: ../data/gui/advanced_menuitem_menu.ui.h:1 msgid "Show _XML Console" -msgstr "Mostra Console _XML" +msgstr "Mostra la console _XML" #: ../data/gui/advanced_menuitem_menu.ui.h:2 msgid "Edit Archi_ving Preferences" -msgstr "Modifica Preferenze di Archi_viazione" +msgstr "Modifica le preferenze di archi_viazione" #: ../data/gui/advanced_menuitem_menu.ui.h:3 msgid "Edit _Privacy Lists..." -msgstr "Modifica Liste _Privacy..." +msgstr "Modifica gli elenchi della _privacy..." #: ../data/gui/advanced_menuitem_menu.ui.h:4 msgid "_Administrator" @@ -650,7 +651,7 @@ #: ../data/gui/advanced_menuitem_menu.ui.h:5 msgid "_Send Server Message..." -msgstr "_Invia Messaggio Server..." +msgstr "_Invia un messaggio del server..." #: ../data/gui/advanced_menuitem_menu.ui.h:6 msgid "Sends a message to users currently connected to this server" @@ -658,27 +659,27 @@ #: ../data/gui/advanced_menuitem_menu.ui.h:7 msgid "Sets Message of the Day" -msgstr "Imposta Messaggio del Giorno" +msgstr "Imposta il messaggio del giorno" #: ../data/gui/advanced_menuitem_menu.ui.h:8 msgid "Set MOTD..." -msgstr "Imposta MOTD..." +msgstr "Imposta il messaggio del giorno..." #: ../data/gui/advanced_menuitem_menu.ui.h:9 msgid "Updates Message of the Day" -msgstr "Aggiorna il Messaggio del Giorno" +msgstr "Aggiorna il messaggio del giorno" #: ../data/gui/advanced_menuitem_menu.ui.h:10

1 0

python-nbxmpp: Fix typos
by Fedor Brunner 25 Feb '14

25 Feb '14

changeset 9954a0178fe8 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=9954a0178fe8 description: Fix typos diffstat: nbxmpp/client_nb.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diffs (52 lines): diff -r 3a7acfa0b346 -r 9954a0178fe8 nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Wed Feb 19 10:30:13 2014 +0100 +++ b/nbxmpp/client_nb.py Tue Feb 25 10:38:31 2014 +0100 @@ -17,7 +17,7 @@ # $Id: client.py,v 1.52 2006/01/02 19:40:55 normanr Exp $ """ -Client class establishs connection to XMPP Server and handles authentication +Client class establishes connection to XMPP Server and handles authentication """ import socket @@ -32,7 +32,7 @@ """ Client class is XMPP connection mountpoint. Objects for authentication, network communication, roster, xml parsing ... are plugged to client object. - Client implements the abstract behavior - mostly negotioation and callbacks + Client implements the abstract behavior - mostly negotiation and callbacks handling, whereas underlying modules take care of feature-specific logic """ @@ -154,10 +154,10 @@ Open XMPP connection (open XML streams in both directions) :param on_connect: called after stream is successfully opened - :param on_connect_failure: called when error occures during connection + :param on_connect_failure: called when error occurs during connection :param hostname: hostname of XMPP server from SRV request :param port: port number of XMPP server - :param on_proxy_failure: called if error occurres during TCP connection + :param on_proxy_failure: called if error occurs during TCP connection to proxy server or during proxy connecting process :param proxy: dictionary with proxy data. It should contain at least values for keys 'host' and 'port' - connection details for proxy @@ -426,7 +426,7 @@ def _tls_negotiation_handler(self, con=None, tag=None): """ - Take care of TLS negotioation with <starttls> + Take care of TLS negotiation with <starttls> """ log.info('-------------tls_negotiaton_handler() >> tag: %s' % tag) if not con and not tag: @@ -450,7 +450,7 @@ # because <starttls> negotiation with BOSH is forbidden self.Connection.tls_init( on_succ = lambda: self._xmpp_connect(socket_type='tls'), - on_fail = lambda: self.disconnect('error while etabilishing TLS')) + on_fail = lambda: self.disconnect('error while establishing TLS')) def _on_connect(self): """

1 0

gajim: fix <file> xmlns for jingleFT
by Gajim 24 Feb '14

24 Feb '14

changeset 23b26bc36b11 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=23b26bc36b11 description: fix <file> xmlns for jingleFT diffstat: src/common/jingle_content.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d7d8cb266c79 -r 23b26bc36b11 src/common/jingle_content.py --- a/src/common/jingle_content.py Mon Feb 24 22:13:25 2014 +0100 +++ b/src/common/jingle_content.py Mon Feb 24 23:03:04 2014 +0100 @@ -175,7 +175,7 @@ simode = nbxmpp.simplexml.Node(tag='request') else: simode = nbxmpp.simplexml.Node(tag='offer') - file_tag = simode.setTag('file', namespace=nbxmpp.NS_FILE) + file_tag = simode.setTag('file') if self.file_props.name: node = nbxmpp.simplexml.Node(tag='name') node.addData(self.file_props.name)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits