print warning instead of traceback when we get a commands request from an invalid JID. Fixes #6995
This commit is contained in:
parent
241325488e
commit
281c7f3a82
|
@ -27,6 +27,9 @@ import helpers
|
||||||
import dataforms
|
import dataforms
|
||||||
import gajim
|
import gajim
|
||||||
|
|
||||||
|
import logging
|
||||||
|
log = logging.getLogger('gajim.c.commands')
|
||||||
|
|
||||||
class AdHocCommand:
|
class AdHocCommand:
|
||||||
commandnode = 'command'
|
commandnode = 'command'
|
||||||
commandname = 'The Command'
|
commandname = 'The Command'
|
||||||
|
@ -371,7 +374,11 @@ class ConnectionCommands:
|
||||||
Send disco#info result for query for command (JEP-0050, example 6.).
|
Send disco#info result for query for command (JEP-0050, example 6.).
|
||||||
Return True if the result was sent, False if not
|
Return True if the result was sent, False if not
|
||||||
"""
|
"""
|
||||||
|
try:
|
||||||
jid = helpers.get_full_jid_from_iq(iq_obj)
|
jid = helpers.get_full_jid_from_iq(iq_obj)
|
||||||
|
except helpers.InvalidFormat:
|
||||||
|
log.warn('Invalid JID: %s, ignoring it' % iq_obj.getFrom())
|
||||||
|
return
|
||||||
node = iq_obj.getTagAttr('query', 'node')
|
node = iq_obj.getTagAttr('query', 'node')
|
||||||
|
|
||||||
if node not in self.__commands: return False
|
if node not in self.__commands: return False
|
||||||
|
|
Loading…
Reference in New Issue