mod_console: Add host:* commands to help (thanks Zash)

[prosody.git] / plugins / mod_proxy65.lua

diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua
index ed279ed30dcb6240b0d36aa061c4208fa1e93903..613594440a43940d88ffa79d7c11fc598e6871bf 100644 (file)
--- a/plugins/mod_proxy65.lua
+++ b/plugins/mod_proxy65.lua
@@ -14,7 +14,7 @@ if module:get_host_type() ~= "component" then
        error("proxy65 should be loaded as a component, please see http://prosody.im/doc/components", 0);
 end
 
-local jid_split, jid_join = require "util.jid".split, require "util.jid".join;
+local jid_split, jid_join, jid_compare = require "util.jid".split, require "util.jid".join, require "util.jid".compare;
 local st = require "util.stanza";
 local componentmanager = require "core.componentmanager";
 local config_get = require "core.configmanager".get;
@@ -151,24 +151,11 @@ local function get_stream_host(origin, stanza)
        local err_reply = replies_cache.stream_host_err;
        local sid = stanza.tags[1].attr.sid;
        local allow = false;
-       local jid_node, jid_host, jid_resource = jid_split(stanza.attr.from);
-       
-       if stanza.attr.from == nil then
-               jid_node = origin.username;
-               jid_host = origin.host;
-               jid_resource = origin.resource;
-       end
+       local jid = stanza.attr.from;
        
        if proxy_acl and #proxy_acl > 0 then
-               if host ~= nil then -- at least a domain is needed.
-                       for _, acl in ipairs(proxy_acl) do
-                               local acl_node, acl_host, acl_resource = jid_split(acl);
-                               if ((acl_node ~= nil and acl_node == jid_node) or acl_node == nil) and
-                                  ((acl_host ~= nil and acl_host == jid_host) or acl_host == nil) and
-                                  ((acl_resource ~= nil and acl_resource == jid_resource) or acl_resource == nil) then
-                                       allow = true;
-                               end
-                       end
+               for _, acl in ipairs(proxy_acl) do
+                       if jid_compare(jid, acl) then allow = true; end
                end
        else
                allow = true;
@@ -181,7 +168,7 @@ local function get_stream_host(origin, stanza)
                        replies_cache.stream_host = reply;
                end
        else
-               module:log("warn", "Denying use of proxy for %s", tostring(jid_join(jid_node, jid_host, jid_resource)));
+               module:log("warn", "Denying use of proxy for %s", tostring(jid));
                if err_reply == nil then
                        err_reply = st.iq({type="error", from=host})
                                :query("http://jabber.org/protocol/bytestreams")
@@ -236,8 +223,12 @@ function handle_to_domain(origin, stanza)
                        elseif xmlns == "http://jabber.org/protocol/bytestreams" then
                                origin.send(get_stream_host(origin, stanza));
                                return true;
+                       else
+                               origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+                               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);
@@ -248,6 +239,15 @@ function handle_to_domain(origin, stanza)
                                        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));