Commits

commits@gajim.org

17632 discussions

gajim: une GnomeKeyring vi gobject introspections
by Yann Leboulanger 26 Dec '12

26 Dec '12

changeset 48fe995edbdc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=48fe995edbdc description: une GnomeKeyring vi gobject introspections diffstat: src/common/exceptions.py | 12 ++++ src/common/passwords.py | 125 ++++++++++++++++++++++++++-------------------- 2 files changed, 83 insertions(+), 54 deletions(-) diffs (207 lines): diff -r 43233605baaa -r 48fe995edbdc src/common/exceptions.py --- a/src/common/exceptions.py Wed Dec 26 11:19:36 2012 +0100 +++ b/src/common/exceptions.py Wed Dec 26 11:19:59 2012 +0100 @@ -143,3 +143,15 @@ def __str__(self): return self.text + +class GnomeKeyringError(Exception): + """ + Error with Gnome Keyring + """ + + def __init__(self, error): + Exception.__init__(self) + self.error = error + + def __str__(self): + return str(self.error) diff -r 43233605baaa -r 48fe995edbdc src/common/passwords.py --- a/src/common/passwords.py Wed Dec 26 11:19:36 2012 +0100 +++ b/src/common/passwords.py Wed Dec 26 11:19:59 2012 +0100 @@ -29,11 +29,12 @@ import warnings from common import gajim from common import kwalletbinding +from common.exceptions import GnomeKeyringError USER_HAS_GNOMEKEYRING = False USER_USES_GNOMEKEYRING = False USER_HAS_KWALLETCLI = False -gnomekeyring = None +GnomeKeyring = None class PasswordStorage(object): def get_password(self, account_name): @@ -61,13 +62,15 @@ class GnomePasswordStorage(PasswordStorage): def __init__(self): - self.keyring = gnomekeyring.get_default_keyring_sync() + (err, self.keyring) = GnomeKeyring.get_default_keyring_sync() + if err != GnomeKeyring.Result.OK: + raise GnomeKeyringError(err) if self.keyring is None: self.keyring = 'login' - try: - gnomekeyring.create_sync(self.keyring, None) - except gnomekeyring.AlreadyExistsError: - pass + err = GnomeKeyring.create_sync(self.keyring, None) + if err not in (GnomeKeyring.Result.OK, + GnomeKeyring.Result.KEYRING_ALREADY_EXISTS): + raise GnomeKeyringError(err) def get_password(self, account_name): conf = gajim.config.get_per('accounts', account_name, 'password') @@ -78,62 +81,75 @@ ## migrate the password over to keyring try: self.save_password(account_name, password, update=False) - except gnomekeyring.NoKeyringDaemonError: - ## no keyring daemon: in the future, stop using it - set_storage(SimplePasswordStorage()) + except GnomeKeyringError, e: + if e.error == GnomeKeyring.Result.NO_KEYRING_DAEMON: + ## no keyring daemon: in the future, stop using it + set_storage(SimplePasswordStorage()) return password - try: - server = gajim.config.get_per('accounts', account_name, 'hostname') - user = gajim.config.get_per('accounts', account_name, 'name') - attributes1 = dict(server=str(server), user=str(user), protocol='xmpp') - attributes2 = dict(account_name=str(account_name), gajim=1) - try: - items = gnomekeyring.find_items_sync( - gnomekeyring.ITEM_NETWORK_PASSWORD, attributes1) - except gnomekeyring.Error: - try: - items = gnomekeyring.find_items_sync( - gnomekeyring.ITEM_GENERIC_SECRET, attributes2) - if items: - # We found an old item, move it to new way of storing - password = items[0].secret - self.save_password(account_name, password) - gnomekeyring.item_delete_sync(items[0].keyring, - int(items[0].item_id)) - except gnomekeyring.Error: - items = [] - if len(items) > 1: - warnings.warn("multiple gnome keyring items found for account %s;" - " trying to use the first one..." - % account_name) - if items: - return items[0].secret + server = gajim.config.get_per('accounts', account_name, 'hostname') + user = gajim.config.get_per('accounts', account_name, 'name') + attributes1 = GnomeKeyring.attribute_list_new() + GnomeKeyring.attribute_list_append_string(attributes1, 'server', + str(server)) + GnomeKeyring.attribute_list_append_string(attributes1, 'user', + str(user)) + GnomeKeyring.attribute_list_append_string(attributes1, 'protocol', + 'xmpp') + attributes2 = GnomeKeyring.attribute_list_new() + GnomeKeyring.attribute_list_append_string(attributes2, 'account_name', + str(account_name)) + GnomeKeyring.attribute_list_append_string(attributes2, 'gajim', + '1') + (err, items) = GnomeKeyring.find_items_sync( + GnomeKeyring.ItemType.NETWORK_PASSWORD, attributes1) + if err != GnomeKeyring.Result.OK: + (err, items) = GnomeKeyring.find_items_sync( + GnomeKeyring.ItemType.GENERIC_SECRET, attributes2) + if err == GnomeKeyring.Result.OK and len(items) > 0: + password = items[0].secret + self.save_password(account_name, password) + for item in items: + GnomeKeyring.item_delete_sync(item.keyring, + int(item.item_id)) else: - return None - except gnomekeyring.DeniedError: + items = [] + if len(items) > 1: + warnings.warn("multiple gnome keyring items found for account %s;" + " trying to use the first one..." % account_name) + if items: + return items[0].secret + else: return None - except gnomekeyring.NoKeyringDaemonError: + if err == GnomeKeyring.Result.NO_KEYRING_DAEMON: ## no keyring daemon: in the future, stop using it set_storage(SimplePasswordStorage()) - return None + return None def save_password(self, account_name, password, update=True): server = gajim.config.get_per('accounts', account_name, 'hostname') user = gajim.config.get_per('accounts', account_name, 'name') display_name = _('XMPP account %s@%s') % (user, server) - attributes1 = dict(server=str(server), user=str(user), protocol='xmpp') + attributes1 = GnomeKeyring.attribute_list_new() + GnomeKeyring.attribute_list_append_string(attributes1, 'server', + str(server)) + GnomeKeyring.attribute_list_append_string(attributes1, 'user', + str(user)) + GnomeKeyring.attribute_list_append_string(attributes1, 'protocol', + 'xmpp') if password is None: password = str() - try: - auth_token = gnomekeyring.item_create_sync( - self.keyring, gnomekeyring.ITEM_NETWORK_PASSWORD, - display_name, attributes1, password, update) - except gnomekeyring.DeniedError: - set_storage(SimplePasswordStorage()) - storage.save_password(account_name, password) - return + (err, auth_token) = GnomeKeyring.item_create_sync(self.keyring, + GnomeKeyring.ItemType.NETWORK_PASSWORD, display_name, attributes1, + password, update) + if err != GnomeKeyring.Result.OK: + if err == GnomeKeyring.Result.DENIED: + set_storage(SimplePasswordStorage()) + storage.save_password(account_name, password) + return + else: + raise GnomeKeyringError(err) gajim.config.set_per('accounts', account_name, 'password', - 'gnomekeyring:') + 'gnomekeyring:') if account_name in gajim.connections: gajim.connections[account_name].password = password @@ -181,24 +197,25 @@ global storage if storage is None: # None is only in first time get_storage is called if gajim.config.get('use_gnomekeyring'): - global gnomekeyring + global GnomeKeyring try: - gnomekeyring = __import__('gnomekeyring') + gir = __import__('gi.repository', globals(), locals(), + ['GnomeKeyring'], -1) + GnomeKeyring = gir.GnomeKeyring except ImportError: pass else: global USER_HAS_GNOMEKEYRING global USER_USES_GNOMEKEYRING USER_HAS_GNOMEKEYRING = True - if gnomekeyring.is_available(): + if GnomeKeyring.is_available(): USER_USES_GNOMEKEYRING = True else: USER_USES_GNOMEKEYRING = False if USER_USES_GNOMEKEYRING: try: storage = GnomePasswordStorage() - except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError, - gnomekeyring.CancelledError): + except GnomeKeyringError: storage = None if storage is None: if gajim.config.get('use_kwalletcli'):

1 0

gajim: fix some GTK calls
by Yann Leboulanger 26 Dec '12

26 Dec '12

changeset 43233605baaa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=43233605baaa description: fix some GTK calls diffstat: src/dialogs.py | 2 +- src/roster_window.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diffs (47 lines): diff -r 580833a487c3 -r 43233605baaa src/dialogs.py --- a/src/dialogs.py Tue Dec 25 18:56:05 2012 +0100 +++ b/src/dialogs.py Wed Dec 26 11:19:36 2012 +0100 @@ -235,7 +235,7 @@ cancelbutton.connect('clicked', self.on_cancelbutton_clicked) self.xml.connect_signals(self) - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) self.window.show_all() self.check = bool(checkbuttontext) diff -r 580833a487c3 -r 43233605baaa src/roster_window.py --- a/src/roster_window.py Tue Dec 25 18:56:05 2012 +0100 +++ b/src/roster_window.py Wed Dec 26 11:19:36 2012 +0100 @@ -2279,7 +2279,7 @@ else: # No need to redraw contacts if we're quitting if child_iterA: - self.model[child_iterA][C_AVATAR_PIXBUF] = None + self.model[child_iterA][C_AVATAR_PIXBUF] = '' if account in gajim.con_types: gajim.con_types[account] = None for jid in gajim.contacts.get_jid_list(account): @@ -2343,10 +2343,12 @@ table = {'offline':9, 'connecting':9, 'online':0, 'chat':1, 'away':2, 'xa':3, 'dnd':4, 'invisible':5} + liststore = self.status_combobox.get_model() # we check if there are more options in the combobox that it should # if yes, we remove the first ones - while len(self.status_combobox.get_model()) > len(table)+2: - self.status_combobox.remove_text(0) + while len(liststore) > len(table)+2: + titer = liststore.get_iter_first() + liststore.remove(titer) show = helpers.get_global_show() # temporarily block signal in order not to send status that we show @@ -2356,7 +2358,6 @@ self.status_combobox.set_active(table[show]) else: uf_show = helpers.get_uf_show(show) - liststore = self.status_combobox.get_model() liststore.prepend(['SEPARATOR', None, '', True]) status_combobox_text = uf_show + ' (' + _("desync'ed") +')' liststore.prepend([status_combobox_text,

1 0

gajim: fix config names. Fixes #7276
by Yann Leboulanger 25 Dec '12

25 Dec '12

changeset 580833a487c3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=580833a487c3 description: fix config names. Fixes #7276 diffstat: src/common/connection.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r d115b393d09e -r 580833a487c3 src/common/connection.py --- a/src/common/connection.py Tue Dec 25 18:18:39 2012 +0100 +++ b/src/common/connection.py Tue Dec 25 18:56:05 2012 +0100 @@ -2384,7 +2384,7 @@ if not change_nick: t = p.setTag(nbxmpp.NS_MUC + ' x') tags = {} - timeout = gajim.config.get_per('room', room_jid, + timeout = gajim.config.get_per('rooms', room_jid, 'muc_restore_timeout') if timeout is None or timeout == -2: timeout = gajim.config.get('muc_restore_timeout') @@ -2398,7 +2398,7 @@ last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime( last_date)) tags['since'] = last_date - nb = gajim.config.get_per('room', room_jid, 'muc_restore_lines') + nb = gajim.config.get_per('rooms', room_jid, 'muc_restore_lines') if nb is None or nb == -2: nb = gajim.config.get('muc_restore_lines') if nb >= 0:

1 0

gajim: correctly get SSL certificate from nbxmpp. Fixes #7283
by Yann Leboulanger 25 Dec '12

25 Dec '12

changeset d115b393d09e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d115b393d09e description: correctly get SSL certificate from nbxmpp. Fixes #7283 diffstat: src/common/connection.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (32 lines): diff -r d343c934b40a -r d115b393d09e src/common/connection.py --- a/src/common/connection.py Sun Dec 23 17:48:11 2012 +0100 +++ b/src/common/connection.py Tue Dec 25 18:18:39 2012 +0100 @@ -1334,7 +1334,7 @@ if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, conn=self, - certificate=con.Connection.ssl_certificate, + certificate=con.Connection.ssl_certificate[-1], new_fingerprint=con.Connection.ssl_fingerprint_sha1[ -1])) return True @@ -1342,8 +1342,8 @@ gajim.config.set_per('accounts', self.name, 'ssl_fingerprint_sha1', con.Connection.ssl_fingerprint_sha1[-1]) - if not check_X509.check_certificate(con.Connection.ssl_certificate, - hostname) and '100' not in gajim.config.get_per('accounts', + if not check_X509.check_certificate(con.Connection.ssl_certificate[ + -1], hostname) and '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): txt = _('The authenticity of the %s certificate could be ' 'invalid.\nThe certificate does not cover this domain.') % \ @@ -1352,7 +1352,7 @@ error_text=txt, error_num=100, cert=con.Connection.ssl_cert_pem[-1], fingerprint=con.Connection.ssl_fingerprint_sha1[-1], - certificate=con.Connection.ssl_certificate)) + certificate=con.Connection.ssl_certificate[-1])) return True self._register_handlers(con, con_type)

1 0

gajim: correctly handle SSL errors. Fixes #7252
by Yann Leboulanger 25 Dec '12

25 Dec '12

changeset d343c934b40a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d343c934b40a description: correctly handle SSL errors. Fixes #7252 diffstat: src/common/connection.py | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diffs (74 lines): diff -r 193bd037c983 -r d343c934b40a src/common/connection.py --- a/src/common/connection.py Sun Dec 23 16:23:43 2012 +0100 +++ b/src/common/connection.py Sun Dec 23 17:48:11 2012 +0100 @@ -1308,34 +1308,40 @@ try: errnum = con.Connection.ssl_errnum except AttributeError: - errnum = -1 # we don't have an errnum - if errnum > 0 and str(errnum) not in gajim.config.get_per('accounts', - self.name, 'ignore_ssl_errors').split(): - text = _('The authenticity of the %s certificate could be invalid.' - ) % hostname - if errnum in ssl_error: - text += _('\nSSL Error: %s') % ssl_error[errnum] - else: - text += _('\nUnknown SSL error: %d') % errnum - gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_text=text, error_num=errnum, - cert=con.Connection.ssl_cert_pem, - fingerprint=con.Connection.ssl_fingerprint_sha1, - certificate=con.Connection.ssl_certificate)) - return True + errnum = [] # we don't have an errnum + i = 0 + for er in errnum: + if er > 0 and str(er) not in gajim.config.get_per('accounts', + self.name, 'ignore_ssl_errors').split(): + text = _('The authenticity of the %s certificate could be ' + 'invalid.') % hostname + if er in ssl_error: + text += _('\nSSL Error: %s') % ssl_error[er] + else: + text += _('\nUnknown SSL error: %d') % er + gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, + error_text=text, error_num=er, + cert=con.Connection.ssl_cert_pem[i], + fingerprint=con.Connection.ssl_fingerprint_sha1[i], + certificate=con.Connection.ssl_certificate[i])) + return True + i += 1 if hasattr(con.Connection, 'ssl_fingerprint_sha1'): saved_fingerprint = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1') if saved_fingerprint: # Check sha1 fingerprint - if con.Connection.ssl_fingerprint_sha1 != saved_fingerprint: + if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, - conn=self, certificate=con.Connection.ssl_certificate, - new_fingerprint=con.Connection.ssl_fingerprint_sha1)) + conn=self, + certificate=con.Connection.ssl_certificate, + new_fingerprint=con.Connection.ssl_fingerprint_sha1[ + -1])) return True else: gajim.config.set_per('accounts', self.name, - 'ssl_fingerprint_sha1', con.Connection.ssl_fingerprint_sha1) + 'ssl_fingerprint_sha1', + con.Connection.ssl_fingerprint_sha1[-1]) if not check_X509.check_certificate(con.Connection.ssl_certificate, hostname) and '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): @@ -1344,8 +1350,8 @@ hostname gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, error_text=txt, error_num=100, - cert=con.Connection.ssl_cert_pem, - fingerprint=con.Connection.ssl_fingerprint_sha1, + cert=con.Connection.ssl_cert_pem[-1], + fingerprint=con.Connection.ssl_fingerprint_sha1[-1], certificate=con.Connection.ssl_certificate)) return True

1 0

gajim: fix config names. Fixes #7276
by Yann Leboulanger 25 Dec '12

25 Dec '12

changeset e5fc5cf2b012 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e5fc5cf2b012 description: fix config names. Fixes #7276 diffstat: src/common/connection.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 8e70f3b50b78 -r e5fc5cf2b012 src/common/connection.py --- a/src/common/connection.py Tue Dec 25 18:18:39 2012 +0100 +++ b/src/common/connection.py Tue Dec 25 18:56:05 2012 +0100 @@ -2384,7 +2384,7 @@ if not change_nick: t = p.setTag(nbxmpp.NS_MUC + ' x') tags = {} - timeout = gajim.config.get_per('room', room_jid, + timeout = gajim.config.get_per('rooms', room_jid, 'muc_restore_timeout') if timeout is None or timeout == -2: timeout = gajim.config.get('muc_restore_timeout') @@ -2398,7 +2398,7 @@ last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime( last_date)) tags['since'] = last_date - nb = gajim.config.get_per('room', room_jid, 'muc_restore_lines') + nb = gajim.config.get_per('rooms', room_jid, 'muc_restore_lines') if nb is None or nb == -2: nb = gajim.config.get('muc_restore_lines') if nb >= 0:

1 0

gajim: correctly get SSL certificate from nbxmpp. Fixes #7283
by Yann Leboulanger 25 Dec '12

25 Dec '12

changeset 8e70f3b50b78 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8e70f3b50b78 description: correctly get SSL certificate from nbxmpp. Fixes #7283 diffstat: src/common/connection.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (32 lines): diff -r 1965d691ba63 -r 8e70f3b50b78 src/common/connection.py --- a/src/common/connection.py Sun Dec 23 17:48:11 2012 +0100 +++ b/src/common/connection.py Tue Dec 25 18:18:39 2012 +0100 @@ -1334,7 +1334,7 @@ if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, conn=self, - certificate=con.Connection.ssl_certificate, + certificate=con.Connection.ssl_certificate[-1], new_fingerprint=con.Connection.ssl_fingerprint_sha1[ -1])) return True @@ -1342,8 +1342,8 @@ gajim.config.set_per('accounts', self.name, 'ssl_fingerprint_sha1', con.Connection.ssl_fingerprint_sha1[-1]) - if not check_X509.check_certificate(con.Connection.ssl_certificate, - hostname) and '100' not in gajim.config.get_per('accounts', + if not check_X509.check_certificate(con.Connection.ssl_certificate[ + -1], hostname) and '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): txt = _('The authenticity of the %s certificate could be ' 'invalid.\nThe certificate does not cover this domain.') % \ @@ -1352,7 +1352,7 @@ error_text=txt, error_num=100, cert=con.Connection.ssl_cert_pem[-1], fingerprint=con.Connection.ssl_fingerprint_sha1[-1], - certificate=con.Connection.ssl_certificate)) + certificate=con.Connection.ssl_certificate[-1])) return True self._register_handlers(con, con_type)

1 0

python-nbxmpp: update xep-300 to the lastest version
by Jefry Lagrange 24 Dec '12

24 Dec '12

changeset 5812cedb80f0 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=5812cedb80f0 description: update xep-300 to the lastest version diffstat: nbxmpp/protocol.py | 43 +++++++++++++++++++------------------------ 1 files changed, 19 insertions(+), 24 deletions(-) diffs (100 lines): diff -r 7a4fd6fbf98c -r 5812cedb80f0 nbxmpp/protocol.py --- a/nbxmpp/protocol.py Sun Dec 23 17:47:21 2012 +0100 +++ b/nbxmpp/protocol.py Mon Dec 24 14:55:21 2012 -0400 @@ -162,12 +162,12 @@ 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' NS_HASHES_SHA512 = 'urn:xmpp:hash-function-textual-names:sha-512' - + xmpp_stream_error_conditions = ''' bad-format -- -- -- The entity has sent XML that cannot be processed. bad-namespace-prefix -- -- -- The entity has sent a namespace prefix that is unsupported, or has sent no namespace prefix on an element that requires such a prefix. @@ -1037,12 +1037,12 @@ attrs={'id': self.getID()}) iq.setQuery(self.getQuery().getName()).setNamespace(self.getQueryNS()) return iq - -class Hashes(Node): + +class Hashes(Node): """ Hash elements for various XEPs as defined in XEP-300 """ - + """ RECOMENDED HASH USE: Algorithm Support @@ -1053,14 +1053,14 @@ SHA-256 MUST SHA-512 SHOULD """ - + 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): """ Calculate the hash and add it. It is preferable doing it here @@ -1078,12 +1078,12 @@ hl = hashlib.sha256() elif algo == 'sha-512': hl = hashlib.sha512() - + if hl: hl.update(file_string) hash_ = hl.hexdigest() else: # if it is a file - + if algo == 'md5': hl = hashlib.md5() elif algo == 'sha-1': @@ -1092,23 +1092,18 @@ hl = hashlib.sha256() elif algo == 'sha-512': hl = hashlib.sha512() - + if hl: for line in file_string: hl.update(line) hash_ = hl.hexdigest() - - return hash_ - + + 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): """ Acknowledgement elements for Stream Management

1 0

gajim: correctly handle SSL errors. Fixes #7252
by Yann Leboulanger 23 Dec '12

23 Dec '12

changeset 1965d691ba63 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1965d691ba63 description: correctly handle SSL errors. Fixes #7252 diffstat: src/common/connection.py | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diffs (74 lines): diff -r 21ba342ff001 -r 1965d691ba63 src/common/connection.py --- a/src/common/connection.py Sun Dec 16 23:53:32 2012 +0100 +++ b/src/common/connection.py Sun Dec 23 17:48:11 2012 +0100 @@ -1308,34 +1308,40 @@ try: errnum = con.Connection.ssl_errnum except AttributeError: - errnum = -1 # we don't have an errnum - if errnum > 0 and str(errnum) not in gajim.config.get_per('accounts', - self.name, 'ignore_ssl_errors').split(): - text = _('The authenticity of the %s certificate could be invalid.' - ) % hostname - if errnum in ssl_error: - text += _('\nSSL Error: %s') % ssl_error[errnum] - else: - text += _('\nUnknown SSL error: %d') % errnum - gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_text=text, error_num=errnum, - cert=con.Connection.ssl_cert_pem, - fingerprint=con.Connection.ssl_fingerprint_sha1, - certificate=con.Connection.ssl_certificate)) - return True + errnum = [] # we don't have an errnum + i = 0 + for er in errnum: + if er > 0 and str(er) not in gajim.config.get_per('accounts', + self.name, 'ignore_ssl_errors').split(): + text = _('The authenticity of the %s certificate could be ' + 'invalid.') % hostname + if er in ssl_error: + text += _('\nSSL Error: %s') % ssl_error[er] + else: + text += _('\nUnknown SSL error: %d') % er + gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, + error_text=text, error_num=er, + cert=con.Connection.ssl_cert_pem[i], + fingerprint=con.Connection.ssl_fingerprint_sha1[i], + certificate=con.Connection.ssl_certificate[i])) + return True + i += 1 if hasattr(con.Connection, 'ssl_fingerprint_sha1'): saved_fingerprint = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1') if saved_fingerprint: # Check sha1 fingerprint - if con.Connection.ssl_fingerprint_sha1 != saved_fingerprint: + if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, - conn=self, certificate=con.Connection.ssl_certificate, - new_fingerprint=con.Connection.ssl_fingerprint_sha1)) + conn=self, + certificate=con.Connection.ssl_certificate, + new_fingerprint=con.Connection.ssl_fingerprint_sha1[ + -1])) return True else: gajim.config.set_per('accounts', self.name, - 'ssl_fingerprint_sha1', con.Connection.ssl_fingerprint_sha1) + 'ssl_fingerprint_sha1', + con.Connection.ssl_fingerprint_sha1[-1]) if not check_X509.check_certificate(con.Connection.ssl_certificate, hostname) and '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): @@ -1344,8 +1350,8 @@ hostname gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, error_text=txt, error_num=100, - cert=con.Connection.ssl_cert_pem, - fingerprint=con.Connection.ssl_fingerprint_sha1, + cert=con.Connection.ssl_cert_pem[-1], + fingerprint=con.Connection.ssl_fingerprint_sha1[-1], certificate=con.Connection.ssl_certificate)) return True

1 0

python-nbxmpp: store all SSL errors
by Yann Leboulanger 23 Dec '12

23 Dec '12

changeset 7a4fd6fbf98c in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=7a4fd6fbf98c description: store all SSL errors diffstat: nbxmpp/tls_nb.py | 12 ++++++------ nbxmpp/transports_nb.py | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diffs (45 lines): diff -r dacd58839ca8 -r 7a4fd6fbf98c nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sun Dec 09 21:08:11 2012 +0100 +++ b/nbxmpp/tls_nb.py Sun Dec 23 17:47:21 2012 +0100 @@ -393,7 +393,7 @@ flags |= 16384 tcpsock._sslContext.set_options(flags) - tcpsock.ssl_errnum = 0 + tcpsock.ssl_errnum = [0] tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, self._ssl_verify_callback) try: @@ -449,11 +449,11 @@ def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): # Exceptions can't propagate up through this callback, so print them here. try: - self._owner.ssl_fingerprint_sha1 = cert.digest('sha1') - self._owner.ssl_certificate = cert - self._owner.ssl_errnum = errnum - self._owner.ssl_cert_pem = OpenSSL.crypto.dump_certificate( - OpenSSL.crypto.FILETYPE_PEM, cert) + self._owner.ssl_fingerprint_sha1.append(cert.digest('sha1')) + self._owner.ssl_certificate.append(cert) + self._owner.ssl_errnum.append(errnum) + self._owner.ssl_cert_pem.append(OpenSSL.crypto.dump_certificate( + OpenSSL.crypto.FILETYPE_PEM, cert)) return True except: log.error("Exception caught in _ssl_info_callback:", exc_info=True) diff -r dacd58839ca8 -r 7a4fd6fbf98c nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sun Dec 09 21:08:11 2012 +0100 +++ b/nbxmpp/transports_nb.py Sun Dec 23 17:47:21 2012 +0100 @@ -310,6 +310,12 @@ self.proxy_dict = proxy_dict self.on_remote_disconnect = self.disconnect + # ssl variables + self.ssl_fingerprint_sha1 = [] + self.ssl_certificate = [] + self.ssl_errnum = [] + self.ssl_cert_pem = [] + # FIXME: transport should not be aware xmpp def start_disconnect(self): NonBlockingTransport.start_disconnect(self)

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