X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fusermanager.lua;h=2da64cff202c16d148c8e9fe95c9a5c754e6d9c7;hb=61fbebe4017d142510fbcfce61714ecb48b99503;hp=a67ad368338495abb5903d88f34c2bebf5a7ae7f;hpb=a38112234c1da8c0af38f5798e7ce2f39be93598;p=prosody.git

diff --git a/core/usermanager.lua b/core/usermanager.lua
index a67ad368..2da64cff 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -1,13 +1,73 @@
+-- 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.
+--
+
+
 
 require "util.datamanager"
 local datamanager = datamanager;
+local log = require "util.logger".init("usermanager");
+local error = error;
+local hashes = require "util.hashes";
 
 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
 
-return _M;
\ No newline at end of file
+return _M;