core (xmpp): check that entity_jid is actually a jid in SatRosterProtocol.isJidInRoster

This commit is contained in:
Goffi 2020-03-01 18:29:46 +01:00
commit e2a5f7394e

View file

@ -1010,6 +1010,10 @@ class SatMessageProtocol(xmppim.MessageProtocol):
xmppim.MessageProtocol.__init__(self) xmppim.MessageProtocol.__init__(self)
self.host = host self.host = host
@property
def client(self):
return self.parent
def parseMessage(self, message_elt): def parseMessage(self, message_elt):
"""Parse a message XML and return message_data """Parse a message XML and return message_data
@ -1141,6 +1145,7 @@ class SatMessageProtocol(xmppim.MessageProtocol):
media_type = mimetypes.guess_type(attachment['name'], strict=False)[0] media_type = mimetypes.guess_type(attachment['name'], strict=False)[0]
if media_type: if media_type:
attachment[C.MESS_KEY_ATTACHMENTS_MEDIA_TYPE] = media_type attachment[C.MESS_KEY_ATTACHMENTS_MEDIA_TYPE] = media_type
return data return data
def skipEmptyMessage(self, data): def skipEmptyMessage(self, data):
@ -1431,6 +1436,9 @@ class SatRosterProtocol(xmppim.RosterClientProtocol):
def isJidInRoster(self, entity_jid): def isJidInRoster(self, entity_jid):
"""Return True if jid is in roster""" """Return True if jid is in roster"""
if not isinstance(entity_jid, jid.JID):
raise exceptions.InternalError(
f"a JID is expected, not {type(entity_jid)}: {entity_jid!r}")
return entity_jid in self._jids return entity_jid in self._jids
def isPresenceAuthorised(self, entity_jid): def isPresenceAuthorised(self, entity_jid):