mod_adhoc: Add support for commands only executable by global administrators

[prosody.git] / util / sasl.lua

diff --git a/util/sasl.lua b/util/sasl.lua
index 3eb2db65a2d882083faf1dbe4ef7d643423d3535..17d10b804b7b9188a434d2dfe669db078912b905 100644 (file)
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -48,13 +48,17 @@ end
 
 -- create a new SASL object which can be used to authenticate clients
 function new(realm, profile)
-       local mechanisms = {};
-       for backend, f in pairs(profile) do
-               if backend_mechanism[backend] then
-                       for _, mechanism in ipairs(backend_mechanism[backend]) do
-                               mechanisms[mechanism] = true;
+       local mechanisms = profile.mechanisms;
+       if not mechanisms then
+               mechanisms = {};
+               for backend, f in pairs(profile) do
+                       if backend_mechanism[backend] then
+                               for _, mechanism in ipairs(backend_mechanism[backend]) do
+                                       mechanisms[mechanism] = true;
+                               end
                        end
                end
+               profile.mechanisms = mechanisms;
        end
        return setmetatable({ profile = profile, realm = realm, mechs = mechanisms }, method);
 end
@@ -71,18 +75,16 @@ end
 
 -- select a mechanism to use
 function method:select(mechanism)
-       if self.mech_i then
-               return false;
+       if not self.selected and self.mechs[mechanism] then
+               self.selected = mechanism;
+               return true;
        end
-       
-       self.mech_i = mechanisms[self:mechanisms()[mechanism] and mechanism];
-       return (self.mech_i ~= nil);
 end
 
 -- feed new messages to process into the library
 function method:process(message)
        --if message == "" or message == nil then return "failure", "malformed-request" end
-       return self.mech_i(self, message);
+       return mechanisms[self.selected](self, message);
 end
 
 -- load the mechanisms