X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_auth_anonymous.lua;h=c27057be2fb01e89f44d0cdf1fba5ffc9f69e3f7;hb=06146ae59d35e26ceb38d45423334a7811b752e2;hp=5df81f2435133d6e79ffe5acbb73d3e2d1f30b72;hpb=b57bc7e759d3383783e809cfa0e0fad9706ab003;p=prosody.git

diff --git a/plugins/mod_auth_anonymous.lua b/plugins/mod_auth_anonymous.lua
index 5df81f24..c27057be 100644
--- a/plugins/mod_auth_anonymous.lua
+++ b/plugins/mod_auth_anonymous.lua
@@ -9,41 +9,39 @@
 local new_sasl = require "util.sasl".new;
 local datamanager = require "util.datamanager";
 
-function new_default_provider(host)
-	local provider = { name = "anonymous" };
+-- define auth provider
+local provider = {};
 
-	function provider.test_password(username, password)
-		return nil, "Password based auth not supported.";
-	end
-
-	function provider.get_password(username)
-		return nil, "Password not available.";
-	end
+function provider.test_password(username, password)
+	return nil, "Password based auth not supported.";
+end
 
-	function provider.set_password(username, password)
-		return nil, "Password based auth not supported.";
-	end
+function provider.get_password(username)
+	return nil, "Password not available.";
+end
 
-	function provider.user_exists(username)
-		return nil, "Only anonymous users are supported."; -- FIXME check if anonymous user is connected?
-	end
+function provider.set_password(username, password)
+	return nil, "Password based auth not supported.";
+end
 
-	function provider.create_user(username, password)
-		return nil, "Account creation/modification not supported.";
-	end
+function provider.user_exists(username)
+	return nil, "Only anonymous users are supported."; -- FIXME check if anonymous user is connected?
+end
 
-	function provider.get_sasl_handler()
-		local anonymous_authentication_profile = {
-			anonymous = function(sasl, username, realm)
-				return true; -- for normal usage you should always return true here
-			end
-		};
-		return new_sasl(module.host, anonymous_authentication_profile);
-	end
+function provider.create_user(username, password)
+	return nil, "Account creation/modification not supported.";
+end
 
-	return provider;
+function provider.get_sasl_handler()
+	local anonymous_authentication_profile = {
+		anonymous = function(sasl, username, realm)
+			return true; -- for normal usage you should always return true here
+		end
+	};
+	return new_sasl(module.host, anonymous_authentication_profile);
 end
 
+-- datamanager callback to disable writes
 local function dm_callback(username, host, datastore, data)
 	if host == module.host then
 		return false;
@@ -51,8 +49,7 @@ local function dm_callback(username, host, datastore, data)
 	return username, host, datastore, data;
 end
 
-if module:get_option_boolean("disallow_s2s", true) then
-	hosts[module.host].disallow_s2s = true;
+if not module:get_option_boolean("allow_anonymous_s2s", false) then
 	module:hook("route/remote", function (event)
 		return false; -- Block outgoing s2s from anonymous users
 	end, 300);
@@ -65,5 +62,5 @@ function module.unload()
 	datamanager.remove_callback(dm_callback);
 end
 
-module:add_item("auth-provider", new_default_provider(module.host));
+module:provides("auth", provider);