diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-07-03 04:04:27 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-07-03 04:04:27 +0100 |
| commit | a61b473078bbaa025855b0fdc8bd2046f9bcd481 (patch) | |
| tree | 3d22c874cbef8f1325f66f3eaec9b8358ebb8003 /core | |
| parent | a00feb415fee14056a606aa3b2e3bdc2f3a137fd (diff) | |
| download | prosody-a61b473078bbaa025855b0fdc8bd2046f9bcd481.tar.gz prosody-a61b473078bbaa025855b0fdc8bd2046f9bcd481.zip | |
stanza_router: Check host.disallow_s2s before routing over s2sout. you can haz no s2s.
Diffstat (limited to 'core')
| -rw-r--r-- | core/stanza_router.lua | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua index d3bd2445..5bf437f9 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -173,12 +173,16 @@ function core_route_stanza(origin, stanza) core_post_stanza(origin, stanza); elseif origin.type == "c2s" then -- Remote host - local xmlns = stanza.attr.xmlns; - --stanza.attr.xmlns = "jabber:server"; - stanza.attr.xmlns = nil; - log("debug", "sending s2s stanza: %s", tostring(stanza)); - send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors - stanza.attr.xmlns = xmlns; -- reset + if not hosts[from_host].disallow_s2s then + local xmlns = stanza.attr.xmlns; + --stanza.attr.xmlns = "jabber:server"; + stanza.attr.xmlns = nil; + log("debug", "sending s2s stanza: %s", tostring(stanza)); + send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors + stanza.attr.xmlns = xmlns; -- reset + else + core_route_stanza(hosts[from_host], st.error_reply(stanza, "cancel", "not-allowed", "Communication with remote servers is not allowed")); + end elseif origin.type == "component" or origin.type == "local" then -- Route via s2s for components and modules log("debug", "Routing outgoing stanza for %s to %s", from_host, host); |