Commits

commits@gajim.org

17632 discussions

gajim: Handle "NOTATION_NAME", "NOTATION_DATA" GPG lines. Fixes ...
by Gajim 27 Dec '13

27 Dec '13

changeset a7e0c40fb1f5 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=a7e0c40fb1f5 description: Handle "NOTATION_NAME", "NOTATION_DATA" GPG lines. Fixes #7612 diffstat: src/common/gnupg.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0612d0cdc37f -r a7e0c40fb1f5 src/common/gnupg.py --- a/src/common/gnupg.py Fri Dec 27 12:16:58 2013 +0100 +++ b/src/common/gnupg.py Fri Dec 27 12:42:19 2013 +0100 @@ -175,7 +175,7 @@ "PLAINTEXT_LENGTH", "POLICY_URL", "DECRYPTION_INFO", "DECRYPTION_OKAY", "INV_SGNR", "FILE_START", "FILE_ERROR", "FILE_DONE", "PKA_TRUST_GOOD", "PKA_TRUST_BAD", "BADMDC", - "GOODMDC", "NO_SGNR"): + "GOODMDC", "NO_SGNR", "NOTATION_NAME", "NOTATION_DATA"): pass elif key == "BADSIG": self.valid = False

1 0

gajim: ignore address-related errors for getaddrinfo. Fixes #7611
by Gajim 27 Dec '13

27 Dec '13

changeset 0612d0cdc37f 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=0612d0cdc37f description: ignore address-related errors for getaddrinfo. Fixes #7611 cleanup of jingle_transport.py diffstat: src/common/jingle_transport.py | 79 +++++++++++++++++++++++------------------ 1 files changed, 45 insertions(+), 34 deletions(-) diffs (123 lines): diff -r ee8f2e6efe1b -r 0612d0cdc37f src/common/jingle_transport.py --- a/src/common/jingle_transport.py Mon Dec 23 23:26:54 2013 +0100 +++ b/src/common/jingle_transport.py Fri Dec 27 12:16:58 2013 +0100 @@ -178,30 +178,39 @@ return if not self.connection: return - local_ip_cand = [] port = int(gajim.config.get('file_transfers_port')) #type preference of connection type. XEP-0260 section 2.2 type_preference = 126 - c = {'host': self.connection.peerhost[0]} - c['candidate_id'] = self.connection.connection.getAnID() - c['port'] = port - c['type'] = 'direct' - c['jid'] = self.ourjid - c['priority'] = (2**16) * type_preference + priority = (2**16) * type_preference + hosts = set() + local_ip_cand = [] + + c = {'host': self.connection.peerhost[0], + 'candidate_id': self.connection.connection.getAnID(), + 'port': port, + 'type': 'direct', + 'jid': self.ourjid, + 'priority': priority} + hosts.add(self.connection.peerhost[0]) local_ip_cand.append(c) - for addr in socket.getaddrinfo(socket.gethostname(), None): - if not addr[4][0] in local_ip_cand and not addr[4][0].startswith('127'): - c = {'host': addr[4][0]} - c['candidate_id'] = self.connection.connection.getAnID() - c['port'] = port - c['type'] = 'direct' - c['jid'] = self.ourjid - c['priority'] = (2**16) * type_preference - c['initiator'] = self.file_props.sender - c['target'] = self.file_props.receiver - local_ip_cand.append(c) + try: + for addrinfo in socket.getaddrinfo(socket.gethostname(), None): + addr = addrinfo[4][0] + if not addr in hosts and not addr.startswith('127'): + c = {'host': addr, + 'candidate_id': self.connection.connection.getAnID(), + 'port': port, + 'type': 'direct', + 'jid': self.ourjid, + 'priority': priority, + 'initiator': self.file_props.sender, + 'target': self.file_props.receiver} + hosts.add(addr) + local_ip_cand.append(c) + except socket.gaierror: + pass # ignore address-related errors for getaddrinfo self._add_candidates(local_ip_cand) @@ -209,6 +218,7 @@ if not self.connection: return type_preference = 126 + priority = (2**16) * type_preference additional_ip_cand = [] port = int(gajim.config.get('file_transfers_port')) ft_add_hosts = gajim.config.get('ft_add_hosts_to_send') @@ -216,14 +226,14 @@ if ft_add_hosts: hosts = [e.strip() for e in ft_add_hosts.split(',')] for h in hosts: - c = {'host': h} - c['candidate_id'] = self.connection.connection.getAnID() - c['port'] = port - c['type'] = 'direct' - c['jid'] = self.ourjid - c['priority'] = (2**16) * type_preference - c['initiator'] = self.file_props.sender - c['target'] = self.file_props.receiver + c = {'host': h, + 'candidate_id': self.connection.connection.getAnID(), + 'port': port, + 'type': 'direct', + 'jid': self.ourjid, + 'priority': priority, + 'initiator': self.file_props.sender, + 'target': self.file_props.receiver} additional_ip_cand.append(c) self._add_candidates(additional_ip_cand) @@ -232,6 +242,7 @@ if not self.connection: return type_preference = 10 + priority = (2**16) * type_preference proxy_cand = [] socks5conn = self.connection proxyhosts = socks5conn._get_file_transfer_proxies_from_config(self.file_props) @@ -240,14 +251,14 @@ self.file_props.proxyhosts = proxyhosts for proxyhost in proxyhosts: - c = {'host': proxyhost['host']} - c['candidate_id'] = self.connection.connection.getAnID() - c['port'] = int(proxyhost['port']) - c['type'] = 'proxy' - c['jid'] = proxyhost['jid'] - c['priority'] = (2**16) * type_preference - c['initiator'] = self.file_props.sender - c['target'] = self.file_props.receiver + c = {'host': proxyhost['host'], + 'candidate_id': self.connection.connection.getAnID(), + 'port': int(proxyhost['port']), + 'type': 'proxy', + 'jid': proxyhost['jid'], + 'priority': priority, + 'initiator': self.file_props.sender, + 'target': self.file_props.receiver} proxy_cand.append(c) self._add_candidates(proxy_cand)

1 0

gajim: cipher specification cleanup
by Gajim 24 Dec '13

24 Dec '13

changeset ee8f2e6efe1b 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=ee8f2e6efe1b description: cipher specification cleanup https://trac.gajim.org/ticket/7599 diffstat: src/common/config.py | 2 +- src/common/jingle_xtls.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r f433eb8241d4 -r ee8f2e6efe1b src/common/config.py --- a/src/common/config.py Mon Dec 23 21:39:23 2013 +0100 +++ b/src/common/config.py Mon Dec 23 23:26:54 2013 +0100 @@ -349,7 +349,7 @@ 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.')], 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], - 'cipher_list': [ opt_str, 'HIGH:!aNULL:!eNULL:RC4-SHA', '' ], + 'cipher_list': [ opt_str, 'HIGH:!aNULL:RC4-SHA', '' ], 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], 'warn_when_insecure_password': [ opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain connection.') ], diff -r f433eb8241d4 -r ee8f2e6efe1b src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Mon Dec 23 21:39:23 2013 +0100 +++ b/src/common/jingle_xtls.py Mon Dec 23 23:26:54 2013 +0100 @@ -101,7 +101,7 @@ ctx = SSL.Context(SSL.SSLv23_METHOD) flags = (SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3 | SSL.OP_SINGLE_DH_USE) ctx.set_options(flags) - ctx.set_cipher_list('HIGH:!aNULL:!eNULL') + ctx.set_cipher_list('HIGH:!aNULL:!3DES') if fingerprint == 'server': # for testing purposes only ctx.set_verify(SSL.VERIFY_NONE|SSL.VERIFY_FAIL_IF_NO_PEER_CERT,

1 0

gajim: cipher specification cleanup
by Gajim 23 Dec '13

23 Dec '13

changeset d55c0a3e26b1 in /home/hg/repos/gajim author: Fedor Brunner fedor.brunner(a)azet.sk branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d55c0a3e26b1 description: cipher specification cleanup https://trac.gajim.org/ticket/7599 diffstat: src/common/config.py | 2 +- src/common/jingle_xtls.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 331e9e05a879 -r d55c0a3e26b1 src/common/config.py --- a/src/common/config.py Fri Dec 06 21:20:22 2013 +0100 +++ b/src/common/config.py Mon Dec 23 23:26:54 2013 +0100 @@ -349,7 +349,7 @@ 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.')], 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], - 'cipher_list': [ opt_str, 'HIGH:!aNULL:!eNULL:RC4-SHA', '' ], + 'cipher_list': [ opt_str, 'HIGH:!aNULL:RC4-SHA', '' ], 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], 'warn_when_insecure_password': [ opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain connection.') ], diff -r 331e9e05a879 -r d55c0a3e26b1 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Fri Dec 06 21:20:22 2013 +0100 +++ b/src/common/jingle_xtls.py Mon Dec 23 23:26:54 2013 +0100 @@ -95,7 +95,7 @@ ctx = SSL.Context(SSL.SSLv23_METHOD) flags = (SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3 | SSL.OP_SINGLE_DH_USE) ctx.set_options(flags) - ctx.set_cipher_list('HIGH:!aNULL:!eNULL') + ctx.set_cipher_list('HIGH:!aNULL:!3DES') if fingerprint == 'server': # for testing purposes only ctx.set_verify(SSL.VERIFY_NONE|SSL.VERIFY_FAIL_IF_NO_PEER_CERT,

1 0

gajim: hide some menuitems in private chat context menu. Fixes #...
by Gajim 23 Dec '13

23 Dec '13

changeset f433eb8241d4 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=f433eb8241d4 description: hide some menuitems in private chat context menu. Fixes #7603 diffstat: src/gui_menu_builder.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 9c9ae68353a3 -r f433eb8241d4 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Mon Dec 23 16:56:58 2013 +0100 +++ b/src/gui_menu_builder.py Mon Dec 23 21:39:23 2013 +0100 @@ -381,6 +381,11 @@ if not control: items_to_hide.append(convert_to_gc_menuitem) + # Hide items when it's a pm + if gc_contact: + items_to_hide += [rename_menuitem, edit_groups_menuitem, + subscription_menuitem, remove_from_roster_menuitem] + for item in items_to_hide: item.set_no_show_all(True) item.hide()

1 0

python-nbxmpp: Added tag nbxmpp-0.3 for changeset 3bf3d313e869
by Yann Leboulanger 23 Dec '13

23 Dec '13

changeset 22553bd602d0 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=22553bd602d0 description: Added tag nbxmpp-0.3 for changeset 3bf3d313e869 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (7 lines): diff -r 3bf3d313e869 -r 22553bd602d0 .hgtags --- a/.hgtags Mon Dec 23 16:52:52 2013 +0100 +++ b/.hgtags Mon Dec 23 17:25:29 2013 +0100 @@ -1,2 +1,3 @@ 5d8f5ba88c86ade8294db98db847b2f0a1acbccd nbxmpp-0.1 7d34c8148cee4c6e5e2fceca6cd8f9ea1bc82de4 nbxmpp-0.2 +3bf3d313e8693a273fe1a44723606ff5c6a3aba1 nbxmpp-0.3

1 0

python-nbxmpp: prepare 0.3 release
by Yann Leboulanger 23 Dec '13

23 Dec '13

changeset 3bf3d313e869 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=3bf3d313e869 description: prepare 0.3 release diffstat: ChangeLog | 6 ++++++ nbxmpp/__init__.py | 2 ++ setup.py | 2 +- 3 files changed, 9 insertions(+), 1 deletions(-) diffs (34 lines): diff -r a9d1433fc39d -r 3bf3d313e869 ChangeLog --- a/ChangeLog Mon Dec 16 15:55:53 2013 +0100 +++ b/ChangeLog Mon Dec 23 16:52:52 2013 +0100 @@ -1,3 +1,9 @@ +python-nbxmpp 0.3 (23 December 2013) + + * Improve security level + * Ability to configure cipher list + * Store only depth 0 SSL certificate + python-nbxmpp 0.2 (26 July 2013) * Add some namespace diff -r a9d1433fc39d -r 3bf3d313e869 nbxmpp/__init__.py --- a/nbxmpp/__init__.py Mon Dec 16 15:55:53 2013 +0100 +++ b/nbxmpp/__init__.py Mon Dec 23 16:52:52 2013 +0100 @@ -16,3 +16,5 @@ from client_nb import NonBlockingClient from plugin import PlugIn from smacks import Smacks + +__version__ = "0.3" diff -r a9d1433fc39d -r 3bf3d313e869 setup.py --- a/setup.py Mon Dec 16 15:55:53 2013 +0100 +++ b/setup.py Mon Dec 23 16:52:52 2013 +0100 @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.2', + version='0.3', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org',

1 0

gajim: Gajim need latest nbxmpp version
by Gajim 23 Dec '13

23 Dec '13

changeset 9c9ae68353a3 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=9c9ae68353a3 description: Gajim need latest nbxmpp version diffstat: src/gajim.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diffs (19 lines): diff -r 0ed2dc30c94d -r 9c9ae68353a3 src/gajim.py --- a/src/gajim.py Mon Dec 23 16:03:39 2013 +0100 +++ b/src/gajim.py Mon Dec 23 16:56:58 2013 +0100 @@ -68,6 +68,15 @@ 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"): + print 'Gajim needs python-nbxmpp > 0.3 to run. Quiting...' + sys.exit() +except: + print 'Gajim needs python-nbxmpp > 0.3 to run. Quiting...' + sys.exit() + from common import demandimport demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n',

1 0

gajim: don't crash with new nbxmpp
by Gajim 23 Dec '13

23 Dec '13

changeset 0ed2dc30c94d 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=0ed2dc30c94d description: don't crash with new nbxmpp diffstat: src/common/connection_handlers_events.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diffs (30 lines): diff -r 37e19d43dbee -r 0ed2dc30c94d src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Dec 18 20:08:45 2013 +0400 +++ b/src/common/connection_handlers_events.py Mon Dec 23 16:03:39 2013 +0100 @@ -42,6 +42,9 @@ import gtkgui_helpers +if gajim.HAVE_PYOPENSSL: + import OpenSSL.crypto + import logging log = logging.getLogger('gajim.c.connection_handlers_events') @@ -1633,12 +1636,12 @@ self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ self.errnum) self.ssl_cert = '' - if len(self.conn.connection.Connection.ssl_cert_pem): - self.ssl_cert = self.conn.connection.Connection.ssl_cert_pem self.ssl_fingerprint = '' if self.conn.connection.Connection.ssl_certificate: - self.ssl_fingerprint = \ - self.conn.connection.Connection.ssl_certificate.digest('sha1') + cert = self.conn.connection.Connection.ssl_certificate + self.ssl_cert = OpenSSL.crypto.dump_certificate( + OpenSSL.crypto.FILETYPE_PEM, cert) + self.ssl_fingerprint = cert.digest('sha1') return True class NewAccountNotConnectedEvent(nec.NetworkIncomingEvent):

1 0

gajim-plugins: ClientsIconsPlugin. Fix Adium and Pidgin detection.
by Gajim Plugins 18 Dec '13

18 Dec '13

changeset f6fa329a5295 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=f6fa329a5295 description: ClientsIconsPlugin. Fix Adium and Pidgin detection. diffstat: clients_icons/clients_icons.py | 31 +++---------------------------- clients_icons/manifest.ini | 2 +- 2 файлов изменено, 4 вставок(+), 29 удалений(-) различия (89 строк): diff -r e0c3177c3021 -r f6fa329a5295 clients_icons/clients_icons.py --- a/clients_icons/clients_icons.py Fri Dec 06 11:10:16 2013 +0400 +++ b/clients_icons/clients_icons.py Thu Dec 19 00:00:23 2013 +0400 @@ -31,8 +31,6 @@ 'http://talkgadget.google.com/client/caps': ['google.png', 'GTalk'], 'http://oneteam.im/caps': ['oneteamiphone.png', 'OneTeam'], 'http://tkabber.jabber.ru/': ['tkabber.png', 'Tkabber'], - 'http://pidgin.im/': ['pidgin.png', 'Pidgin'], - 'http://pidgin.im/caps': ['pidgin.png', 'Pidgin'], 'http://qutim.org': ['qutim.png', 'QutIM'], 'http://qutim.org/': ['qutim.png', 'QutIM'], 'http://exodus.jabberstudio.org/caps': ['exodus.png', 'Exodus'], @@ -133,7 +131,6 @@ 'http://gabber.sourceforge.net': ['gabber.png', 'Gabber'], 'http://megafonvolga.ru/': ['megafon.png', 'Megafon'], 'rss(a)isida-bot.com': ['osiris.png', 'Osiris'], - 'libpurple': ['libpurple.png', 'Libpurple'], 'http://www.adium.im/': ['adium.png', 'Adium'], 'http://eqo.com/': ['libpurple.png', 'Eqo'], 'http://instantbird.com/': ['instantbird.png', 'Instantbird'], @@ -150,18 +147,10 @@ 'mcabber' :['mcabber.png', ''], 'yaxim' :['yaxim.png', ''], 'Xabber' :['xabber.png', ''], + 'Adium' :['adium.png', ''], + 'Pidgin': ['pidgin.png', ''], } -libpurple_clients ={ - 'adium': 'http://www.adium.im/', - 'eqo': 'http://eqo.com/', - 'finch': 'http://pidgin.im/', - 'instantbird': 'http://instantbird.com/', - 'meebo': 'https://www.meebo.com/', - 'palm': 'http://opensource.palm.com/packages.html', - 'pidgin': 'http://pidgin.im/', - 'spectrum': 'http://spectrum.im/', - 'telepathy-haze': 'http://pidgin.im/' -} + class ClientsIconsPlugin(GajimPlugin): @@ -320,12 +309,6 @@ if not caps: return gtk.image_new_from_pixbuf(self.default_pixbuf), _('Unknown') - if 'pidgin.im/' in caps: - caps = 'libpurple' - for client in libpurple_clients: - if client in contact.resource.lower(): - caps = libpurple_clients[client] - caps_from_jid = self.check_jid(contact.jid) if caps_from_jid: caps = caps_from_jid @@ -586,12 +569,6 @@ tag = iq_obj.stanza.getTags('c') if tag: caps = tag[0].getAttr('node') - if caps: - if 'pidgin.im/' in caps: - caps = 'libpurple' - for client in libpurple_clients: - if client in contact.resource.lower(): - caps = libpurple_clients[client] caps_from_jid = self.check_jid(iq_obj.jid) if caps_from_jid: @@ -608,8 +585,6 @@ tag = iq_obj.stanza.getTags('c') if tag: caps = tag[0].getAttr('node') - if 'pidgin.im/' in caps: - caps = 'libpurple' gc_control = gajim.interface.msg_win_mgr.get_gc_control(iq_obj.jid, iq_obj.conn.name) diff -r e0c3177c3021 -r f6fa329a5295 clients_icons/manifest.ini --- a/clients_icons/manifest.ini Fri Dec 06 11:10:16 2013 +0400 +++ b/clients_icons/manifest.ini Thu Dec 19 00:00:23 2013 +0400 @@ -1,7 +1,7 @@ [info] name: Clients icons short_name: clients_icons -version: 5.1 +version: 5.2 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

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