mod_muc: The default room name is the room node

[prosody.git] / core / usermanager.lua

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 808faf71797b5f71eb97b534a52d54138fa0d9e0..158d59c7bc1bcd64a526edd4f907e1d3a8fd7faf 100644 (file)
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -1,9 +1,22 @@
+-- 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"
 
@@ -19,15 +32,12 @@ function validate_credentials(host, username, password, method)
                end
        end
        -- must do md5
-       if not hashes.md5 then
-               return nil, "Server misconfiguration, the md5 library is not available.";
-       end
        -- make credentials md5
        local pwd = credentials.password;
-       if not pwd then pwd = credentials.md5; else pwd = hashes.md5(pwd); end
+       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 "");
+               password = hashes.md5(password or "", true);
        elseif method ~= "DIGEST-MD5" then
                return nil, "Unsupported auth method";
        end
@@ -49,10 +59,19 @@ end
 
 function get_supported_methods(host)
        local methods = {["PLAIN"] = true}; -- TODO this should be taken from the config
-       if hashes.md5 then
-               methods["DIGEST-MD5"] = true;
-       end
+       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;