X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fsasl_cyrus.lua;h=b42bee07e1860f89f95508bd14665a68a0b21cc2;hb=020b58d94cd173ac6e67bd17dc52d5f0c49a03a4;hp=49c3d433d041df34319bed8f9a4bbbbdba908e0b;hpb=c6e762785881197f667c5906bcd8ff6742b85cc6;p=prosody.git

diff --git a/util/sasl_cyrus.lua b/util/sasl_cyrus.lua
index 49c3d433..b42bee07 100644
--- a/util/sasl_cyrus.lua
+++ b/util/sasl_cyrus.lua
@@ -19,26 +19,40 @@ local tostring = tostring;
 local pairs, ipairs = pairs, ipairs;
 local t_insert, t_concat = table.insert, table.concat;
 local s_match = string.match;
+local setmetatable = setmetatable
 
 local keys = keys;
 
 local print = print
+local pcall = pcall
+local s_match, s_gmatch = string.match, string.gmatch
 
 module "sasl_cyrus"
 
 local method = {};
 method.__index = method;
-local mechanisms = {};
-local backend_mechanism = {};
-
-pcall(cyrussasl.server_init, "prosody")
+local initialized = false;
+
+local function init(service_name)
+	if not initialized then
+		local st, errmsg = pcall(cyrussasl.server_init, service_name);
+		if st then
+			initialized = true;
+		else
+			log("error", "Failed to initialize CyrusSASL: %s", errmsg);
+		end
+	end
+end
 
 -- create a new SASL object which can be used to authenticate clients
 function new(realm, service_name)
 	local sasl_i = {};
+
+	init(service_name);
+
 	sasl_i.realm = realm;
 	sasl_i.service_name = service_name;
-	sasl_i.cyrus = cyrussasl.server_new(service_name, realm, realm, nil, nil)
+	sasl_i.cyrus = cyrussasl.server_new(service_name, nil, nil, nil, nil)
 	if sasl_i.cyrus == 0 then
 		log("error", "got NULL return value from server_new")
 		return nil;
@@ -62,28 +76,29 @@ end
 -- get a list of possible SASL mechanims to use
 function method:mechanisms()
 	local mechanisms = {}
-	local cyrus_mechs = cyrussasl.listmech(self.cyrus)
-	for w in s_gmatch(cyrus_mechs, "%a+") do
+	local cyrus_mechs = cyrussasl.listmech(self.cyrus, nil, "", " ", "")
+	for w in s_gmatch(cyrus_mechs, "[^ ]+") do
 		mechanisms[w] = true;
 	end
-	self.mechanisms = mechanisms
+	self.mechs = mechanisms
 	return array.collect(keys(mechanisms));
 end
 
 -- select a mechanism to use
 function method:select(mechanism)
 	self.mechanism = mechanism;
-	return not self.mechanisms[mechanisms];
+	return self.mechs[mechanism];
 end
 
 -- feed new messages to process into the library
 function method:process(message)
 	local err;
 	local data;
+
 	if self.mechanism then
-		err, data = cyrussasl.server_start(self.cyrus, self.mechanism, message)
+		err, data = cyrussasl.server_start(self.cyrus, self.mechanism, message or "")
 	else
-		err, data = cyrussasl.server_step(self.cyrus, message)
+		err, data = cyrussasl.server_step(self.cyrus, message or "")
 	end
 
 	self.username = cyrussasl.get_username(self.cyrus)