Commits July 2015

commits@gajim.org

1 participants
101 discussions

gajim: Use bare JID when checking MAM message recipient. Fixes #...
by Gajim 15 Jul '15

15 Jul '15

changeset 36bbc045577a in /home/hg/repos/gajim author: Holger Weiss <holger(a)zedat.fu-berlin.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=36bbc045577a description: Use bare JID when checking MAM message recipient. Fixes #7973 diffstat: src/common/connection_handlers_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r fb8a1f44d9b0 -r 36bbc045577a src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Feb 16 13:11:17 2015 +0100 +++ b/src/common/connection_handlers_events.py Tue Feb 10 12:57:49 2015 +0100 @@ -1102,7 +1102,7 @@ msg_ = forwarded.getTag('message') to_ = msg_.getAttr('to') if to_: - gajim.get_jid_without_resource(to_) + to_ = gajim.get_jid_without_resource(to_) else: to_ = gajim.get_jid_from_account(account) frm_ = gajim.get_jid_without_resource(msg_.getAttr('from'))

1 0

gajim: correctly cleanup handlers when disabling an account. Fix...
by Gajim 15 Jul '15

15 Jul '15

changeset 458e2751848c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=458e2751848c description: correctly cleanup handlers when disabling an account. Fixes #7711 diffstat: src/config.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r be295ef9643c -r 458e2751848c src/config.py --- a/src/config.py Wed Feb 18 12:53:37 2015 -0500 +++ b/src/config.py Sat Jan 03 14:15:18 2015 +0100 @@ -2553,6 +2553,7 @@ gajim.interface.roster.close_all(account) if account == gajim.ZEROCONF_ACC_NAME: gajim.connections[account].disable_account() + gajim.connections[account].cleanup() del gajim.connections[account] del gajim.interface.instances[account] del gajim.interface.minimized_controls[account]

1 0

gajim: don't show useless buttons in notifications. Fixes #7838
by Gajim 15 Jul '15

15 Jul '15

changeset 62d0306604fd in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=62d0306604fd description: don't show useless buttons in notifications. Fixes #7838 diffstat: src/gui_interface.py | 4 ++-- src/notify.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diffs (42 lines): diff -r 458e2751848c -r 62d0306604fd src/gui_interface.py --- a/src/gui_interface.py Sat Jan 03 14:15:18 2015 +0100 +++ b/src/gui_interface.py Sat Jan 03 15:24:58 2015 +0100 @@ -202,7 +202,7 @@ path = gtkgui_helpers.get_icon_path('gajim-connection_lost', 48) account = obj.conn.name notify.popup(_('Connection Failed'), account, account, - 'connection_failed', path, obj.title, obj.msg) + '', path, obj.title, obj.msg) def unblock_signed_in_notifications(self, account): gajim.block_signed_in_notifications[account] = False @@ -665,7 +665,7 @@ else: path = gtkgui_helpers.get_icon_path('gtk-dialog-warning', 48) account = obj.conn.name - notify.popup('warning', account, account, 'warning', path, + notify.popup('warning', account, account, '', path, _('OpenPGP Passphrase Incorrect'), _('You are currently connected without your OpenPGP key.')) self.forget_gpg_passphrase(obj.keyID) diff -r 458e2751848c -r 62d0306604fd src/notify.py --- a/src/notify.py Sat Jan 03 14:15:18 2015 +0100 +++ b/src/notify.py Sat Jan 03 15:24:58 2015 +0100 @@ -341,7 +341,7 @@ version = self.version if version[:2] == [0, 2]: actions = {} - if 'actions' in self.capabilities: + if 'actions' in self.capabilities and self.msg_type: actions = {'default': 0} try: self.notif.Notify( @@ -391,7 +391,7 @@ self.path_to_image = os.path.abspath( gtkgui_helpers.get_icon_path('gajim', 48)) actions = () - if 'actions' in self.capabilities: + if 'actions' in self.capabilities and self.msg_type: actions = (dbus.String('default'), dbus.String( self.event_type)) try:

1 0

gajim: improve ipv6 connection with zeroconf
by Gajim 15 Jul '15

15 Jul '15

changeset 38cec02c0c91 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=38cec02c0c91 description: improve ipv6 connection with zeroconf diffstat: src/common/zeroconf/client_zeroconf.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 62d0306604fd -r 38cec02c0c91 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Sat Jan 03 15:24:58 2015 +0100 +++ b/src/common/zeroconf/client_zeroconf.py Sat Jan 03 20:51:41 2015 +0100 @@ -446,7 +446,7 @@ def do_connect(self): errnum = 0 try: - self._sock.connect(self._server) + self._sock.connect(self._server[:2]) self._sock.setblocking(False) except Exception as ee: errnum = ee.errno

1 0

gajim: update to latest gnupg.py
by Gajim 15 Jul '15

15 Jul '15

changeset b6b81c4c1f33 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b6b81c4c1f33 description: update to latest gnupg.py diffstat: src/common/gnupg.py | 431 +++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 324 insertions(+), 107 deletions(-) diffs (truncated from 742 to 300 lines): diff -r 38cec02c0c91 -r b6b81c4c1f33 src/common/gnupg.py --- a/src/common/gnupg.py Sat Jan 03 20:51:41 2015 +0100 +++ b/src/common/gnupg.py Sat Jan 24 16:09:44 2015 +0100 @@ -31,11 +31,10 @@ A unittest harness (test_gnupg.py) has also been added. """ -import locale -__version__ = "0.3.4" +__version__ = "0.3.8.dev0" __author__ = "Vinay Sajip" -__date__ = "$05-Jun-2014 09:48:54$" +__date__ = "$07-Dec-2014 18:46:17$" try: from io import StringIO @@ -53,6 +52,13 @@ import sys import threading +STARTUPINFO = None +if os.name == 'nt': + try: + from subprocess import STARTUPINFO, STARTF_USESHOWWINDOW, SW_HIDE + except ImportError: + STARTUPINFO = None + try: import logging.NullHandler as NullHandler except ImportError: @@ -73,6 +79,50 @@ if not logger.handlers: logger.addHandler(NullHandler()) +# We use the test below because it works for Jython as well as CPython +if os.path.__name__ == 'ntpath': + # On Windows, we don't need shell quoting, other than worrying about + # paths with spaces in them. + def shell_quote(s): + return '"%s"' % s +else: + # Section copied from sarge + + # This regex determines which shell input needs quoting + # because it may be unsafe + UNSAFE = re.compile(r'[^\w%+,./:=@-]') + + def shell_quote(s): + """ + Quote text so that it is safe for Posix command shells. + + For example, "*.py" would be converted to "'*.py'". If the text is + considered safe it is returned unquoted. + + :param s: The value to quote + :type s: str (or unicode on 2.x) + :return: A safe version of the input, from the point of view of Posix + command shells + :rtype: The passed-in type + """ + if not isinstance(s, string_types): + raise TypeError('Expected string type, got %s' % type(s)) + if not s: + result = "''" + elif not UNSAFE.search(s): + result = s + else: + result = "'%s'" % s.replace("'", r"'\''") + return result + + # end of sarge code + +# Now that we use shell=False, we shouldn't need to quote arguments. +# Use no_quote instead of shell_quote to remind us of where quoting +# was needed. +def no_quote(s): + return s + def _copy_data(instream, outstream): # Copy one stream to another sent = 0 @@ -112,11 +162,19 @@ passphrase = '%s\n' % passphrase passphrase = passphrase.encode(encoding) stream.write(passphrase) - logger.debug("Wrote passphrase: %r", passphrase) + logger.debug('Wrote passphrase') def _is_sequence(instance): return isinstance(instance, (list, tuple, set, frozenset)) +def _make_memory_stream(s): + try: + from io import BytesIO + rv = BytesIO(s) + except ImportError: + rv = StringIO(s) + return rv + def _make_binary_stream(s, encoding): if _py3k: if isinstance(s, str): @@ -124,12 +182,7 @@ else: if type(s) is not str: s = s.encode(encoding) - try: - from io import BytesIO - rv = BytesIO(s) - except ImportError: - rv = StringIO(s) - return rv + return _make_memory_stream(s) class Verify(object): "Handle status messages for --verify" @@ -175,7 +228,8 @@ "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", "NOTATION_NAME", "NOTATION_DATA"): + "GOODMDC", "NO_SGNR", "NOTATION_NAME", "NOTATION_DATA", + "PROGRESS"): pass elif key == "BADSIG": self.valid = False @@ -230,6 +284,10 @@ else: self.key_status = 'signing key was revoked' self.status = self.key_status + elif key == "UNEXPECTED": + self.valid = False + self.key_id = value + self.status = 'unexpected data' else: raise ValueError("Unknown status message: %r" % key) @@ -298,8 +356,8 @@ 'problem': reason, 'text': self.problem_reason[reason]}) elif key == "IMPORT_RES": import_res = value.split() - for i in range(len(self.counts)): - setattr(self, self.counts[i], int(import_res[i])) + for i, count in enumerate(self.counts): + setattr(self, count, int(import_res[i])) elif key == "KEYEXPIRED": self.results.append({'fingerprint': None, 'problem': '0', 'text': 'Key expired'}) @@ -326,7 +384,53 @@ r'\0': '\0', } -class ListKeys(list): +class SendResult(object): + def __init__(self, gpg): + self.gpg = gpg + + def handle_status(self, key, value): + logger.debug('SendResult: %s: %s', key, value) + +class SearchKeys(list): + ''' Handle status messages for --search-keys. + + Handle pub and uid (relating the latter to the former). + + Don't care about the rest + ''' + + UID_INDEX = 1 + FIELDS = 'type keyid algo length date expires'.split() + + def __init__(self, gpg): + self.gpg = gpg + self.curkey = None + self.fingerprints = [] + self.uids = [] + + def get_fields(self, args): + result = {} + for i, var in enumerate(self.FIELDS): + result[var] = args[i] + result['uids'] = [] + return result + + def pub(self, args): + self.curkey = curkey = self.get_fields(args) + self.append(curkey) + + def uid(self, args): + uid = args[self.UID_INDEX] + uid = ESCAPE_PATTERN.sub(lambda m: chr(int(m.group(1), 16)), uid) + for k, v in BASIC_ESCAPES.items(): + uid = uid.replace(k, v) + self.curkey['uids'].append(uid) + self.uids.append(uid) + + def handle_status(self, key, value): + pass + +class ListKeys(SearchKeys): ''' Handle status messages for --list-keys. Handle pub and uid (relating the latter to the former). @@ -343,25 +447,17 @@ grp = reserved for gpgsm rvk = revocation key ''' - def __init__(self, gpg): - self.gpg = gpg - self.curkey = None - self.fingerprints = [] - self.uids = [] + + UID_INDEX = 9 + FIELDS = 'type trust length algo keyid date expires dummy ownertrust uid'.split() def key(self, args): - vars = (""" - type trust length algo keyid date expires dummy ownertrust uid - """).split() - self.curkey = {} - for i in range(len(vars)): - self.curkey[vars[i]] = args[i] - self.curkey['uids'] = [] - if self.curkey['uid']: - self.curkey['uids'].append(self.curkey['uid']) - del self.curkey['uid'] - self.curkey['subkeys'] = [] - self.append(self.curkey) + self.curkey = curkey = self.get_fields(args) + if curkey['uid']: + curkey['uids'].append(curkey['uid']) + del curkey['uid'] + curkey['subkeys'] = [] + self.append(curkey) pub = sec = key @@ -369,22 +465,34 @@ self.curkey['fingerprint'] = args[9] self.fingerprints.append(args[9]) - def uid(self, args): - uid = args[9] - uid = ESCAPE_PATTERN.sub(lambda m: chr(int(m.group(1), 16)), uid) - for k, v in BASIC_ESCAPES.items(): - uid = uid.replace(k, v) - self.curkey['uids'].append(uid) - self.uids.append(uid) - def sub(self, args): subkey = [args[4], args[11]] self.curkey['subkeys'].append(subkey) - def handle_status(self, key, value): - pass -class Crypt(Verify): +class ScanKeys(ListKeys): + ''' Handle status messages for --with-fingerprint.''' + + def sub(self, args): + # --with-fingerprint --with-colons somehow outputs fewer colons, + # use the last value args[-1] instead of args[11] + subkey = [args[4], args[-1]] + self.curkey['subkeys'].append(subkey) + +class TextHandler(object): + def _as_text(self): + return self.data.decode(self.gpg.encoding, self.gpg.decode_errors) + + if _py3k: + __str__ = _as_text + else: + __unicode__ = _as_text + + def __str__(self): + return self.data + + +class Crypt(Verify, TextHandler): "Handle status messages for --encrypt and --decrypt" def __init__(self, gpg): Verify.__init__(self, gpg) @@ -398,19 +506,16 @@ __bool__ = __nonzero__ - def __str__(self): - return self.data.decode(self.gpg.encoding, self.gpg.decode_errors) - def handle_status(self, key, value): if key in ("ENC_TO", "USERID_HINT", "GOODMDC", "END_DECRYPTION", - "BEGIN_SIGNING", "NO_SECKEY", "ERROR", "NODATA", + "BEGIN_SIGNING", "NO_SECKEY", "ERROR", "NODATA", "PROGRESS", "CARDCTRL", "BADMDC", "SC_OP_FAILURE", "SC_OP_SUCCESS"): # in the case of ERROR, this is because a more specific error # message will have come first pass

1 0

gajim: make windon listen on ipv4 + ipv6 for zeroconf. Fixes #8007
by Gajim 14 Jul '15

14 Jul '15

changeset 3897db63b8c5 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=3897db63b8c5 description: make windon listen on ipv4 + ipv6 for zeroconf. Fixes #8007 diffstat: src/common/zeroconf/client_zeroconf.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (24 lines): diff -r 9bd987174591 -r 3897db63b8c5 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Tue Jul 14 14:19:24 2015 +0200 +++ b/src/common/zeroconf/client_zeroconf.py Tue Jul 14 21:39:05 2015 +0200 @@ -30,6 +30,7 @@ import socket import errno import sys +import os import string from random import Random @@ -71,6 +72,12 @@ self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) + if os.name == 'nt': + ver = os.sys.getwindowsversion() + if (ver[3], ver[0]) == (2, 6): # Win Vista + + # 47 is socket.IPPROTO_IPV6 + # 27 is socket.IPV6_V6ONLY under windows, but not defined ... + self._serv.setsockopt(41, 27, 0) # will fail when port is busy, or we don't have rights to bind try: self._serv.bind((ai[4][0], self.port))

1 0

gajim: make autojoined room as minimized too. Fixes #7856
by Gajim 14 Jul '15

14 Jul '15

changeset 9bd987174591 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=9bd987174591 description: make autojoined room as minimized too. Fixes #7856 diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 90ce09f919a0 -r 9bd987174591 src/dialogs.py --- a/src/dialogs.py Tue Jul 14 14:11:06 2015 +0200 +++ b/src/dialogs.py Tue Jul 14 14:19:24 2015 +0200 @@ -2660,7 +2660,7 @@ # Add as bookmark, with autojoin and not minimized name = gajim.get_nick_from_jid(room_jid) gajim.interface.add_gc_bookmark(self.account, name, room_jid, - autojoin, '0', password, nickname) + autojoin, autojoin, password, nickname) if self.automatic: gajim.automatic_rooms[self.account][room_jid] = self.automatic

1 0

gajim: remove the Ctrl-F -> send file shortcut in one window mod...
by Gajim 14 Jul '15

14 Jul '15

changeset 90ce09f919a0 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=90ce09f919a0 description: remove the Ctrl-F -> send file shortcut in one window mode. Fixes #7831 diffstat: src/message_window.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r b9cd031027cb -r 90ce09f919a0 src/message_window.py --- a/src/message_window.py Mon Jul 13 21:39:12 2015 +0200 +++ b/src/message_window.py Tue Jul 14 14:11:06 2015 +0200 @@ -366,6 +366,10 @@ # theme if not gtk.settings_get_default().get_property( 'gtk-key-theme-name') == 'Emacs': + if gajim.interface.msg_win_mgr.mode == \ + gajim.interface.msg_win_mgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: + gajim.interface.roster.tree.grab_focus() + return False control._on_send_file_menuitem_activate(None) return True elif control.type_id == message_control.TYPE_CHAT and \

1 0

gajim: [moparisthebest] Encrypt GPG message to recipient and to ...
by Gajim 13 Jul '15

13 Jul '15

changeset b9cd031027cb 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=b9cd031027cb description: [moparisthebest] Encrypt GPG message to recipient and to our own key so that we can decrypt it later and use carbon. Fixes #7616 diffstat: src/common/connection.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diffs (24 lines): diff -r f849d2befa6b -r b9cd031027cb src/common/connection.py --- a/src/common/connection.py Mon Jul 13 15:42:33 2015 +0200 +++ b/src/common/connection.py Mon Jul 13 21:39:12 2015 +0200 @@ -313,9 +313,10 @@ error = _('The contact\'s key (%s) does not match the key assigned ' 'in Gajim.' % keyID[:8]) else: + myKeyID = gajim.config.get_per('accounts', self.name, 'keyid') def encrypt_thread(msg, keyID, always_trust=False): # encrypt message. This function returns (msgenc, error) - return self.gpg.encrypt(msg.encode('utf-8'), [keyID], + return self.gpg.encrypt(msg.encode('utf-8'), [keyID, myKeyID], always_trust) def _on_encrypted(output): msgenc, error = output @@ -424,8 +425,6 @@ if msgenc: msg_iq.setTag(nbxmpp.NS_ENCRYPTED + ' x').setData(msgenc) - if self.carbons_enabled: - msg_iq.addChild(name='private', namespace=nbxmpp.NS_CARBONS) msg_iq.addChild(name='no-permanent-storage', namespace=nbxmpp.NS_MSG_HINTS)

1 0

gajim: add invities to member list when converting chat to muc. ...
by Gajim 13 Jul '15

13 Jul '15

changeset f849d2befa6b 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=f849d2befa6b description: add invities to member list when converting chat to muc. Fixes #8098 diffstat: src/groupchat_control.py | 2 +- src/gui_interface.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diffs (26 lines): diff -r 9fffd77e85af -r f849d2befa6b src/groupchat_control.py --- a/src/groupchat_control.py Mon Jul 13 10:14:34 2015 +0200 +++ b/src/groupchat_control.py Mon Jul 13 15:42:33 2015 +0200 @@ -1613,7 +1613,7 @@ gajim.automatic_rooms[self.account][self.room_jid]['invities']: if self.room_jid not in gajim.interface.instances[ self.account]['gc_config']: - if obj.role == 'owner': + if obj.affiliation == 'owner': # We need to configure the room if it's a new one. # We cannot know it's a new one. Status 201 is not # sent by all servers. diff -r 9fffd77e85af -r f849d2befa6b src/gui_interface.py --- a/src/gui_interface.py Mon Jul 13 10:14:34 2015 +0200 +++ b/src/gui_interface.py Mon Jul 13 15:42:33 2015 +0200 @@ -587,6 +587,10 @@ elif f.var == 'public_list': f.value = False obj.conn.send_gc_config(obj.jid, obj.dataform.get_purged()) + user_list = {} + for jid in gajim.automatic_rooms[account][obj.jid]['invities']: + user_list[jid] = {'affiliation': 'member'} + obj.conn.send_gc_affiliation_list(obj.jid, user_list) else: # use default configuration obj.conn.send_gc_config(obj.jid, obj.form_node)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2015