Author: steve-e Date: 2007-12-31 02:19:08 +0100 (Mon, 31 Dec 2007) New Revision: 9229
Modified: trunk/src/chat_control.py trunk/src/common/connection.py trunk/src/common/helpers.py trunk/src/common/zeroconf/connection_handlers_zeroconf.py trunk/src/common/zeroconf/connection_zeroconf.py Log: Backport some fixes to zeroconf: don't fail on special characters, don't allow gpg usage when it is not secure or even possible Be more verbose when there is a key missmatch.
Mind that presence in zeroconf are not signed, gpg keys have to be assigned manually therefore.
Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-12-31 00:24:59 UTC (rev 9228) +++ trunk/src/chat_control.py 2007-12-31 01:19:08 UTC (rev 9229) @@ -1367,7 +1367,7 @@ if self.gpg_is_active: keyID = contact.keyID encrypted = True - if keyID == '': + if not keyID: keyID = 'UNKNOWN'
chatstates_on = gajim.config.get('outgoing_chat_state_notifications') != \
Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-12-31 00:24:59 UTC (rev 9228) +++ trunk/src/common/connection.py 2007-12-31 01:19:08 UTC (rev 9229) @@ -966,7 +966,7 @@ if keyID == 'UNKNOWN': error = _('Neither the remote presence is signed, nor a key was assigned.') elif keyID[8:] == 'MISMATCH': - error = _('The contact's key does not match the key assigned in Gajim.') + error = _('The contact's key (%s) does not match the key assigned in Gajim.' % keyID[:8]) else: #encrypt msgenc, error = self.gpg.encrypt(msg, [keyID])
Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2007-12-31 00:24:59 UTC (rev 9228) +++ trunk/src/common/helpers.py 2007-12-31 01:19:08 UTC (rev 9229) @@ -1100,7 +1100,7 @@ If the given keyID is None, return UNKNOWN; if the key does not match the assigned key XXXXXXXXMISMATCH is returned. If the key is trusted and not yet assigned, assign it''' if gajim.connections[account].USE_GPG: - if len(keyID) == 16: + if keyID and len(keyID) == 16: keyID = keyID[8:] attached_keys = gajim.config.get_per('accounts', account,
Modified: trunk/src/common/zeroconf/connection_handlers_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2007-12-31 00:24:59 UTC (rev 9228) +++ trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2007-12-31 01:19:08 UTC (rev 9229) @@ -732,6 +732,8 @@ keyID = gajim.config.get_per('accounts', self.name, 'keyid') if keyID: decmsg = self.gpg.decrypt(encmsg, keyID) + # \x00 chars are not allowed in C (so in GTK) + decmsg = decmsg.replace('\x00', '') if decmsg: msgtxt = decmsg encrypted = True
Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2007-12-31 00:24:59 UTC (rev 9228) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2007-12-31 01:19:08 UTC (rev 9229) @@ -167,14 +167,16 @@ if keyID and self.USE_GPG: use_gpg_agent = gajim.config.get('use_gpg_agent') if self.connected < 2 and self.gpg.passphrase is None and \ - not use_gpg_agent: + not use_gpg_agent: # We didn't set a passphrase self.dispatch('ERROR', (_('OpenPGP passphrase was not given'), #%s is the account name here _('You will be connected to %s without OpenPGP.') % self.name)) + self.USE_GPG = False elif self.gpg.passphrase is not None or use_gpg_agent: signed = self.gpg.sign(msg, keyID) if signed == 'BAD_PASSPHRASE': + self.USE_GPG = False signed = '' if self.connected < 2: self.dispatch('BAD_PASSPHRASE', ()) @@ -375,8 +377,13 @@ msgtxt = msg msgenc = '' if keyID and self.USE_GPG: - # encrypt - msgenc, error = self.gpg.encrypt(msg, [keyID]) + if keyID == 'UNKNOWN': + error = _('Neither the remote presence is signed, nor a key was assigned.') + elif keyID[8:] == 'MISMATCH': + error = _('The contact's key (%s) does not match the key assigned in Gajim.' % keyID[:8]) + else: + # encrypt + msgenc, error = self.gpg.encrypt(msg, [keyID]) if msgenc and not error: msgtxt = '[This message is encrypted]' lang = os.getenv('LANG')