Commits November 2013

commits@gajim.org

2 participants
61 discussions

gajim: improve manage bookmark behaviour when copy/pasting room ...
by Gajim 06 Nov '13

06 Nov '13

changeset 53c0972a4ab4 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=53c0972a4ab4 description: improve manage bookmark behaviour when copy/pasting room JID. Fixes room jid checking. Fixes #7547 diffstat: src/config.py | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diffs (57 lines): diff -r c8d945a5b22f -r 53c0972a4ab4 src/config.py --- a/src/config.py Wed Nov 06 21:17:15 2013 +0100 +++ b/src/config.py Wed Nov 06 22:00:21 2013 +0100 @@ -3413,7 +3413,7 @@ nick = helpers.parse_resource(nick) except helpers.InvalidFormat, e: dialogs.ErrorDialog(_('Invalid nickname'), - _('Character not allowed')) + _('Character not allowed'), transient_for=self.window) self.nick_entry.set_text(model[iter_][6]) return True model[iter_][6] = nick @@ -3424,16 +3424,17 @@ return server = widget.get_text().decode('utf-8') if '@' in server: - dialogs.ErrorDialog(_('Invalid server'), _('Character not allowed')) + dialogs.ErrorDialog(_('Invalid server'), _('Character not allowed'), + transient_for=self.window) widget.set_text(server.replace('@', '')) room_jid = self.room_entry.get_text().decode('utf-8').strip() + '@' + \ server.strip() try: - room_jid = helpers.parse_resource(room_jid) + room_jid = helpers.parse_jid(room_jid) except helpers.InvalidFormat, e: dialogs.ErrorDialog(_('Invalid server'), - _('Character not allowed')) + _('Character not allowed'), transient_for=self.window) self.server_entry.set_text(model[iter_][2].split('@')[1]) return True model[iter_][2] = room_jid @@ -3444,16 +3445,18 @@ return room = widget.get_text().decode('utf-8') if '@' in room: - dialogs.ErrorDialog(_('Invalid server'), _('Character not allowed')) - widget.set_text(room.replace('@', '')) + room, server = room.split('@', 1) + widget.set_text(room) + if server: + self.server_entry.set_text(server) + self.server_entry.grab_focus() room_jid = room.strip() + '@' + \ self.server_entry.get_text().decode('utf-8').strip() try: - room_jid = helpers.parse_resource(room_jid) + room_jid = helpers.parse_jid(room_jid) except helpers.InvalidFormat, e: dialogs.ErrorDialog(_('Invalid room'), - _('Character not allowed')) - self.room_entry.set_text(model[iter_][2].split('@')[0]) + _('Character not allowed'), transient_for=self.window) return True model[iter_][2] = room_jid

1 0

gajim: prevent traceback. Fixes #7503
by Gajim 06 Nov '13

06 Nov '13

changeset c8d945a5b22f 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=c8d945a5b22f description: prevent traceback. Fixes #7503 diffstat: src/common/stanza_session.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (27 lines): diff -r 80b6bc2509b8 -r c8d945a5b22f src/common/stanza_session.py --- a/src/common/stanza_session.py Wed Nov 06 19:02:37 2013 +0100 +++ b/src/common/stanza_session.py Wed Nov 06 21:17:15 2013 +0100 @@ -810,7 +810,10 @@ # the offset of the group we chose (need it to match up with the dhhash) group_order = 0 - self.modp = int(form.getField('modp').getOptions()[group_order][1]) + modp_f = form.getField('modp') + if not modp_f: + return + self.modp = int(modp_f.getOptions()[group_order][1]) x.addChild(node=nbxmpp.DataField(name='modp', value=self.modp)) g = dh.generators[self.modp] @@ -818,7 +821,10 @@ self.n_o = base64.b64decode(form['my_nonce']) - dhhashes = form.getField('dhhashes').getValues() + dhhashes_f = form.getField('dhhashes') + if not dhhashes_f: + return + dhhashes = dhhashes_f.getValues() self.negotiated['He'] = base64.b64decode(dhhashes[group_order].encode( 'utf8'))

1 0

gajim: fix variable initialization. Fixes #7551
by Gajim 06 Nov '13

06 Nov '13

changeset 80b6bc2509b8 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=80b6bc2509b8 description: fix variable initialization. Fixes #7551 diffstat: src/disco.py | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diffs (26 lines): diff -r 1361dbec53af -r 80b6bc2509b8 src/disco.py --- a/src/disco.py Wed Nov 06 21:49:27 2013 +0400 +++ b/src/disco.py Wed Nov 06 19:02:37 2013 +0100 @@ -942,14 +942,15 @@ Set the window title based on agent info """ # Set the banner and window title + name = '' if len(identities) > 1: - # Check if an identity with server category is present - for i, _identity in enumerate(identities): - if _identity['category'] == 'server' and 'name' in _identity: - name = _identity['name'] - break - elif 'name' in identities[0]: - name = identities[0]['name'] + # Check if an identity with server category is present + for i, _identity in enumerate(identities): + if _identity['category'] == 'server' and 'name' in _identity: + name = _identity['name'] + break + elif 'name' in identities[0]: + name = identities[0]['name'] if name: self.window._set_window_banner_text(self._get_agent_address(), name)

1 0

gajim: Typo.Fixes #7551
by Gajim 06 Nov '13

06 Nov '13

changeset 1361dbec53af in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=1361dbec53af description: Typo.Fixes #7551 diffstat: src/disco.py | 20 ++++++++++---------- 1 файлов изменено, 10 вставок(+), 10 удалений(-) различия (31 строк): diff -r cab3da8ca8ea -r 1361dbec53af src/disco.py --- a/src/disco.py Tue Nov 05 13:12:38 2013 +0100 +++ b/src/disco.py Wed Nov 06 21:49:27 2013 +0400 @@ -942,17 +942,17 @@ Set the window title based on agent info """ # Set the banner and window title - if len(identities) > 1: - # Check if an identity with server category is present - for i, _identity in enumerate(identities): - if _identity['category'] == 'server' and 'name' in _identity: - name = _identity['name'] - break - elif 'name' in identities[0]: - name = identities[0]['name'] + if len(identities) > 1: + # Check if an identity with server category is present + for i, _identity in enumerate(identities): + if _identity['category'] == 'server' and 'name' in _identity: + name = _identity['name'] + break + elif 'name' in identities[0]: + name = identities[0]['name'] - if name: - self.window._set_window_banner_text(self._get_agent_address(), name) + if name: + self.window._set_window_banner_text(self._get_agent_address(), name) # Add an icon to the banner. pix = self.cache.get_icon(identities, addr=self._get_agent_address())

1 0

gajim-plugins: file sharing. Send offer to jid with resource
by Gajim Plugins 05 Nov '13

05 Nov '13

changeset bff0a35ffdc7 in /home/hg/repos/gajim-plugins author: Jefry Lagrange <jefry.reyes(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=bff0a35ffdc7 description: file sharing. Send offer to jid with resource diffstat: file_sharing/fshare_protocol.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (30 lines): diff -r 1ffb3c9ead46 -r bff0a35ffdc7 file_sharing/fshare_protocol.py --- a/file_sharing/fshare_protocol.py Fri Oct 04 23:52:46 2013 +0400 +++ b/file_sharing/fshare_protocol.py Tue Nov 05 19:26:28 2013 +0000 @@ -118,14 +118,15 @@ # TODO: reply with malformed stanza error pass - def on_toplevel_request(self, stanza, jid): + def on_toplevel_request(self, stanza, fjid): + jid = get_jid_without_resource(fjid) roots = self.plugin.database.get_toplevel_dirs(self.account, jid) items = [] for root in roots: items.append({'type' : 'directory', 'name' : root[0] }) - return self.offer(stanza.getID(), jid, None, items) + return self.offer(stanza.getID(), fjid, None, items) def on_dir_request(self, stanza, fjid, jid, dir_): result = self.plugin.database.get_files_from_dir(self.account, jid, dir_) @@ -139,7 +140,7 @@ return -1 node = stanza.getQuery().getAttr('node') if node is None: - return self.on_toplevel_request(stanza, jid) + return self.on_toplevel_request(stanza, fjid) result = self.plugin.database.get_file(self.account, jid, None, node) if result == []: return self.offer(stanza.getID(), fjid, node, result)

1 0

gajim: don't send receipt answer for forwarded messages. Fixes #...
by Gajim 05 Nov '13

05 Nov '13

changeset cab3da8ca8ea 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=cab3da8ca8ea description: don't send receipt answer for forwarded messages. Fixes #7548 diffstat: src/common/connection_handlers.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 580a87dafae4 -r cab3da8ca8ea src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Nov 05 11:21:56 2013 +0100 +++ b/src/common/connection_handlers.py Tue Nov 05 13:12:38 2013 +0100 @@ -1211,7 +1211,8 @@ gc_contact = gajim.contacts.get_gc_contact(self.name, obj.jid, nick) if obj.receipt_request_tag and gajim.config.get_per('accounts', self.name, 'answer_receipts') and ((contact and contact.sub \ - not in (u'to', u'none')) or gc_contact) and obj.mtype != 'error': + not in (u'to', u'none')) or gc_contact) and obj.mtype != 'error' and \ + not obj.forwarded: receipt = nbxmpp.Message(to=obj.fjid, typ='chat') receipt.setID(obj.id_) receipt.setTag('received', namespace='urn:xmpp:receipts',

1 0

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

05 Nov '13

changeset 580a87dafae4 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=580a87dafae4 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 227c979bebc0 -r 580a87dafae4 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Tue Nov 05 15:04:49 2013 +0400 +++ 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: don't send receipt answer for forwarded messages. Fixes #...
by Gajim 05 Nov '13

05 Nov '13

changeset fd7a48bf7d8a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=fd7a48bf7d8a description: don't send receipt answer for forwarded messages. Fixes #7548 diffstat: src/common/connection_handlers.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 8073f9ceabb5 -r fd7a48bf7d8a src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Nov 05 11:21:56 2013 +0100 +++ b/src/common/connection_handlers.py Tue Nov 05 13:12:38 2013 +0100 @@ -1211,7 +1211,8 @@ gc_contact = gajim.contacts.get_gc_contact(self.name, obj.jid, nick) if obj.receipt_request_tag and gajim.config.get_per('accounts', self.name, 'answer_receipts') and ((contact and contact.sub \ - not in (u'to', u'none')) or gc_contact) and obj.mtype != 'error': + not in (u'to', u'none')) or gc_contact) and obj.mtype != 'error' and \ + not obj.forwarded: receipt = nbxmpp.Message(to=obj.fjid, typ='chat') receipt.setID(obj.id_) receipt.setTag('received', namespace='urn:xmpp:receipts',

1 0

gajim: [Darlan]Set layout_style of buttons Add (gtk-add) Remove ...
by Gajim 05 Nov '13

05 Nov '13

changeset 227c979bebc0 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=227c979bebc0 description: [Darlan]Set layout_style of buttons Add (gtk-add) Remove (gtk-remove) to center. See #7491 diffstat: data/gui/gajim_themes_window.ui | 53 ++++++++++++++++++++-------------------- 1 файлов изменено, 27 вставок(+), 26 удалений(-) различия (217 строк): diff -r 5185f641598e -r 227c979bebc0 data/gui/gajim_themes_window.ui --- a/data/gui/gajim_themes_window.ui Tue Nov 05 14:46:48 2013 +0400 +++ b/data/gui/gajim_themes_window.ui Tue Nov 05 15:04:49 2013 +0400 @@ -65,6 +65,7 @@ <object class="GtkHButtonBox" id="hbuttonbox27"> <property name="visible">True</property> <property name="spacing">6</property> + <property name="layout_style">center</property> <child> <object class="GtkButton" id="add_button"> <property name="label">gtk-add</property> @@ -149,7 +150,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -166,7 +167,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -183,7 +184,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -198,7 +199,7 @@ <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -212,8 +213,8 @@ <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -229,8 +230,8 @@ <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -248,7 +249,7 @@ <property name="right_attach">3</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -270,8 +271,8 @@ <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -293,8 +294,8 @@ <property name="right_attach">3</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -349,7 +350,7 @@ <property name="top_attach">4</property> <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -365,7 +366,7 @@ <property name="top_attach">4</property> <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -381,7 +382,7 @@ <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -394,7 +395,7 @@ <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -407,7 +408,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -423,7 +424,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -436,7 +437,7 @@ <packing> <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -449,7 +450,7 @@ <property name="top_attach">5</property> <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -465,7 +466,7 @@ <property name="top_attach">5</property> <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -479,7 +480,7 @@ <property name="top_attach">7</property> <property name="bottom_attach">8</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -495,7 +496,7 @@ <property name="top_attach">7</property> <property name="bottom_attach">8</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -521,7 +522,7 @@ <property name="top_attach">8</property> <property name="bottom_attach">9</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -537,7 +538,7 @@ <property name="top_attach">8</property> <property name="bottom_attach">9</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child>

1 0

gajim: [Darlan]Set layout_style of buttons Add (gtk-add) Remove ...
by Gajim 05 Nov '13

05 Nov '13

changeset 5185f641598e in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=5185f641598e description: [Darlan]Set layout_style of buttons Add (gtk-add) Remove (gtk-remove) to center. Fixes #7491 diffstat: data/gui/manage_bookmarks_window.ui | 1 + data/gui/manage_proxies_window.ui | 1 + 2 файлов изменено, 2 вставок(+), 0 удалений(-) различия (22 строк): diff -r 1adbc20ab5a1 -r 5185f641598e data/gui/manage_bookmarks_window.ui --- a/data/gui/manage_bookmarks_window.ui Sun Nov 03 17:57:12 2013 +0100 +++ b/data/gui/manage_bookmarks_window.ui Tue Nov 05 14:46:48 2013 +0400 @@ -51,6 +51,7 @@ <object class="GtkHButtonBox" id="hbuttonbox25"> <property name="visible">True</property> <property name="spacing">6</property> + <property name="layout_style">center</property> <child> <object class="GtkButton" id="add_bookmark_button"> <property name="label">gtk-add</property> diff -r 1adbc20ab5a1 -r 5185f641598e data/gui/manage_proxies_window.ui --- a/data/gui/manage_proxies_window.ui Sun Nov 03 17:57:12 2013 +0100 +++ b/data/gui/manage_proxies_window.ui Tue Nov 05 14:46:48 2013 +0400 @@ -64,6 +64,7 @@ <object class="GtkHButtonBox" id="hbuttonbox21"> <property name="visible">True</property> <property name="spacing">6</property> + <property name="layout_style">center</property> <child> <object class="GtkButton" id="add_proxy_button"> <property name="label">gtk-add</property>

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