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 35e87a2ee96402a33b173b2bd6917850d9279b11..5df81f2435133d6e79ffe5acbb73d3e2d1f30b72 100644 (file)
--- a/plugins/mod_auth_anonymous.lua
+++ b/plugins/mod_auth_anonymous.lua
@@ -1,13 +1,11 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- Copyright (C) 2010 Jeff Mitchell
 --
 -- This project is MIT/X11 licensed. Please see the
 -- 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";
 
@@ -35,13 +33,12 @@ function new_default_provider(host)
        end
 
        function provider.get_sasl_handler()
-               local realm = module:get_option("sasl_realm") or module.host;
                local anonymous_authentication_profile = {
-                       anonymous = function(username, realm)
+                       anonymous = function(sasl, username, realm)
                                return true; -- for normal usage you should always return true here
                        end
                };
-               return new_sasl(realm, anonymous_authentication_profile);
+               return new_sasl(module.host, anonymous_authentication_profile);
        end
 
        return provider;
@@ -53,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