summaryrefslogtreecommitdiff
path: root/sleekxmpp/stanza
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2014-02-03 19:15:08 -0600
committerLance Stout <lancestout@gmail.com>2014-02-03 19:15:08 -0600
commitbd03f071c611225984223c6d942cab49b46bfcc8 (patch)
tree2a76615ab2786835216d51c96e98ff2ceee5feff /sleekxmpp/stanza
parent12995e280e7dcb9a34933d9e4fa3614d1b958eaa (diff)
downloadslixmpp-bd03f071c611225984223c6d942cab49b46bfcc8.tar.gz
slixmpp-bd03f071c611225984223c6d942cab49b46bfcc8.tar.bz2
slixmpp-bd03f071c611225984223c6d942cab49b46bfcc8.tar.xz
slixmpp-bd03f071c611225984223c6d942cab49b46bfcc8.zip
Fix verifying 'from' for IQ results.
Closes issue #278
Diffstat (limited to 'sleekxmpp/stanza')
-rw-r--r--sleekxmpp/stanza/iq.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/sleekxmpp/stanza/iq.py b/sleekxmpp/stanza/iq.py
index ba945e08..e377b82f 100644
--- a/sleekxmpp/stanza/iq.py
+++ b/sleekxmpp/stanza/iq.py
@@ -9,7 +9,7 @@
from sleekxmpp.stanza.rootstanza import RootStanza
from sleekxmpp.xmlstream import StanzaBase, ET
from sleekxmpp.xmlstream.handler import Waiter, Callback
-from sleekxmpp.xmlstream.matcher import MatcherId
+from sleekxmpp.xmlstream.matcher import MatchIDSender
from sleekxmpp.exceptions import IqTimeout, IqError
@@ -193,6 +193,13 @@ class Iq(RootStanza):
"""
if timeout is None:
timeout = self.stream.response_timeout
+
+ criteria = {
+ 'id': self['id'],
+ 'self': self.stream.boundjid,
+ 'peer': self['to']
+ }
+
if callback is not None and self['type'] in ('get', 'set'):
handler_name = 'IqCallback_%s' % self['id']
if timeout_callback:
@@ -203,19 +210,19 @@ class Iq(RootStanza):
self._fire_timeout,
repeat=False)
handler = Callback(handler_name,
- MatcherId(self['id']),
+ MatchIDSender(criteria),
self._handle_result,
once=True)
else:
handler = Callback(handler_name,
- MatcherId(self['id']),
+ MatchIDSender(criteria),
callback,
once=True)
self.stream.register_handler(handler)
StanzaBase.send(self, now=now)
return handler_name
elif block and self['type'] in ('get', 'set'):
- waitfor = Waiter('IqWait_%s' % self['id'], MatcherId(self['id']))
+ waitfor = Waiter('IqWait_%s' % self['id'], MatchIDSender(criteria))
self.stream.register_handler(waitfor)
StanzaBase.send(self, now=now)
result = waitfor.wait(timeout)