Commits November 2010

commits@gajim.org

3 participants
111 discussions

gajim: remove unused import
by Denis Fomin 30 Nov '10

30 Nov '10

changeset ad5ff4f23bcb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ad5ff4f23bcb description: remove unused import diffstat: src/common/zeroconf/connection_zeroconf.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r b71c601a79bd -r ad5ff4f23bcb src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Tue Nov 30 23:36:57 2010 +0100 +++ b/src/common/zeroconf/connection_zeroconf.py Wed Dec 01 02:13:34 2010 +0300 @@ -43,7 +43,6 @@ from common.connection import CommonConnection from common import gajim -from common import GnuPG from common.zeroconf import client_zeroconf from common.zeroconf import zeroconf from connection_handlers_zeroconf import *

1 0

gajim: ignore groupchat invitations from contacts that are not i...
by Yann Leboulanger 30 Nov '10

30 Nov '10

changeset b71c601a79bd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b71c601a79bd description: ignore groupchat invitations from contacts that are not in roster if ignore_unknown_contacts is enabled. Fixes #6057 diffstat: src/common/connection_handlers_events.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 79a998b4324a -r b71c601a79bd src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Nov 30 11:41:14 2010 +0100 +++ b/src/common/connection_handlers_events.py Tue Nov 30 23:36:57 2010 +0100 @@ -1007,6 +1007,11 @@ except helpers.InvalidFormat: log.warn('Invalid JID: %s, ignoring it' % item.getAttr('from')) return + jid = gajim.get_jid_without_resource(self.jid_from) + if gajim.config.get_per('accounts', self.conn.name, + 'ignore_unknown_contacts') and not gajim.contacts.get_contacts( + self.conn.name, jid): + return self.reason = item.getTagData('reason') self.password = self.msg_obj.invite_tag.getTagData('password')

1 0

gajim: rename GnuPG.py to gpg.py. Fixes #6055
by Yann Leboulanger 30 Nov '10

30 Nov '10

changeset 79a998b4324a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=79a998b4324a description: rename GnuPG.py to gpg.py. Fixes #6055 diffstat: src/common/GnuPG.py | 131 ----------------------------------------------- src/common/connection.py | 8 +- src/common/gpg.py | 130 ++++++++++++++++++++++++++++++++++++++++++++++ src/config.py | 4 +- 4 files changed, 136 insertions(+), 137 deletions(-) diffs (truncated from 329 to 300 lines): diff -r 481f8f5151a2 -r 79a998b4324a src/common/GnuPG.py --- a/src/common/GnuPG.py Tue Nov 30 11:10:37 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,131 +0,0 @@ -## src/common/GnuPG.py -## -## Copyright (C) 2003-2010 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> -## Copyright (C) 2008 Jean-Marie Traissard <jim AT lapin.org> -## Jonathan Schleifer <js-gajim AT webkeks.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -import gajim -import os -from os import tmpfile - -if gajim.HAVE_GPG: - import gnupg - - class GnuPG(gnupg.GPG): - def __init__(self, use_agent=False): - gnupg.GPG.__init__(self) - self.passphrase = None - self.use_agent = use_agent - self.always_trust = False - - def _setup_my_options(self): - self.options.armor = 1 - self.options.meta_interactive = 0 - self.options.extra_args.append('--no-secmem-warning') - # disable photo viewer when verifying keys - self.options.extra_args.append('--verify-options') - self.options.extra_args.append('no-show-photo') - if self.use_agent: - self.options.extra_args.append('--use-agent') - - def encrypt(self, str_, recipients, always_trust=False): - result = super(GnuPG, self).encrypt(str_, recipients, - always_trust=always_trust, passphrase=self.passphrase) - - if result.status == 'invalid recipient': - return '', 'NOT_TRUSTED' - - if result.ok: - error = '' - else: - error = result.status - - return self._stripHeaderFooter(str(result)), error - - def decrypt(self, str_, keyID): - data = self._addHeaderFooter(str_, 'MESSAGE') - result = super(GnuPG, self).decrypt(data, - passphrase=self.passphrase) - - return str(result) - - def sign(self, str_, keyID): - result = super(GnuPG, self).sign(str_, keyid=keyID, detach=True, - passphrase=self.passphrase) - - if result.fingerprint: - return self._stripHeaderFooter(str(result)) -# if 'KEYEXPIRED' in resp: -# return 'KEYEXPIRED' - return 'BAD_PASSPHRASE' - - 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) - - if result.valid: - return result.key_id - return '' - - def get_keys(self, secret=False): - keys = {} - result = super(GnuPG, self).list_keys(secret=secret) - for key in result: - # Take first not empty uid - keys[key['keyid'][8:]] = [uid for uid in key['uids'] if uid][0] - return keys - - def get_secret_keys(self): - return self.get_keys(True) - - def _stripHeaderFooter(self, data): - """ - Remove header and footer from data - """ - if not data: return '' - lines = data.splitlines() - while lines[0] != '': - lines.remove(lines[0]) - while lines[0] == '': - lines.remove(lines[0]) - i = 0 - for line in lines: - if line: - if line[0] == '-': break - i = i+1 - line = '\n'.join(lines[0:i]) - return line - - def _addHeaderFooter(self, data, type_): - """ - Add header and footer from data - """ - out = "-----BEGIN PGP %s-----" % type_ + os.linesep - out = out + "Version: PGP" + os.linesep - out = out + os.linesep - out = out + data + os.linesep - out = out + "-----END PGP %s-----" % type_ + os.linesep - return out diff -r 481f8f5151a2 -r 79a998b4324a src/common/connection.py --- a/src/common/connection.py Tue Nov 30 11:10:37 2010 +0100 +++ b/src/common/connection.py Tue Nov 30 11:41:14 2010 +0100 @@ -54,7 +54,7 @@ import common.xmpp from common import helpers from common import gajim -from common import GnuPG +from common import gpg from common import passwords from common import exceptions @@ -123,7 +123,7 @@ self.USE_GPG = False if gajim.HAVE_GPG: self.USE_GPG = True - self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) + self.gpg = gpg.GnuPG(gajim.config.get('use_gpg_agent')) self.status = '' self.old_show = '' self.priority = gajim.get_priority(name, 'offline') @@ -633,7 +633,7 @@ self.server_resource = self._compute_resource() if gajim.HAVE_GPG: self.USE_GPG = True - self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) + self.gpg = gpg.GnuPG(gajim.config.get('use_gpg_agent')) self.connect_and_init(show, msg, sign_msg) return @@ -853,7 +853,7 @@ return if gajim.HAVE_GPG: self.USE_GPG = True - self.gpg = GnuPG.GnuPG(gajim.config.get( + self.gpg = gpg.GnuPG(gajim.config.get( 'use_gpg_agent')) gajim.nec.push_incoming_event( AccountCreatedEvent(None, conn=self, diff -r 481f8f5151a2 -r 79a998b4324a src/common/gpg.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/common/gpg.py Tue Nov 30 11:41:14 2010 +0100 @@ -0,0 +1,130 @@ +## src/common/gpg.py +## +## Copyright (C) 2003-2010 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> +## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jean-Marie Traissard <jim AT lapin.org> +## Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + +from gajim import HAVE_GPG +import os + +if HAVE_GPG: + import gnupg + + class GnuPG(gnupg.GPG): + def __init__(self, use_agent=False): + gnupg.GPG.__init__(self) + self.passphrase = None + self.use_agent = use_agent + self.always_trust = False + + def _setup_my_options(self): + self.options.armor = 1 + self.options.meta_interactive = 0 + self.options.extra_args.append('--no-secmem-warning') + # disable photo viewer when verifying keys + self.options.extra_args.append('--verify-options') + self.options.extra_args.append('no-show-photo') + if self.use_agent: + self.options.extra_args.append('--use-agent') + + def encrypt(self, str_, recipients, always_trust=False): + result = super(GnuPG, self).encrypt(str_, recipients, + always_trust=always_trust, passphrase=self.passphrase) + + if result.status == 'invalid recipient': + return '', 'NOT_TRUSTED' + + if result.ok: + error = '' + else: + error = result.status + + return self._stripHeaderFooter(str(result)), error + + def decrypt(self, str_, keyID): + data = self._addHeaderFooter(str_, 'MESSAGE') + result = super(GnuPG, self).decrypt(data, + passphrase=self.passphrase) + + return str(result) + + def sign(self, str_, keyID): + result = super(GnuPG, self).sign(str_, keyid=keyID, detach=True, + passphrase=self.passphrase) + + if result.fingerprint: + return self._stripHeaderFooter(str(result)) +# if 'KEYEXPIRED' in resp: +# return 'KEYEXPIRED' + return 'BAD_PASSPHRASE' + + 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) + + if result.valid: + return result.key_id + return '' + + def get_keys(self, secret=False): + keys = {} + result = super(GnuPG, self).list_keys(secret=secret) + for key in result: + # Take first not empty uid + keys[key['keyid'][8:]] = [uid for uid in key['uids'] if uid][0] + return keys + + def get_secret_keys(self): + return self.get_keys(True) + + def _stripHeaderFooter(self, data): + """ + Remove header and footer from data + """ + if not data: return '' + lines = data.splitlines() + while lines[0] != '': + lines.remove(lines[0]) + while lines[0] == '': + lines.remove(lines[0]) + i = 0 + for line in lines: + if line: + if line[0] == '-': break + i = i+1 + line = '\n'.join(lines[0:i]) + return line + + def _addHeaderFooter(self, data, type_): + """

1 0

gajim: handle some errors when verifying gpg keys
by Yann Leboulanger 30 Nov '10

30 Nov '10

changeset 481f8f5151a2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=481f8f5151a2 description: handle some errors when verifying gpg keys diffstat: src/common/gnupg.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diffs (19 lines): diff -r 084c0947d75a -r 481f8f5151a2 src/common/gnupg.py --- a/src/common/gnupg.py Mon Nov 29 21:15:54 2010 +0100 +++ b/src/common/gnupg.py Tue Nov 30 11:10:37 2010 +0100 @@ -677,6 +677,15 @@ elif key == "SIG_ID": (self.signature_id, self.creation_date, self.timestamp) = value.split() + elif key == "ERRSIG": + self.valid = False + (self.key_id, + algo, hash_algo, + cls, + self.timestamp) = value.split()[:5] + elif key == "NO_PUBKEY": + self.valid = False + self.key_id = value else: raise ValueError("Unknown status message: %r" % key)

1 0

gajim: fix var name
by Yann Leboulanger 29 Nov '10

29 Nov '10

changeset 084c0947d75a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=084c0947d75a description: fix var name diffstat: src/groupchat_control.py | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diffs (42 lines): diff -r b14e72db6e7a -r 084c0947d75a src/groupchat_control.py --- a/src/groupchat_control.py Mon Nov 29 18:44:22 2010 +0100 +++ b/src/groupchat_control.py Mon Nov 29 21:15:54 2010 +0100 @@ -1201,29 +1201,29 @@ # http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes... # -init changes = [] - if '100' in obj.statusCode: + if '100' in obj.status_code: # Can be a presence (see chg_contact_status in groupchat_control.py) changes.append(_('Any occupant is allowed to see your full JID')) gc_control.is_anonymous = False - if '102' in statusCode: + if '102' in obj.status_code: changes.append(_('Room now shows unavailable member')) - if '103' in statusCode: + if '103' in obj.status_code: changes.append(_('room now does not show unavailable members')) - if '104' in statusCode: + if '104' in obj.status_code: changes.append(_('A non-privacy-related room configuration change ' 'has occurred')) - if '170' in statusCode: + if '170' in obj.status_code: # Can be a presence (see chg_contact_status in groupchat_control.py) changes.append(_('Room logging is now enabled')) - if '171' in statusCode: + if '171' in obj.status_code: changes.append(_('Room logging is now disabled')) - if '172' in statusCode: + if '172' in obj.status_code: changes.append(_('Room is now non-anonymous')) gc_control.is_anonymous = False - if '173' in statusCode: + if '173' in obj.status_code: changes.append(_('Room is now semi-anonymous')) gc_control.is_anonymous = True - if '174' in statusCode: + if '174' in obj.status_code: changes.append(_('Room is now fully-anonymous')) gc_control.is_anonymous = True

1 0

gajim: switch from GnuPGInterface to python-gnupg, so gpg is ava...
by Yann Leboulanger 29 Nov '10

29 Nov '10

changeset b14e72db6e7a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b14e72db6e7a description: switch from GnuPGInterface to python-gnupg, so gpg is available under windows. Fixes #5096, #3615, #1890, #996 diffstat: debian/rules | 1 - src/common/GnuPG.py | 200 ++------- src/common/GnuPGInterface.py | 673 ------------------------------- src/common/connection.py | 19 +- src/common/gajim.py | 2 +- src/common/gnupg.py | 921 +++++++++++++++++++++++++++++++++++++++++++ src/features_window.py | 6 +- 7 files changed, 977 insertions(+), 845 deletions(-) diffs (truncated from 1938 to 300 lines): diff -r c3f1f5f7d238 -r b14e72db6e7a debian/rules --- a/debian/rules Mon Nov 29 18:44:16 2010 +0300 +++ b/debian/rules Mon Nov 29 18:44:22 2010 +0100 @@ -12,6 +12,5 @@ DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR) binary-install/gajim:: - rm $(DEB_DESTDIR)/usr/share/gajim/src/common/GnuPGInterface.py* dh_pysupport -pgajim convert $(DEB_DESTDIR)/usr/share/icons/hicolor/64x64/apps/gajim.png -resize 32x32 $(DEB_DESTDIR)/usr/share/pixmaps/gajim.xpm diff -r c3f1f5f7d238 -r b14e72db6e7a src/common/GnuPG.py --- a/src/common/GnuPG.py Mon Nov 29 18:44:16 2010 +0300 +++ b/src/common/GnuPG.py Mon Nov 29 18:44:22 2010 +0100 @@ -23,17 +23,17 @@ ## import gajim +import os from os import tmpfile -from common import helpers if gajim.HAVE_GPG: - import GnuPGInterface + import gnupg - class GnuPG(GnuPGInterface.GnuPG): - def __init__(self, use_agent = False): - GnuPGInterface.GnuPG.__init__(self) + class GnuPG(gnupg.GPG): + def __init__(self, use_agent=False): + gnupg.GPG.__init__(self) + self.passphrase = None self.use_agent = use_agent - self._setup_my_options() self.always_trust = False def _setup_my_options(self): @@ -46,166 +46,56 @@ if self.use_agent: self.options.extra_args.append('--use-agent') - def _read_response(self, child_stdout): - # Internal method: reads all the output from GPG, taking notice - # only of lines that begin with the magic [GNUPG:] prefix. - # (See doc/DETAILS in the GPG distribution for info on GPG's - # output when --status-fd is specified.) - # - # Returns a dictionary, mapping GPG's keywords to the arguments - # for that keyword. + def encrypt(self, str_, recipients, always_trust=False): + result = super(GnuPG, self).encrypt(str_, recipients, + always_trust=always_trust, passphrase=self.passphrase) - resp = {} - while True: - line = helpers.temp_failure_retry(child_stdout.readline) - if line == "": break - line = line.rstrip() - if line[0:9] == '[GNUPG:] ': - # Chop off the prefix - line = line[9:] - L = line.split(None, 1) - keyword = L[0] - if len(L) > 1: - resp[ keyword ] = L[1] - else: - resp[ keyword ] = "" - return resp + if result.status == 'invalid recipient': + return '', 'NOT_TRUSTED' - def encrypt(self, str_, recipients, always_trust=False): - self.options.recipients = recipients # a list! + if result.ok: + error = '' + else: + error = result.status - opt = ['--encrypt'] - if always_trust or self.always_trust: - opt.append('--always-trust') - proc = self.run(opt, create_fhs=['stdin', 'stdout', 'status', - 'stderr']) - proc.handles['stdin'].write(str_) - try: - proc.handles['stdin'].close() - except IOError: - pass - - output = proc.handles['stdout'].read() - try: - proc.handles['stdout'].close() - except IOError: - pass - - stat = proc.handles['status'] - resp = self._read_response(stat) - try: - proc.handles['status'].close() - except IOError: - pass - - error = proc.handles['stderr'].read() - proc.handles['stderr'].close() - - try: proc.wait() - except IOError: pass - if 'INV_RECP' in resp and resp['INV_RECP'].split()[0] == '10': - # unusable recipient "Key not trusted" - return '', 'NOT_TRUSTED' - if 'BEGIN_ENCRYPTION' in resp and 'END_ENCRYPTION' in resp: - # Encryption succeeded, even if there is output on stderr. Maybe - # verbose is on - error = '' - return self._stripHeaderFooter(output), helpers.decode_string(error) + return self._stripHeaderFooter(str(result)), error def decrypt(self, str_, keyID): - proc = self.run(['--decrypt', '-q', '-u %s'%keyID], create_fhs=['stdin', 'stdout']) - enc = self._addHeaderFooter(str_, 'MESSAGE') - proc.handles['stdin'].write(enc) - proc.handles['stdin'].close() + data = self._addHeaderFooter(str_, 'MESSAGE') + result = super(GnuPG, self).decrypt(data, + passphrase=self.passphrase) - output = proc.handles['stdout'].read() - proc.handles['stdout'].close() - - try: proc.wait() - except IOError: pass - return output + return str(result) def sign(self, str_, keyID): - proc = self.run(['-b', '-u %s'%keyID], create_fhs=['stdin', 'stdout', 'status', 'stderr']) - proc.handles['stdin'].write(str_) - try: - proc.handles['stdin'].close() - except IOError: - pass + result = super(GnuPG, self).sign(str_, keyid=keyID, detach=True, + passphrase=self.passphrase) - output = proc.handles['stdout'].read() - try: - proc.handles['stdout'].close() - proc.handles['stderr'].close() - except IOError: - pass - - stat = proc.handles['status'] - resp = self._read_response(stat) - try: - proc.handles['status'].close() - except IOError: - pass - - try: proc.wait() - except IOError: pass - if 'GOOD_PASSPHRASE' in resp or 'SIG_CREATED' in resp: - return self._stripHeaderFooter(output) - if 'KEYEXPIRED' in resp: - return 'KEYEXPIRED' + if result.fingerprint: + return self._stripHeaderFooter(str(result)) +# if 'KEYEXPIRED' in resp: +# return 'KEYEXPIRED' return 'BAD_PASSPHRASE' def verify(self, str_, sign): if str_ is None: return '' - f = tmpfile() - fd = f.fileno() - f.write(str_) - f.seek(0) + 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) - proc = self.run(['--verify', '--enable-special-filenames', '-', '-&%s'%fd], create_fhs=['stdin', 'status', 'stderr']) + if result.valid: + return result.key_id + return '' - f.close() - sign = self._addHeaderFooter(sign, 'SIGNATURE') - proc.handles['stdin'].write(sign) - proc.handles['stdin'].close() - proc.handles['stderr'].close() - - stat = proc.handles['status'] - resp = self._read_response(stat) - proc.handles['status'].close() - - try: proc.wait() - except IOError: pass - - keyid = '' - if 'GOODSIG' in resp: - keyid = resp['GOODSIG'].split()[0] - return keyid - - def get_keys(self, secret = False): - if secret: - opt = '--list-secret-keys' - else: - opt = '--list-keys' - proc = self.run(['--with-colons', opt], - create_fhs=['stdout']) - output = proc.handles['stdout'].read() - proc.handles['stdout'].close() - - try: proc.wait() - except IOError: pass - + def get_keys(self, secret=False): keys = {} - lines = output.split('\n') - for line in lines: - sline = line.split(':') - if (sline[0] == 'sec' and secret) or \ - (sline[0] == 'pub' and not secret): - # decode escaped chars - name = eval('"' + sline[9].replace('"', '\\"') + '"') - # make it unicode instance - keys[sline[4][8:]] = helpers.decode_string(name) + result = super(GnuPG, self).list_keys(secret=secret) + for key in result: + # Take first not empty uid + keys[key['keyid'][8:]] = [uid for uid in key['uids'] if uid][0] return keys def get_secret_keys(self): @@ -216,7 +106,7 @@ Remove header and footer from data """ if not data: return '' - lines = data.split('\n') + lines = data.splitlines() while lines[0] != '': lines.remove(lines[0]) while lines[0] == '': @@ -233,9 +123,9 @@ """ Add header and footer from data """ - out = "-----BEGIN PGP %s-----\n" % type_ - out = out + "Version: PGP\n" - out = out + "\n" - out = out + data + "\n" - out = out + "-----END PGP %s-----\n" % type_ + out = "-----BEGIN PGP %s-----" % type_ + os.linesep + out = out + "Version: PGP" + os.linesep + out = out + os.linesep + out = out + data + os.linesep + out = out + "-----END PGP %s-----" % type_ + os.linesep return out diff -r c3f1f5f7d238 -r b14e72db6e7a src/common/GnuPGInterface.py --- a/src/common/GnuPGInterface.py Mon Nov 29 18:44:16 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,673 +0,0 @@ -# -*- coding:utf-8 -*- -## src/common/GnuPGInterface.py -## -## Copyright (C) 2001 Frank J. Tobin <ftobin AT neverending.org> -## Copyright (C) 2005 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006-2010 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2008 Jean-Marie Traissard <jim AT lapin.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -""" -Interface to GNU Privacy Guard (GnuPG) - -GnuPGInterface is a Python module to interface with GnuPG. -It concentrates on interacting with GnuPG via filehandles, -providing access to control GnuPG via versatile and extensible means. - -This module is based on GnuPG::Interface, a Perl module by the same author. - -Normally, using this module will involve creating a -GnuPG object, setting some options in it's 'options' data member -(which is of type Options), creating some pipes

1 0

gajim: Revert [12663]
by Denis Fomin 29 Nov '10

29 Nov '10

changeset c3f1f5f7d238 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c3f1f5f7d238 description: Revert [12663] diffstat: src/roster_window.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diffs (13 lines): diff -r a463a6e835d8 -r c3f1f5f7d238 src/roster_window.py --- a/src/roster_window.py Mon Nov 29 12:53:50 2010 +0100 +++ b/src/roster_window.py Mon Nov 29 18:44:16 2010 +0300 @@ -1085,9 +1085,6 @@ return False def draw_contact(self, jid, account, selected=False, focus=False): - gobject.idle_add(self._draw_contact, jid, account, selected, focus) - - def _draw_contact(self, jid, account, selected=False, focus=False): """ Draw the correct state image, name BUT not avatar """

1 0

gajim: use NEC to handle agent info / items events
by Yann Leboulanger 29 Nov '10

29 Nov '10

changeset a463a6e835d8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a463a6e835d8 description: use NEC to handle agent info / items events diffstat: src/chat_control.py | 2 - src/common/connection.py | 83 +++++++++++++++++ src/common/connection_handlers.py | 147 +----------------------------- src/common/connection_handlers_events.py | 98 ++++++++++++++++++++- src/common/protocol/caps.py | 25 ++-- src/config.py | 11 +- src/disco.py | 72 +++++++------- src/gui_interface.py | 9 - 8 files changed, 246 insertions(+), 201 deletions(-) diffs (truncated from 678 to 300 lines): diff -r 506cf198d1a7 -r a463a6e835d8 src/chat_control.py --- a/src/chat_control.py Mon Nov 29 13:31:48 2010 +0300 +++ b/src/chat_control.py Mon Nov 29 12:53:50 2010 +0100 @@ -3044,8 +3044,6 @@ if obj.session != self.session: return - obj.printed_in_chat = True - details = _('Unable to decrypt message from %s\nIt may have been ' 'tampered with.') % obj.fjid self.print_conversation_line(details, 'status', '', obj.timestamp) diff -r 506cf198d1a7 -r a463a6e835d8 src/common/connection.py --- a/src/common/connection.py Mon Nov 29 13:31:48 2010 +0300 +++ b/src/common/connection.py Mon Nov 29 12:53:50 2010 +0100 @@ -714,11 +714,17 @@ self.secret_hmac = str(random.random())[2:] gajim.ged.register_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) + gajim.ged.register_event_handler('agent-info-error-received', ged.CORE, + self._nec_agent_info_error_received) + gajim.ged.register_event_handler('agent-info-received', ged.CORE, + self._nec_agent_info_received) # END __init__ def __del__(self): gajim.ged.remove_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) + gajim.ged.remove_event_handler('agent-info-error-received', ged.CORE, + self._nec_agent_info_error_received) def get_config_values_or_default(self): if gajim.config.get_per('accounts', self.name, 'keep_alives_enabled'): @@ -1594,6 +1600,83 @@ self.awaiting_answers[id_] = (PRIVACY_ARRIVED, ) self.connection.send(iq) + def _nec_agent_info_error_received(self, obj): + if obj.conn.name != self.name: + return + if obj.id_[:6] == 'Gajim_': + if not self.privacy_rules_requested: + self.privacy_rules_requested = True + self._request_privacy() + + def _nec_agent_info_received(self, obj): + if obj.conn.name != self.name: + return + is_muc = False + transport_type = '' + for identity in obj.identities: + if 'category' in identity and identity['category'] in ('gateway', + 'headline') and 'type' in identity: + transport_type = identity['type'] + if 'category' in identity and identity['category'] == 'conference' \ + and 'type' in identity and identity['type'] == 'text': + is_muc = True + + if transport_type and obj.fjid not in gajim.transport_type: + gajim.transport_type[obj.fjid] = transport_type + gajim.logger.save_transport_type(obj.fjid, transport_type) + + if obj.id_[:6] == 'Gajim_': + hostname = gajim.config.get_per('accounts', self.name, 'hostname') + our_jid = gajim.get_jid_from_account(self.name) + if obj.fjid == hostname: + if common.xmpp.NS_GMAILNOTIFY in obj.features: + gajim.gmail_domains.append(obj.fjid) + self.request_gmail_notifications() + if common.xmpp.NS_SECLABEL in obj.features: + self.seclabel_supported = True + for identity in obj.identities: + if identity['category'] == 'pubsub' and identity.get( + 'type') == 'pep': + self.pep_supported = True + break + if common.xmpp.NS_VCARD in obj.features: + self.vcard_supported = True + if common.xmpp.NS_PUBSUB in obj.features: + self.pubsub_supported = True + if common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS in obj.features: + self.pubsub_publish_options_supported = True + else: + # Remove stored bookmarks accessible to everyone. + self.send_pb_purge(our_jid, 'storage:bookmarks') + self.send_pb_delete(our_jid, 'storage:bookmarks') + if common.xmpp.NS_ARCHIVE in obj.features: + self.archiving_supported = True + if common.xmpp.NS_ARCHIVE_AUTO in obj.features: + self.archive_auto_supported = True + if common.xmpp.NS_ARCHIVE_MANAGE in obj.features: + self.archive_manage_supported = True + if common.xmpp.NS_ARCHIVE_MANUAL in obj.features: + self.archive_manual_supported = True + if common.xmpp.NS_ARCHIVE_PREF in obj.features: + self.archive_pref_supported = True + if common.xmpp.NS_BYTESTREAM in obj.features and \ + gajim.config.get_per('accounts', self.name, 'use_ft_proxies'): + our_fjid = helpers.parse_jid(our_jid + '/' + \ + self.server_resource) + gajim.proxy65_manager.resolve(obj.fjid, self.connection, + our_fjid, self.name) + if common.xmpp.NS_MUC in obj.features and is_muc: + type_ = transport_type or 'jabber' + self.muc_jid[type_] = obj.fjid + if transport_type: + if transport_type in self.available_transports: + self.available_transports[transport_type].append(obj.fjid) + else: + self.available_transports[transport_type] = [obj.fjid] + if not self.privacy_rules_requested: + self.privacy_rules_requested = True + self._request_privacy() + def send_custom_status(self, show, msg, jid): if not show in gajim.SHOW_LIST: return -1 diff -r 506cf198d1a7 -r a463a6e835d8 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Nov 29 13:31:48 2010 +0300 +++ b/src/common/connection_handlers.py Mon Nov 29 12:53:50 2010 +0100 @@ -203,42 +203,13 @@ def _DiscoverItemsErrorCB(self, con, iq_obj): log.debug('DiscoverItemsErrorCB') - jid = helpers.get_full_jid_from_iq(iq_obj) - self.dispatch('AGENT_ERROR_ITEMS', (jid)) + gajim.nec.push_incoming_event(AgentItemsErrorReceivedEvent(None, + conn=self, stanza=iq_obj)) def _DiscoverItemsCB(self, con, iq_obj): log.debug('DiscoverItemsCB') - q = iq_obj.getTag('query') - node = q.getAttr('node') - if not node: - node = '' - qp = iq_obj.getQueryPayload() - items = [] - if not qp: - qp = [] - for i in qp: - # CDATA payload is not processed, only nodes - if not isinstance(i, common.xmpp.simplexml.Node): - continue - attr = {} - for key in i.getAttrs(): - attr[key] = i.getAttrs()[key] - if 'jid' not in attr: - continue - try: - attr['jid'] = helpers.parse_jid(attr['jid']) - except common.helpers.InvalidFormat: - # jid is not conform - continue - items.append(attr) - jid = helpers.get_full_jid_from_iq(iq_obj) - hostname = gajim.config.get_per('accounts', self.name, 'hostname') - id_ = iq_obj.getID() - if jid == hostname and id_[:6] == 'Gajim_': - for item in items: - self.discoverInfo(item['jid'], id_prefix='Gajim_') - else: - self.dispatch('AGENT_INFO_ITEMS', (jid, node, items)) + gajim.nec.push_incoming_event(AgentItemsReceivedEvent(None, conn=self, + stanza=iq_obj)) def _DiscoverItemsGetCB(self, con, iq_obj): log.debug('DiscoverItemsGetCB') @@ -291,117 +262,15 @@ def _DiscoverInfoErrorCB(self, con, iq_obj): log.debug('DiscoverInfoErrorCB') - jid = helpers.get_full_jid_from_iq(iq_obj) - id_ = iq_obj.getID() - if id_[:6] == 'Gajim_': - if not self.privacy_rules_requested: - self.privacy_rules_requested = True - self._request_privacy() - self.dispatch('AGENT_ERROR_INFO', (jid)) + gajim.nec.push_incoming_event(AgentInfoErrorReceivedEvent(None, + conn=self, stanza=iq_obj)) def _DiscoverInfoCB(self, con, iq_obj): log.debug('DiscoverInfoCB') if not self.connection or self.connected < 2: return - # According to XEP-0030: - # For identity: category, type is mandatory, name is optional. - # For feature: var is mandatory - identities, features, data = [], [], [] - q = iq_obj.getTag('query') - node = q.getAttr('node') - if not node: - node = '' - qc = iq_obj.getQueryChildren() - if not qc: - qc = [] - is_muc = False - transport_type = '' - for i in qc: - if i.getName() == 'identity': - attr = {} - for key in i.getAttrs().keys(): - attr[key] = i.getAttr(key) - if 'category' in attr and attr['category'] in ('gateway', - 'headline') and 'type' in attr: - transport_type = attr['type'] - if 'category' in attr and attr['category'] == 'conference' and \ - 'type' in attr and attr['type'] == 'text': - is_muc = True - identities.append(attr) - elif i.getName() == 'feature': - var = i.getAttr('var') - if var: - features.append(var) - elif i.getName() == 'x' and i.getNamespace() == common.xmpp.NS_DATA: - data.append(common.xmpp.DataForm(node=i)) - jid = helpers.get_full_jid_from_iq(iq_obj) - if transport_type and jid not in gajim.transport_type: - gajim.transport_type[jid] = transport_type - gajim.logger.save_transport_type(jid, transport_type) - id_ = iq_obj.getID() - if id_ is None: - log.warn('Invalid IQ received without an ID. Ignoring it: %s' % \ - iq_obj) - return - if not identities: - # ejabberd doesn't send identities when we browse online users - #FIXME: see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225 - identities = [{'category': 'server', 'type': 'im', 'name': node}] - if id_[:6] == 'Gajim_': - if jid == gajim.config.get_per('accounts', self.name, 'hostname'): - if features.__contains__(common.xmpp.NS_GMAILNOTIFY): - gajim.gmail_domains.append(jid) - self.request_gmail_notifications() - if features.__contains__(common.xmpp.NS_SECLABEL): - self.seclabel_supported = True - for identity in identities: - if identity['category'] == 'pubsub' and identity.get( - 'type') == 'pep': - self.pep_supported = True - break - if features.__contains__(common.xmpp.NS_VCARD): - self.vcard_supported = True - if features.__contains__(common.xmpp.NS_PUBSUB): - self.pubsub_supported = True - if features.__contains__( - common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS): - self.pubsub_publish_options_supported = True - else: - # Remove stored bookmarks accessible to everyone. - our_jid = gajim.get_jid_from_account(self.name) - self.send_pb_purge(our_jid, 'storage:bookmarks') - self.send_pb_delete(our_jid, 'storage:bookmarks') - if features.__contains__(common.xmpp.NS_ARCHIVE): - self.archiving_supported = True - if features.__contains__(common.xmpp.NS_ARCHIVE_AUTO): - self.archive_auto_supported = True - if features.__contains__(common.xmpp.NS_ARCHIVE_MANAGE): - self.archive_manage_supported = True - if features.__contains__(common.xmpp.NS_ARCHIVE_MANUAL): - self.archive_manual_supported = True - if features.__contains__(common.xmpp.NS_ARCHIVE_PREF): - self.archive_pref_supported = True - if features.__contains__(common.xmpp.NS_BYTESTREAM) and \ - gajim.config.get_per('accounts', self.name, 'use_ft_proxies'): - our_jid = helpers.parse_jid(gajim.get_jid_from_account( - self.name) + '/' + self.server_resource) - gajim.proxy65_manager.resolve(jid, self.connection, our_jid, - self.name) - if features.__contains__(common.xmpp.NS_MUC) and is_muc: - type_ = transport_type or 'jabber' - self.muc_jid[type_] = jid - if transport_type: - if transport_type in self.available_transports: - self.available_transports[transport_type].append(jid) - else: - self.available_transports[transport_type] = [jid] - if not self.privacy_rules_requested: - self.privacy_rules_requested = True - self._request_privacy() - - self.dispatch('AGENT_INFO_INFO', (jid, node, identities, features, - data)) - self._capsDiscoCB(jid, node, identities, features, data) + gajim.nec.push_incoming_event(AgentInfoReceivedEvent(None, conn=self, + stanza=iq_obj)) class ConnectionVcard: def __init__(self): diff -r 506cf198d1a7 -r a463a6e835d8 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Nov 29 13:31:48 2010 +0300 +++ b/src/common/connection_handlers_events.py Mon Nov 29 12:53:50 2010 +0100 @@ -1572,7 +1572,6 @@ self.fjid = self.msg_obj.fjid self.timestamp = self.msg_obj.timestamp self.session = self.msg_obj.session - self.printed_in_chat = False return True class SignedInEvent(nec.NetworkIncomingEvent):

1 0

gajim: Do not redraw the roster twice
by Denis Fomin 29 Nov '10

29 Nov '10

changeset 506cf198d1a7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=506cf198d1a7 description: Do not redraw the roster twice diffstat: src/roster_window.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (19 lines): diff -r 66f686595381 -r 506cf198d1a7 src/roster_window.py --- a/src/roster_window.py Mon Nov 29 11:22:27 2010 +0100 +++ b/src/roster_window.py Mon Nov 29 13:31:48 2010 +0300 @@ -2466,9 +2466,12 @@ self.draw_contact(obj.room_jid, account) def _nec_roster_received(self, obj): - self.fill_contacts_and_groups_dicts(obj.roster, obj.conn.name) - self.add_account_contacts(obj.conn.name) - self.fire_up_unread_messages_events(obj.conn.name) + if obj.received_from_server: + self.fill_contacts_and_groups_dicts(obj.roster, obj.conn.name) + self.add_account_contacts(obj.conn.name) + self.fire_up_unread_messages_events(obj.conn.name) + else: + gobject.idle_add(self.refilter_shown_roster_items) def _nec_anonymous_auth(self, obj): """

1 0

gajim: use NEC to handle register-agent-info events
by Yann Leboulanger 29 Nov '10

29 Nov '10

changeset 66f686595381 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=66f686595381 description: use NEC to handle register-agent-info events diffstat: src/common/connection.py | 4 +++- src/common/connection_handlers_events.py | 4 ++++ src/gui_interface.py | 14 +++++++------- 3 files changed, 14 insertions(+), 8 deletions(-) diffs (66 lines): diff -r d7a7be8def5d -r 66f686595381 src/common/connection.py --- a/src/common/connection.py Mon Nov 29 13:25:17 2010 +0300 +++ b/src/common/connection.py Mon Nov 29 11:22:27 2010 +0100 @@ -897,7 +897,9 @@ return is_form = data[2] conf = data[1] - self.dispatch('REGISTER_AGENT_INFO', (data[0], conf, is_form)) + gajim.nec.push_incoming_event(RegisterAgentInfoReceivedEvent( + None, conn=self, agent=data[0], config=conf, + is_form=is_form)) elif realm == common.xmpp.NS_PRIVACY: if event == common.xmpp.features_nb.PRIVACY_LISTS_RECEIVED: # data is (list) diff -r d7a7be8def5d -r 66f686595381 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Nov 29 13:25:17 2010 +0300 +++ b/src/common/connection_handlers_events.py Mon Nov 29 11:22:27 2010 +0100 @@ -1578,3 +1578,7 @@ class SignedInEvent(nec.NetworkIncomingEvent): name = 'signed-in' base_network_events = [] + +class RegisterAgentInfoReceivedEvent(nec.NetworkIncomingEvent): + name = 'register-agent-info-received' + base_network_events = [] diff -r d7a7be8def5d -r 66f686595381 src/gui_interface.py --- a/src/gui_interface.py Mon Nov 29 13:25:17 2010 +0300 +++ b/src/gui_interface.py Mon Nov 29 11:22:27 2010 +0100 @@ -546,15 +546,15 @@ notify.popup(event_type, obj.jid, account, 'unsubscribed', path, event_type, obj.jid) - def handle_event_register_agent_info(self, account, array): + def handle_event_register_agent_info(self, obj): # ('REGISTER_AGENT_INFO', account, (agent, infos, is_form)) # info in a dataform if is_form is True - if array[2] or 'instructions' in array[1]: - config.ServiceRegistrationWindow(array[0], array[1], account, - array[2]) + if obj.is_form or 'instructions' in obj.config: + config.ServiceRegistrationWindow(obj.agent, obj.config, + obj.conn.name, obj.is_form) else: - dialogs.ErrorDialog(_('Contact with "%s" cannot be established') \ - % array[0], _('Check your connection or try again later.')) + dialogs.ErrorDialog(_('Contact with "%s" cannot be established') % \ + obj.agent, _('Check your connection or try again later.')) def handle_event_agent_info_items(self, account, array): #('AGENT_INFO_ITEMS', account, (agent, node, items)) @@ -1388,7 +1388,6 @@ 'DB_ERROR': [self.handle_event_db_error], 'INFORMATION': [self.handle_event_information], 'MSGERROR': [self.handle_event_msgerror], - 'REGISTER_AGENT_INFO': [self.handle_event_register_agent_info], 'AGENT_INFO_ITEMS': [self.handle_event_agent_info_items], 'FILE_REQUEST': [self.handle_event_file_request], 'FILE_REQUEST_ERROR': [self.handle_event_file_request_error], @@ -1424,6 +1423,7 @@ 'password-required': [self.handle_event_password_required], 'plain-connection': [self.handle_event_plain_connection], 'presence-received': [self.handle_event_presence], + 'register-agent-info-received': [self.handle_event_register_agent_info], 'roster-info': [self.handle_event_roster_info], 'roster-item-exchange-received': \ [self.handle_event_roster_item_exchange],

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2010