aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2009-11-18 22:02:32 +0100
committerTobias Markmann <tm@ayena.de>2009-11-18 22:02:32 +0100
commitfd57560a965a70db6591a5847a12dc320c2cdf0f (patch)
tree9b086c6eee5b15a5b690299caebce1c92153a3a5
parent7815630d28c0ffe23c63c54eeb4f401252b61d0f (diff)
downloadprosody-fd57560a965a70db6591a5847a12dc320c2cdf0f.tar.gz
prosody-fd57560a965a70db6591a5847a12dc320c2cdf0f.zip
SASLprep authentication and password in SASL PLAIN implementation.
-rw-r--r--util/sasl/plain.lua10
1 files changed, 10 insertions, 0 deletions
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