Commits December 2013

commits@gajim.org

2 participants
151 discussions

gajim: [fedor] enable forward secrecy thanks to Diffie-Hellman p...
by Gajim 30 Dec '13

30 Dec '13

changeset 5c38116a4e87 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5c38116a4e87 description: [fedor] enable forward secrecy thanks to Diffie-Hellman parameters. Fixes #7555 diffstat: data/other/dh4096.pem | 18 ++++++++++++++++++ src/common/jingle_xtls.py | 21 +++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diffs (60 lines): diff -r 7598aeb7344d -r 5c38116a4e87 data/other/dh4096.pem --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/other/dh4096.pem Tue Nov 12 21:10:22 2013 +0100 @@ -0,0 +1,18 @@ +-----BEGIN DH PARAMETERS----- +MIICCAKCAgEA+hRyUsFN4VpJ1O8JLcCo/VWr19k3BCgJ4uk+d+KhehjdRqNDNyOQ +l/MOyQNQfWXPeGKmOmIig6Ev/nm6Nf9Z2B1h3R4hExf+zTiHnvVPeRBhjdQi81rt +Xeoh6TNrSBIKIHfUJWBh3va0TxxjQIs6IZOLeVNRLMqzeylWqMf49HsIXqbcokUS +Vt1BkvLdW48j8PPv5DsKRN3tloTxqDJGo9tKvj1Fuk74A+Xda1kNhB7KFlqMyN98 +VETEJ6c7KpfOo30mnK30wqw3S8OtaIR/maYX72tGOno2ehFDkq3pnPtEbD2CScxc +alJC+EL7RPk5c/tgeTvCngvc1KZn92Y//EI7G9tPZtylj2b56sHtMftIoYJ9+ODM +sccD5Piz/rejE3Ome8EOOceUSCYAhXn8b3qvxVI1ddd1pED6FHRhFvLrZxFvBEM9 +ERRMp5QqOaHJkM+Dxv8Cj6MqrCbfC4u+ZErxodzuusgDgvZiLF22uxMZbobFWyte +OvOzKGtwcTqO/1wV5gKkzu1ZVswVUQd5Gg8lJicwqRWyyNRczDDoG9jVDxmogKTH +AaqLulO7R8Ifa1SwF2DteSGVtgWEN8gDpN3RBmmPTDngyF2DHb5qmpnznwtFKdTL +KWbuHn491xNO25CQWMtem80uKw+pTnisBRF/454n1Jnhub144YRBoN8CAQI= +-----END DH PARAMETERS----- + +These are the 4096 bit DH parameters from "Assigned Number for SKIP Protocols" +(http://www.skip-vpn.org/spec/numbers.html). +See there for how they were generated. +Note that g is not a generator, but this is not a problem since p is a safe prime. diff -r 7598aeb7344d -r 5c38116a4e87 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Mon Nov 11 13:37:16 2013 +0100 +++ b/src/common/jingle_xtls.py Tue Nov 12 21:10:22 2013 +0100 @@ -49,6 +49,8 @@ TYPE_DSA = crypto.TYPE_DSA SELF_SIGNED_CERTIFICATE = 'localcert' +DH_PARAMS = 'dh_params.pem' +DEFAULT_DH_PARAMS = 'dh4096.pem' def default_callback(connection, certificate, error_num, depth, return_code): log.info("certificate: %s" % certificate) @@ -106,6 +108,25 @@ cert_name = os.path.join(gajim.MY_CERT_DIR, SELF_SIGNED_CERTIFICATE) ctx.use_privatekey_file (cert_name + '.pkey') ctx.use_certificate_file(cert_name + '.cert') + + # Try to load Diffie-Hellman parameters. + # First try user DH parameters, if this fails load the default DH parameters + dh_params_name = os.path.join(gajim.MY_CERT_DIR, DH_PARAMS) + try: + with open(dh_params_name, "r") as dh_params_file: + ctx.load_tmp_dh(dh_params_name) + except IOError as err: + log.warn('Unable to load DH parameter file: %s. You should generate it by using this command : "openssl dhparam 4096 -out ~/.local/share/gajim/dh_params.pem". This command take about 15 minutes to complete.' % dh_params_name) + default_dh_params_name = os.path.join(common.gajim.DATA_DIR, + 'other', DEFAULT_DH_PARAMS) + try: + with open(default_dh_params_name, "r") as default_dh_params_file: + ctx.load_tmp_dh(default_dh_params_name) + except IOError as err: + log.error('Unable to load default DH parameter file: %s , %s' + % (default_dh_params_name, err)) + raise + store = ctx.get_cert_store() for f in os.listdir(os.path.expanduser(gajim.MY_PEER_CERTS_PATH)): load_cert_file(os.path.join(os.path.expanduser(

1 0

gajim: fix warning message
by Gajim 30 Dec '13

30 Dec '13

changeset 8cd71a0a0c4b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=8cd71a0a0c4b description: fix warning message diffstat: src/common/jingle_xtls.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 5c38116a4e87 -r 8cd71a0a0c4b src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Tue Nov 12 21:10:22 2013 +0100 +++ b/src/common/jingle_xtls.py Thu Nov 14 21:34:15 2013 +0100 @@ -116,7 +116,10 @@ with open(dh_params_name, "r") as dh_params_file: ctx.load_tmp_dh(dh_params_name) except IOError as err: - log.warn('Unable to load DH parameter file: %s. You should generate it by using this command : "openssl dhparam 4096 -out ~/.local/share/gajim/dh_params.pem". This command take about 15 minutes to complete.' % dh_params_name) + log.warn('Unable to load DH parameter file: %s. You should generate it ' + 'by using this command : "openssl dhparam 4096 -out ' + '~/.config/gajim/dh_params.pem". This command take about 15 ' + 'minutes to complete.' % dh_params_name) default_dh_params_name = os.path.join(common.gajim.DATA_DIR, 'other', DEFAULT_DH_PARAMS) try:

1 0

gajim: set transient_for for 'This service does not contain any ...
by Gajim 30 Dec '13

30 Dec '13

changeset 723730d19b50 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=723730d19b50 description: set transient_for for 'This service does not contain any items to browse.' diffstat: src/disco.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 8cd71a0a0c4b -r 723730d19b50 src/disco.py --- a/src/disco.py Thu Nov 14 21:34:15 2013 +0100 +++ b/src/disco.py Fri Nov 15 20:23:41 2013 +0400 @@ -1127,7 +1127,8 @@ # We can't travel anywhere else. self.window.destroy() dialogs.ErrorDialog(_('The service is not browsable'), -_('This service does not contain any items to browse.')) + _('This service does not contain any items to browse.'), + transient_for=self.window.window) return # We got a list of items def fill_partial_rows(items):

1 0

gajim: Set transient_for 'You are no longer in group chat'
by Gajim 30 Dec '13

30 Dec '13

changeset dd01be31b935 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=dd01be31b935 description: Set transient_for 'You are no longer in group chat' diffstat: src/groupchat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 723730d19b50 -r dd01be31b935 src/groupchat_control.py --- a/src/groupchat_control.py Fri Nov 15 20:23:41 2013 +0400 +++ b/src/groupchat_control.py Sat Nov 16 22:23:13 2013 +0400 @@ -243,7 +243,7 @@ #in second %s code replaces with nickname _('You are no longer in group chat "%(room)s" or ' '"%(nick)s" has left.') % {'room': '\u200E' + room, - 'nick': nick}) + 'nick': nick}, transient_for=self.parent_win.window) return ChatControl.send_message(self, message, xhtml=xhtml,

1 0

gajim: fix var name
by Gajim 30 Dec '13

30 Dec '13

changeset 7aa8fb774afa in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=7aa8fb774afa description: fix var name diffstat: src/common/jingle.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (17 lines): diff -r d06bb658d995 -r 7aa8fb774afa src/common/jingle.py --- a/src/common/jingle.py Fri Nov 08 00:31:34 2013 +0400 +++ b/src/common/jingle.py Fri Nov 08 14:06:22 2013 +0400 @@ -80,7 +80,7 @@ try: jid = helpers.get_full_jid_from_iq(stanza) except helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % stanza.getFrom()) + logger.warn('Invalid JID: %s, ignoring it' % stanza.getFrom()) return id_ = stanza.getID() if (jid, id_) in self.__iq_responses.keys(): @@ -224,4 +224,3 @@ if session.peerjid == jid and session.get_content(media): return session return None -

1 0

gajim: [fedor] use openssl random number generator if available,...
by Gajim 30 Dec '13

30 Dec '13

changeset ac2e5ca76e46 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=ac2e5ca76e46 description: [fedor] use openssl random number generator if available, and improve entropy. Fixes #7550 diffstat: src/common/configpaths.py | 7 +++-- src/common/crypto.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++- src/gajim.py | 16 +++++++++++++++ 3 files changed, 67 insertions(+), 4 deletions(-) diffs (116 lines): diff -r 7aa8fb774afa -r ac2e5ca76e46 src/common/configpaths.py --- a/src/common/configpaths.py Fri Nov 08 14:06:22 2013 +0400 +++ b/src/common/configpaths.py Sun Nov 10 08:39:50 2013 +0100 @@ -139,9 +139,10 @@ self.config_root = self.cache_root = self.data_root = root d = {'MY_DATA': '', 'LOG_DB': 'logs.db', 'MY_CACERTS': 'cacerts.pem', - 'MY_EMOTS': 'emoticons', 'MY_ICONSETS': 'iconsets', - 'MY_MOOD_ICONSETS': 'moods', 'MY_ACTIVITY_ICONSETS': 'activities', - 'PLUGINS_USER': 'plugins', 'MY_PEER_CERTS': 'certs'} + 'MY_EMOTS': 'emoticons', 'MY_ICONSETS': 'iconsets', + 'MY_MOOD_ICONSETS': 'moods', 'MY_ACTIVITY_ICONSETS': 'activities', + 'PLUGINS_USER': 'plugins', 'MY_PEER_CERTS': 'certs', + 'RNG_SEED': u'rng_seed'} for name in d: self.add(name, TYPE_DATA, windowsify(d[name])) diff -r 7aa8fb774afa -r ac2e5ca76e46 src/common/crypto.py --- a/src/common/crypto.py Fri Nov 08 14:06:22 2013 +0400 +++ b/src/common/crypto.py Sun Nov 10 08:39:50 2013 +0100 @@ -19,6 +19,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +import sys import os import math @@ -75,8 +76,53 @@ else: return base28_chr[n] +def add_entropy_sources_OpenSSL(): + # Other possibly variable data. This are very low quality sources of + # entropy, but some of them are installation dependent and can be hard + # to guess for the attacker. + # Data available on all platforms Unix, Windows + sources = [sys.argv, sys.builtin_module_names, + sys.copyright, sys.getfilesystemencoding(), sys.hexversion, + sys.modules, sys.path, sys.version, sys.api_version, + os.environ, os.getcwd(), os.getpid()] + + for s in sources: + OpenSSL.rand.add(str(s), 0.01) + + # On Windows add the current contents of the screen to the PRNG state. + if os.name == 'nt': + OpenSSL.rand.screen() + # The /proc filesystem on POSIX systems contains many random variables: + # memory statistics, interrupt counts, network packet counts + if os.name == 'posix': + dirs = ['/proc', '/proc/net', '/proc/self'] + for d in dirs: + if os.access(d, os.R_OK): + for filename in os.listdir(d): + OpenSSL.rand.add(filename, 0) + try: + with open(d + os.sep + filename, "r") as fp: + # Limit the ammount of read bytes, in case a memory + # file was opened + OpenSSL.rand.add(str(fp.read(5000)), 0.01) + except: + # Ignore all read and access errors + pass + +PYOPENSSL_PRNG_PRESENT = False +try: + import OpenSSL.rand + PYOPENSSL_PRNG_PRESENT = True +except ImportError: + # PyOpenSSL PRNG not available + pass + def random_bytes(bytes_): - return os.urandom(bytes_) + if PYOPENSSL_PRNG_PRESENT: + OpenSSL.rand.add(os.urandom(bytes_), bytes_) + return OpenSSL.rand.bytes(bytes_) + else: + return os.urandom(bytes_) def generate_nonce(): return random_bytes(8) diff -r 7aa8fb774afa -r ac2e5ca76e46 src/gajim.py --- a/src/gajim.py Fri Nov 08 14:06:22 2013 +0400 +++ b/src/gajim.py Sun Nov 10 08:39:50 2013 +0100 @@ -302,6 +302,19 @@ pid_filename = gajimpaths['PID_FILE'] config_filename = gajimpaths['CONFIG_FILE'] +# Seed the OpenSSL pseudo random number generator from file and initialize +RNG_SEED = gajimpaths['RNG_SEED'] +PYOPENSSL_PRNG_PRESENT = False +try: + import OpenSSL.rand + from common import crypto + PYOPENSSL_PRNG_PRESENT = True + # Seed from file + OpenSSL.rand.load_file(RNG_SEED) + crypto.add_entropy_sources_OpenSSL() +except ImportError: + log.info("PyOpenSSL PRNG not available") + import traceback import errno import dialogs @@ -448,6 +461,9 @@ del pid_dir def on_exit(): + # Save the entropy from OpenSSL PRNG + if PYOPENSSL_PRNG_PRESENT: + OpenSSL.rand.write_file(RNG_SEED) # delete pid file on normal exit if os.path.exists(pid_filename): os.remove(pid_filename)

1 0

gajim: Fix wrong import
by Gajim 30 Dec '13

30 Dec '13

changeset 688b9cb30dda in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=688b9cb30dda description: Fix wrong import diffstat: src/htmltextview.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (19 lines): diff -r ac2e5ca76e46 -r 688b9cb30dda src/htmltextview.py --- a/src/htmltextview.py Sun Nov 10 08:39:50 2013 +0100 +++ b/src/htmltextview.py Mon Nov 11 14:27:30 2013 +0400 @@ -833,7 +833,6 @@ class HtmlTextView(Gtk.TextView): def __init__(self): - from gtkgui_helpers import get_gtk_builder GObject.GObject.__init__(self) self.set_wrap_mode(Gtk.WrapMode.CHAR) self.set_editable(False) @@ -950,6 +949,7 @@ dialogs.AddNewContactWindow(self.account, jid) def make_link_menu(self, event, kind, text): + from gtkgui_helpers import get_gtk_builder xml = get_gtk_builder('chat_context_menu.ui') menu = xml.get_object('chat_context_menu') childs = menu.get_children()

1 0

gajim: Add date to gajim logs. Fixes #7556
by Gajim 30 Dec '13

30 Dec '13

changeset edb73cd1006f in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=edb73cd1006f description: Add date to gajim logs. Fixes #7556 diffstat: src/common/logging_helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 688b9cb30dda -r edb73cd1006f src/common/logging_helpers.py --- a/src/common/logging_helpers.py Mon Nov 11 14:27:30 2013 +0400 +++ b/src/common/logging_helpers.py Mon Nov 11 15:43:56 2013 +0400 @@ -141,7 +141,7 @@ consoleloghandler.setFormatter( FancyFormatter( '%(asctime)s %(levelname)s %(name)s %(message)s', - '%H:%M:%S', + '%x %H:%M:%S', use_color ) )

1 0

gajim: improve manage bookmark jid handling. Fixes #7547
by Gajim 30 Dec '13

30 Dec '13

changeset 7598aeb7344d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=7598aeb7344d description: improve manage bookmark jid handling. Fixes #7547 diffstat: src/config.py | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diffs (64 lines): diff -r edb73cd1006f -r 7598aeb7344d src/config.py --- a/src/config.py Mon Nov 11 15:43:56 2013 +0400 +++ b/src/config.py Mon Nov 11 13:37:16 2013 +0100 @@ -3244,7 +3244,8 @@ self.server_entry = self.xml.get_object('server_entry') self.server_entry.connect('changed', self.on_server_entry_changed) self.room_entry = self.xml.get_object('room_entry') - self.room_entry.connect('changed', self.on_room_entry_changed) + self.room_entry_changed_id = self.room_entry.connect('changed', + self.on_room_entry_changed) self.pass_entry = self.xml.get_object('pass_entry') self.pass_entry.connect('changed', self.on_pass_entry_changed) self.autojoin_checkbutton = self.xml.get_object('autojoin_checkbutton') @@ -3385,7 +3386,9 @@ self.title_entry.set_text(model[iter_][1]) room_jid = model[iter_][2] (room, server) = room_jid.split('@') + self.room_entry.handler_block(self.room_entry_changed_id) self.room_entry.set_text(room) + self.room_entry.handler_unblock(self.room_entry_changed_id) self.server_entry.set_text(server) self.autojoin_checkbutton.set_active(model[iter_][3]) @@ -3437,13 +3440,17 @@ if not iter_: return server = widget.get_text() + if not server: + return if '@' in server: dialogs.ErrorDialog(_('Invalid server'), _('Character not allowed'), transient_for=self.window) widget.set_text(server.replace('@', '')) - room_jid = self.room_entry.get_text().strip() + '@' + \ - server.strip() + room = self.room_entry.get_text().strip() + if not room: + return + room_jid = room + '@' + server.strip() try: room_jid = helpers.parse_jid(room_jid) except helpers.InvalidFormat as e: @@ -3458,14 +3465,18 @@ if not iter_: return room = widget.get_text() + if not room: + return if '@' in room: room, server = room.split('@', 1) widget.set_text(room) if server: self.server_entry.set_text(server) self.server_entry.grab_focus() - room_jid = room.strip() + '@' + \ - self.server_entry.get_text().strip() + server = self.server_entry.get_text().strip() + if not server: + return + room_jid = room.strip() + '@' + server try: room_jid = helpers.parse_jid(room_jid) except helpers.InvalidFormat:

1 0

gajim: don't send receipt answer for forwarded messages. Fixes #...
by Gajim 30 Dec '13

30 Dec '13

changeset ec6f654d9765 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=ec6f654d9765 description: don't send receipt answer for forwarded messages. Fixes #7548 diffstat: src/common/connection_handlers.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r c4c80ac4a1a1 -r ec6f654d9765 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Nov 05 15:04:49 2013 +0400 +++ b/src/common/connection_handlers.py Tue Nov 05 13:12:38 2013 +0100 @@ -1209,7 +1209,8 @@ gc_contact = gajim.contacts.get_gc_contact(self.name, obj.jid, nick) if obj.receipt_request_tag and gajim.config.get_per('accounts', self.name, 'answer_receipts') and ((contact and contact.sub \ - not in ('to', 'none')) or gc_contact) and obj.mtype != 'error': + not in ('to', 'none')) or gc_contact) and obj.mtype != 'error' and \ + not obj.forwarded: receipt = nbxmpp.Message(to=obj.fjid, typ='chat') receipt.setID(obj.id_) receipt.setTag('received', namespace='urn:xmpp:receipts',

1 0

← Newer
1
2
3
4
5
6
7
...
16
Older →

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 December 2013