Software / code / prosody
Changeset
3006:a3580f556c27
mod_proxy65: Send error reply to activation stanza if one or both parties were not connected to the proxy
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 05 May 2010 15:33:29 +0100 |
| parents | 3005:c49be80767ee |
| children | 3007:9d122a6ae674 3008:23915803adbf |
| files | plugins/mod_proxy65.lua |
| diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_proxy65.lua Wed May 05 15:32:16 2010 +0100 +++ b/plugins/mod_proxy65.lua Wed May 05 15:33:29 2010 +0100 @@ -241,6 +241,7 @@ return true; end elseif stanza.name == "iq" and type == "set" then + module:log("debug", "Received activation request from %s", stanza.attr.from); local reply, from, to, sid = set_activation(stanza); if reply ~= nil and from ~= nil and to ~= nil and sid ~= nil then local sha = sha1(sid .. from .. to, true); @@ -251,6 +252,15 @@ transfers[sha].activated = true; transfers[sha].target:lock_read(false); transfers[sha].initiator:lock_read(false); + else + module:log("debug", "Both parties were not yet connected"); + local message = "Neither party is connected to the proxy"; + if transfers[sha].initiator then + message = "The recipient is not connected to the proxy"; + elseif transfers[sha].target then + message = "The sender (you) is not connected to the proxy"; + end + origin.send(st.error_reply(stanza, "cancel", "not-allowed", message)); end else module:log("error", "activation failed: sid: %s, initiator: %s, target: %s", tostring(sid), tostring(from), tostring(to));
