Commits

commits@gajim.org

17632 discussions

gajim: fix the "do not ask me again" behaviour with untrusted GP...
by Gajim 01 Dec '13

01 Dec '13

changeset 0206274033da 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=0206274033da description: fix the "do not ask me again" behaviour with untrusted GPG key warning. Fixes #7584 diffstat: src/common/connection.py | 2 +- src/common/gpg.py | 10 ++++++++-- src/gui_interface.py | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diffs (52 lines): diff -r a49c6adac288 -r 0206274033da src/common/connection.py --- a/src/common/connection.py Sat Nov 30 15:25:21 2013 +0100 +++ b/src/common/connection.py Sun Dec 01 10:06:38 2013 +0100 @@ -326,7 +326,7 @@ form_node, user_nick, keyID, attention, correction_msg, callback) gajim.nec.push_incoming_event(GPGTrustKeyEvent(None, - conn=self, callback=_on_always_trust)) + conn=self, keyID=keyID, callback=_on_always_trust)) else: self._message_encrypted_cb(output, type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, diff -r a49c6adac288 -r 0206274033da src/common/gpg.py --- a/src/common/gpg.py Sat Nov 30 15:25:21 2013 +0100 +++ b/src/common/gpg.py Sun Dec 01 10:06:38 2013 +0100 @@ -34,7 +34,7 @@ self.decode_errors = 'replace' self.passphrase = None self.use_agent = use_agent - self.always_trust = False + self.always_trust = [] # list of keyID to always trust def _setup_my_options(self): self.options.armor = 1 @@ -47,8 +47,14 @@ self.options.extra_args.append('--use-agent') def encrypt(self, str_, recipients, always_trust=False): + trust = always_trust + if not trust: + trust = True + for key in recipients: + if key not in self.always_trust: + trust = False result = super(GnuPG, self).encrypt(str_, recipients, - always_trust=always_trust, passphrase=self.passphrase) + always_trust=trust, passphrase=self.passphrase) if result.status == 'invalid recipient': return '', 'NOT_TRUSTED' diff -r a49c6adac288 -r 0206274033da src/gui_interface.py --- a/src/gui_interface.py Sat Nov 30 15:25:21 2013 +0100 +++ b/src/gui_interface.py Sun Dec 01 10:06:38 2013 +0100 @@ -695,7 +695,7 @@ #('GPG_ALWAYS_TRUST', account, callback) def on_yes(checked): if checked: - obj.conn.gpg.always_trust = True + obj.conn.gpg.always_trust.append(obj.keyID) obj.callback(True) def on_no():

1 0

gajim: fix adding transport contacts
by Gajim 30 Nov '13

30 Nov '13

changeset a49c6adac288 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=a49c6adac288 description: fix adding transport contacts diffstat: src/dialogs.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (25 lines): diff -r 155fdc9f6544 -r a49c6adac288 src/dialogs.py --- a/src/dialogs.py Sat Nov 30 10:33:04 2013 +0100 +++ b/src/dialogs.py Sat Nov 30 15:25:21 2013 +0100 @@ -1060,10 +1060,10 @@ model = self.protocol_combobox.get_model() iter_ = self.protocol_combobox.get_active_iter() type_ = model[iter_][2] - if type_ != 'jabber' and not self.jid_escaped: + if type_ != 'jabber': transport = self.protocol_jid_combobox.get_active_text().decode( 'utf-8') - if self.account: + if self.account and not self.jid_escaped: self.adding_jid = (jid, transport, type_) gajim.connections[self.account].request_gateway_prompt( transport, jid) @@ -5182,7 +5182,7 @@ """ Class for displaying information about a XEP-0116 encrypted session """ - def __init__(self, control): + def __init__(self, control, transient_for=None): xml = gtkgui_helpers.get_gtk_builder('esession_info_window.ui') security_image = xml.get_object('security_image') status_label = xml.get_object('verification_status_label')

1 0

python-nbxmpp: prevent traceback
by Yann Leboulanger 30 Nov '13

30 Nov '13

changeset e88ec6cb0884 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=e88ec6cb0884 description: prevent traceback diffstat: nbxmpp/smacks.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 42b312ce951f -r e88ec6cb0884 nbxmpp/smacks.py --- a/nbxmpp/smacks.py Sat Nov 30 09:58:35 2013 +0100 +++ b/nbxmpp/smacks.py Sat Nov 30 11:29:05 2013 +0100 @@ -95,7 +95,11 @@ number of stanzas received by the server. Pops stanzas that were handled by the server from the queue. ''' - h = int(stanza.getAttr('h')) + h = stanza.getAttr('h') + if not h: + log.error('Server did not send h attribute') + return + h = int(h) diff = self.out_h - h if len(self.uqueue) < diff or diff < 0:

1 0

gajim: [Dicson] Do not display dialog confirm_metacontacts when ...
by Gajim 30 Nov '13

30 Nov '13

changeset 155fdc9f6544 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=155fdc9f6544 description: [Dicson] Do not display dialog confirm_metacontacts when using Make CONTACT first contact. Fixes #7576 diffstat: src/roster_window.py | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diffs (40 lines): diff -r 4507ce0d9d3a -r 155fdc9f6544 src/roster_window.py --- a/src/roster_window.py Sat Nov 30 10:10:39 2013 +0100 +++ b/src/roster_window.py Sat Nov 30 10:33:04 2013 +0100 @@ -4555,8 +4555,12 @@ self.draw_account(account_source) context.finish(True, True, etime) + dest_family = gajim.contacts.get_metacontacts_family(account_dest, + c_dest.jid) + source_family = gajim.contacts.get_metacontacts_family(account_source, + c_source.jid) confirm_metacontacts = gajim.config.get('confirm_metacontacts') - if confirm_metacontacts == 'no': + if confirm_metacontacts == 'no' or dest_family == source_family: merge_contacts() return pritext = _('You are about to create a metacontact. Are you sure you ' @@ -4830,7 +4834,7 @@ return menu = gtk.Menu() item = gtk.MenuItem(_('Send %s to %s') % (c_source.get_shown_name(), - c_dest.get_shown_name())) + c_dest.get_shown_name()), use_underline=False) item.connect('activate', self.on_drop_rosterx, account_source, c_source, account_dest, c_dest, is_big_brother, context, etime) menu.append(item) @@ -4841,10 +4845,11 @@ account_source, c_source.jid) if dest_family == source_family and dest_family: item = gtk.MenuItem(_('Make %s first contact') % ( - c_source.get_shown_name())) + c_source.get_shown_name()), use_underline=False) else: item = gtk.MenuItem(_('Make %s and %s metacontacts') % ( - c_source.get_shown_name(), c_dest.get_shown_name())) + c_source.get_shown_name(), c_dest.get_shown_name()), + use_underline=False) item.connect('activate', self.on_drop_in_contact, account_source, c_source, account_dest, c_dest, is_big_brother, context, etime)

1 0

gajim: [fedor] fix gpg signature when hash algo is not SHA-1. Fi...
by Gajim 30 Nov '13

30 Nov '13

changeset 4507ce0d9d3a 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=4507ce0d9d3a description: [fedor] fix gpg signature when hash algo is not SHA-1. Fixes #7569 diffstat: src/common/gpg.py | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diffs (32 lines): diff -r 7202e4b54fbd -r 4507ce0d9d3a src/common/gpg.py --- a/src/common/gpg.py Sat Nov 30 10:04:50 2013 +0100 +++ b/src/common/gpg.py Sat Nov 30 10:10:39 2013 +0100 @@ -80,14 +80,21 @@ def verify(self, str_, sign): if str_ is None: return '' - data = '-----BEGIN PGP SIGNED MESSAGE-----' + os.linesep - data = data + 'Hash: SHA1' + os.linesep + os.linesep - data = data + str_ + os.linesep - data = data + self._addHeaderFooter(sign, 'SIGNATURE') - result = super(GnuPG, self).verify(data) + # Hash algorithm is not transfered in the signed presence stanza so try + # all algorithms. Text name for hash algorithms from RFC 4880 - section 9.4 + hash_algorithms = ['SHA512', 'SHA384', 'SHA256', 'SHA224', 'SHA1', 'RIPEMD160'] + for algo in hash_algorithms: + data = os.linesep.join( + ['-----BEGIN PGP SIGNED MESSAGE-----', + 'Hash: ' + algo, + '', + str_, + self._addHeaderFooter(sign, 'SIGNATURE')] + ) + result = super(GnuPG, self).verify(data) + if result.valid: + return result.key_id - if result.valid: - return result.key_id return '' def get_keys(self, secret=False):

1 0

gajim: improve XEP-184 mark colors. see #7476
by Gajim 30 Nov '13

30 Nov '13

changeset 7202e4b54fbd 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=7202e4b54fbd description: improve XEP-184 mark colors. see #7476 diffstat: src/conversation_textview.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (16 lines): diff -r ed832ba2cbdd -r 7202e4b54fbd src/conversation_textview.py --- a/src/conversation_textview.py Sat Nov 30 10:00:10 2013 +0100 +++ b/src/conversation_textview.py Sat Nov 30 10:04:50 2013 +0100 @@ -306,10 +306,10 @@ self.displaymarking_tags = {} tag = buffer_.create_tag('xep0184-warning') - tag.set_property('foreground', 'red') + tag.set_property('foreground', '#cc0000') tag = buffer_.create_tag('xep0184-received') - tag.set_property('foreground', 'green') + tag.set_property('foreground', '#73d216') # One mark at the begining then 2 marks between each lines size = gajim.config.get('max_conversation_lines')

1 0

gajim: Make threads usable under windows so GPG works correctly....
by Gajim 30 Nov '13

30 Nov '13

changeset ed832ba2cbdd 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=ed832ba2cbdd description: Make threads usable under windows so GPG works correctly. Fixes #7565 diffstat: src/gajim.py | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diffs (20 lines): diff -r b2788bedd2a1 -r ed832ba2cbdd src/gajim.py --- a/src/gajim.py Sat Nov 30 09:48:18 2013 +0100 +++ b/src/gajim.py Sat Nov 30 10:00:10 2013 +0100 @@ -509,13 +509,9 @@ interface.run() try: - if os.name != 'nt': - # This makes Gajim unusable under windows, and threads are used only - # for GPG, so not under windows - gtk.gdk.threads_init() - gtk.gdk.threads_enter() + gtk.gdk.threads_init() + gtk.gdk.threads_enter() gtk.main() - if os.name != 'nt': - gtk.gdk.threads_leave() + gtk.gdk.threads_leave() except KeyboardInterrupt: print >> sys.stderr, 'KeyboardInterrupt'

1 0

python-nbxmpp: [fedor] Disable SSL v3 protocol and use only TLS ...
by Yann Leboulanger 30 Nov '13

30 Nov '13

changeset 42b312ce951f in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=42b312ce951f description: [fedor] Disable SSL v3 protocol and use only TLS 1.0, TLS 1.1, TLS 1.2. Fixes #9 diffstat: nbxmpp/tls_nb.py | 37 +++++++++++++++++-------------------- 1 files changed, 17 insertions(+), 20 deletions(-) diffs (78 lines): diff -r a21475d3659f -r 42b312ce951f nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Fri Nov 29 20:31:51 2013 +0100 +++ b/nbxmpp/tls_nb.py Sat Nov 30 09:58:35 2013 +0100 @@ -253,13 +253,13 @@ :param mycerts: path to pem file with certificates of user trusted servers :param cipher_list: list of ciphers to use when connection to server. If - None is provided, a default list is used: HIGH:!aNULL:!eNULL:RC4-SHA + None is provided, a default list is used: HIGH:!aNULL:RC4-SHA """ PlugIn.__init__(self) self.cacerts = cacerts self.mycerts = mycerts if cipher_list is None: - self.cipher_list = 'HIGH:!aNULL:!eNULL:RC4-SHA' + self.cipher_list = 'HIGH:!aNULL:RC4-SHA' else: self.cipher_list = cipher_list @@ -277,8 +277,11 @@ return res def _dumpX509(self, cert, stream=sys.stderr): + try: + print >> stream, "Digest (SHA-2 256):", cert.digest("sha256") + except ValueError: # Old OpenSSL version + pass print >> stream, "Digest (SHA-1):", cert.digest("sha1") - print >> stream, "Digest (MD5):", cert.digest("md5") print >> stream, "Serial #:", cert.get_serial_number() print >> stream, "Version:", cert.get_version() print >> stream, "Expired:", ("Yes" if cert.has_expired() else "No") @@ -349,17 +352,21 @@ def _startSSL_pyOpenSSL(self): log.debug("_startSSL_pyOpenSSL called") tcpsock = self._owner + # See http://docs.python.org/dev/library/ssl.html + tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) + flags = OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_NO_SSLv3 | \ + OpenSSL.SSL.OP_SINGLE_DH_USE + try: + flags |= OpenSSL.SSL.OP_NO_TICKET + except AttributeError, e: + # py-OpenSSL < 0.9 or old OpenSSL + flags |= 16384 + tcpsock._sslContext.set_options(flags) + # NonBlockingHTTPBOSH instance has no attribute _owner if hasattr(tcpsock, '_owner') and tcpsock._owner._caller.client_cert \ and os.path.exists(tcpsock._owner._caller.client_cert): conn = tcpsock._owner._caller - # FIXME make a checkbox for Client Cert / SSLv23 / TLSv1 - # If we are going to use a client cert/key pair for authentication, - # we choose TLSv1* method. - tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) - flags = (OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_NO_SSLv3 - | OpenSSL.SSL.OP_SINGLE_DH_USE) - tcpsock._sslContext.set_options(flags) log.debug('Using client cert and key from %s' % conn.client_cert) try: p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert).read(), @@ -385,16 +392,6 @@ 'from file %s: %s' % (conn.client_cert, msg)) else: log.info('client cert and key loaded OK') - else: - # See http://docs.python.org/dev/library/ssl.html - tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) - flags = OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_SINGLE_DH_USE - try: - flags |= OpenSSL.SSL.OP_NO_TICKET - except AttributeError, e: - # py-OpenSSL < 0.9 or old OpenSSL - flags |= 16384 - tcpsock._sslContext.set_options(flags) tcpsock.ssl_errnum = [] tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER,

1 0

gajim: prevent traceback. Fixes #7572
by Gajim 30 Nov '13

30 Nov '13

changeset b2788bedd2a1 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=b2788bedd2a1 description: prevent traceback. Fixes #7572 diffstat: src/gui_interface.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 8fba80aa51ce -r b2788bedd2a1 src/gui_interface.py --- a/src/gui_interface.py Fri Nov 29 22:07:59 2013 +0400 +++ b/src/gui_interface.py Sat Nov 30 09:48:18 2013 +0100 @@ -1688,6 +1688,8 @@ event = gajim.events.get_first_event(account, fjid, type_) if not event: event = gajim.events.get_first_event(account, jid, type_) + if not event: + return if type_ == 'printed_pm': ctrl = event.parameters[2]

1 0

python-nbxmpp: [fedor] fix BOSH connection. Fixes #10
by Yann Leboulanger 29 Nov '13

29 Nov '13

changeset a21475d3659f in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=a21475d3659f description: [fedor] fix BOSH connection. Fixes #10 diffstat: nbxmpp/bosh.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r a7f633ee2fc2 -r a21475d3659f nbxmpp/bosh.py --- a/nbxmpp/bosh.py Sun Nov 03 17:55:20 2013 +0100 +++ b/nbxmpp/bosh.py Fri Nov 29 20:31:51 2013 +0100 @@ -68,6 +68,7 @@ self.bosh_secure = 'true' else: self.bosh_secure = 'false' + self.cipher_list = cipher_list self.use_proxy_auth = bosh_dict['useauth'] self.proxy_creds = proxy_creds self.wait_cb_time = None @@ -450,6 +451,7 @@ on_disconnect=self.disconnect, idlequeue = self.idlequeue, estabilish_tls = self.estabilish_tls, + cipher_list = self.cipher_list, certs = self.certs, on_http_request_possible = self.on_http_request_possible, http_dict = http_dict,

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