From 5554c334177b01d969cd5feb4d73ec2af0c80e7a Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Thu, 12 Nov 2009 21:57:37 +0100 Subject: Move each mechanism in an own file. --- util/sasl/plain.lua | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 util/sasl/plain.lua (limited to 'util/sasl/plain.lua') diff --git a/util/sasl/plain.lua b/util/sasl/plain.lua new file mode 100644 index 00000000..898657f0 --- /dev/null +++ b/util/sasl/plain.lua @@ -0,0 +1,53 @@ +-- sasl.lua v0.4 +-- Copyright (C) 2008-2009 Tobias Markmann +-- +-- All rights reserved. +-- +-- Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +-- +-- * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +-- * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +-- * Neither the name of Tobias Markmann nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +-- +-- 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 registerMechanism = registerMechanism + +module "plain" + +--========================= +--SASL PLAIN according to RFC 4616 +local function plain(self, message) + 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 + + local correct, state = false, false; + if self.profile.plain then + local correct_password; + correct_password, state = self.profile.plain(authentication, self.realm); + if correct_password == password then correct = true; else correct = false; end + elseif self.profile.plain_test then + correct, state = self.profile.plain_test(authentication, self.realm, password); + end + + self.username = authentication + if not state then + return "failure", "account-disabled"; + end + + if correct then + return "success"; + else + return "failure", "not-authorized"; + end +end + +registerMechanism("PLAIN", {"plain", "plain_test"}, plain); + +return _M; \ No newline at end of file -- cgit v1.2.3 From 72e185fa03df69754ea24322db832e85b015c379 Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Fri, 13 Nov 2009 09:21:19 +0100 Subject: Getting PLAIN mechanism work with the new API. --- util/sasl/plain.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'util/sasl/plain.lua') diff --git a/util/sasl/plain.lua b/util/sasl/plain.lua index 898657f0..08056053 100644 --- a/util/sasl/plain.lua +++ b/util/sasl/plain.lua @@ -11,7 +11,7 @@ -- -- 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 registerMechanism = registerMechanism +local s_match = string.match; module "plain" @@ -48,6 +48,8 @@ local function plain(self, message) end end -registerMechanism("PLAIN", {"plain", "plain_test"}, plain); +function init(registerMechanism) + registerMechanism("PLAIN", {"plain", "plain_test"}, plain); +end return _M; \ No newline at end of file -- cgit v1.2.3 From fd57560a965a70db6591a5847a12dc320c2cdf0f Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Wed, 18 Nov 2009 22:02:32 +0100 Subject: SASLprep authentication and password in SASL PLAIN implementation. --- util/sasl/plain.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'util/sasl/plain.lua') diff --git a/util/sasl/plain.lua b/util/sasl/plain.lua index 08056053..d9fdb9a2 100644 --- a/util/sasl/plain.lua +++ b/util/sasl/plain.lua @@ -12,6 +12,8 @@ -- 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 s_match = string.match; +local saslprep = require "util.encodings".stringprep.saslprep; +local log = require "util.logger".init("sasl"); module "plain" @@ -26,6 +28,14 @@ local function plain(self, message) if authentication == nil or password == nil then return "failure", "malformed-request"; end + + -- SASLprep password and authentication + authentication = saslprep(authentication); + password = saslprep(password); + + if (not password) or (password == "") or (not authentication) or (authentication == "") then + log("debug", "Username or password violates either SASLprep."); + end local correct, state = false, false; if self.profile.plain then -- cgit v1.2.3 From 547b733736f76dac6fce0757ec73742377f5f99b Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Thu, 19 Nov 2009 17:08:58 +0100 Subject: Fail if username or password don't pass SASLprep. --- util/sasl/plain.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'util/sasl/plain.lua') diff --git a/util/sasl/plain.lua b/util/sasl/plain.lua index d9fdb9a2..5c7ff68a 100644 --- a/util/sasl/plain.lua +++ b/util/sasl/plain.lua @@ -34,7 +34,8 @@ local function plain(self, message) password = saslprep(password); if (not password) or (password == "") or (not authentication) or (authentication == "") then - log("debug", "Username or password violates either SASLprep."); + log("debug", "Username or password violates SASLprep."); + return "failure", "malformed-request"; end local correct, state = false, false; -- cgit v1.2.3 From b32b0e118daa6a32b464bf21e7c091041eec0dbb Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Thu, 19 Nov 2009 17:17:52 +0100 Subject: Adding some human readable error messages. --- util/sasl/plain.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util/sasl/plain.lua') diff --git a/util/sasl/plain.lua b/util/sasl/plain.lua index 5c7ff68a..46a86bb9 100644 --- a/util/sasl/plain.lua +++ b/util/sasl/plain.lua @@ -35,7 +35,7 @@ local function plain(self, message) if (not password) or (password == "") or (not authentication) or (authentication == "") then log("debug", "Username or password violates SASLprep."); - return "failure", "malformed-request"; + return "failure", "malformed-request", "Invalid username or password."; end local correct, state = false, false; @@ -55,7 +55,7 @@ local function plain(self, message) if correct then return "success"; else - return "failure", "not-authorized"; + return "failure", "not-authorized", "Unable to authorize you with the authentication credentials you've sent."; end end -- cgit v1.2.3