Merge with backout

[prosody.git] / plugins / mod_auth_anonymous.lua

diff --git a/plugins/mod_auth_anonymous.lua b/plugins/mod_auth_anonymous.lua
index 8d790508d4d880f19a4442d41438bed8dd046fce..5df81f2435133d6e79ffe5acbb73d3e2d1f30b72 100644 (file)
--- a/plugins/mod_auth_anonymous.lua
+++ b/plugins/mod_auth_anonymous.lua
@@ -6,7 +6,6 @@
 -- COPYING file in the source package for more information.
 --
 
-local log = require "util.logger".init("auth_anonymous");
 local new_sasl = require "util.sasl".new;
 local datamanager = require "util.datamanager";
 
@@ -51,15 +50,18 @@ local function dm_callback(username, host, datastore, data)
        end
        return username, host, datastore, data;
 end
-local host = hosts[module.host];
-local _saved_disallow_s2s = host.disallow_s2s;
+
+if module:get_option_boolean("disallow_s2s", true) then
+       hosts[module.host].disallow_s2s = true;
+       module:hook("route/remote", function (event)
+               return false; -- Block outgoing s2s from anonymous users
+       end, 300);
+end
+
 function module.load()
-       _saved_disallow_s2s = host.disallow_s2s;
-       host.disallow_s2s = module:get_option("disallow_s2s") ~= false;
        datamanager.add_callback(dm_callback);
 end
 function module.unload()
-       host.disallow_s2s = _saved_disallow_s2s;
        datamanager.remove_callback(dm_callback);
 end