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

Merge branch 'better-avatar-error-log' into 'master' 

Also log the offending JID on avatar decoding issue

See merge request gajim/gajim!158
This commit is contained in:
Philipp Hörist 2017-11-25 18:44:08 +01:00
parent fc627fc19c cdf4d0ee69
commit efc14f9d97
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gajim/common/connection_handlers.py
View File

@ -474,7 +474,7 @@ class ConnectionVcard:
app.nec.push_incoming_event( app.nec.push_incoming_event(
VcardNotPublishedEvent(None, conn=self)) VcardNotPublishedEvent(None, conn=self))
def get_vcard_photo(self, vcard): def _get_vcard_photo(self, vcard, jid):
try: try:
photo = vcard['PHOTO']['BINVAL'] photo = vcard['PHOTO']['BINVAL']
except (KeyError, AttributeError): except (KeyError, AttributeError):
@ -488,7 +488,7 @@ class ConnectionVcard:
try: try:
photo_decoded = base64.b64decode(photo.encode('utf-8')) photo_decoded = base64.b64decode(photo.encode('utf-8'))
except binascii.Error as error: except binascii.Error as error:
app.log('avatar').warning('Invalid Avatar: %s', error) app.log('avatar').warning('Invalid avatar for %s: %s', jid, error)
return None, None return None, None
avatar_sha = hashlib.sha1(photo_decoded).hexdigest() avatar_sha = hashlib.sha1(photo_decoded).hexdigest()
@ -532,7 +532,7 @@ class ConnectionVcard:
def _on_own_avatar_received(self, jid, resource, room, vcard): def _on_own_avatar_received(self, jid, resource, room, vcard):
avatar_sha, photo_decoded = self.get_vcard_photo(vcard) avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid)
app.log('avatar').info( app.log('avatar').info(
'Received own (vCard): %s', avatar_sha) 'Received own (vCard): %s', avatar_sha)
@ -570,7 +570,7 @@ class ConnectionVcard:
""" """
Called when we receive a vCard Parse the vCard and trigger Events Called when we receive a vCard Parse the vCard and trigger Events
""" """
avatar_sha, photo_decoded = self.get_vcard_photo(vcard) avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid)
app.interface.save_avatar(photo_decoded) app.interface.save_avatar(photo_decoded)
# Received vCard from a contact # Received vCard from a contact

6
gajim/vcard.py
View File

@ -202,7 +202,7 @@ class VcardWindow:
except AttributeError: except AttributeError:
pass pass
def set_values(self, vcard): def _set_values(self, vcard, jid):
for i in vcard.keys(): for i in vcard.keys():
if i == 'PHOTO' and self.xml.get_object('information_notebook').\ if i == 'PHOTO' and self.xml.get_object('information_notebook').\
get_n_pages() > 4: get_n_pages() > 4:
@ -215,7 +215,7 @@ class VcardWindow:
photo_decoded = base64.b64decode( photo_decoded = base64.b64decode(
photo_encoded.encode('utf-8')) photo_encoded.encode('utf-8'))
except binascii.Error as error: except binascii.Error as error:
app.log('avatar').warning('Invalid Avatar: %s', error) app.log('avatar').warning('Invalid avatar for %s: %s', jid, error)
continue continue
pixbuf = gtkgui_helpers.get_pixbuf_from_data(photo_decoded) pixbuf = gtkgui_helpers.get_pixbuf_from_data(photo_decoded)
if pixbuf is None: if pixbuf is None:
@ -266,7 +266,7 @@ class VcardWindow:
def _nec_vcard_received(self, jid, resource, room, vcard): def _nec_vcard_received(self, jid, resource, room, vcard):
self.clear_values() self.clear_values()
self.set_values(vcard) self._set_values(vcard, jid)
def set_os_info(self, obj): def set_os_info(self, obj):
if obj.conn.name != self.account: if obj.conn.name != self.account: