copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

also replace non-character unicode AFTER decryption. Fixes #6974

This commit is contained in:
Yann Leboulanger 2011-09-16 23:42:28 +02:00
parent e5bb7672c2
commit b27c27685e
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/connection_handlers.py
View File

@ -977,6 +977,8 @@ class ConnectionHandlersBase:
if keyID: if keyID:
def decrypt_thread(encmsg, keyID, obj): def decrypt_thread(encmsg, keyID, obj):
decmsg = self.gpg.decrypt(encmsg, keyID) decmsg = self.gpg.decrypt(encmsg, keyID)
decmsg = self.connection.Dispatcher.replace_non_character(
decmsg)
# \x00 chars are not allowed in C (so in GTK) # \x00 chars are not allowed in C (so in GTK)
obj.msgtxt = helpers.decode_string(decmsg.replace('\x00', obj.msgtxt = helpers.decode_string(decmsg.replace('\x00',
'')) ''))

3
src/common/stanza_session.py
View File

@ -492,6 +492,9 @@ class EncryptedStanzaSession(ArchivingStanzaSession):
for child in parsed.getChildren(): for child in parsed.getChildren():
stanza.addChild(node=child) stanza.addChild(node=child)
# replace non-character unicode
stranza = self.conn.connection.Dispatcher.replace_non_character(stanza)
return stanza return stanza
def decrypt(self, ciphertext): def decrypt(self, ciphertext):

5
src/common/xmpp/dispatcher_nb.py
View File

@ -197,6 +197,9 @@ class XMPPDispatcher(PlugIn):
raise ValueError('Incorrect stream start: (%s,%s). Terminating.' raise ValueError('Incorrect stream start: (%s,%s). Terminating.'
% (tag, ns)) % (tag, ns))
def replace_non_character(self, data):
return re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data)
def ProcessNonBlocking(self, data): def ProcessNonBlocking(self, data):
""" """
Check incoming stream for data waiting Check incoming stream for data waiting
@ -212,7 +215,7 @@ class XMPPDispatcher(PlugIn):
# disconnect method will never be called. # disconnect method will never be called.
# Is this intended? # Is this intended?
# also look at transports start_disconnect() # also look at transports start_disconnect()
data = re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data) data = self.replace_non_character(data)
for handler in self._cycleHandlers: for handler in self._cycleHandlers:
handler(self) handler(self)
if len(self._pendingExceptions) > 0: if len(self._pendingExceptions) > 0: