Ignore roster updates with unrecognized subscription values.

This commit is contained in:
Lance Stout 2012-07-30 19:44:13 -07:00
parent bc8b5774ac
commit 3bd84b8d27

View file

@ -287,15 +287,17 @@ class ClientXMPP(BaseXMPP):
if iq['roster']['ver']: if iq['roster']['ver']:
roster.version = iq['roster']['ver'] roster.version = iq['roster']['ver']
items = iq['roster']['items'] items = iq['roster']['items']
for jid in items:
item = items[jid]
roster[jid]['name'] = item['name']
roster[jid]['groups'] = item['groups']
roster[jid]['from'] = item['subscription'] in ['from', 'both']
roster[jid]['to'] = item['subscription'] in ['to', 'both']
roster[jid]['pending_out'] = (item['ask'] == 'subscribe')
roster[jid].save(remove=(item['subscription'] == 'remove')) valid_subscriptions = ('to', 'from', 'both', 'none', 'remove')
for jid, item in items.items():
if item['subscription'] in valid_subscriptions:
roster[jid]['name'] = item['name']
roster[jid]['groups'] = item['groups']
roster[jid]['from'] = item['subscription'] in ('from', 'both')
roster[jid]['to'] = item['subscription'] in ('to', 'both')
roster[jid]['pending_out'] = (item['ask'] == 'subscribe')
roster[jid].save(remove=(item['subscription'] == 'remove'))
self.event("roster_update", iq) self.event("roster_update", iq)
if iq['type'] == 'set': if iq['type'] == 'set':