mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.11->trunk

Browse source
This commit is contained in:
Matthew Wild 2021-05-13 11:17:13 +01:00
commit 5bc8b2a379
19 changed files with 111 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/mod_proxy65.lua
View file

@ -93,6 +93,7 @@ function module.add_host(module)
local proxy_address = module:get_option_string("proxy65_address", host);
local proxy_acl = module:get_option_array("proxy65_acl");
local proxy_open_access = module:get_option_boolean("proxy65_open_access", false);
-- COMPAT w/pre-0.9 where proxy65_port was specified in the components section of the config
local legacy_config = module:get_option_number("proxy65_port");
@ -109,13 +110,20 @@ function module.add_host(module)
-- check ACL
-- using 'while' instead of 'if' so we can break out of it
while proxy_acl and #proxy_acl > 0 do --luacheck: ignore 512
local allow;
if proxy_acl and #proxy_acl > 0 then
local jid = stanza.attr.from;
local allow;
for _, acl in ipairs(proxy_acl) do
if jid_compare(jid, acl) then allow = true; break; end
if jid_compare(jid, acl) then
allow = true;
break;
end
end
if allow then break; end
elseif proxy_open_access or origin.type == "c2s" then
allow = true;
end
if not allow then
module:log("warn", "Denying use of proxy for %s", stanza.attr.from);
origin.send(st.error_reply(stanza, "auth", "forbidden"));
return true;