# HG changeset patch # User Tobias Markmann # Date 1258578152 -3600 # Node ID dd0b250cb6c4ec68a31470dc05debe27adea27a7 # Parent 08a6b91bfe7b0e11231c544812f467f50b21b9f8 SASLprep authentication and password in SASL PLAIN implementation. diff -r 08a6b91bfe7b -r dd0b250cb6c4 util/sasl/plain.lua --- a/util/sasl/plain.lua Wed Nov 18 11:59:50 2009 +0100 +++ b/util/sasl/plain.lua Wed Nov 18 22:02:32 2009 +0100 @@ -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 @@ 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