Commits November 2013

commits@gajim.org

2 participants
61 discussions

gajim: [fedor] improve Jingle XTLS security. Fixes #7544
by Gajim 05 Nov '13

05 Nov '13

changeset 8073f9ceabb5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8073f9ceabb5 description: [fedor] improve Jingle XTLS security. Fixes #7544 diffstat: src/common/jingle_xtls.py | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diffs (63 lines): diff -r 0861ddcb7fab -r 8073f9ceabb5 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Wed Oct 30 11:58:18 2013 +0100 +++ b/src/common/jingle_xtls.py Tue Nov 05 11:21:56 2013 +0100 @@ -92,7 +92,10 @@ """ constructs and returns the context objects """ - ctx = SSL.Context(SSL.TLSv1_METHOD) + 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') if fingerprint == 'server': # for testing purposes only ctx.set_verify(SSL.VERIFY_NONE|SSL.VERIFY_FAIL_IF_NO_PEER_CERT, @@ -174,12 +177,12 @@ pkey.generate_key(type, bits) return pkey -def createCertRequest(pkey, digest="md5", **name): +def createCertRequest(pkey, digest="sha1", **name): """ Create a certificate request. Arguments: pkey - The key to associate with the request - digest - Digestion method to use for signing, default is md5 + digest - Digestion method to use for signing, default is sha1 **name - The name of the subject of the request, possible arguments are: C - Country name @@ -201,7 +204,7 @@ req.sign(pkey, digest) return req -def createCertificate(req, (issuerCert, issuerKey), serial, (notBefore, notAfter), digest="md5"): +def createCertificate(req, (issuerCert, issuerKey), serial, (notBefore, notAfter), digest="sha1"): """ Generate a certificate given a certificate request. @@ -213,7 +216,7 @@ starts being valid notAfter - Timestamp (relative to now) when the certificate stops being valid - digest - Digest method to use for signing, default is md5 + digest - Digest method to use for signing, default is sha1 Returns: The signed certificate in an X509 object """ cert = crypto.X509() @@ -233,10 +236,12 @@ and '.cert' extensions CN : common name """ - key = createKeyPair(TYPE_RSA, 1024) + key = createKeyPair(TYPE_RSA, 4096) req = createCertRequest(key, CN=CN) cert = createCertificate(req, (req, key), 0, (0, 60*60*24*365*5)) # five years - open(filepath + '.pkey', 'w').write(crypto.dump_privatekey( + private_key_file = open(filepath + '.pkey', 'w') + os.chmod(filepath + '.pkey', 0600) + private_key_file.write(crypto.dump_privatekey( crypto.FILETYPE_PEM, key)) open(filepath + '.cert', 'w').write(crypto.dump_certificate( crypto.FILETYPE_PEM, cert))

1 0

gajim: ability to configure cipher list
by Gajim 03 Nov '13

03 Nov '13

changeset 1adbc20ab5a1 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=1adbc20ab5a1 description: ability to configure cipher list diffstat: src/common/config.py | 1 + src/common/connection.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diffs (25 lines): diff -r 202898e4ed10 -r 1adbc20ab5a1 src/common/config.py --- a/src/common/config.py Sat Nov 02 21:22:41 2013 +0100 +++ b/src/common/config.py Sun Nov 03 17:57:12 2013 +0100 @@ -349,6 +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', '' ], '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 202898e4ed10 -r 1adbc20ab5a1 src/common/connection.py --- a/src/common/connection.py Sat Nov 02 21:22:41 2013 +0100 +++ b/src/common/connection.py Sun Nov 03 17:57:12 2013 +0100 @@ -1236,7 +1236,9 @@ if not os.path.exists(cacerts): cacerts = '' mycerts = common.gajim.MY_CACERTS - secure_tuple = (self._current_type, cacerts, mycerts) + cipher_list = gajim.config.get_per('accounts', self.name, + 'cipher_list') + secure_tuple = (self._current_type, cacerts, mycerts, cipher_list) con = nbxmpp.NonBlockingClient( domain=self._hostname,

1 0

python-nbxmpp: ability to configure cipher list. see #7
by Yann Leboulanger 03 Nov '13

03 Nov '13

changeset a7f633ee2fc2 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=a7f633ee2fc2 description: ability to configure cipher list. see #7 diffstat: doc/examples/xsend.py | 4 +++- nbxmpp/bosh.py | 8 ++++---- nbxmpp/client_nb.py | 27 ++++++++++++++++----------- nbxmpp/tls_nb.py | 20 ++++++++++---------- nbxmpp/transports_nb.py | 29 ++++++++++++++++------------- 5 files changed, 49 insertions(+), 39 deletions(-) diffs (232 lines): diff -r 93e04118f0c9 -r a7f633ee2fc2 doc/examples/xsend.py --- a/doc/examples/xsend.py Sun Nov 03 13:47:50 2013 +0100 +++ b/doc/examples/xsend.py Sun Nov 03 17:55:20 2013 +0100 @@ -35,6 +35,8 @@ def __init__(self): self.jid = nbxmpp.protocol.JID(jidparams['jid']) self.password = jidparams['password'] + self.sm = nbxmpp.Smacks(self) # Stream Management + self.client_cert = None def on_auth(self, con, auth): if not auth: @@ -59,7 +61,7 @@ def connect(self): idle_queue = nbxmpp.idlequeue.get_idlequeue() self.client = nbxmpp.NonBlockingClient(self.jid.getDomain(), idle_queue, caller=self) - self.con = self.client.connect(self.on_connected, self.on_connection_failed, secure_tuple=('tls', '', '')) + self.con = self.client.connect(self.on_connected, self.on_connection_failed, secure_tuple=('tls', '', '', None)) def send_message(self, to_jid, text): id_ = self.client.send(nbxmpp.protocol.Message(to_jid, text, typ='chat')) diff -r 93e04118f0c9 -r a7f633ee2fc2 nbxmpp/bosh.py --- a/nbxmpp/bosh.py Sun Nov 03 13:47:50 2013 +0100 +++ b/nbxmpp/bosh.py Sun Nov 03 17:55:20 2013 +0100 @@ -37,10 +37,10 @@ class NonBlockingBOSH(NonBlockingTransport): - def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, certs, - xmpp_server, domain, bosh_dict, proxy_creds): - NonBlockingTransport.__init__(self, raise_event, on_disconnect, idlequeue, - estabilish_tls, certs) + def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, + certs, cipher_list, xmpp_server, domain, bosh_dict, proxy_creds): + NonBlockingTransport.__init__(self, raise_event, on_disconnect, + idlequeue, estabilish_tls, certs, cipher_list) self.bosh_sid = None if locale.getdefaultlocale()[0]: diff -r 93e04118f0c9 -r a7f633ee2fc2 nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Sun Nov 03 13:47:50 2013 +0100 +++ b/nbxmpp/client_nb.py Sun Nov 03 17:55:20 2013 +0100 @@ -149,7 +149,7 @@ def connect(self, on_connect, on_connect_failure, hostname=None, port=5222, on_proxy_failure=None, on_stream_error_cb=None, proxy=None, - secure_tuple=('plain', None, None)): + secure_tuple=('tls', None, None, None)): """ Open XMPP connection (open XML streams in both directions) @@ -157,22 +157,25 @@ :param on_connect_failure: called when error occures during connection :param hostname: hostname of XMPP server from SRV request :param port: port number of XMPP server - :param on_proxy_failure: called if error occurres during TCP connection to - proxy server or during proxy connecting process + :param on_proxy_failure: called if error occurres during TCP connection + to proxy server or during proxy connecting process :param proxy: dictionary with proxy data. It should contain at least - values for keys 'host' and 'port' - connection details for proxy serve - and optionally keys 'user' and 'pass' as proxy credentials - :param secure_tuple: tuple of (desired connection type, cacerts, mycerts) - connection type can be 'ssl' - TLS established after TCP connection, - 'tls' - TLS established after negotiation with starttls, or 'plain'. - cacerts, mycerts - see tls_nb.NonBlockingTLS constructor for more - details + values for keys 'host' and 'port' - connection details for proxy + serve and optionally keys 'user' and 'pass' as proxy credentials + :param secure_tuple: tuple of (desired connection type, cacerts, + mycerts, cipher_list) + connection type can be 'ssl' - TLS established after TCP connection, + 'tls' - TLS established after negotiation with starttls, or + 'plain'. + cacerts, mycerts, cipher_list - see tls_nb.NonBlockingTLS + constructor for more details """ self.on_connect = on_connect self.on_connect_failure=on_connect_failure self.on_proxy_failure = on_proxy_failure self.on_stream_error_cb = on_stream_error_cb - self.desired_security, self.cacerts, self.mycerts = secure_tuple + self.desired_security, self.cacerts, self.mycerts, self.cipher_list = \ + secure_tuple self.Connection = None self.Port = port self.proxy = proxy @@ -209,6 +212,7 @@ idlequeue=self.idlequeue, estabilish_tls=establish_tls, certs=certs, + cipher_list = self.cipher_list, proxy_creds=(proxy_user, proxy_pass), xmpp_server=(self.xmpp_hostname, self.Port), domain=self.Server, @@ -230,6 +234,7 @@ idlequeue=self.idlequeue, estabilish_tls=establish_tls, certs=certs, + cipher_list = self.cipher_list, proxy_dict=proxy_dict) # plug transport into client as self.Connection diff -r 93e04118f0c9 -r a7f633ee2fc2 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sun Nov 03 13:47:50 2013 +0100 +++ b/nbxmpp/tls_nb.py Sun Nov 03 17:55:20 2013 +0100 @@ -247,21 +247,21 @@ PyOpenSSLWrapper. """ - def __init__(self, cacerts, mycerts): + def __init__(self, cacerts, mycerts, cipher_list): """ :param cacerts: path to pem file with certificates of known XMPP servers - :param mycerts: path to pem file with certificates of user trusted servers + :param mycerts: path to pem file with certificates of user trusted + servers + :param cipher_list: list of ciphers to use when connection to server. If + None is provided, a default list is used: HIGH:!aNULL:!eNULL:RC4-SHA """ PlugIn.__init__(self) self.cacerts = cacerts self.mycerts = mycerts - - # from ssl.h (partial extract) - ssl_h_bits = { "SSL_ST_CONNECT": 0x1000, "SSL_ST_ACCEPT": 0x2000, - "SSL_CB_LOOP": 0x01, "SSL_CB_EXIT": 0x02, - "SSL_CB_READ": 0x04, "SSL_CB_WRITE": 0x08, - "SSL_CB_ALERT": 0x4000, - "SSL_CB_HANDSHAKE_START": 0x10, "SSL_CB_HANDSHAKE_DONE": 0x20} + if cipher_list is None: + self.cipher_list = 'HIGH:!aNULL:!eNULL:RC4-SHA' + else: + self.cipher_list = cipher_list def plugin(self, owner): """ @@ -399,7 +399,7 @@ tcpsock.ssl_errnum = [] tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, self._ssl_verify_callback) - tcpsock._sslContext.set_cipher_list('HIGH:!aNULL:!eNULL:RC4-SHA') + tcpsock._sslContext.set_cipher_list(self.cipher_list) store = tcpsock._sslContext.get_cert_store() self._load_cert_file(self.cacerts, store) self._load_cert_file(self.mycerts, store) diff -r 93e04118f0c9 -r a7f633ee2fc2 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sun Nov 03 13:47:50 2013 +0100 +++ b/nbxmpp/transports_nb.py Sun Nov 03 17:55:20 2013 +0100 @@ -109,7 +109,7 @@ """ def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, - certs): + certs, cipher_list): """ Each trasport class can have different constructor but it has to have at least all the arguments of NonBlockingTransport constructor @@ -117,10 +117,11 @@ :param raise_event: callback for monitoring of sent and received data :param on_disconnect: callback called on disconnection during runtime :param idlequeue: processing idlequeue - :param estabilish_tls: boolean whether to estabilish TLS connection after - TCP connection is done - :param certs: tuple of (cacerts, mycerts) see constructor of - tls_nb.NonBlockingTLS for more details + :param estabilish_tls: boolean whether to estabilish TLS connection + after TCP connection is done + :param certs: tuple of (cacerts, mycerts) see constructor + of tls_nb.NonBlockingTLS for more details + :param cipher_list: list of ciphers used to connect to server """ PlugIn.__init__(self) self.raise_event = raise_event @@ -135,6 +136,7 @@ self.set_state(DISCONNECTED) self.estabilish_tls = estabilish_tls self.certs = certs + self.cipher_list = cipher_list # type of used ssl lib (if any) will be assigned to this member var self.ssl_lib = None self._exported_methods=[self.onreceive, self.set_send_timeout, @@ -293,12 +295,12 @@ estabilish TLS connection. """ def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, - certs, proxy_dict=None): + certs, cipher_list, proxy_dict=None): """ :param proxy_dict: dictionary with proxy data as loaded from config file """ - NonBlockingTransport.__init__(self, raise_event, on_disconnect, idlequeue, - estabilish_tls, certs) + NonBlockingTransport.__init__(self, raise_event, on_disconnect, + idlequeue, estabilish_tls, certs, cipher_list) IdleObject.__init__(self) # queue with messages to be send @@ -409,7 +411,8 @@ NonBlockingTLS module """ cacerts, mycerts = self.certs - result = tls_nb.NonBlockingTLS.get_instance(cacerts, mycerts).PlugIn(self) + result = tls_nb.NonBlockingTLS.get_instance(cacerts, mycerts, + self.cipher_list).PlugIn(self) if result: on_succ() else: @@ -630,8 +633,8 @@ """ def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, - certs, on_http_request_possible, on_persistent_fallback, http_dict, - proxy_dict=None): + certs, cipher_list, on_http_request_possible, on_persistent_fallback, + http_dict, proxy_dict=None): """ :param on_http_request_possible: method to call when HTTP request to socket owned by transport is possible. @@ -640,10 +643,10 @@ :param http_dict: dictionary with data for HTTP request and headers """ NonBlockingTCP.__init__(self, raise_event, on_disconnect, idlequeue, - estabilish_tls, certs, proxy_dict) + estabilish_tls, certs, cipher_list, proxy_dict) self.http_protocol, self.http_host, self.http_port, self.http_path = \ - urisplit(http_dict['http_uri']) + urisplit(http_dict['http_uri']) self.http_protocol = self.http_protocol or 'http' self.http_path = self.http_path or '/' self.http_version = http_dict['http_version']

1 0

python-nbxmpp: [fedor] ephemeral key exchange and enable TLS 1.1...
by Yann Leboulanger 03 Nov '13

03 Nov '13

changeset 93e04118f0c9 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=93e04118f0c9 description: [fedor] ephemeral key exchange and enable TLS 1.1 and TLS 1.2 when connecting using client cert authentification. Fixes #8 diffstat: nbxmpp/tls_nb.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (26 lines): diff -r cabaea232b6e -r 93e04118f0c9 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Mon Sep 09 16:56:14 2013 +0200 +++ b/nbxmpp/tls_nb.py Sun Nov 03 13:47:50 2013 +0100 @@ -355,8 +355,11 @@ conn = tcpsock._owner._caller # FIXME make a checkbox for Client Cert / SSLv23 / TLSv1 # If we are going to use a client cert/key pair for authentication, - # we choose TLSv1 method. - tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD) + # we choose TLSv1* method. + tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) + flags = (OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_NO_SSLv3 + | OpenSSL.SSL.OP_SINGLE_DH_USE) + tcpsock._sslContext.set_options(flags) log.debug('Using client cert and key from %s' % conn.client_cert) try: p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert).read(), @@ -385,7 +388,7 @@ else: # See http://docs.python.org/dev/library/ssl.html tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) - flags = OpenSSL.SSL.OP_NO_SSLv2 + flags = OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_SINGLE_DH_USE try: flags |= OpenSSL.SSL.OP_NO_TICKET except AttributeError, e:

1 0

gajim: [fedor] prefer stronger hash algorithms. Fixes #7541
by Gajim 02 Nov '13

02 Nov '13

changeset 202898e4ed10 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=202898e4ed10 description: [fedor] prefer stronger hash algorithms. Fixes #7541 diffstat: src/common/jingle.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diffs (24 lines): diff -r 76b20f3deb64 -r 202898e4ed10 src/common/jingle.py --- a/src/common/jingle.py Sat Nov 02 17:06:21 2013 +0100 +++ b/src/common/jingle.py Sat Nov 02 21:22:41 2013 +0100 @@ -170,14 +170,14 @@ def __hash_support(self, contact): if contact.supports(nbxmpp.NS_HASHES): - if contact.supports(nbxmpp.NS_HASHES_MD5): - return 'md5' + if contact.supports(nbxmpp.NS_HASHES_SHA512): + return 'sha-512' + elif contact.supports(nbxmpp.NS_HASHES_SHA256): + return 'sha-256' elif contact.supports(nbxmpp.NS_HASHES_SHA1): return 'sha-1' - elif contact.supports(nbxmpp.NS_HASHES_SHA256): - return 'sha-256' - elif contact.supports(nbxmpp.NS_HASHES_SHA512): - return 'sha-512' + elif contact.supports(nbxmpp.NS_HASHES_MD5): + return 'md5' return None def iter_jingle_sessions(self, jid, sid=None, media=None):

1 0

gajim: use ―*20 instead of gajim-muc-separator.png. See #7476
by Gajim 02 Nov '13

02 Nov '13

changeset 76b20f3deb64 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=76b20f3deb64 description: use ―*20 instead of gajim-muc-separator.png. See #7476 diffstat: icons/hicolor/16x16/status/gajim-muc_separator.png | Bin src/conversation_textview.py | 12 +++--------- src/htmltextview.py | 15 ++------------- 3 files changed, 5 insertions(+), 22 deletions(-) diffs (81 lines): diff -r e9b3d913e455 -r 76b20f3deb64 icons/hicolor/16x16/status/gajim-muc_separator.png Binary file icons/hicolor/16x16/status/gajim-muc_separator.png has changed diff -r e9b3d913e455 -r 76b20f3deb64 src/conversation_textview.py --- a/src/conversation_textview.py Sat Nov 02 16:09:12 2013 +0100 +++ b/src/conversation_textview.py Sat Nov 02 17:06:21 2013 +0100 @@ -169,8 +169,6 @@ ) ) - FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-muc_separator') MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check') # smooth scroll constants @@ -325,8 +323,6 @@ self.xep0184_warning_tooltip = tooltips.BaseTooltip() self.line_tooltip = tooltips.BaseTooltip() - # use it for hr too - self.tv.focus_out_line_pixbuf = ConversationTextview.FOCUS_OUT_LINE_PIXBUF self.smooth_id = None self.just_cleared = False @@ -580,7 +576,7 @@ self.focus_out_end_mark) begin_iter_for_previous_line = end_iter_for_previous_line.copy() # img_char+1 (the '\n') - begin_iter_for_previous_line.backward_chars(2) + begin_iter_for_previous_line.backward_chars(21) # remove focus out line buffer_.delete(begin_iter_for_previous_line, @@ -589,14 +585,12 @@ # add the new focus out line end_iter = buffer_.get_end_iter() - buffer_.insert(end_iter, '\n') - buffer_.insert_pixbuf(end_iter, - ConversationTextview.FOCUS_OUT_LINE_PIXBUF) + buffer_.insert(end_iter, '\n' + '―' * 20) end_iter = buffer_.get_end_iter() before_img_iter = end_iter.copy() # one char back (an image also takes one char) - before_img_iter.backward_char() + before_img_iter.backward_chars(20) buffer_.apply_tag_by_name('focus-out-line', before_img_iter, end_iter) self.allow_focus_out_line = False diff -r e9b3d913e455 -r 76b20f3deb64 src/htmltextview.py --- a/src/htmltextview.py Sat Nov 02 16:09:12 2013 +0100 +++ b/src/htmltextview.py Sat Nov 02 17:06:21 2013 +0100 @@ -762,15 +762,8 @@ elif name == 'hr': #FIXME: plenty of unused attributes (width, height,...) :) self._jump_line() - try: - if self.conv_textbuf: - self.conv_textbuf.insert_pixbuf(self.iter, - self.conv_textview.focus_out_line_pixbuf) - else: - self._insert_text(u'\u2550'*40) - self._jump_line() - except Exception, e: - log.debug(str('Error in hr'+e)) + self._insert_text(u'\u2015'*40) + self._jump_line() elif name in LIST_ELEMS: self.list_counters.pop() elif name == 'li': @@ -1100,10 +1093,6 @@ htmlview = ConversationTextview(None) - path = gtkgui_helpers.get_icon_path('gajim-muc_separator') - # use this for hr - htmlview.tv.focus_out_line_pixbuf = gtk.gdk.pixbuf_new_from_file(path) - tooltip = tooltips.BaseTooltip() def on_textview_motion_notify_event(widget, event):

1 0

gajim: fix computing hash once socket is correctly closed
by Gajim 02 Nov '13

02 Nov '13

changeset e9b3d913e455 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=e9b3d913e455 description: fix computing hash once socket is correctly closed diffstat: src/common/socks5.py | 1 + src/gui_interface.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diffs (29 lines): diff -r adf85c2a5f54 -r e9b3d913e455 src/common/socks5.py --- a/src/common/socks5.py Sat Nov 02 09:00:16 2013 +0100 +++ b/src/common/socks5.py Sat Nov 02 16:09:12 2013 +0100 @@ -379,6 +379,7 @@ self.idlequeue.remove_timeout(reader.fd) if do_disconnect: reader.disconnect() + del self.readers[key] if not remove_all: break else: diff -r adf85c2a5f54 -r e9b3d913e455 src/gui_interface.py --- a/src/gui_interface.py Sat Nov 02 09:00:16 2013 +0100 +++ b/src/gui_interface.py Sat Nov 02 16:09:12 2013 +0100 @@ -996,13 +996,13 @@ return if file_props.type_ == 'r' and file_props.hash_: # we receive a file + gajim.socks5queue.remove_receiver(file_props.sid, True, True) # we compare hashes if file_props.session_type == 'jingle': # Compare hashes in a new thread self.hashThread = Thread(target=self.__compare_hashes, args=(account, file_props)) self.hashThread.start() - gajim.socks5queue.remove_receiver(file_props.sid, True, True) else: # we send a file jid = unicode(file_props.receiver) gajim.socks5queue.remove_sender(file_props.sid, True, True)

1 0

gajim: file_props.size is an integer
by Gajim 02 Nov '13

02 Nov '13

changeset adf85c2a5f54 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=adf85c2a5f54 description: file_props.size is an integer diffstat: src/common/connection_handlers_events.py | 4 ++-- src/common/jingle_content.py | 2 +- src/common/socks5.py | 6 +++--- src/filetransfers_window.py | 11 ++++++----- 4 files changed, 12 insertions(+), 11 deletions(-) diffs (119 lines): diff -r 09d61510d6c3 -r adf85c2a5f54 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Nov 01 20:00:28 2013 +0100 +++ b/src/common/connection_handlers_events.py Sat Nov 02 09:00:16 2013 +0100 @@ -2072,7 +2072,7 @@ if name == 'name': self.file_props.name = val if name == 'size': - self.file_props.size = val + self.file_props.size = int(val) if name == 'hash': self.file_props.algo = child.getAttr('algo') self.file_props.hash_ = val @@ -2113,7 +2113,7 @@ if name == 'name': self.file_props.name = val if name == 'size': - self.file_props.size = val + self.file_props.size = int(val) mime_type = si.getAttr('mime-type') if mime_type is not None: self.file_props.mime_type = mime_type diff -r 09d61510d6c3 -r adf85c2a5f54 src/common/jingle_content.py --- a/src/common/jingle_content.py Fri Nov 01 20:00:28 2013 +0100 +++ b/src/common/jingle_content.py Sat Nov 02 09:00:16 2013 +0100 @@ -193,7 +193,7 @@ else: # if the file is less than 10 mb, then it is small # lets calculate it right away - if int(self.file_props.size) < 10000000 and not \ + if self.file_props.size < 10000000 and not \ self.file_props.hash_: h = self._calcHash() file_tag.addChild(node=h) diff -r 09d61510d6c3 -r adf85c2a5f54 src/common/socks5.py --- a/src/common/socks5.py Fri Nov 01 20:00:28 2013 +0100 +++ b/src/common/socks5.py Sat Nov 02 09:00:16 2013 +0100 @@ -646,7 +646,7 @@ self.file_props.last_time self.file_props.last_time = current_time self.file_props.received_len = self.size - if self.size >= int(self.file_props.size): + if self.size >= self.file_props.size: self.state = 8 # end connection self.file_props.error = 0 self.disconnect() @@ -688,7 +688,7 @@ self.file_props.last_time = current_time self.file_props.received_len += lenn self.remaining_buff = '' - if self.file_props.received_len == int(self.file_props.size): + if self.file_props.received_len == self.file_props.size: self.rem_fd(fd) self.disconnect() self.file_props.error = 0 @@ -728,7 +728,7 @@ self.disconnect() self.file_props.error = -6 # file system error return 0 - if self.file_props.received_len >= int(self.file_props.size): + if self.file_props.received_len >= self.file_props.size: # transfer completed self.rem_fd(fd) self.disconnect() diff -r 09d61510d6c3 -r adf85c2a5f54 src/filetransfers_window.py --- a/src/filetransfers_window.py Fri Nov 01 20:00:28 2013 +0100 +++ b/src/filetransfers_window.py Sat Nov 02 09:00:16 2013 +0100 @@ -408,6 +408,7 @@ propose_resume=not dl_finished, on_response=on_response, transient_for=dialog2) dialog.set_destroy_with_parent(True) + return else: dirname = os.path.dirname(file_path) if not os.access(dirname, os.W_OK) and os.name != 'nt': @@ -489,7 +490,7 @@ file_props.completed = True text = self._format_percent(100) received_size = int(file_props.received_len) - full_size = int(file_props.size) + full_size = file_props.size text += helpers.convert_bytes(received_size) + '/' + \ helpers.convert_bytes(full_size) self.model.set(iter_, C_PROGRESS, text) @@ -498,7 +499,7 @@ self.model.set(iter_, C_PULSE, 1) text = _('Checking file...') + '\n' received_size = int(file_props.received_len) - full_size = int(file_props.size) + full_size = file_props.size text += helpers.convert_bytes(received_size) + '/' + \ helpers.convert_bytes(full_size) self.model.set(iter_, C_PROGRESS, text) @@ -512,7 +513,7 @@ elif status == 'hash_error': text = _('File error') + '\n' received_size = int(file_props.received_len) - full_size = int(file_props.size) + full_size = file_props.size text += helpers.convert_bytes(received_size) + '/' + \ helpers.convert_bytes(full_size) self.model.set(iter_, C_PROGRESS, text) @@ -602,7 +603,7 @@ Change the progress of a transfer with new transfered size """ file_props = FilesProp.getFilePropByType(typ, sid) - full_size = int(file_props.size) + full_size = file_props.size if full_size == 0: percent = 0 else: @@ -711,7 +712,7 @@ file_props.type_ = 's' file_props.desc = file_desc file_props.elapsed_time = 0 - file_props.size = unicode(stat[6]) + file_props.size = stat[6] file_props.sender = account file_props.receiver = contact file_props.tt_account = account

1 0

gajim: fix getting correct old message type when restoring last ...
by Gajim 01 Nov '13

01 Nov '13

changeset 09d61510d6c3 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=09d61510d6c3 description: fix getting correct old message type when restoring last conversation. Fixes #7534 diffstat: src/chat_control.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (22 lines): diff -r b88ad3dcad3d -r 09d61510d6c3 src/chat_control.py --- a/src/chat_control.py Fri Nov 01 19:10:49 2013 +0100 +++ b/src/chat_control.py Fri Nov 01 20:00:28 2013 +0100 @@ -3003,14 +3003,14 @@ xhtml = None if row[2].startswith('<body '): xhtml = row[2] + ChatControlBase.print_conversation_line(self, row[2], kind, name, + tim, small_attr, small_attr + ['restored_message'], + small_attr + ['restored_message'], False, + old_kind=local_old_kind, xhtml=xhtml) if row[2].startswith('/me ') or row[2].startswith('/me\n'): local_old_kind = None else: local_old_kind = kind - ChatControlBase.print_conversation_line(self, row[2], kind, name, - tim, small_attr, small_attr + ['restored_message'], - small_attr + ['restored_message'], False, - old_kind=local_old_kind, xhtml=xhtml) if len(rows): self.conv_textview.print_empty_line()

1 0

gajim: correctly show nickname when we restore previous conversa...
by Gajim 01 Nov '13

01 Nov '13

changeset b88ad3dcad3d 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=b88ad3dcad3d description: correctly show nickname when we restore previous conversation lines with chat_merge_consecutive_nickname enabled. Fixes #7534 diffstat: src/chat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 7ba03a1683f2 -r b88ad3dcad3d src/chat_control.py --- a/src/chat_control.py Fri Nov 01 12:08:05 2013 +0100 +++ b/src/chat_control.py Fri Nov 01 19:10:49 2013 +0100 @@ -2978,6 +2978,7 @@ 'remove it (all history will be lost).') % common.logger.LOG_DB_PATH) rows = [] local_old_kind = None + self.conv_textview.just_cleared = True for row in rows: # row[0] time, row[1] has kind, row[2] the message if not row[2]: # message is empty, we don't print it continue

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 2013