pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Check that avatar sha1 is consistent with the hash.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-01-25 16:00:33 +01:00
parent 4c2eee6a13
commit 25898e9ee7
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
poezio/core/handlers.py
View file

@ -13,7 +13,7 @@ import ssl
import sys import sys
import time import time
from datetime import datetime from datetime import datetime
from hashlib import sha256, sha512 from hashlib import sha1, sha256, sha512
from os import path, makedirs from os import path, makedirs
import pyasn1.codec.der.decoder import pyasn1.codec.der.decoder
@ -415,8 +415,10 @@ class HandlerCore:
result = yield from self.core.xmpp[ result = yield from self.core.xmpp[
'xep_0084'].retrieve_avatar( 'xep_0084'].retrieve_avatar(
jid, avatar_hash, timeout=60) jid, avatar_hash, timeout=60)
contact.avatar = result['pubsub']['items']['item'][ avatar = result['pubsub']['items']['item']['avatar_data']['value']
'avatar_data']['value'] if sha1(avatar).hexdigest().lower() != avatar_hash.lower():
raise Exception('Avatar sha1 doesn’t match 0084 hash.')
contact.avatar = avatar
except Exception: except Exception:
log.debug( log.debug(
'Failed retrieving 0084 data from %s:', 'Failed retrieving 0084 data from %s:',
@ -460,7 +462,10 @@ class HandlerCore:
result = yield from self.core.xmpp['xep_0054'].get_vcard( result = yield from self.core.xmpp['xep_0054'].get_vcard(
jid, cached=True, timeout=60) jid, cached=True, timeout=60)
avatar = result['vcard_temp']['PHOTO'] avatar = result['vcard_temp']['PHOTO']
contact.avatar = avatar['BINVAL'] binval = avatar['BINVAL']
if sha1(binval).hexdigest().lower() != avatar_hash.lower():
raise Exception('Avatar sha1 doesn’t match 0153 hash.')
contact.avatar = binval
except Exception: except Exception:
log.debug('Failed retrieving vCard from %s:', jid, exc_info=True) log.debug('Failed retrieving vCard from %s:', jid, exc_info=True)
return return