Commits

commits@gajim.org

17632 discussions

gajim: make werequest an optional argument in JingleSession
by Jefry Lagrange 10 Jun '12

10 Jun '12

changeset e7832358c2e3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e7832358c2e3 description: make werequest an optional argument in JingleSession diffstat: src/common/jingle.py | 4 ++-- src/common/jingle_session.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diffs (34 lines): diff -r b8909ee93957 -r e7832358c2e3 src/common/jingle.py --- a/src/common/jingle.py Sat Jun 09 15:17:16 2012 -0400 +++ b/src/common/jingle.py Sun Jun 10 17:08:54 2012 -0400 @@ -101,7 +101,7 @@ # do we need to create a new jingle object if sid not in self._sessions: #TODO: tie-breaking and other things... - newjingle = JingleSession(con=self, werequest=False, weinitiate=False, jid=jid, + newjingle = JingleSession(con=self, weinitiate=False, jid=jid, iq_id=id_, sid=sid) self._sessions[sid] = newjingle @@ -148,7 +148,7 @@ if contact is None: return use_security = contact.supports(xmpp.NS_JINGLE_XTLS) - jingle = JingleSession(self, request, weinitiate=True, jid=jid) + jingle = JingleSession(self, weinitiate=True, jid=jid, werequest=request) # this is a file transfer jingle.session_type_FT = True self._sessions[jingle.sid] = jingle diff -r b8909ee93957 -r e7832358c2e3 src/common/jingle_session.py --- a/src/common/jingle_session.py Sat Jun 09 15:17:16 2012 -0400 +++ b/src/common/jingle_session.py Sun Jun 10 17:08:54 2012 -0400 @@ -63,7 +63,8 @@ negotiated between an initiator and a responder. """ - def __init__(self, con, werequest, weinitiate, jid, iq_id=None, sid=None): + def __init__(self, con, weinitiate, jid, iq_id=None, sid=None, + werequest=False): """ con -- connection object, weinitiate -- boolean, are we the initiator?

1 0

gajim: start listening when we get session initiate. Fixes #7175
by Jefry Lagrange 09 Jun '12

09 Jun '12

changeset b8909ee93957 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b8909ee93957 description: start listening when we get session initiate. Fixes #7175 diffstat: src/common/jingle_ft.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (15 lines): diff -r ac7c628635eb -r b8909ee93957 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Fri Jun 08 20:02:45 2012 -0400 +++ b/src/common/jingle_ft.py Sat Jun 09 15:17:16 2012 -0400 @@ -117,9 +117,11 @@ gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, conn=self.session.connection, stanza=stanza, jingle_content=content, FT_content=self)) + self._listen_host() # Delete this after file_props refactoring this shouldn't be necesary self.session.file_hash = self.file_props['hash'] self.session.hash_algo = self.file_props['algo'] + def __on_session_initiate_sent(self, stanza, content, error, action): # Calculate file_hash in a new thread # if we haven't sent the hash already.

1 0

gajim: dont cancel when we cant bind to port. Fixes #7173
by Jefry Lagrange 09 Jun '12

09 Jun '12

changeset ac7c628635eb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ac7c628635eb description: dont cancel when we cant bind to port. Fixes #7173 diffstat: src/common/socks5.py | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diffs (34 lines): diff -r e2ec1b037b4d -r ac7c628635eb src/common/socks5.py --- a/src/common/socks5.py Wed May 30 08:30:49 2012 +0200 +++ b/src/common/socks5.py Fri Jun 08 20:02:45 2012 -0400 @@ -22,7 +22,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## - import socket import struct import hashlib @@ -98,13 +97,6 @@ fingerprint=fingerprint) self.listener.queue = self self.listener.bind() - if self.listener.started is False: - self.listener = None - # We cannot bind port, call error callback and fail - self.error_cb(_('Unable to bind to port %s.') % port, - _('Maybe you have another running instance of Gajim. File ' - 'Transfer will be cancelled.')) - return None else: # There is already a listener, we update the file's information # on the new connection. @@ -1473,7 +1465,7 @@ self.ai = None continue if not self.ai: - # unable to bind, show error dialog + log.error('unable to bind to port ' + str(self.port)) return None self._serv.listen(socket.SOMAXCONN) self._serv.setblocking(False)

1 0

gajim: don't crash when there are non-ascii chars in gpg keys list
by Yann Leboulanger 30 May '12

30 May '12

changeset e2ec1b037b4d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e2ec1b037b4d description: don't crash when there are non-ascii chars in gpg keys list diffstat: src/common/gpg.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r cac4252df282 -r e2ec1b037b4d src/common/gpg.py --- a/src/common/gpg.py Mon May 28 19:54:59 2012 -0400 +++ b/src/common/gpg.py Wed May 30 08:30:49 2012 +0200 @@ -31,6 +31,7 @@ class GnuPG(gnupg.GPG): def __init__(self, use_agent=False): gnupg.GPG.__init__(self) + gnupg.GPG.decode_errors = 'replace' self.passphrase = None self.use_agent = use_agent self.always_trust = False

1 0

gajim: send hash in session-init when the file is less than 10 mb
by Jefry Lagrange 28 May '12

28 May '12

changeset cac4252df282 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cac4252df282 description: send hash in session-init when the file is less than 10 mb diffstat: src/common/connection_handlers_events.py | 4 ++++ src/common/jingle_content.py | 7 ++++++- src/common/jingle_ft.py | 30 ++++++++++++++++++++---------- src/common/jingle_session.py | 19 +++++++++---------- 4 files changed, 39 insertions(+), 21 deletions(-) diffs (118 lines): diff -r c157e198bae5 -r cac4252df282 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon May 28 18:07:52 2012 -0400 +++ b/src/common/connection_handlers_events.py Mon May 28 19:54:59 2012 -0400 @@ -1980,6 +1980,10 @@ if val is None: continue self.file_props[name] = val + # Delete this, it shouldn't be necesary after file_props gets + # refactored. + if name == 'hash': + self.file_props['algo'] = child.getAttr('algo') file_desc_tag = file_tag.getTag('desc') if file_desc_tag is not None: self.file_props['desc'] = file_desc_tag.getData() diff -r c157e198bae5 -r cac4252df282 src/common/jingle_content.py --- a/src/common/jingle_content.py Mon May 28 18:07:52 2012 -0400 +++ b/src/common/jingle_content.py Mon May 28 19:54:59 2012 -0400 @@ -162,7 +162,7 @@ self.sent = True content.addChild(node=self.transport.make_transport()) - def _fill_content(self, content, action): + def _fill_content(self, content): description_node = xmpp.simplexml.Node( tag=xmpp.NS_JINGLE_FILE_TRANSFER + ' description') @@ -183,6 +183,11 @@ if 'hash' in self.file_props: # TODO: use xep-300 for this bit pass + # if the file is less than 10 mb, then it is small + # lets calculate it right away + if int(self.file_props['size']) < 10000000: + h = self._calcHash() + file_tag.addChild(node=h) desc = file_tag.setTag('desc') if 'desc' in self.file_props: desc.setData(self.file_props['desc']) diff -r c157e198bae5 -r cac4252df282 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon May 28 18:07:52 2012 -0400 +++ b/src/common/jingle_ft.py Mon May 28 19:54:59 2012 -0400 @@ -117,12 +117,27 @@ gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, conn=self.session.connection, stanza=stanza, jingle_content=content, FT_content=self)) + # Delete this after file_props refactoring this shouldn't be necesary + self.session.file_hash = self.file_props['hash'] + self.session.hash_algo = self.file_props['algo'] def __on_session_initiate_sent(self, stanza, content, error, action): # Calculate file_hash in a new thread - self.hashThread = threading.Thread(target=self.__calcHash) - self.hashThread.start() + # if we haven't sent the hash already. + if 'hash' not in self.file_props: + self.hashThread = threading.Thread(target=self.__send_hash) + self.hashThread.start() - def __calcHash(self): + def __send_hash(self): + # Send hash in a session info + checksum = xmpp.Node(tag='checksum', + payload=[xmpp.Node(tag='file', + payload=[self._calcHash()])]) + checksum.setNamespace(xmpp.NS_JINGLE_FILE_TRANSFER) + self.session.__session_info(checksum ) + + + def _calcHash(self): + # Caculates the hash and returns a xep-300 hash stanza if self.session.hash_algo == None: return try: @@ -139,13 +154,8 @@ return self.file_props['hash'] = hash_ h.addHash(hash_, self.session.hash_algo) - checksum = xmpp.Node(tag='checksum', - payload=[xmpp.Node(tag='file', payload=[h])]) - checksum.setNamespace(xmpp.NS_JINGLE_FILE_TRANSFER) - # Send hash in a session info - self.session.__session_info(checksum ) - - + return h + def __on_session_accept(self, stanza, content, error, action): log.info("__on_session_accept") con = self.session.connection diff -r c157e198bae5 -r cac4252df282 src/common/jingle_session.py --- a/src/common/jingle_session.py Mon May 28 18:07:52 2012 -0400 +++ b/src/common/jingle_session.py Mon May 28 19:54:59 2012 -0400 @@ -433,17 +433,16 @@ payload = jingle.getPayload() for p in payload: if p.getName() == 'checksum': - hashes = p.getTag('file').getTag(name='hashes', + hash_ = p.getTag('file').getTag(name='hash', namespace=xmpp.NS_HASHES) - for hash in hashes.getChildren(): - algo = hash.getAttr('algo') - if algo in xmpp.Hashes.supported: - self.hash_algo = algo - data = hash.getData() - # This only works because there is only one session - # per file in jingleFT - self.file_hash = data - raise xmpp.NodeProcessed + algo = hash_.getAttr('algo') + if algo in xmpp.Hashes.supported: + self.hash_algo = algo + data = hash_.getData() + # This only works because there is only one session + # per file in jingleFT + self.file_hash = data + raise xmpp.NodeProcessed self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info', type_='modify') raise xmpp.NodeProcessed

1 0

gajim: update xep300 to version 1
by Jefry Lagrange 28 May '12

28 May '12

changeset c157e198bae5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c157e198bae5 description: update xep300 to version 1 diffstat: src/common/xmpp/protocol.py | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diffs (40 lines): diff -r 841c40a99615 -r c157e198bae5 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Sun May 27 21:05:43 2012 -0400 +++ b/src/common/xmpp/protocol.py Mon May 28 18:07:52 2012 -0400 @@ -162,7 +162,7 @@ NS_PUBKEY_REVOKE = 'urn:xmpp:revoke:2' NS_PUBKEY_ATTEST = 'urn:xmpp:attest:2' NS_STREAM_MGMT = 'urn:xmpp:sm:2' # XEP-198 -NS_HASHES = 'urn:xmpp:hashes:0' # XEP-300 +NS_HASHES = 'urn:xmpp:hashes:1' # XEP-300 NS_HASHES_MD5 = 'urn:xmpp:hash-function-textual-names:md5' NS_HASHES_SHA1 = 'urn:xmpp:hash-function-textual-names:sha-1' NS_HASHES_SHA256 = 'urn:xmpp:hash-function-textual-names:sha-256' @@ -1057,9 +1057,9 @@ supported = ('md5', 'sha-1', 'sha-256', 'sha-512') def __init__(self, nsp=NS_HASHES): - Node.__init__(self, None, {}, [], None, None,False, None) + Node.__init__(self, None, {}, [], None, None, False, None) self.setNamespace(nsp) - self.setName('hashes') + self.setName('hash') def calculateHash(self, algo, file_string): """ @@ -1101,13 +1101,8 @@ return hash_ def addHash(self, hash_, algo): - """ - More than one hash can be added. Although it is permitted, it should - not be done for big files because it could slow down Gajim. - """ - attrs = {} - attrs['algo'] = algo - self.addChild('hash', attrs, [hash_]) + self.setAttr('algo', algo) + self.setData(hash_) class Acks(Node): """

1 0

gajim: sends file request after hash mismatch
by Jefry Lagrange 28 May '12

28 May '12

changeset 841c40a99615 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=841c40a99615 description: sends file request after hash mismatch diffstat: src/common/connection_handlers_events.py | 9 ++++--- src/common/jingle.py | 6 ++-- src/common/jingle_content.py | 40 ++++++++++++++++++++++++++++++++ src/common/jingle_ft.py | 28 +-------------------- src/common/jingle_session.py | 4 ++- src/filetransfers_window.py | 11 +++++--- src/gui_interface.py | 2 +- src/roster_window.py | 2 +- 8 files changed, 62 insertions(+), 40 deletions(-) diffs (219 lines): diff -r 4358cf55befc -r 841c40a99615 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri May 18 16:58:51 2012 +0200 +++ b/src/common/connection_handlers_events.py Sun May 27 21:05:43 2012 -0400 @@ -1973,12 +1973,13 @@ typ='stream') raise xmpp.NodeProcessed file_tag = si.getTag('file') - for attribute in file_tag.getAttrs(): - if attribute in ('name', 'size', 'hash', 'date'): - val = file_tag.getAttr(attribute) + for child in file_tag.getChildren(): + name = child.getName() + if name in ('name', 'size', 'hash', 'date'): + val = child.getData() if val is None: continue - self.file_props[attribute] = val + self.file_props[name] = val file_desc_tag = file_tag.getTag('desc') if file_desc_tag is not None: self.file_props['desc'] = file_desc_tag.getData() diff -r 4358cf55befc -r 841c40a99615 src/common/jingle.py --- a/src/common/jingle.py Fri May 18 16:58:51 2012 +0200 +++ b/src/common/jingle.py Sun May 27 21:05:43 2012 -0400 @@ -101,7 +101,7 @@ # do we need to create a new jingle object if sid not in self._sessions: #TODO: tie-breaking and other things... - newjingle = JingleSession(con=self, weinitiate=False, jid=jid, + newjingle = JingleSession(con=self, werequest=False, weinitiate=False, jid=jid, iq_id=id_, sid=sid) self._sessions[sid] = newjingle @@ -141,14 +141,14 @@ jingle.start_session() return jingle.sid - def start_file_transfer(self, jid, file_props): + def start_file_transfer(self, jid, file_props, request=False): logger.info("start file transfer with file: %s" % file_props) contact = gajim.contacts.get_contact_with_highest_priority(self.name, gajim.get_jid_without_resource(jid)) if contact is None: return use_security = contact.supports(xmpp.NS_JINGLE_XTLS) - jingle = JingleSession(self, weinitiate=True, jid=jid) + jingle = JingleSession(self, request, weinitiate=True, jid=jid) # this is a file transfer jingle.session_type_FT = True self._sessions[jingle.sid] = jingle diff -r 4358cf55befc -r 841c40a99615 src/common/jingle_content.py --- a/src/common/jingle_content.py Fri May 18 16:58:51 2012 +0200 +++ b/src/common/jingle_content.py Sun May 27 21:05:43 2012 -0400 @@ -162,6 +162,46 @@ self.sent = True content.addChild(node=self.transport.make_transport()) + def _fill_content(self, content, action): + description_node = xmpp.simplexml.Node( + tag=xmpp.NS_JINGLE_FILE_TRANSFER + ' description') + + if self.session.werequest: + simode = xmpp.simplexml.Node(tag='request') + else: + simode = xmpp.simplexml.Node(tag='offer') + + file_tag = simode.setTag('file', namespace=xmpp.NS_FILE) + if 'name' in self.file_props: + node = xmpp.simplexml.Node(tag='name') + node.addData(self.file_props['name']) + file_tag.addChild(node=node) + if 'size' in self.file_props: + node = xmpp.simplexml.Node(tag='size') + node.addData(self.file_props['size']) + file_tag.addChild(node=node) + if 'hash' in self.file_props: + # TODO: use xep-300 for this bit + pass + desc = file_tag.setTag('desc') + if 'desc' in self.file_props: + desc.setData(self.file_props['desc']) + + description_node.addChild(node=simode) + + if self.use_security: + security = xmpp.simplexml.Node( + tag=xmpp.NS_JINGLE_XTLS + ' security') + # TODO: add fingerprint element + for m in ('x509', ): # supported authentication methods + method = xmpp.simplexml.Node(tag='method') + method.setAttr('name', m) + security.addChild(node=method) + content.addChild(node=security) + + content.addChild(node=description_node) + + def destroy(self): self.callbacks = None del self.session.contents[(self.creator, self.name)] diff -r 4358cf55befc -r 841c40a99615 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Fri May 18 16:58:51 2012 +0200 +++ b/src/common/jingle_ft.py Sun May 27 21:05:43 2012 -0400 @@ -132,6 +132,8 @@ return h = xmpp.Hashes() hash_ = h.calculateHash(self.session.hash_algo, file_) + # DEBUG + #hash_ = '1294809248109223' if not hash_: # Hash alogrithm not supported return @@ -294,32 +296,6 @@ else: self.__state_changed(STATE_CAND_SENT, args) - def _fill_content(self, content): - description_node = xmpp.simplexml.Node( - tag=xmpp.NS_JINGLE_FILE_TRANSFER + ' description') - - sioffer = xmpp.simplexml.Node(tag='offer') - file_tag = sioffer.setTag('file', namespace=xmpp.NS_FILE) - file_tag.setAttr('name', self.file_props['name']) - file_tag.setAttr('size', self.file_props['size']) - desc = file_tag.setTag('desc') - if 'desc' in self.file_props: - desc.setData(self.file_props['desc']) - - description_node.addChild(node=sioffer) - - if self.use_security: - security = xmpp.simplexml.Node( - tag=xmpp.NS_JINGLE_XTLS + ' security') - # TODO: add fingerprint element - for m in ('x509', ): # supported authentication methods - method = xmpp.simplexml.Node(tag='method') - method.setAttr('name', m) - security.addChild(node=method) - content.addChild(node=security) - - content.addChild(node=description_node) - def _store_socks5_sid(self, sid, hash_id): # callback from socsk5queue.start_listener self.file_props['hash'] = hash_id diff -r 4358cf55befc -r 841c40a99615 src/common/jingle_session.py --- a/src/common/jingle_session.py Fri May 18 16:58:51 2012 +0200 +++ b/src/common/jingle_session.py Sun May 27 21:05:43 2012 -0400 @@ -63,7 +63,7 @@ negotiated between an initiator and a responder. """ - def __init__(self, con, weinitiate, jid, iq_id=None, sid=None): + def __init__(self, con, werequest, weinitiate, jid, iq_id=None, sid=None): """ con -- connection object, weinitiate -- boolean, are we the initiator? @@ -83,6 +83,8 @@ self.responder = weinitiate and self.peerjid or self.ourjid # are we an initiator? self.weinitiate = weinitiate + # Are we requesting or offering a file? + self.werequest = werequest # what state is session in? (one from JingleStates) self.state = JingleStates.ended if not sid: diff -r 4358cf55befc -r 841c40a99615 src/filetransfers_window.py --- a/src/filetransfers_window.py Fri May 18 16:58:51 2012 +0200 +++ b/src/filetransfers_window.py Sun May 27 21:05:43 2012 -0400 @@ -37,7 +37,6 @@ is_transfer_stopped) from common.xmpp.protocol import NS_JINGLE_FILE_TRANSFER import logging - log = logging.getLogger('gajim.filetransfer_window') C_IMAGE = 0 @@ -249,10 +248,14 @@ dialogs.ErrorDialog(_('File transfer stopped'), sectext) self.tree.get_selection().unselect_all() - def show_hash_error(self, jid, file_props): + def show_hash_error(self, jid, file_props, account): def on_yes(dummy): - # TODO: Request the file to the sender - pass + # Request the file to the sender + sid = gajim.connections[account].start_file_transfer(jid, + file_props, + True) + file_props['sid'] = sid + if file_props['type'] == 'r': file_name = os.path.basename(file_props['file-name']) diff -r 4358cf55befc -r 841c40a99615 src/gui_interface.py --- a/src/gui_interface.py Fri May 18 16:58:51 2012 +0200 +++ b/src/gui_interface.py Sun May 27 21:05:43 2012 -0400 @@ -989,7 +989,7 @@ ft.show_stopped(jid, file_props, error_msg=_('Error opening file')) elif file_props['error'] == -10: - ft.show_hash_error(jid, file_props) + ft.show_hash_error(jid, file_props, account) return msg_type = '' diff -r 4358cf55befc -r 841c40a99615 src/roster_window.py --- a/src/roster_window.py Fri May 18 16:58:51 2012 +0200 +++ b/src/roster_window.py Sun May 27 21:05:43 2012 -0400 @@ -1978,7 +1978,7 @@ gajim.events.remove_events(account, jid, event) return True elif event.type_ == 'file-hash-error': - ft.show_hash_error(jid, data) + ft.show_hash_error(jid, data, account) gajim.events.remove_events(account, jid, event) elif event.type_ == 'file-completed': ft.show_completed(jid, data)

1 0

gajim: update python-gnupg to 0.3.0 + add KEYEXPIRED support. Fi...
by Yann Leboulanger 18 May '12

18 May '12

changeset 4358cf55befc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4358cf55befc description: update python-gnupg to 0.3.0 + add KEYEXPIRED support. Fixes #7151 diffstat: src/common/gnupg.py | 1190 ++++++++++++++++++++++++++------------------------ src/common/gpg.py | 4 +- 2 files changed, 622 insertions(+), 572 deletions(-) diffs (truncated from 1364 to 300 lines): diff -r 1c957ee45b0e -r 4358cf55befc src/common/gnupg.py --- a/src/common/gnupg.py Wed May 16 17:23:34 2012 +0400 +++ b/src/common/gnupg.py Fri May 18 16:58:51 2012 +0200 @@ -27,25 +27,22 @@ and so does not work on Windows). Renamed to gnupg.py to avoid confusion with the previous versions. -Modifications Copyright (C) 2008-2011 Vinay Sajip. All rights reserved. +Modifications Copyright (C) 2008-2012 Vinay Sajip. All rights reserved. A unittest harness (test_gnupg.py) has also been added. """ import locale +__version__ = "0.3.0" __author__ = "Vinay Sajip" -__date__ = "$25-Jan-2011 11:40:48$" +__date__ = "$12-May-2012 10:49:10$" try: from io import StringIO - from io import TextIOWrapper - from io import BufferedReader - from io import BufferedWriter except ImportError: from cStringIO import StringIO - class BufferedReader: pass - class BufferedWriter: pass +import codecs import locale import logging import os @@ -110,34 +107,11 @@ passphrase = '%s\n' % passphrase passphrase = passphrase.encode(encoding) stream.write(passphrase) - logger.debug("Passphrase written") + logger.debug("Wrote passphrase: %r", passphrase) def _is_sequence(instance): return isinstance(instance,list) or isinstance(instance,tuple) -def _wrap_input(inp): - if isinstance(inp, BufferedWriter): - oldinp = inp - inp = TextIOWrapper(inp) - logger.debug('wrapped input: %r -> %r', oldinp, inp) - return inp - -def _wrap_output(outp): - if isinstance(outp, BufferedReader): - oldoutp = outp - outp = TextIOWrapper(outp) - logger.debug('wrapped output: %r -> %r', oldoutp, outp) - return outp - -#The following is needed for Python2.7 :-( -def _make_file(s): - try: - rv = StringIO(s) - except (TypeError, UnicodeError): - from io import BytesIO - rv = BytesIO(s) - return rv - def _make_binary_stream(s, encoding): try: if _py3k: @@ -152,526 +126,11 @@ rv = StringIO(s) return rv -class GPG(object): - "Encapsulate access to the gpg executable" - def __init__(self, gpgbinary='gpg', gnupghome=None, verbose=False, use_agent=False): - """Initialize a GPG process wrapper. Options are: - - gpgbinary -- full pathname for GPG binary. - - gnupghome -- full pathname to where we can find the public and - private keyrings. Default is whatever gpg defaults to. - """ - self.gpgbinary = gpgbinary - self.gnupghome = gnupghome - self.verbose = verbose - self.use_agent = use_agent - self.encoding = locale.getpreferredencoding() - if self.encoding is None: # This happens on Jython! - self.encoding = sys.stdin.encoding - if gnupghome and not os.path.isdir(self.gnupghome): - os.makedirs(self.gnupghome,0x1C0) - p = self._open_subprocess(["--version"]) - result = Verify() # any result will do for this - self._collect_output(p, result, stdin=p.stdin) - if p.returncode != 0: - raise ValueError("Error invoking gpg: %s: %s" % (p.returncode, - result.stderr)) - - def _open_subprocess(self, args, passphrase=False): - # Internal method: open a pipe to a GPG subprocess and return - # the file objects for communicating with it. - cmd = [self.gpgbinary, '--status-fd 2 --no-tty'] - if self.gnupghome: - cmd.append('--homedir "%s" ' % self.gnupghome) - if passphrase: - cmd.append('--batch --passphrase-fd 0') - if self.use_agent: - cmd.append('--use-agent') - cmd.extend(args) - cmd = ' '.join(cmd) - if self.verbose: - print(cmd) - logger.debug("%s", cmd) - return Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE) - - def _read_response(self, stream, result): - # Internal method: reads all the output from GPG, taking notice - # only of lines that begin with the magic [GNUPG:] prefix. - # - # Calls methods on the response object for each valid token found, - # with the arg being the remainder of the status line. - lines = [] - while True: - line = stream.readline() - lines.append(line) - if self.verbose: - print(line) - logger.debug("%s", line.rstrip()) - 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: - value = L[1] - else: - value = "" - result.handle_status(keyword, value) - result.stderr = ''.join(lines) - - def _read_data(self, stream, result): - # Read the contents of the file from GPG's stdout - chunks = [] - while True: - data = stream.read(1024) - if len(data) == 0: - break - logger.debug("chunk: %r" % data[:256]) - chunks.append(data) - if _py3k: - # Join using b'' or '', as appropriate - result.data = type(data)().join(chunks) - else: - result.data = ''.join(chunks) - - def _collect_output(self, process, result, writer=None, stdin=None): - """ - Drain the subprocesses output streams, writing the collected output - to the result. If a writer thread (writing to the subprocess) is given, - make sure it's joined before returning. If a stdin stream is given, - close it before returning. - """ - stderr = _wrap_output(process.stderr) - rr = threading.Thread(target=self._read_response, args=(stderr, result)) - rr.setDaemon(True) - logger.debug('stderr reader: %r', rr) - rr.start() - - stdout = process.stdout # _wrap_output(process.stdout) - dr = threading.Thread(target=self._read_data, args=(stdout, result)) - dr.setDaemon(True) - logger.debug('stdout reader: %r', dr) - dr.start() - - dr.join() - rr.join() - if writer is not None: - writer.join() - process.wait() - if stdin is not None: - try: - stdin.close() - except IOError: - pass - stderr.close() - stdout.close() - - def _handle_io(self, args, file, result, passphrase=None, binary=False): - "Handle a call to GPG - pass input data, collect output data" - # Handle a basic data call - pass data to GPG, handle the output - # including status information. Garbage In, Garbage Out :) - p = self._open_subprocess(args, passphrase is not None) - if not binary and not isinstance(file, BufferedReader): - stdin = _wrap_input(p.stdin) - else: - stdin = p.stdin - if passphrase: - _write_passphrase(stdin, passphrase, self.encoding) - writer = _threaded_copy_data(file, stdin) - self._collect_output(p, result, writer, stdin) - return result - - # - # SIGNATURE METHODS - # - def sign(self, message, **kwargs): - """sign message""" - f = _make_binary_stream(message, self.encoding) - result = self.sign_file(f, **kwargs) - f.close() - return result - - def sign_file(self, file, keyid=None, passphrase=None, clearsign=True, - detach=False, binary=False): - """sign file""" - logger.debug("sign_file: %s", file) - if binary: - args = ['-s'] - else: - args = ['-sa'] - # You can't specify detach-sign and clearsign together: gpg ignores - # the detach-sign in that case. - if detach: - args.append("--detach-sign") - elif clearsign: - args.append("--clearsign") - if keyid: - args.append("--default-key %s" % keyid) - result = Sign(self.encoding) - #We could use _handle_io here except for the fact that if the - #passphrase is bad, gpg bails and you can't write the message. - #self._handle_io(args, _make_file(message), result, passphrase=passphrase) - p = self._open_subprocess(args, passphrase is not None) - try: - stdin = p.stdin - if passphrase: - _write_passphrase(stdin, passphrase, self.encoding) - writer = _threaded_copy_data(file, stdin) - except IOError: - logging.exception("error writing message") - writer = None - self._collect_output(p, result, writer, stdin) - return result - - def verify(self, data): - """Verify the signature on the contents of the string 'data' - - >>> gpg = GPG(gnupghome="keys") - >>> input = gpg.gen_key_input(Passphrase='foo') - >>> key = gpg.gen_key(input) - >>> assert key - >>> sig = gpg.sign('hello',keyid=key.fingerprint,passphrase='bar') - >>> assert not sig - >>> sig = gpg.sign('hello',keyid=key.fingerprint,passphrase='foo') - >>> assert sig - >>> verify = gpg.verify(sig.data) - >>> assert verify - - """ - f = _make_binary_stream(data, self.encoding) - result = self.verify_file(f) - f.close() - return result - - def verify_file(self, file, data_filename=None): - "Verify the signature on the contents of the file-like object 'file'" - logger.debug('verify_file: %r, %r', file, data_filename) - result = Verify() - args = ['--verify'] - if data_filename is None: - self._handle_io(args, file, result, binary=True) - else: - logger.debug('Handling detached verification') - import tempfile - fd, fn = tempfile.mkstemp(prefix='pygpg') - s = file.read() - file.close() - logger.debug('Wrote to temp file: %r', s) - os.write(fd, s) - os.close(fd) - args.append(fn) - args.append(data_filename) - try: - p = self._open_subprocess(args) - self._collect_output(p, result, stdin=p.stdin) - finally: - os.unlink(fn) - return result - - # - # KEY MANAGEMENT - # - - def import_keys(self, key_data): - """ import the key_data into our keyring - - >>> import shutil

1 0

gajim: revert [c78ce7188b4]
by Fomin Denis 16 May '12

16 May '12

changeset 1c957ee45b0e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1c957ee45b0e description: revert [c78ce7188b4] diffstat: src/roster_window.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diffs (13 lines): diff -r ec78ce7188b4 -r 1c957ee45b0e src/roster_window.py --- a/src/roster_window.py Sat May 12 21:51:05 2012 +0400 +++ b/src/roster_window.py Wed May 16 17:23:34 2012 +0400 @@ -3390,9 +3390,6 @@ mw.window.window.focus(gtk.get_current_event_time()) return ctrl = gajim.interface.minimized_controls[account][jid] - # redrawing partipiant list - sw = ctrl.xml.get_object('list_scrolledwindow') - sw.queue_draw() mw = gajim.interface.msg_win_mgr.get_window(jid, account) if not mw: mw = gajim.interface.msg_win_mgr.create_window(ctrl.contact,

1 0

gajim: redraw partipiant list after maximizing the conference. F...
by Fomin Denis 12 May '12

12 May '12

changeset ec78ce7188b4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ec78ce7188b4 description: redraw partipiant list after maximizing the conference. Fixes #6961 diffstat: src/roster_window.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 1a3dc2a7f03d -r ec78ce7188b4 src/roster_window.py --- a/src/roster_window.py Wed May 09 12:16:48 2012 +0400 +++ b/src/roster_window.py Sat May 12 21:51:05 2012 +0400 @@ -3390,6 +3390,9 @@ mw.window.window.focus(gtk.get_current_event_time()) return ctrl = gajim.interface.minimized_controls[account][jid] + # redrawing partipiant list + sw = ctrl.xml.get_object('list_scrolledwindow') + sw.queue_draw() mw = gajim.interface.msg_win_mgr.get_window(jid, account) if not mw: mw = gajim.interface.msg_win_mgr.create_window(ctrl.contact, @@ -6409,7 +6412,7 @@ # it means we are waiting for this number of accounts to disconnect # before quitting self.quit_on_next_offline = -1 - + # groups to draw next time we draw groups. self.groups_to_draw = {} # accounts to draw next time we draw accounts.

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