Commits August 2007

commits@gajim.org

7 participants
239 discussions

[commit-gajim] r8585 - trunk/src/common
by asterix＠gajim.org 29 Aug '07

29 Aug '07

Author: asterix Date: 2007-08-29 17:42:37 +0200 (Wed, 29 Aug 2007) New Revision: 8585 Modified: trunk/src/common/proxy65_manager.py Log: fixes large WCPU footprint under freebsd. fixes #1963 Modified: trunk/src/common/proxy65_manager.py =================================================================== --- trunk/src/common/proxy65_manager.py 2007-08-29 09:55:55 UTC (rev 8584) +++ trunk/src/common/proxy65_manager.py 2007-08-29 15:42:37 UTC (rev 8585) @@ -253,7 +253,8 @@ self._recv=self._sock.recv except Exception, ee: (errnum, errstr) = ee - if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): + # 56 is for freebsd + if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK, 56): # still trying to connect return # win32 needs this

1 0

[commit-gajim] r8584 - in trunk: data/glade src
by asterix＠gajim.org 29 Aug '07

29 Aug '07

Author: asterix Date: 2007-08-29 11:55:55 +0200 (Wed, 29 Aug 2007) New Revision: 8584 Modified: trunk/data/glade/service_discovery_window.glade trunk/src/disco.py Log: remove unused filter entry in disco window Modified: trunk/data/glade/service_discovery_window.glade =================================================================== --- trunk/data/glade/service_discovery_window.glade 2007-08-29 09:12:41 UTC (rev 8583) +++ trunk/data/glade/service_discovery_window.glade 2007-08-29 09:55:55 UTC (rev 8584) @@ -62,16 +62,22 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="label224"> + <widget class="GtkComboBoxEntry" id="address_comboboxentry"> <property name="visible">True</property> - <property name="label" translatable="yes">_Address:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">address_comboboxentry</property> + <property name="items" translatable="yes"></property> + <signal name="changed" handler="on_address_comboboxentry_changed"/> + <signal name="key_press_event" handler="on_address_comboboxentry_key_press_event"/> + <child internal-child="entry"> + <widget class="GtkEntry" id="comboboxentry-entry1"> + </widget> + </child> </widget> <packing> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -127,22 +133,16 @@ </packing> </child> <child> - <widget class="GtkComboBoxEntry" id="address_comboboxentry"> + <widget class="GtkLabel" id="label224"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> - <signal name="changed" handler="on_address_comboboxentry_changed"/> - <signal name="key_press_event" handler="on_address_comboboxentry_key_press_event"/> - <child internal-child="entry"> - <widget class="GtkEntry" id="comboboxentry-entry1"> - </widget> - </child> + <property name="label" translatable="yes">_Address:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">address_comboboxentry</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options">GTK_FILL</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> </widget> @@ -172,41 +172,6 @@ </packing> </child> <child> - <widget class="GtkHBox" id="filter_hbox"> - <property name="visible">True</property> - <property name="no_show_all">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkLabel" id="label361"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Filter:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">filter_entry</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="filter_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> - <signal name="changed" handler="on_filter_entry_changed"/> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <child> <widget class="GtkHBox" id="hbox2994"> <property name="visible">True</property> <property name="spacing">12</property> @@ -260,7 +225,7 @@ <packing> <property name="expand">False</property> <property name="padding">2</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> </widget> Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2007-08-29 09:12:41 UTC (rev 8583) +++ trunk/src/disco.py 2007-08-29 09:55:55 UTC (rev 8584) @@ -444,7 +444,6 @@ self.style_event_id = 0 self.banner.realize() self.paint_banner() - self.filter_hbox = self.xml.get_widget('filter_hbox') self.action_buttonbox = self.xml.get_widget('action_buttonbox') # Address combobox

1 0

[commit-gajim] r8583 - trunk/src
by asterix＠gajim.org 29 Aug '07

29 Aug '07

Author: asterix Date: 2007-08-29 11:12:41 +0200 (Wed, 29 Aug 2007) New Revision: 8583 Modified: trunk/src/dialogs.py Log: fix widget visibility in add new contct dialog Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-08-29 06:08:06 UTC (rev 8582) +++ trunk/src/dialogs.py 2007-08-29 09:12:41 UTC (rev 8583) @@ -480,6 +480,7 @@ return location['add_contact'] = self self.xml = gtkgui_helpers.get_glade('add_new_contact_window.glade') + self.xml.signal_autoconnect(self) self.window = self.xml.get_widget('add_new_contact_window') for w in ('account_combobox', 'account_hbox', 'account_label', 'uid_label', 'uid_entry', 'protocol_combobox', 'protocol_jid_combobox', @@ -551,7 +552,6 @@ self.auto_authorize_checkbutton.show() liststore = gtk.ListStore(str) self.protocol_jid_combobox.set_model(liststore) - self.xml.signal_autoconnect(self) if jid: type_ = gajim.get_transport_name_from_jid(jid) if not type_:

1 0

[commit-gajim] r8582 - trunk/src/common
by bct＠gajim.org 29 Aug '07

29 Aug '07

Author: bct Date: 2007-08-29 08:08:06 +0200 (Wed, 29 Aug 2007) New Revision: 8582 Modified: trunk/src/common/connection_handlers.py Log: fix determining whether a message was encrypted Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-08-28 19:38:42 UTC (rev 8581) +++ trunk/src/common/connection_handlers.py 2007-08-29 06:08:06 UTC (rev 8582) @@ -1531,7 +1531,6 @@ if not no_log_for: no_log_for = '' no_log_for = no_log_for.split() - encrypted = False chatstate = None encTag = msg.getTag('x', namespace = common.xmpp.NS_ENCRYPTED) decmsg = ''

1 0

[commit-gajim] r8581 - trunk/src/common
by roidelapluie＠gajim.org 28 Aug '07

28 Aug '07

Author: roidelapluie Date: 2007-08-28 21:38:42 +0200 (Tue, 28 Aug 2007) New Revision: 8581 Modified: trunk/src/common/stanza_session.py Log: [misc] Fix a coding issue. Fix #3399. Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2007-08-28 18:44:31 UTC (rev 8580) +++ trunk/src/common/stanza_session.py 2007-08-28 19:38:42 UTC (rev 8581) @@ -41,7 +41,7 @@ self.negotiated = {} def generate_thread_id(self): - return "".join([random.choice(string.letters) for x in xrange(0,32)]) + return "".join([random.choice(string.ascii_letters) for x in xrange(0,32)]) def send(self, msg): if self.thread_id:

1 0

[commit-gajim] r8580 - trunk/src
by roidelapluie＠gajim.org 28 Aug '07

28 Aug '07

Author: roidelapluie Date: 2007-08-28 20:44:31 +0200 (Tue, 28 Aug 2007) New Revision: 8580 Modified: trunk/src/roster_window.py Log: Change theme for minimized controls when combobox is changed in config window. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-08-27 13:46:25 UTC (rev 8579) +++ trunk/src/roster_window.py 2007-08-28 18:44:31 UTC (rev 8580) @@ -4486,6 +4486,8 @@ for account in gajim.connections: for addr in gajim.interface.instances[account]['disco']: gajim.interface.instances[account]['disco'][addr].paint_banner() + for ctrl in gajim.interface.minimized_controls[account].values(): + ctrl.repaint_themed_widgets() def on_show_offline_contacts_menuitem_activate(self, widget): '''when show offline option is changed:

1 0

[commit-gajim] r8579 - trunk/src
by asterix＠gajim.org 27 Aug '07

27 Aug '07

Author: asterix Date: 2007-08-27 15:46:25 +0200 (Mon, 27 Aug 2007) New Revision: 8579 Modified: trunk/src/features_window.py Log: show pycrypto in features window Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2007-08-27 13:45:57 UTC (rev 8578) +++ trunk/src/features_window.py 2007-08-27 13:46:25 UTC (rev 8579) @@ -89,6 +89,10 @@ _('Transform LaTeX espressions between $$ $$.'), _('Requires texlive-latex-base, dvips and imagemagick. You have to set \'use_latex\' to True in the Advanced Configuration Editor.'), _('Feature not available under Windows.')), + _('End to end encryption'): (self.pycrypto_available, + _('Encrypting chatmessages.'), + _('Requires python-crypto.'), + _('Requires python-crypto.')), } # name, supported @@ -274,3 +278,7 @@ if exitcode == 0: return True return False + + def pycrypto_available(self): + from common import gajim + return gajim.HAVE_PYCRYPTO

1 0

[commit-gajim] r8578 - trunk/src/common
by asterix＠gajim.org 27 Aug '07

27 Aug '07

Author: asterix Date: 2007-08-27 15:45:57 +0200 (Mon, 27 Aug 2007) New Revision: 8578 Modified: trunk/src/common/gajim.py Log: fix import error Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2007-08-27 13:36:24 UTC (rev 8577) +++ trunk/src/common/gajim.py 2007-08-27 13:45:57 UTC (rev 8578) @@ -139,12 +139,13 @@ HAVE_PYCRYPTO = True try: from Crypto.PublicKey.RSA import generate + import os except ImportError: HAVE_PYCRYPTO = False else: # public key for XEP-0116 #FIXME os.urandom is not a cryptographic PRNG - pubkey = Crypto.PublicKey.RSA.generate(384, os.urandom) + pubkey = generate(384, os.urandom) def get_nick_from_jid(jid): pos = jid.find('@')

1 0

[commit-gajim] r8577 - in trunk: . src src/common
by asterix＠gajim.org 27 Aug '07

27 Aug '07

Author: asterix Date: 2007-08-27 15:36:24 +0200 (Mon, 27 Aug 2007) New Revision: 8577 Modified: trunk/README.html trunk/src/chat_control.py trunk/src/common/connection_handlers.py trunk/src/common/gajim.py trunk/src/common/stanza_session.py trunk/src/gajim.py Log: make python-crypto an optional dependency Modified: trunk/README.html =================================================================== --- trunk/README.html 2007-08-27 12:36:55 UTC (rev 8576) +++ trunk/README.html 2007-08-27 13:36:24 UTC (rev 8577) @@ -29,6 +29,7 @@ <h2>Optional Runtime Requirements</h2> <ul> <li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> +<li>python-crypto to enable End to end encryption</li> <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> <li>dnsutils (or whatever package provides the nslookup binary) for SRV support; if you don't know what that is, you don't need it</li> <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li> Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-08-27 12:36:55 UTC (rev 8576) +++ trunk/src/chat_control.py 2007-08-27 13:36:24 UTC (rev 8577) @@ -1592,8 +1592,11 @@ toggle_gpg_menuitem.set_property('sensitive', is_sensitive) # TODO: check that the remote client supports e2e - isactive = int(self.session != None and self.session.enable_encryption) - toggle_e2e_menuitem.set_active(isactive) + if not gajim.HAVE_PYCRYPTO: + toggle_e2e_menuitem.set_sensitive(False) + else: + isactive = int(self.session != None and self.session.enable_encryption) + toggle_e2e_menuitem.set_active(isactive) # If we don't have resource, we can't do file transfer # in transports, contact holds our info we need to disable it too Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-08-27 12:36:55 UTC (rev 8576) +++ trunk/src/common/connection_handlers.py 2007-08-27 13:36:24 UTC (rev 8577) @@ -1490,7 +1490,8 @@ return if msg.getTag('feature') and msg.getTag('feature').namespace == \ common.xmpp.NS_FEATURE: - self._FeatureNegCB(con, msg, session) + if gajim.HAVE_PYCRYPTO: + self._FeatureNegCB(con, msg, session) return if msg.getTag('init') and msg.getTag('init').namespace == \ common.xmpp.NS_ESESSION_INIT: Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2007-08-27 12:36:55 UTC (rev 8576) +++ trunk/src/common/gajim.py 2007-08-27 13:36:24 UTC (rev 8577) @@ -136,6 +136,16 @@ for status in ('online', 'chat', 'away', 'xa', 'dnd', 'invisible'): priority_dict[status] = config.get('autopriority' + status) +HAVE_PYCRYPTO = True +try: + from Crypto.PublicKey.RSA import generate +except ImportError: + HAVE_PYCRYPTO = False +else: + # public key for XEP-0116 + #FIXME os.urandom is not a cryptographic PRNG + pubkey = Crypto.PublicKey.RSA.generate(384, os.urandom) + def get_nick_from_jid(jid): pos = jid.find('@') return jid[:pos] Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2007-08-27 12:36:55 UTC (rev 8576) +++ trunk/src/common/stanza_session.py 2007-08-27 13:36:24 UTC (rev 8577) @@ -14,10 +14,6 @@ from common import dh import xmpp.c14n -from Crypto.Cipher import AES -from Crypto.Hash import HMAC, SHA256 -from Crypto.PublicKey import RSA - import base64 XmlDsig = 'http://www.w3.org/2000/09/xmldsig#' @@ -99,25 +95,31 @@ # we could send an acknowledgement message here, but we won't. self.status = None -# an encrypted stanza negotiation has several states. i've represented them as the following values in the 'status' +if gajim.HAVE_PYCRYPTO: + from Crypto.Cipher import AES + from Crypto.Hash import HMAC, SHA256 + from Crypto.PublicKey import RSA + +# an encrypted stanza negotiation has several states. i've represented them +# as the following values in the 'status' # attribute of the session object: # 1. None: # default state # 2. 'requested-e2e': -# this client has initiated an esession negotiation and is waiting for -# a response +# this client has initiated an esession negotiation and is waiting +# for a response # 3. 'responded-e2e': -# this client has responded to an esession negotiation request and is -# waiting for the initiator to identify itself and complete the +# this client has responded to an esession negotiation request and +# is waiting for the initiator to identify itself and complete the # negotiation # 4. 'identified-alice': -# this client identified itself and is waiting for the responder to +# this client identified itself and is waiting for the responder to # identify itself and complete the negotiation # 5. 'active': -# an encrypted session has been successfully negotiated. messages of -# any of the types listed in 'encryptable_stanzas' should be encrypted -# before they're sent. +# an encrypted session has been successfully negotiated. messages +# of any of the types listed in 'encryptable_stanzas' should be +# encrypted before they're sent. # the transition between these states is handled in gajim.py's # handle_session_negotiation method. @@ -144,7 +146,8 @@ # keep the encrypter updated with my latest cipher key def set_kc_s(self, value): self._kc_s = value - self.encrypter = self.cipher.new(self._kc_s, self.cipher.MODE_CTR, counter=self.encryptcounter) + self.encrypter = self.cipher.new(self._kc_s, self.cipher.MODE_CTR, + counter=self.encryptcounter) def get_kc_s(self): return self._kc_s @@ -152,7 +155,8 @@ # keep the decrypter updated with the other party's latest cipher key def set_kc_o(self, value): self._kc_o = value - self.decrypter = self.cipher.new(self._kc_o, self.cipher.MODE_CTR, counter=self.decryptcounter) + self.decrypter = self.cipher.new(self._kc_o, self.cipher.MODE_CTR, + counter=self.decryptcounter) def get_kc_o(self): return self._kc_o @@ -167,7 +171,8 @@ else: return chr(n) - # convert a large integer to a big-endian bitstring, padded with \x00s to 16 bytes + # convert a large integer to a big-endian bitstring, padded with \x00s to + # 16 bytes def encode_mpi_with_padding(self, n): ret = self.encode_mpi(n) @@ -195,13 +200,16 @@ def sign(self, string): if self.negotiated['sign_algs'] == (XmlDsig + 'rsa-sha256'): hash = self.sha256(string) - return self.encode_mpi(gajim.interface.pubkey.sign(hash, '')[0]) + return self.encode_mpi(gajim.pubkey.sign(hash, '')[0]) def encrypt_stanza(self, stanza): - encryptable = filter(lambda x: x.getName() not in ('error', 'amp', 'thread'), stanza.getChildren()) + encryptable = filter(lambda x: x.getName() not in ('error', 'amp', + 'thread'), stanza.getChildren()) - # XXX can also encrypt contents of <error/> elements in stanzas @type = 'error' - # (except for <defined-condition xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> child elements) + # XXX can also encrypt contents of <error/> elements in stanzas @type = + # 'error' + # (except for <defined-condition + # xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> child elements) old_en_counter = self.c_s @@ -220,7 +228,8 @@ # XXX check for rekey request, handle <key/> elements m_content = ''.join(map(str, c.getChildren())) - c.NT.mac = base64.b64encode(self.hmac(self.km_s, m_content + self.encode_mpi(old_en_counter))) + c.NT.mac = base64.b64encode(self.hmac(self.km_s, m_content + \ + self.encode_mpi(old_en_counter))) return stanza @@ -278,15 +287,18 @@ return self.random_bytes(8) def decrypt_stanza(self, stanza): - c = stanza.getTag(name='c', namespace='http://www.xmpp.org/extensions/xep-0200.html#ns') + c = stanza.getTag(name='c', + namespace='http://www.xmpp.org/extensions/xep-0200.html#ns') stanza.delChild(c) # contents of <c>, minus <mac>, minus whitespace - macable = ''.join(map(str, filter(lambda x: x.getName() != 'mac', c.getChildren()))) + macable = ''.join(map(str, filter(lambda x: x.getName() != 'mac', + c.getChildren()))) received_mac = base64.b64decode(c.getTagData('mac')) - calculated_mac = self.hmac(self.km_o, macable + self.encode_mpi_with_padding(self.c_o)) + calculated_mac = self.hmac(self.km_o, macable + \ + self.encode_mpi_with_padding(self.c_o)) if not calculated_mac == received_mac: raise exceptions.DecryptionError, 'bad signature' @@ -351,7 +363,8 @@ if self.negotiated['sign_algs'] == (XmlDsig + 'rsa-sha256'): keyvalue = parsed.getTag(name='RSAKeyValue', namespace=XmlDsig) - n, e = map(lambda x: self.decode_mpi(base64.b64decode(keyvalue.getTagData(x))), ('Modulus', 'Exponent')) + n, e = map(lambda x: self.decode_mpi(base64.b64decode( + keyvalue.getTagData(x))), ('Modulus', 'Exponent')) eir_pubkey = RSA.construct((n,long(e))) pubkey_o = xmpp.c14n.c14n(keyvalue) @@ -359,7 +372,8 @@ # XXX DSA, etc. raise 'unimplemented' - enc_sig = parsed.getTag(name='SignatureValue', namespace=XmlDsig).getData() + enc_sig = parsed.getTag(name='SignatureValue', + namespace=XmlDsig).getData() signature = (self.decode_mpi(base64.b64decode(enc_sig)),) else: mac_o = self.decrypt(id_o) @@ -390,7 +404,7 @@ def make_identity(self, form, dh_i): if self.negotiated['send_pubkey']: if self.negotiated['sign_algs'] == (XmlDsig + 'rsa-sha256'): - fields = (gajim.interface.pubkey.n, gajim.interface.pubkey.e) + fields = (gajim.pubkey.n, gajim.pubkey.e) cb_fields = map(lambda f: base64.b64encode(self.encode_mpi(f)), fields) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-08-27 12:36:55 UTC (rev 8576) +++ trunk/src/gajim.py 2007-08-27 13:36:24 UTC (rev 8577) @@ -118,7 +118,6 @@ from atom_window import AtomWindow import negotiation -import Crypto.PublicKey.RSA from common import exceptions from common.zeroconf import connection_zeroconf @@ -2765,10 +2764,6 @@ gobject.timeout_add(2000, self.process_connections) gobject.timeout_add(10000, self.read_sleepy) - # public key for XEP-0116 - # XXX os.urandom is not a cryptographic PRNG - self.pubkey = Crypto.PublicKey.RSA.generate(384, os.urandom) - if __name__ == '__main__': def sigint_cb(num, stack): sys.exit(5)

1 0

[commit-gajim] r8576 - trunk/src
by asterix＠gajim.org 27 Aug '07

27 Aug '07

Author: asterix Date: 2007-08-27 14:36:55 +0200 (Mon, 27 Aug 2007) New Revision: 8576 Modified: trunk/src/message_window.py Log: fix dubble disconnect of a handler. self.hid is already disconnected in _on_window_destroy function Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2007-08-27 12:09:07 UTC (rev 8575) +++ trunk/src/message_window.py 2007-08-27 12:36:55 UTC (rev 8576) @@ -349,7 +349,6 @@ gajim.interface.msg_win_mgr._on_window_delete(self.window, None) gajim.interface.msg_win_mgr._on_window_destroy(self.window) # dnd clean up - self.notebook.disconnect(self.hid) self.notebook.drag_dest_unset() self.window.destroy() return # don't show_title, we are dead

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
24
Older →

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 August 2007