Commits

commits@gajim.org

17632 discussions

gajim: fix Host resolver. Fixes #7729, #7750
by Gajim 22 Apr '14

22 Apr '14

changeset e19ef59ed06d 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=e19ef59ed06d description: fix Host resolver. Fixes #7729, #7750 diffstat: src/common/resolver.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f0e7d9dfa503 -r e19ef59ed06d src/common/resolver.py --- a/src/common/resolver.py Mon Apr 21 21:10:09 2014 +0200 +++ b/src/common/resolver.py Tue Apr 22 13:11:00 2014 +0200 @@ -332,7 +332,7 @@ domain = ufqdn # For nslookup 9.6 if domain: # add 4 for ' has' after domain name - rest = line[len(domain)+4:].split('=') + rest = line[len(domain)+4:].split('record') if len(rest) != 2: continue answer_type, props_str = rest

1 0

gajim-website: [Davide Pizzetti] updated italian translation
by Gajim Website 21 Apr '14

21 Apr '14

changeset bbf08b2d36b4 in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=bbf08b2d36b4 description: [Davide Pizzetti] updated italian translation diffstat: locale/it_IT/LC_MESSAGES/msg.po | 51 ++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diffs (160 lines): diff -r 3304a308ca62 -r bbf08b2d36b4 locale/it_IT/LC_MESSAGES/msg.po --- a/locale/it_IT/LC_MESSAGES/msg.po Wed Apr 02 21:49:36 2014 +0200 +++ b/locale/it_IT/LC_MESSAGES/msg.po Mon Apr 21 21:12:07 2014 +0200 @@ -1,22 +1,22 @@ # Italian translations for PACKAGE package. # 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. -# Davide Pizzetti <erpizzo(a)alice.it>, 2014 +# 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: 2014-03-15 10:13+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" +"PO-Revision-Date: 2014-04-17 14:36+0200\n" +"Last-Translator: Davide Pizzetti <erpizzo(a)alice.it>\n" +"Language-Team: Gajim Translators\n" +"Language: it\n" "MIME-Version: 1.0\n" "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" +"X-Generator: Virtaal 0.7.1\n" #: Design.php:85 msgid "Home" @@ -371,7 +371,7 @@ #: downloads.php:23 #, c-format msgid " The Debian package of %s is " -msgstr " Il pacchetto della versione %s per Debian è" +msgstr " Il pacchetto della versione %s per Debian è " #: downloads.php:25 msgid "" @@ -447,7 +447,7 @@ #: downloads.php:85 msgid " Just " -msgstr " Basta eseguire" +msgstr " Basta eseguire " #: downloads.php:89 msgid " SourceMage\n" @@ -680,10 +680,13 @@ "Group chat support (with Multi-User Chat protocol), invitation, chat to " "group chat transformation, minimize group chat to roster" msgstr "" +"Supporto alle conversazioni di gruppo (con il protocollo Multi-User Chat), " +"inviti, passaggio da chat individuale a chat di gruppo, minimizzazione della " +"chat nell'elenco dei propri contatti" #: index.php:26 msgid "Emoticons, avatars, PEP (user activity, mood and tune)" -msgstr "" +msgstr "Emoticon, avatar, PEP (attività degli utenti, umore e tonalità)" #: index.php:27 msgid "Audio / video conferences" @@ -739,7 +742,7 @@ #: index.php:38 msgid "Link local (bonjour / zeroconf), BOSH" -msgstr "" +msgstr "Collega local (bonjour / zeroconf), BOSH" #: index.php:39 msgid "Other features via plugins" @@ -779,14 +782,12 @@ msgstr "Gajim %s è qui!" #: index.php:65 -#, fuzzy msgid "15 March 2014" -msgstr "17 marzo 2013" +msgstr "15 marzo 2014" #: index.php:66 -#, fuzzy msgid "16 December 2013" -msgstr "18 dicembre 2011" +msgstr "16 dicembre 2013" #: index.php:67 msgid "25 May 2013" @@ -830,26 +831,24 @@ msgstr "Novità rispetto alla versione %s:" #: index.php:98 index.php:108 -#, fuzzy msgid "Improve File transfer" -msgstr "Migliora la ricerca nei propri contatti" +msgstr "Migliora il trasferimento dei file" #: index.php:99 index.php:109 -#, fuzzy msgid "Improve security" -msgstr "Migliora la ricerca nei propri contatti" +msgstr "Migliora la sicurezza" #: index.php:100 index.php:110 msgid "Improve audio / video calls" -msgstr "" +msgstr "Migliora le chiamate audio / video" #: index.php:101 index.php:111 msgid "Last message correction" -msgstr "" +msgstr "Correzione dell'ultimo messaggio" #: index.php:102 msgid "Jingle Audio under windows" -msgstr "" +msgstr "Jingle Audio sotto le finestre" #: index.php:103 index.php:112 index.php:119 index.php:127 index.php:133 #: index.php:140 index.php:152 @@ -859,7 +858,7 @@ #: index.php:103 index.php:112 index.php:119 index.php:127 index.php:133 #: index.php:140 index.php:152 msgid "Full changelog, see" -msgstr "Registro dei cambiamenti completo, consulta" +msgstr "Registro dei cambiamenti completo, consulta il " #: index.php:104 index.php:113 index.php:120 index.php:128 index.php:134 #: index.php:141 index.php:153 @@ -884,7 +883,7 @@ #: index.php:126 msgid "Improve farstream calls" -msgstr "" +msgstr "Migliora le chiamate con farstream" #: index.php:132 msgid "Fix crash when pressing ESC in chat window" @@ -893,7 +892,7 @@ #: index.php:138 msgid "Switch to python-farstream" -msgstr "" +msgstr "Passaggio a python-farstream" #: index.php:139 msgid "Fix several issues" @@ -917,7 +916,7 @@ #: index.php:149 msgid "Nested roster group" -msgstr "" +msgstr "Gruppo dei propri contatti nidificato" #: index.php:150 msgid "Roster filtrering"

1 0

gajim: [Davide Pizzetti] Updated italian translation
by Gajim 21 Apr '14

21 Apr '14

changeset f0e7d9dfa503 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=f0e7d9dfa503 description: [Davide Pizzetti] Updated italian translation diffstat: po/it.po | 370 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 186 insertions(+), 184 deletions(-) diffs (truncated from 1185 to 300 lines): diff -r fcd2f1221914 -r f0e7d9dfa503 po/it.po --- a/po/it.po Tue Apr 15 14:01:55 2014 +0200 +++ b/po/it.po Mon Apr 21 21:10:09 2014 +0200 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Gajim 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-09 16:54+0200\n" -"PO-Revision-Date: 2014-04-08 22:58+0200\n" +"POT-Creation-Date: 2014-04-21 21:07+0200\n" +"PO-Revision-Date: 2014-04-16 23:42+0200\n" "Last-Translator: Davide Pizzetti <erpizzo(a)alice.it>\n" "Language-Team: Gajim Translators\n" "Language: it\n" @@ -187,8 +187,8 @@ #: ../src/config.py:1753 ../src/config.py:2348 ../src/config.py:2430 #: ../src/config.py:2445 ../src/config.py:3740 ../src/config.py:3815 #: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524 -#: ../src/dialogs.py:537 ../src/roster_window.py:3158 -#: ../src/roster_window.py:3164 ../src/roster_window.py:3169 +#: ../src/dialogs.py:537 ../src/roster_window.py:3161 +#: ../src/roster_window.py:3167 ../src/roster_window.py:3172 msgid "None" msgstr "Nessuno" @@ -363,8 +363,8 @@ #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 #: ../src/common/contacts.py:135 ../src/dialogs.py:116 ../src/dialogs.py:128 -#: ../src/roster_window.py:3100 ../src/roster_window.py:4226 -#: ../src/roster_window.py:5871 +#: ../src/roster_window.py:3103 ../src/roster_window.py:4229 +#: ../src/roster_window.py:5874 msgid "General" msgstr "Generale" @@ -748,7 +748,7 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 #: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:674 -#: ../src/roster_window.py:5840 ../src/roster_window.py:5974 +#: ../src/roster_window.py:5843 ../src/roster_window.py:5977 msgid "_Unblock" msgstr "_Sblocca" @@ -952,8 +952,8 @@ #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 -#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5770 -#: ../src/roster_window.py:5941 +#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5773 +#: ../src/roster_window.py:5944 msgid "In_vite to" msgstr "In_vita a" @@ -971,7 +971,7 @@ #. Send Custom Status #: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:598 -#: ../src/roster_window.py:5781 +#: ../src/roster_window.py:5784 msgid "Send Cus_tom Status" msgstr "Invia uno s_tato personalizzato" @@ -986,12 +986,12 @@ #. Rename #: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:661 -#: ../src/roster_window.py:5821 +#: ../src/roster_window.py:5824 msgid "_Rename..." msgstr "_Rinomina..." #. Edit Groups -#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5963 +#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5966 msgid "Edit _Groups..." msgstr "Modifica i _gruppi..." @@ -1025,7 +1025,7 @@ #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:677 -#: ../src/roster_window.py:5848 ../src/roster_window.py:5980 +#: ../src/roster_window.py:5851 ../src/roster_window.py:5983 msgid "_Block" msgstr "_Blocca" @@ -1040,14 +1040,14 @@ #. Remove #. Remove group #: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:687 -#: ../src/roster_window.py:5858 +#: ../src/roster_window.py:5861 msgid "Remo_ve" msgstr "_Elimina" #: ../data/gui/contact_context_menu.ui.h:26 #: ../data/gui/gc_control_popup_menu.ui.h:9 #: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19 -#: ../src/roster_window.py:6056 +#: ../src/roster_window.py:6059 msgid "_History" msgstr "_Cronologia" @@ -2121,7 +2121,7 @@ #: ../data/gui/preferences_window.ui.h:93 msgid "Contact's nickname:" -msgstr "Soprannome del contatto" +msgstr "Soprannome del contatto:" #: ../data/gui/preferences_window.ui.h:94 msgid "Your nickname:" @@ -2575,7 +2575,7 @@ msgstr "<b>Cosa vuoi fare?</b>" #. Remove -#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5990 +#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5993 msgid "_Remove" msgstr "_Rimuovi" @@ -3089,7 +3089,7 @@ #: ../src/gui_menu_builder.py:318 ../src/gui_menu_builder.py:489 #: ../src/roster_window.py:771 ../src/roster_window.py:1735 #: ../src/roster_window.py:1737 ../src/roster_window.py:2086 -#: ../src/roster_window.py:3629 ../src/roster_window.py:3656 +#: ../src/roster_window.py:3632 ../src/roster_window.py:3659 msgid "Not in Roster" msgstr "Non nei tuoi contatti" @@ -3107,7 +3107,7 @@ #: ../src/chat_control.py:1768 msgid "Feature not available, see Help->Features" -msgstr "Funzionalità non disponibile, controllare Aiuto->Funzionalità" +msgstr "Funzionalità non disponibile, consulta Aiuto->Funzionalità" #: ../src/chat_control.py:1772 msgid "Feature not supported by remote client" @@ -3134,7 +3134,7 @@ #: ../src/chat_control.py:2115 #, python-format msgid "%(nickname)s from group chat %(room_name)s" -msgstr "%(nickname)s della conversazione di gruppo %(room_name)s" +msgstr "%(nickname)s dalla conversazione di gruppo %(room_name)s" #. No key assigned nor a key is used by remote contact #: ../src/chat_control.py:2255 ../src/dialogs.py:5206 @@ -3262,7 +3262,7 @@ #: ../src/chat_control.py:3001 ../src/common/connection_handlers_events.py:916 #: ../src/common/connection_handlers.py:1145 #: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:533 -#: ../src/common/logger.py:1161 ../src/gajim.py:245 ../src/session.py:98 +#: ../src/common/logger.py:1161 ../src/gajim.py:252 ../src/session.py:98 msgid "Database Error" msgstr "Errore del database" @@ -3465,7 +3465,7 @@ #: ../src/command_system/implementation/standard.py:274 msgid "Change your nickname in a group chat" -msgstr "Cambia il tuo nickname in una conversazione di gruppo" +msgstr "Cambia il tuo soprannome in una conversazione di gruppo" #. invalid char #: ../src/command_system/implementation/standard.py:279 ../src/config.py:3418 @@ -3591,36 +3591,36 @@ msgid "Excessive arguments" msgstr "Numero eccessivo di parametri" -#: ../src/common/check_paths.py:39 +#: ../src/common/check_paths.py:38 msgid "creating logs database" msgstr "creazione del database dei registri in corso" -#: ../src/common/check_paths.py:87 +#: ../src/common/check_paths.py:86 msgid "creating cache database" msgstr "creazione della cache del database" +#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284 +#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298 +#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312 +#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:326 +#, python-format +msgid "%s is a file but it should be a directory" +msgstr "%s è un file, ma dovrebbe essere una cartella" + #: ../src/common/check_paths.py:278 ../src/common/check_paths.py:285 #: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299 #: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313 #: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327 -#, python-format -msgid "%s is a file but it should be a directory" -msgstr "%s è un file, ma dovrebbe essere una cartella" - -#: ../src/common/check_paths.py:279 ../src/common/check_paths.py:286 -#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300 -#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314 -#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328 -#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346 +#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345 msgid "Gajim will now exit" msgstr "Gajim sta per uscire" -#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345 +#: ../src/common/check_paths.py:336 ../src/common/check_paths.py:344 #, python-format msgid "%s is a directory but should be a file" msgstr "%s è una cartella ma dovrebbe essere un file" -#: ../src/common/check_paths.py:366 +#: ../src/common/check_paths.py:359 #, python-format msgid "creating %s directory" msgstr "creazione della cartella %s" @@ -3686,7 +3686,7 @@ #: ../src/common/commands.py:216 ../src/common/contacts.py:131 #: ../src/common/helpers.py:67 ../src/roster_window.py:824 #: ../src/roster_window.py:1739 ../src/roster_window.py:1741 -#: ../src/roster_window.py:2625 ../src/roster_window.py:5736 +#: ../src/roster_window.py:2625 ../src/roster_window.py:5739 msgid "Groupchats" msgstr "Conversazioni di gruppo" @@ -3908,16 +3908,16 @@ "Character to add after nickname when using nick completion (tab) in group " "chat." msgstr "" -"Carattere da aggiungere dopo il nickname quando si usa il completamento nick " -"(tab) nella conversazione di gruppo." +"Carattere da aggiungere dopo il soprannome quando si usa il completamento " +"automatico dei soprannomi (tab) nella conversazione di gruppo." #: ../src/common/config.py:142 msgid "" "Character to propose to add after desired nickname when desired nickname is " "used by someone else in group chat." msgstr "" -"Carattere da proporre di aggiungere dopo il nickname desiderato quando il " -"nickname desiderato è già usato da qualcun'altro nella conversazione di " +"Carattere da proporre di aggiungere dopo il soprannome desiderato quando il " +"soprannome desiderato è già usato da qualcun'altro nella conversazione di " "gruppo" #: ../src/common/config.py:160 @@ -3941,7 +3941,7 @@ #: ../src/common/config.py:173 msgid "Characters that are printed before the nickname in conversations" -msgstr "Caratteri scritti prima del nickname nelle conversazioni" +msgstr "Caratteri scritti prima del soprannome nelle conversazioni" #: ../src/common/config.py:174 msgid "Characters that are printed after the nickname in conversations" @@ -4225,11 +4225,11 @@ #: ../src/common/config.py:262 msgid "Background color of contacts when they just signed in." -msgstr "Colore di sfondo dei contatti appena collegati." +msgstr "Colore di sfondo dei contatti appena connessi." #: ../src/common/config.py:263 msgid "Background color of contacts when they just signed out." -msgstr "Colore di sfondo dei contatti appena scollegati." +msgstr "Colore di sfondo dei contatti appena disconnessi." #: ../src/common/config.py:265 msgid "" @@ -4264,7 +4264,7 @@ msgstr "" "Jabberd1.4 non vuole informazioni SHA quando ci si unisce ad una stanza " "protetta da password. Impostare a Falso per smettere di inviare informazioni " -"SHA nella presenza sulle conversazioni di gruppo" +"SHA nella presenza sulle conversazioni di gruppo." #. always, never, peracct, pertype should not be translated #: ../src/common/config.py:273 @@ -4307,7 +4307,7 @@ #: ../src/common/config.py:276 msgid "If True, pressing the escape key closes a tab/window." -msgstr "Se Vero, premere il tasto Esc chiude una scheda/finestra" +msgstr "Se Vero, premere il tasto Esc chiude una scheda/finestra." #: ../src/common/config.py:277 msgid "Hides the buttons in chat windows." @@ -4332,12 +4332,12 @@ "In a chat, show the nickname at the beginning of a line only when it's not " "the same person talking than in previous message." msgstr "" -"In una conversazione, mostra il nickname all'inizio della riga solo quando " +"In una conversazione, mostra il soprannome all'inizio della riga solo quando " "non è quello della persona che parlava nel messaggio precedente." #: ../src/common/config.py:282 msgid "Indentation when using merge consecutive nickname."

1 0

gajim: Defer the creation of XTLS until it's first time used.
by Gajim 15 Apr '14

15 Apr '14

changeset fcd2f1221914 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=fcd2f1221914 description: Defer the creation of XTLS until it's first time used. This will make Gajim start a bit faster and more entropy can be generated for key generation. diffstat: src/common/check_paths.py | 7 ------- src/common/jingle_ft.py | 9 +++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diffs (53 lines): diff -r 9528eb6f8432 -r fcd2f1221914 src/common/check_paths.py --- a/src/common/check_paths.py Tue Apr 15 12:42:09 2014 +0200 +++ b/src/common/check_paths.py Tue Apr 15 14:01:55 2014 +0200 @@ -30,7 +30,6 @@ from common import gajim import logger -from common import jingle_xtls # DO NOT MOVE ABOVE OF import gajim import sqlite3 as sqlite @@ -350,12 +349,6 @@ create_path(XTLS_CERTS) if not os.path.exists(LOCAL_XTLS_CERTS): create_path(LOCAL_XTLS_CERTS) - cert_name = os.path.join(LOCAL_XTLS_CERTS, - jingle_xtls.SELF_SIGNED_CERTIFICATE) - if not (os.path.exists(cert_name + '.cert') and os.path.exists( - cert_name + '.pkey')): - jingle_xtls.make_certs(cert_name, 'gajim') - def create_path(directory): head, tail = os.path.split(directory) diff -r 9528eb6f8432 -r fcd2f1221914 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Tue Apr 15 12:42:09 2014 +0200 +++ b/src/common/jingle_ft.py Tue Apr 15 14:01:55 2014 +0200 @@ -19,9 +19,11 @@ Handles Jingle File Transfer (XEP 0234) """ +import os import hashlib import gajim import nbxmpp +import configpaths import jingle_xtls from jingle_content import contents, JingleContent from jingle_transport import * @@ -108,6 +110,13 @@ STATE_TRANSPORT_REPLACE : StateTransportReplace(self), STATE_CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self) } + + if jingle_xtls.PYOPENSSL_PRESENT: + cert_name = os.path.join(configpaths.gajimpaths['MY_CERT'], + jingle_xtls.SELF_SIGNED_CERTIFICATE) + if not (os.path.exists(cert_name + '.cert') + and os.path.exists(cert_name + '.pkey')): + jingle_xtls.make_certs(cert_name, 'gajim') def __state_changed(self, nextstate, args=None): # Executes the next state action and sets the next state

1 0

gajim: XTLS keys will be stored separate for each profile.
by Gajim 15 Apr '14

15 Apr '14

changeset 9528eb6f8432 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=9528eb6f8432 description: XTLS keys will be stored separate for each profile. Fixes #7735. diffstat: src/common/configpaths.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diffs (45 lines): diff -r 46f319807a21 -r 9528eb6f8432 src/common/configpaths.py --- a/src/common/configpaths.py Wed Apr 09 18:02:30 2014 +0200 +++ b/src/common/configpaths.py Tue Apr 15 12:42:09 2014 +0200 @@ -141,7 +141,7 @@ d = {'MY_DATA': '', 'LOG_DB': u'logs.db', 'MY_CACERTS': u'cacerts.pem', 'MY_EMOTS': u'emoticons', 'MY_ICONSETS': u'iconsets', 'MY_MOOD_ICONSETS': u'moods', 'MY_ACTIVITY_ICONSETS': u'activities', - 'PLUGINS_USER': u'plugins', 'MY_PEER_CERTS': u'certs', + 'PLUGINS_USER': u'plugins', 'RNG_SEED': u'rng_seed'} for name in d: self.add(name, TYPE_DATA, windowsify(d[name])) @@ -152,7 +152,6 @@ self.add(name, TYPE_CACHE, windowsify(d[name])) self.add('MY_CONFIG', TYPE_CONFIG, '') - self.add('MY_CERT', TYPE_CONFIG, '') basedir = fse(os.environ.get(u'GAJIM_BASEDIR', defs.basedir)) self.add('DATA', None, os.path.join(basedir, windowsify(u'data'))) @@ -178,16 +177,24 @@ pidfile = windowsify(u'gajim') secretsfile = windowsify(u'secrets') pluginsconfdir = windowsify(u'pluginsconfig') + certsdir = windowsify(u'certs') + localcertsdir = windowsify(u'localcerts') + if len(profile) > 0: conffile += u'.' + profile pidfile += u'.' + profile secretsfile += u'.' + profile pluginsconfdir += u'.' + profile + certsdir += u'.' + profile + localcertsdir += u'.' + profile + pidfile += u'.pid' self.add('CONFIG_FILE', TYPE_CONFIG, conffile) self.add('PID_FILE', TYPE_CACHE, pidfile) self.add('SECRETS_FILE', TYPE_DATA, secretsfile) self.add('PLUGINS_CONFIG_DIR', TYPE_CONFIG, pluginsconfdir) + self.add('MY_PEER_CERTS', TYPE_DATA, certsdir) + self.add('MY_CERT', TYPE_CONFIG, localcertsdir) gajimpaths = ConfigPaths()

1 0

python-nbxmpp: fix comparing str and int
by Python-nbxmpp 09 Apr '14

09 Apr '14

changeset 482579a7fdc3 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=482579a7fdc3 description: fix comparing str and int diffstat: nbxmpp/transports_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r eb393b576751 -r 482579a7fdc3 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Wed Apr 09 17:34:26 2014 +0200 +++ b/nbxmpp/transports_nb.py Wed Apr 09 18:17:56 2014 +0200 @@ -639,7 +639,7 @@ except UnicodeDecodeError: for i in range(-1, -4, -1): char = received[i] - if char & 0xc0 == 0xc0: + if ord(char) & 0xc0 == 0xc0: self.received_bytes_buff = received[i:] received = received[:i] break

1 0

gajim: don't print twice nbxmpp version error message. Fixes #7720
by Gajim 09 Apr '14

09 Apr '14

changeset 46f319807a21 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=46f319807a21 description: don't print twice nbxmpp version error message. Fixes #7720 diffstat: src/gajim.py | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diffs (34 lines): diff -r 7293a6cd2a39 -r 46f319807a21 src/gajim.py --- a/src/gajim.py Wed Apr 09 17:56:09 2014 +0200 +++ b/src/gajim.py Wed Apr 09 18:02:30 2014 +0200 @@ -68,19 +68,26 @@ except ImportError: pass +HAS_NBXMPP=True +MIN_NBXMPP_VER = "0.3.3" try: import nbxmpp except ImportError: + HAS_NBXMPP=False + +if not HAS_NBXMPP: print 'Gajim needs python-nbxmpp to run. Quiting...' sys.exit() try: from distutils.version import LooseVersion as V - if V(nbxmpp.__version__) < V("0.3.3"): - print 'Gajim needs python-nbxmpp > 0.3.3 to run. Quiting...' - sys.exit() + if V(nbxmpp.__version__) < V(MIN_NBXMPP_VER): + HAS_NBXMPP=False except: - print 'Gajim needs python-nbxmpp > 0.3.3 to run. Quiting...' + HAS_NBXMPP=False + +if not HAS_NBXMPP: + print 'Gajim needs python-nbxmpp >= %s to run. Quiting...' % MIN_NBXMPP_VER sys.exit() from common import demandimport

1 0

gajim: don't traceback when we try to open a remembered chat win...
by Gajim 09 Apr '14

09 Apr '14

changeset 7293a6cd2a39 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=7293a6cd2a39 description: don't traceback when we try to open a remembered chat window from a contact not in roster diffstat: src/roster_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r c6392d5f5c43 -r 7293a6cd2a39 src/roster_window.py --- a/src/roster_window.py Wed Apr 09 17:37:56 2014 +0200 +++ b/src/roster_window.py Wed Apr 09 17:56:09 2014 +0200 @@ -2639,6 +2639,9 @@ contact = \ gajim.contacts.get_contact_with_highest_priority( account, jid) + if not contact: + contact = self.add_to_not_in_the_roster(account, + jid) gajim.interface.on_open_chat_window(None, contact, account) gajim.config.set_per('accounts', account,

1 0

gajim: Added tag gajim-0.16-rc1 for changeset f4acdfbbe30b
by Gajim 09 Apr '14

09 Apr '14

changeset c6392d5f5c43 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=c6392d5f5c43 description: Added tag gajim-0.16-rc1 for changeset f4acdfbbe30b diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r b3debc7bde94 -r c6392d5f5c43 .hgtags --- a/.hgtags Wed Apr 09 17:04:03 2014 +0200 +++ b/.hgtags Wed Apr 09 17:37:56 2014 +0200 @@ -10,3 +10,4 @@ e2731a8cd582d3541bc8383e12a4775c8f229d65 gajim-0.16-alpha2 a0b59d4aadced51b902783d75d64461aa41bf7a3 gajim-0.16-beta1 9931beb5eec2c6fce4d7c9d1094375d05ac321de gajim-0.16-beta2 +f4acdfbbe30bd29b832a34c14bd18ade9be9845d gajim-0.16-rc1

1 0

python-nbxmpp: merge from python3 branch
by Python-nbxmpp 09 Apr '14

09 Apr '14

changeset eb393b576751 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=eb393b576751 description: merge from python3 branch diffstat: nbxmpp/__init__.py | 12 ++-- nbxmpp/auth_nb.py | 107 ++++++++++++++++++++++++++------------------ nbxmpp/bosh.py | 28 +++++----- nbxmpp/c14n.py | 4 +- nbxmpp/client_nb.py | 31 ++++++------ nbxmpp/dispatcher_nb.py | 59 ++++++++++++++---------- nbxmpp/features_nb.py | 2 +- nbxmpp/idlequeue.py | 80 +++++++++++++++++++++----------- nbxmpp/protocol.py | 20 +++---- nbxmpp/proxy_connectors.py | 44 +++++++++-------- nbxmpp/rndg.py | 2 +- nbxmpp/roster_nb.py | 28 +++++----- nbxmpp/simplexml.py | 64 +++++++++++++++++--------- nbxmpp/smacks.py | 4 +- nbxmpp/stringprepare.py | 32 ++++++------ nbxmpp/tls_nb.py | 109 ++++++++++++++++++++++++++------------------ nbxmpp/transports_nb.py | 99 ++++++++++++++++++++++++++++------------ 17 files changed, 426 insertions(+), 299 deletions(-) diffs (truncated from 1859 to 300 lines): diff -r fa6cb8f12391 -r eb393b576751 nbxmpp/__init__.py --- a/nbxmpp/__init__.py Mon Mar 31 16:54:20 2014 +0200 +++ b/nbxmpp/__init__.py Wed Apr 09 17:34:26 2014 +0200 @@ -10,11 +10,11 @@ Thanks and credits to the xmpppy developers. See: http://xmpppy.sourceforge.net/ """ -from protocol import * -import simplexml, protocol, auth_nb, transports_nb, roster_nb -import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors -from client_nb import NonBlockingClient -from plugin import PlugIn -from smacks import Smacks +from .protocol import * +from . import simplexml, protocol, auth_nb, transports_nb, roster_nb +from . import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors +from .client_nb import NonBlockingClient +from .plugin import PlugIn +from .smacks import Smacks __version__ = "0.3.3" diff -r fa6cb8f12391 -r eb393b576751 nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Mon Mar 31 16:54:20 2014 +0200 +++ b/nbxmpp/auth_nb.py Wed Apr 09 17:34:26 2014 +0200 @@ -21,24 +21,27 @@ See client_nb.py """ -from protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH -from protocol import NS_STREAM_MGMT -from protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID -from plugin import PlugIn +from __future__ import unicode_literals + +from .protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH +from .protocol import NS_STREAM_MGMT +from .protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID +from .plugin import PlugIn +import sys import re import base64 -import dispatcher_nb +from . import dispatcher_nb import hmac import hashlib import logging log = logging.getLogger('nbxmpp.auth_nb') -import rndg +from . import rndg def HH(some): return hashlib.md5(some).hexdigest() def H(some): return hashlib.md5(some).digest() -def C(some): return ':'.join(some) +def C(some): return b':'.join(some) try: kerberos = __import__('kerberos') @@ -215,9 +218,9 @@ raise NodeProcessed if "EXTERNAL" in self.mecs: self.mecs.remove('EXTERNAL') - sasl_data = u'%s@%s' % (self.username, self._owner.Server) - sasl_data = sasl_data.encode('utf-8').encode('base64').replace( - '\n', '') + sasl_data = '%s@%s' % (self.username, self._owner.Server) + sasl_data = base64.b64encode(sasl_data.encode('utf-8')).decode( + 'utf-8').replace('\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'EXTERNAL'}, payload=[sasl_data]) self.mechanism = 'EXTERNAL' @@ -238,7 +241,7 @@ self.startsasl = SASL_IN_PROCESS self._owner.send(str(node)) raise NodeProcessed - except kerberos.GSSError, e: + 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') @@ -290,10 +293,15 @@ return def scram_base64(s): - return ''.join(s.encode('base64').split('\n')) + try: + s = s.encode('utf-8') + except: + pass + return ''.join(base64.b64encode(s).decode('utf-8').\ + split('\n')) incoming_data = challenge.getData() - data=base64.decodestring(incoming_data) + data=base64.b64decode(incoming_data.encode('utf-8')).decode('utf-8') ### Handle Auth result def on_auth_fail(reason): log.info('Failed SASL authentification: %s' % reason) @@ -366,11 +374,16 @@ hashfn = hashlib.sha1 def HMAC(k, s): - return hmac.HMAC(key=k, msg=s, digestmod=hashfn).digest() + return hmac.new(key=k, msg=s, digestmod=hashfn).digest() - def XOR(x, y): - r = (chr(ord(px) ^ ord(py)) for px, py in zip(x, y)) - return ''.join(r) + if sys.version_info[0] == 2: + def XOR(x, y): + r = (chr(ord(px) ^ ord(py)) for px, py in zip(x, y)) + return bytes(b''.join(r)) + else: + def XOR(x, y): + r = [px ^ py for px, py in zip(x, y)] + return bytes(r) def Hi(s, salt, iters): ii = 1 @@ -378,7 +391,7 @@ s = s.encode('utf-8') except: pass - ui_1 = HMAC(s, salt + '\0\0\0\01') + ui_1 = HMAC(s, salt + b'\0\0\0\01') ui = ui_1 for i in range(iters - 1): ii += 1 @@ -406,16 +419,17 @@ + self.channel_binding) r += ',r=' + data['r'] self.scram_soup += r - salt = data['s'].decode('base64') + self.scram_soup = self.scram_soup.encode('utf-8') + salt = base64.b64decode(data['s'].encode('utf-8')) iter = int(data['i']) SaltedPassword = Hi(self.password, salt, iter) # TODO: Could cache this, along with salt+iter. - ClientKey = HMAC(SaltedPassword, 'Client Key') + ClientKey = HMAC(SaltedPassword, b'Client Key') StoredKey = scram_H(ClientKey) ClientSignature = HMAC(StoredKey, self.scram_soup) ClientProof = XOR(ClientKey, ClientSignature) r += ',p=' + scram_base64(ClientProof) - ServerKey = HMAC(SaltedPassword, 'Server Key') + ServerKey = HMAC(SaltedPassword, b'Server Key') self.scram_ServerSignature = HMAC(ServerKey, self.scram_soup) sasl_data = scram_base64(r) node = Node('response', attrs={'xmlns': NS_SASL}, @@ -425,7 +439,8 @@ if self.scram_step == 1: data = _scram_parse(data) - if data['v'].decode('base64') != self.scram_ServerSignature: + if base64.b64decode(data['v'].encode('utf-8')).decode('utf-8') \ + != self.scram_ServerSignature: # TODO: Not clear what to do here - need to abort. raise Exception node = Node('response', attrs={'xmlns': NS_SASL}); @@ -469,7 +484,7 @@ @staticmethod def _convert_to_iso88591(string): try: - string = string.decode('utf-8').encode('iso-8859-1') + string = string.encode('iso-8859-1') except UnicodeEncodeError: pass return string @@ -482,14 +497,14 @@ if self.mechanism == 'SCRAM-SHA-1': if self.channel_binding == None: # Client doesn't support Channel Binding - self.scram_gs2 = 'n,,' + self.scram_gs2 = 'n,,' # No CB yet. else: # Client supports CB, but server doesn't support CB - self.scram_gs2 = 'y,,' + self.scram_gs2 = 'y,,' else: self.scram_gs2 = 'p=tls-unique,,' - sasl_data = (self.scram_gs2 + self.scram_soup).encode('base64').\ - replace('\n', '') + 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, 'mechanism': self.mechanism}, payload=[sasl_data]) elif self.mechanism == 'DIGEST-MD5': @@ -497,30 +512,34 @@ hash_realm = self._convert_to_iso88591(self.resp['realm']) hash_password = self._convert_to_iso88591(self.password) A1 = C([H(C([hash_username, hash_realm, hash_password])), - self.resp['nonce'], self.resp['cnonce']]) - A2 = C(['AUTHENTICATE', self.resp['digest-uri']]) - response = HH(C([HH(A1), self.resp['nonce'], self.resp['nc'], - self.resp['cnonce'], self.resp['qop'], HH(A2)])) - A2 = C(['', self.resp['digest-uri']]) - self.digest_rspauth = HH(C([HH(A1), self.resp['nonce'], - self.resp['nc'], self.resp['cnonce'], self.resp['qop'], - HH(A2)])) + self.resp['nonce'].encode('utf-8'), self.resp['cnonce'].encode( + 'utf-8')]) + A2 = C([b'AUTHENTICATE', self.resp['digest-uri'].encode('utf-8')]) + response = HH(C([HH(A1).encode('utf-8'), self.resp['nonce'].encode( + 'utf-8'), self.resp['nc'].encode('utf-8'), self.resp['cnonce'].\ + encode('utf-8'), self.resp['qop'].encode('utf-8'), HH(A2).\ + encode('utf-8')])) + A2 = C([b'', self.resp['digest-uri'].encode('utf-8')]) + self.digest_rspauth = HH(C([HH(A1).encode('utf-8'), self.resp[ + 'nonce'].encode('utf-8'), self.resp['nc'].encode('utf-8'), + self.resp['cnonce'].encode('utf-8'), self.resp['qop'].encode( + 'utf-8'), HH(A2).encode('utf-8')])) self.resp['response'] = response - sasl_data = u'' + sasl_data = '' for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce', 'digest-uri', 'response', 'qop'): if key in ('nc', 'qop', 'response', 'charset'): - sasl_data += u"%s=%s," % (key, self.resp[key]) + sasl_data += "%s=%s," % (key, self.resp[key]) else: - sasl_data += u'%s="%s",' % (key, self.resp[key]) - sasl_data = sasl_data[:-1].encode('utf-8').encode('base64').replace( - '\r', '').replace('\n', '') + sasl_data += '%s="%s",' % (key, self.resp[key]) + sasl_data = base64.b64encode(sasl_data[:-1].encode('utf-8')).\ + decode('utf-8').replace('\r', '').replace('\n', '') node = Node('response', attrs={'xmlns': NS_SASL}, payload=[sasl_data]) elif self.mechanism == 'PLAIN': - sasl_data = u'\x00%s\x00%s' % (self.username, self.password) - sasl_data = sasl_data.encode('utf-8').encode('base64').replace( - '\n', '') + sasl_data = '\x00%s\x00%s' % (self.username, self.password) + sasl_data = base64.b64encode(sasl_data.encode('utf-8')).decode( + 'utf-8').replace('\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'}, payload=[sasl_data]) elif self.mechanism == 'X-MESSENGER-OAUTH2': @@ -595,7 +614,7 @@ query.setTagData('hash', hash_) self._method='0k' else: - log.warn("Secure methods unsupported, performing plain text \ + log.warning("Secure methods unsupported, performing plain text \ authentication") self._method = 'plain' self._owner._caller.get_password(self._on_password, self._method) diff -r fa6cb8f12391 -r eb393b576751 nbxmpp/bosh.py --- a/nbxmpp/bosh.py Mon Mar 31 16:54:20 2014 +0200 +++ b/nbxmpp/bosh.py Wed Apr 09 17:34:26 2014 +0200 @@ -20,16 +20,16 @@ import locale from hashlib import sha1 -from transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ +from .transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ CONNECTED, CONNECTING, DISCONNECTED, DISCONNECTING,\ urisplit, DISCONNECT_TIMEOUT_SECONDS -from protocol import BOSHBody, Protocol, NS_CLIENT -from simplexml import Node +from .protocol import BOSHBody, Protocol, NS_CLIENT +from .simplexml import Node import logging log = logging.getLogger('nbxmpp.bosh') -import rndg +from . import rndg KEY_COUNT = 10 @@ -94,7 +94,7 @@ # ssl variables self.ssl_certificate = None - self.ssl_errnum = None + self.ssl_errnum = 0 def connect(self, conn_5tuple, on_connect, on_connect_failure): @@ -130,7 +130,7 @@ if self.get_state() != DISCONNECTED and self.fd != -1: NonBlockingTransport.set_timeout(self, timeout) else: - log.warn('set_timeout: TIMEOUT NOT SET: state is %s, fd is %s' % (self.get_state(), self.fd)) + log.warning('set_timeout: TIMEOUT NOT SET: state is %s, fd is %s' % (self.get_state(), self.fd)) def on_http_request_possible(self): """ @@ -217,7 +217,7 @@ # sent after HTTP response from CM, exception is when we're disconnecting - then we # send anyway if total_pending_reqs >= self.bosh_requests and self.get_state()!=DISCONNECTING: - log.warn('attemp to make more requests than allowed by Connection Manager:\n%s' % + log.warning('attemp to make more requests than allowed by Connection Manager:\n%s' % self.get_current_state()) return @@ -310,7 +310,7 @@

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