Software / code / prosody-modules
Changeset
1720:48b7e8021afa
mod_delegation: original stanza is now cached outside of ns_data, so it can be accessed without knowing the namespace.
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Sun, 03 May 2015 17:46:49 +0200 |
| parents | 1719:3938496cd4f8 |
| children | 1721:f49359330493 |
| files | mod_delegation/mod_delegation.lua |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mod_delegation/mod_delegation.lua Sun May 03 17:43:12 2015 +0200 +++ b/mod_delegation/mod_delegation.lua Sun May 03 17:46:49 2015 +0200 @@ -27,7 +27,6 @@ local _FORWARDED_NS = 'urn:xmpp:forward:0' local _DISCO_NS = 'http://jabber.org/protocol/disco#info' local _DATA_NS = 'jabber:x:data' -local _ORI_ID_PREFIX = "IQ_RESULT_" local _MAIN_SEP = '::' local _BARE_SEP = ':bare:' @@ -151,6 +150,7 @@ --> delegated namespaces hook <-- +local stanza_cache = {} -- we cache original stanza to build reply local function managing_ent_result(event) -- this function manage iq results from the managing entity -- it do a couple of security check before sending the @@ -167,6 +167,7 @@ if #stanza ~= 1 or delegation.name ~= "delegation" or delegation.attr.xmlns ~= _DELEGATION_NS then module:log("warn", "ignoring invalid iq result from managing entity %s", stanza.attr.from) + stanza_cache[stanza.attr.from][stanza.attr.id] = nil return true end @@ -174,18 +175,21 @@ if #delegation ~= 1 or forwarded.name ~= "forwarded" or forwarded.attr.xmlns ~= _FORWARDED_NS then module:log("warn", "ignoring invalid iq result from managing entity %s", stanza.attr.from) + stanza_cache[stanza.attr.from][stanza.attr.id] = nil return true end local iq = forwarded.tags[1] if #forwarded ~= 1 or iq.name ~= "iq" or #iq ~= 1 then module:log("warn", "ignoring invalid iq result from managing entity %s", stanza.attr.from) + stanza_cache[stanza.attr.from][stanza.attr.id] = nil return true end local namespace = iq.tags[1].xmlns local ns_data = ns_delegations[namespace] - local original = ns_data[_ORI_ID_PREFIX..stanza.attr.id] + local original = stanza_cache[stanza.attr.from][stanza.attr.id] + stanza_cache[stanza.attr.from][stanza.attr.id] = nil if stanza.attr.from ~= ns_data.connected or iq.attr.type ~= "result" or iq.attr.id ~= original.attr.id or iq.attr.to ~= original.attr.from then @@ -207,7 +211,8 @@ :add_child(stanza) local iq_id = iq_stanza.attr.id -- we save the original stanza to check the managing entity result - ns_data[_ORI_ID_PREFIX..iq_id] = stanza + if not stanza_cache[to_jid] then stanza_cache[to_jid] = {} end + stanza_cache[to_jid][iq_id] = stanza module:hook("iq-result/host/"..iq_id, managing_ent_result) module:send(iq_stanza) end
