X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fsasl.lua;h=17d10b804b7b9188a434d2dfe669db078912b905;hb=492c253d150aeb7edb6687eb9bf085be6c33133a;hp=772e2dd5e9dbfa27b09b60b7b5c76530594e20e3;hpb=805a09a42894765801a0a50553cd823706bf3a30;p=prosody.git

diff --git a/util/sasl.lua b/util/sasl.lua
index 772e2dd5..17d10b80 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -1,5 +1,5 @@
 -- sasl.lua v0.4
--- Copyright (C) 2008-2009 Tobias Markmann
+-- Copyright (C) 2008-2010 Tobias Markmann
 --
 --    All rights reserved.
 --
@@ -12,53 +12,21 @@
 --    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-local md5 = require "util.hashes".md5;
-local log = require "util.logger".init("sasl");
-local tostring = tostring;
-local st = require "util.stanza";
-local generate_uuid = require "util.uuid".generate;
 local pairs, ipairs = pairs, ipairs;
-local t_insert, t_concat = table.insert, table.concat;
-local to_byte, to_char = string.byte, string.char;
-local to_unicode = require "util.encodings".idna.to_unicode;
-local s_match = string.match;
-local gmatch = string.gmatch
-local string = string
-local math = require "math"
+local t_insert = table.insert;
 local type = type
-local error = error
-local print = print
 local setmetatable = setmetatable;
 local assert = assert;
+local require = require;
 
-require "util.iterators"
-local keys = keys
-
-local array = require "util.array"
 module "sasl"
 
 --[[
 Authentication Backend Prototypes:
 
-plain:
-	function(username, realm)
-		return password, state;
-	end
-
-plain-test:
-	function(username, realm, password)
-		return true or false, state;
-	end
-
-digest-md5:
-	function(username, realm, encoding)
-		return digesthash, state;
-	end
-
-digest-md5-test:
-	function(username, realm, encoding, digesthash)
-		return true or false, state;
-	end
+state = false : disabled
+state = true : enabled
+state = nil : non-existant
 ]]
 
 local method = {};
@@ -80,60 +48,49 @@ end
 
 -- create a new SASL object which can be used to authenticate clients
 function new(realm, profile)
-	sasl_i = {profile = profile};
-	return setmetatable(sasl_i, method);
+	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
+
+-- get a fresh clone with the same realm and profile
+function method:clean_clone()
+	return new(self.realm, self.profile)
 end
 
 -- get a list of possible SASL mechanims to use
 function method:mechanisms()
-	local mechanisms = {}
-	for backend, f in pairs(self.profile) do
-		print(backend)
-		if backend_mechanism[backend] then
-			for _, mechanism in ipairs(backend_mechanism[backend]) do
-				mechanisms[mechanism] = true;
-				end
-		end
-	end
-	self["possible_mechanisms"] = mechanisms;
-	return array.collect(keys(mechanisms));
+	return self.mechs;
 end
 
 -- select a mechanism to use
 function method:select(mechanism)
-
+	if not self.selected and self.mechs[mechanism] then
+		self.selected = mechanism;
+		return true;
+	end
 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 mechanisms[self.selected](self, message);
 end
 
---=========================
---SASL PLAIN
-local function sasl_mechanism_plain(realm, credentials_handler)
-	local object = { mechanism = "PLAIN", realm = realm, credentials_handler = credentials_handler}
-	function object.feed(self, message)
-		if message == "" or message == nil then return "failure", "malformed-request" end
-		local response = message
-		local authorization = s_match(response, "([^&%z]+)")
-		local authentication = s_match(response, "%z([^&%z]+)%z")
-		local password = s_match(response, "%z[^&%z]+%z([^&%z]+)")
-
-		if authentication == nil or password == nil then return "failure", "malformed-request" end
-		self.username = authentication
-		local auth_success = self.credentials_handler("PLAIN", self.username, self.realm, password)
-
-		if auth_success then
-			return "success"
-		elseif auth_success == nil then
-			return "failure", "account-disabled"
-		else
-			return "failure", "not-authorized"
-		end
-	end
-	return object
-end
-registerMechanism("PLAIN", {"plain", "plain_test"}, sasl_mechanism_plain);
+-- load the mechanisms
+require "util.sasl.plain"     .init(registerMechanism);
+require "util.sasl.digest-md5".init(registerMechanism);
+require "util.sasl.anonymous" .init(registerMechanism);
+require "util.sasl.scram"     .init(registerMechanism);
 
 return _M;