X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fusermanager.lua;h=925ac774071489eedae3dfae20bd3547d23f9452;hb=23c6f9b64369d6ac527c8e03bea3ad81d31fbe80;hp=2da64cff202c16d148c8e9fe95c9a5c754e6d9c7;hpb=8aba1c77f0714f2460cc21660bb494fc217e042b;p=prosody.git

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 2da64cff..925ac774 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -1,35 +1,26 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
--- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+--
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
-
-
-require "util.datamanager"
-local datamanager = datamanager;
+local datamanager = require "util.datamanager";
 local log = require "util.logger".init("usermanager");
+local type = type;
 local error = error;
+local ipairs = ipairs;
 local hashes = require "util.hashes";
+local jid_bare = require "util.jid".bare;
+local config = require "core.configmanager";
 
 module "usermanager"
 
 function validate_credentials(host, username, password, method)
 	log("debug", "User '%s' is being validated", username);
 	local credentials = datamanager.load(username, host, "accounts") or {};
+
 	if method == nil then method = "PLAIN"; end
 	if method == "PLAIN" and credentials.password then -- PLAIN, do directly
 		if password == credentials.password then
@@ -37,7 +28,7 @@ function validate_credentials(host, username, password, method)
 		else
 			return nil, "Auth failed. Invalid username or password.";
 		end
-	end
+  end
 	-- must do md5
 	-- make credentials md5
 	local pwd = credentials.password;
@@ -56,6 +47,10 @@ function validate_credentials(host, username, password, method)
 	end
 end
 
+function get_password(username, host)
+  return (datamanager.load(username, host, "accounts") or {}).password
+end
+
 function user_exists(username, host)
 	return datamanager.load(username, host, "accounts") ~= nil; -- FIXME also check for empty credentials
 end
@@ -65,9 +60,22 @@ function create_user(username, password, host)
 end
 
 function get_supported_methods(host)
-	local methods = {["PLAIN"] = true}; -- TODO this should be taken from the config
-	methods["DIGEST-MD5"] = true;
-	return methods;
+	return {["PLAIN"] = true, ["DIGEST-MD5"] = true}; -- TODO this should be taken from the config
+end
+
+function is_admin(jid, host)
+	host = host or "*";
+	local admins = config.get(host, "core", "admins");
+	if host ~= "*" and admins == config.get("*", "core", "admins") then
+		return nil;
+	end
+	if type(admins) == "table" then
+		jid = jid_bare(jid);
+		for _,admin in ipairs(admins) do
+			if admin == jid then return true; end
+		end
+	elseif admins then log("warn", "Option 'admins' for host '%s' is not a table", host); end
+	return nil;
 end
 
 return _M;