X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fusermanager.lua;h=158d59c7bc1bcd64a526edd4f907e1d3a8fd7faf;hb=34215744d79b2fcf146b69a59007d104085dff4a;hp=0f303b24af7d06d3f965445a505c2d184371fa59;hpb=514a28f20f30a9b53169b61785a9bac4d4ba11bd;p=prosody.git

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 0f303b24..158d59c7 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -1,15 +1,77 @@
+-- Prosody IM v0.4
+-- 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 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)
+function validate_credentials(host, username, password, method)
 	log("debug", "User '%s' is being validated", username);
 	local credentials = datamanager.load(username, host, "accounts") or {};
-	if password == credentials.password then return true; end
-	return false;
+	if method == nil then method = "PLAIN"; end
+	if method == "PLAIN" and credentials.password then -- PLAIN, do directly
+		if password == credentials.password then
+			return true;
+		else
+			return nil, "Auth failed. Invalid username or password.";
+		end
+	end
+	-- must do md5
+	-- make credentials md5
+	local pwd = credentials.password;
+	if not pwd then pwd = credentials.md5; else pwd = hashes.md5(pwd, true); end
+	-- make password md5
+	if method == "PLAIN" then
+		password = hashes.md5(password or "", true);
+	elseif method ~= "DIGEST-MD5" then
+		return nil, "Unsupported auth method";
+	end
+	-- compare
+	if password == pwd then
+		return true;
+	else
+		return nil, "Auth failed. Invalid username or password.";
+	end
+end
+
+function user_exists(username, host)
+	return datamanager.load(username, host, "accounts") ~= nil; -- FIXME also check for empty credentials
+end
+
+function create_user(username, password, host)
+	return datamanager.store(username, host, "accounts", {password = password});
+end
+
+function get_supported_methods(host)
+	local methods = {["PLAIN"] = true}; -- TODO this should be taken from the config
+	methods["DIGEST-MD5"] = true;
+	return methods;
+end
+
+function is_admin(jid)
+	local admins = config.get("*", "core", "admins") or {};
+	if type(admins) == "table" then
+		jid = jid_bare(jid);
+		for _,admin in ipairs(admins) do
+			if admin == jid then return true; end
+		end
+	else log("debug", "Option core.admins is not a table"); end
+	return nil;
 end
 
-return _M;
\ No newline at end of file
+return _M;