From 2151270b0c03e5cdda214c6199468e35234e4455 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Mon, 10 Aug 2009 12:14:40 +0200
Subject: Initial commit of the SASL redesign.
---
util/sasl.lua | 251 ++++++----------------------------------------------------
1 file changed, 23 insertions(+), 228 deletions(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 48412ea7..b2dd4034 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -27,244 +27,39 @@ local math = require "math"
local type = type
local error = error
local print = print
+local setmetatable = setmetatable;
+local assert = assert;
module "sasl"
--- Credentials handler:
--- Arguments: ("PLAIN", user, host, password)
--- Returns: true (success) | false (fail) | nil (user unknown)
-local function new_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
+local method = {}
+local mechanisms = {};
+local backend_mechanism = {};
+
+-- register a new SASL mechanims
+local function registerMechanism(name, backends, f)
+ assert(type(name) == "string", "Parameter name MUST be a string.");
+ assert(type(backends) == "string" or type(backends) == "table", "Parameter backends MUST be either a string or a table.");
+ assert(type(f) == "function", "Parameter f MUST be a function.");
+ mechanism[name] = f
+ for _, backend_name in ipairs(backend)
end
--- credentials_handler:
--- Arguments: (mechanism, node, domain, realm, decoder)
--- Returns: Password encoding, (plaintext) password
--- implementing RFC 2831
-local function new_digest_md5(realm, credentials_handler)
- --TODO complete support for authzid
-
- local function serialize(message)
- local data = ""
-
- if type(message) ~= "table" then error("serialize needs an argument of type table.") end
-
- -- testing all possible values
- if message["nonce"] then data = data..[[nonce="]]..message.nonce..[[",]] end
- if message["qop"] then data = data..[[qop="]]..message.qop..[[",]] end
- if message["charset"] then data = data..[[charset=]]..message.charset.."," end
- if message["algorithm"] then data = data..[[algorithm=]]..message.algorithm.."," end
- if message["realm"] then data = data..[[realm="]]..message.realm..[[",]] end
- if message["rspauth"] then data = data..[[rspauth=]]..message.rspauth.."," end
- data = data:gsub(",$", "")
- return data
- end
-
- local function utf8tolatin1ifpossible(passwd)
- local i = 1;
- while i <= #passwd do
- local passwd_i = to_byte(passwd:sub(i, i));
- if passwd_i > 0x7F then
- if passwd_i < 0xC0 or passwd_i > 0xC3 then
- return passwd;
- end
- i = i + 1;
- passwd_i = to_byte(passwd:sub(i, i));
- if passwd_i < 0x80 or passwd_i > 0xBF then
- return passwd;
- end
- end
- i = i + 1;
- end
-
- local p = {};
- local j = 0;
- i = 1;
- while (i <= #passwd) do
- local passwd_i = to_byte(passwd:sub(i, i));
- if passwd_i > 0x7F then
- i = i + 1;
- local passwd_i_1 = to_byte(passwd:sub(i, i));
- t_insert(p, to_char(passwd_i%4*64 + passwd_i_1%64)); -- I'm so clever
- else
- t_insert(p, to_char(passwd_i));
- end
- i = i + 1;
- end
- return t_concat(p);
- end
- local function latin1toutf8(str)
- local p = {};
- for ch in gmatch(str, ".") do
- ch = to_byte(ch);
- if (ch < 0x80) then
- t_insert(p, to_char(ch));
- elseif (ch < 0xC0) then
- t_insert(p, to_char(0xC2, ch));
- else
- t_insert(p, to_char(0xC3, ch - 64));
- end
- end
- return t_concat(p);
- end
- local function parse(data)
- message = {}
- for k, v in gmatch(data, [[([%w%-]+)="?([^",]*)"?,?]]) do -- FIXME The hacky regex makes me shudder
- message[k] = v;
- end
- return message;
- end
-
- local object = { mechanism = "DIGEST-MD5", realm = realm, credentials_handler = credentials_handler};
-
- object.nonce = generate_uuid();
- object.step = 0;
- object.nonce_count = {};
-
- function object.feed(self, message)
- self.step = self.step + 1;
- if (self.step == 1) then
- local challenge = serialize({ nonce = object.nonce,
- qop = "auth",
- charset = "utf-8",
- algorithm = "md5-sess",
- realm = self.realm});
- return "challenge", challenge;
- elseif (self.step == 2) then
- local response = parse(message);
- -- check for replay attack
- if response["nc"] then
- if self.nonce_count[response["nc"]] then return "failure", "not-authorized" end
- end
-
- -- check for username, it's REQUIRED by RFC 2831
- if not response["username"] then
- return "failure", "malformed-request";
- end
- self["username"] = response["username"];
-
- -- check for nonce, ...
- if not response["nonce"] then
- return "failure", "malformed-request";
- else
- -- check if it's the right nonce
- if response["nonce"] ~= tostring(self.nonce) then return "failure", "malformed-request" end
- end
-
- if not response["cnonce"] then return "failure", "malformed-request", "Missing entry for cnonce in SASL message." end
- if not response["qop"] then response["qop"] = "auth" end
-
- if response["realm"] == nil or response["realm"] == "" then
- response["realm"] = "";
- elseif response["realm"] ~= self.realm then
- return "failure", "not-authorized", "Incorrect realm value";
- end
-
- local decoder;
- if response["charset"] == nil then
- decoder = utf8tolatin1ifpossible;
- elseif response["charset"] ~= "utf-8" then
- return "failure", "incorrect-encoding", "The client's response uses "..response["charset"].." for encoding with isn't supported by sasl.lua. Supported encodings are latin or utf-8.";
- end
-
- local domain = "";
- local protocol = "";
- if response["digest-uri"] then
- protocol, domain = response["digest-uri"]:match("(%w+)/(.*)$");
- if protocol == nil or domain == nil then return "failure", "malformed-request" end
- else
- return "failure", "malformed-request", "Missing entry for digest-uri in SASL message."
- end
-
- --TODO maybe realm support
- self.username = response["username"];
- local password_encoding, Y = self.credentials_handler("DIGEST-MD5", response["username"], to_unicode(domain), response["realm"], decoder);
- if Y == nil then return "failure", "not-authorized"
- elseif Y == false then return "failure", "account-disabled" end
- local A1 = "";
- if response.authzid then
- if response.authzid == self.username.."@"..self.realm then
- -- COMPAT
- log("warn", "Client is violating XMPP RFC. See section 6.1 of RFC 3920.");
- A1 = Y..":"..response["nonce"]..":"..response["cnonce"]..":"..response.authzid;
- else
- A1 = "?";
- end
- else
- A1 = Y..":"..response["nonce"]..":"..response["cnonce"];
- end
- local A2 = "AUTHENTICATE:"..protocol.."/"..domain;
-
- local HA1 = md5(A1, true);
- local HA2 = md5(A2, true);
-
- local KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2;
- local response_value = md5(KD, true);
-
- if response_value == response["response"] then
- -- calculate rspauth
- A2 = ":"..protocol.."/"..domain;
-
- HA1 = md5(A1, true);
- HA2 = md5(A2, true);
-
- KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2
- local rspauth = md5(KD, true);
- self.authenticated = true;
- return "challenge", serialize({rspauth = rspauth});
- else
- return "failure", "not-authorized", "The response provided by the client doesn't match the one we calculated."
- end
- elseif self.step == 3 then
- if self.authenticated ~= nil then return "success"
- else return "failure", "malformed-request" end
- end
- end
- return object;
+-- create a new SASL object which can be used to authenticate clients
+function new(realm, profile)
+ sasl_i = {};
+
+ return setmetatable(sasl_i, method);
end
--- Credentials handler: Can be nil. If specified, should take the mechanism as
--- the only argument, and return true for OK, or false for not-OK (TODO)
-local function new_anonymous(realm, credentials_handler)
- local object = { mechanism = "ANONYMOUS", realm = realm, credentials_handler = credentials_handler}
- function object.feed(self, message)
- return "success"
- end
- object["username"] = generate_uuid()
- return object
+-- get a list of possible SASL mechanims to use
+function method:mechanisms()
+
end
+-- select a mechanism to use
+function method.select( mechanism )
-function new(mechanism, realm, credentials_handler)
- local object
- if mechanism == "PLAIN" then object = new_plain(realm, credentials_handler)
- elseif mechanism == "DIGEST-MD5" then object = new_digest_md5(realm, credentials_handler)
- elseif mechanism == "ANONYMOUS" then object = new_anonymous(realm, credentials_handler)
- else
- log("debug", "Unsupported SASL mechanism: "..tostring(mechanism));
- return nil
- end
- return object
end
return _M;
--
cgit v1.2.3
From e8d31c23939c42c0489f33fba40a13bbecb966e4 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Mon, 10 Aug 2009 23:04:19 +0200
Subject: Mostly making the code run; includes fixing typos and so on.
---
util/sasl.lua | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 56 insertions(+), 7 deletions(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index b2dd4034..d6ac5c1e 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -17,6 +17,7 @@ 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;
@@ -30,9 +31,14 @@ local print = print
local setmetatable = setmetatable;
local assert = assert;
+require "util.iterators"
+local keys = keys
+
+local array = require "util.array"
module "sasl"
-local method = {}
+local method = {};
+method.__index = method;
local mechanisms = {};
local backend_mechanism = {};
@@ -41,25 +47,68 @@ local function registerMechanism(name, backends, f)
assert(type(name) == "string", "Parameter name MUST be a string.");
assert(type(backends) == "string" or type(backends) == "table", "Parameter backends MUST be either a string or a table.");
assert(type(f) == "function", "Parameter f MUST be a function.");
- mechanism[name] = f
- for _, backend_name in ipairs(backend)
+ mechanisms[name] = f
+ for _, backend_name in ipairs(backends) do
+ if backend_mechanism[backend_name] == nil then backend_mechanism[backend_name] = {}; end
+ t_insert(backend_mechanism[backend_name], name);
+ end
end
-- create a new SASL object which can be used to authenticate clients
function new(realm, profile)
- sasl_i = {};
-
+ sasl_i = {profile = profile};
return setmetatable(sasl_i, method);
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
+ return array.collect(keys(mechanisms));
end
-- select a mechanism to use
-function method.select( mechanism )
+function method:select(mechanism)
+
+end
+
+-- feed new messages to process into the library
+function method:process(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);
return _M;
--
cgit v1.2.3
From f39e7b794bccd19deba6241b45d4050c2762b416 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Sun, 16 Aug 2009 23:20:02 +0200
Subject: Adding some docu.
---
util/sasl.lua | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index d6ac5c1e..772e2dd5 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -37,6 +37,30 @@ 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
+]]
+
local method = {};
method.__index = method;
local mechanisms = {};
@@ -71,6 +95,7 @@ function method:mechanisms()
end
end
end
+ self["possible_mechanisms"] = mechanisms;
return array.collect(keys(mechanisms));
end
--
cgit v1.2.3
From 58d9ad4e7e1ea0e58e2bbc580c28f893690a0ae1 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Thu, 27 Aug 2009 21:29:36 +0200
Subject: Adjust SASL PLAIN mechanism to the new API.
---
util/sasl.lua | 53 ++++++++++++++++++++++++++++++-----------------------
1 file changed, 30 insertions(+), 23 deletions(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 772e2dd5..9f7bab20 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -101,38 +101,45 @@ end
-- select a mechanism to use
function method:select(mechanism)
-
+ self.mech_i = mechanisms[mechanism]
+ if self.mech_i == nil then return false; end
+ return true;
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 self.mech_i(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
+local function sasl_mechanism_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, false;
+ if self.profile.plain then
+ local correct_password, state = self.profile.plain(authentication, self.realm);
+ if correct_password == password then correct = true; else correct = false; end
+ else if 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
- return object
end
registerMechanism("PLAIN", {"plain", "plain_test"}, sasl_mechanism_plain);
--
cgit v1.2.3
From 1d2b8a073bfb81c0e70732d273bcede5bd6ce67c Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Fri, 28 Aug 2009 13:04:38 +0200
Subject: Making mod_saslauth use the new SASL API.
---
util/sasl.lua | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 9f7bab20..687878c4 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -81,6 +81,7 @@ end
-- create a new SASL object which can be used to authenticate clients
function new(realm, profile)
sasl_i = {profile = profile};
+ sasl_i.realm = realm;
return setmetatable(sasl_i, method);
end
@@ -92,7 +93,7 @@ function method:mechanisms()
if backend_mechanism[backend] then
for _, mechanism in ipairs(backend_mechanism[backend]) do
mechanisms[mechanism] = true;
- end
+ end
end
end
self["possible_mechanisms"] = mechanisms;
@@ -102,7 +103,9 @@ end
-- select a mechanism to use
function method:select(mechanism)
self.mech_i = mechanisms[mechanism]
- if self.mech_i == nil then return false; end
+ if self.mech_i == nil then
+ return false;
+ end
return true;
end
@@ -120,13 +123,16 @@ local function sasl_mechanism_plain(self, message)
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
+ if authentication == nil or password == nil then
+ return "failure", "malformed-request";
+ end
- local correct, state = false, false, false;
+ local correct, state = false, false;
if self.profile.plain then
- local correct_password, state = self.profile.plain(authentication, self.realm);
+ local correct_password;
+ correct_password, state = self.profile.plain(authentication, self.realm);
if correct_password == password then correct = true; else correct = false; end
- else if self.profile.plain_test then
+ elseif self.profile.plain_test then
correct, state = self.profile.plain_test(authentication, self.realm, password);
end
--
cgit v1.2.3
From cc716d31b6b0e2a6f764fd19832175e30a981c75 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Fri, 28 Aug 2009 19:20:12 +0200
Subject: Allow ampersands in passwords for SASL PLAIN mechanism.
---
util/sasl.lua | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 687878c4..e7d90704 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -119,9 +119,9 @@ end
--SASL PLAIN
local function sasl_mechanism_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]+)")
+ 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";
--
cgit v1.2.3
From c73807ad0892ac4d205740786ae2fbfcd351e03f Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Fri, 28 Aug 2009 19:43:33 +0200
Subject: List RFC numbers.
---
util/sasl.lua | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index e7d90704..8cb85033 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -116,7 +116,7 @@ function method:process(message)
end
--=========================
---SASL PLAIN
+--SASL PLAIN according to RFC 4616
local function sasl_mechanism_plain(self, message)
local response = message
local authorization = s_match(response, "([^%z]+)")
@@ -149,4 +149,6 @@ local function sasl_mechanism_plain(self, message)
end
registerMechanism("PLAIN", {"plain", "plain_test"}, sasl_mechanism_plain);
+--=========================
+--SASL DIGEST-MD5
return _M;
--
cgit v1.2.3
From 9b4aee096ab526579a3b7822b4825d129b0bb1a3 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Fri, 28 Aug 2009 19:56:54 +0200
Subject: Importing SASL Digest-MD5 code.
---
util/sasl.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 8cb85033..28562d3f 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -150,5 +150,5 @@ end
registerMechanism("PLAIN", {"plain", "plain_test"}, sasl_mechanism_plain);
--=========================
---SASL DIGEST-MD5
+--SASL DIGEST-MD5 according to RFC 2831
return _M;
--
cgit v1.2.3
From 650d48ce72b44d85828c5d9b36616945a19052ff Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Fri, 28 Aug 2009 19:57:09 +0200
Subject: Importing SASL Digest-MD5 code. Now for real.
---
util/sasl.lua | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 182 insertions(+)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 28562d3f..6fd45ce1 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -151,4 +151,186 @@ registerMechanism("PLAIN", {"plain", "plain_test"}, sasl_mechanism_plain);
--=========================
--SASL DIGEST-MD5 according to RFC 2831
+local function new_digest_md5(realm, credentials_handler)
+ --TODO complete support for authzid
+
+ local function serialize(message)
+ local data = ""
+
+ if type(message) ~= "table" then error("serialize needs an argument of type table.") end
+
+ -- testing all possible values
+ if message["realm"] then data = data..[[realm="]]..message.realm..[[",]] end
+ if message["nonce"] then data = data..[[nonce="]]..message.nonce..[[",]] end
+ if message["qop"] then data = data..[[qop="]]..message.qop..[[",]] end
+ if message["charset"] then data = data..[[charset=]]..message.charset.."," end
+ if message["algorithm"] then data = data..[[algorithm=]]..message.algorithm.."," end
+ if message["rspauth"] then data = data..[[rspauth=]]..message.rspauth.."," end
+ data = data:gsub(",$", "")
+ return data
+ end
+
+ local function utf8tolatin1ifpossible(passwd)
+ local i = 1;
+ while i <= #passwd do
+ local passwd_i = to_byte(passwd:sub(i, i));
+ if passwd_i > 0x7F then
+ if passwd_i < 0xC0 or passwd_i > 0xC3 then
+ return passwd;
+ end
+ i = i + 1;
+ passwd_i = to_byte(passwd:sub(i, i));
+ if passwd_i < 0x80 or passwd_i > 0xBF then
+ return passwd;
+ end
+ end
+ i = i + 1;
+ end
+
+ local p = {};
+ local j = 0;
+ i = 1;
+ while (i <= #passwd) do
+ local passwd_i = to_byte(passwd:sub(i, i));
+ if passwd_i > 0x7F then
+ i = i + 1;
+ local passwd_i_1 = to_byte(passwd:sub(i, i));
+ t_insert(p, to_char(passwd_i%4*64 + passwd_i_1%64)); -- I'm so clever
+ else
+ t_insert(p, to_char(passwd_i));
+ end
+ i = i + 1;
+ end
+ return t_concat(p);
+ end
+ local function latin1toutf8(str)
+ local p = {};
+ for ch in gmatch(str, ".") do
+ ch = to_byte(ch);
+ if (ch < 0x80) then
+ t_insert(p, to_char(ch));
+ elseif (ch < 0xC0) then
+ t_insert(p, to_char(0xC2, ch));
+ else
+ t_insert(p, to_char(0xC3, ch - 64));
+ end
+ end
+ return t_concat(p);
+ end
+ local function parse(data)
+ local message = {}
+ for k, v in gmatch(data, [[([%w%-]+)="?([^",]*)"?,?]]) do -- FIXME The hacky regex makes me shudder
+ message[k] = v;
+ end
+ return message;
+ end
+
+ local object = { mechanism = "DIGEST-MD5", realm = realm, credentials_handler = credentials_handler};
+
+ object.nonce = generate_uuid();
+ object.step = 0;
+ object.nonce_count = {};
+
+ function object.feed(self, message)
+ self.step = self.step + 1;
+ if (self.step == 1) then
+ local challenge = serialize({ nonce = object.nonce,
+ qop = "auth",
+ charset = "utf-8",
+ algorithm = "md5-sess",
+ realm = self.realm});
+ return "challenge", challenge;
+ elseif (self.step == 2) then
+ local response = parse(message);
+ -- check for replay attack
+ if response["nc"] then
+ if self.nonce_count[response["nc"]] then return "failure", "not-authorized" end
+ end
+
+ -- check for username, it's REQUIRED by RFC 2831
+ if not response["username"] then
+ return "failure", "malformed-request";
+ end
+ self["username"] = response["username"];
+
+ -- check for nonce, ...
+ if not response["nonce"] then
+ return "failure", "malformed-request";
+ else
+ -- check if it's the right nonce
+ if response["nonce"] ~= tostring(self.nonce) then return "failure", "malformed-request" end
+ end
+
+ if not response["cnonce"] then return "failure", "malformed-request", "Missing entry for cnonce in SASL message." end
+ if not response["qop"] then response["qop"] = "auth" end
+
+ if response["realm"] == nil or response["realm"] == "" then
+ response["realm"] = "";
+ elseif response["realm"] ~= self.realm then
+ return "failure", "not-authorized", "Incorrect realm value";
+ end
+
+ local decoder;
+ if response["charset"] == nil then
+ decoder = utf8tolatin1ifpossible;
+ elseif response["charset"] ~= "utf-8" then
+ return "failure", "incorrect-encoding", "The client's response uses "..response["charset"].." for encoding with isn't supported by sasl.lua. Supported encodings are latin or utf-8.";
+ end
+
+ local domain = "";
+ local protocol = "";
+ if response["digest-uri"] then
+ protocol, domain = response["digest-uri"]:match("(%w+)/(.*)$");
+ if protocol == nil or domain == nil then return "failure", "malformed-request" end
+ else
+ return "failure", "malformed-request", "Missing entry for digest-uri in SASL message."
+ end
+
+ --TODO maybe realm support
+ self.username = response["username"];
+ local password_encoding, Y = self.credentials_handler("DIGEST-MD5", response["username"], self.realm, response["realm"], decoder);
+ if Y == nil then return "failure", "not-authorized"
+ elseif Y == false then return "failure", "account-disabled" end
+ local A1 = "";
+ if response.authzid then
+ if response.authzid == self.username.."@"..self.realm then
+ -- COMPAT
+ log("warn", "Client is violating XMPP RFC. See section 6.1 of RFC 3920.");
+ A1 = Y..":"..response["nonce"]..":"..response["cnonce"]..":"..response.authzid;
+ else
+ A1 = "?";
+ end
+ else
+ A1 = Y..":"..response["nonce"]..":"..response["cnonce"];
+ end
+ local A2 = "AUTHENTICATE:"..protocol.."/"..domain;
+
+ local HA1 = md5(A1, true);
+ local HA2 = md5(A2, true);
+
+ local KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2;
+ local response_value = md5(KD, true);
+
+ if response_value == response["response"] then
+ -- calculate rspauth
+ A2 = ":"..protocol.."/"..domain;
+
+ HA1 = md5(A1, true);
+ HA2 = md5(A2, true);
+
+ KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2
+ local rspauth = md5(KD, true);
+ self.authenticated = true;
+ return "challenge", serialize({rspauth = rspauth});
+ else
+ return "failure", "not-authorized", "The response provided by the client doesn't match the one we calculated."
+ end
+ elseif self.step == 3 then
+ if self.authenticated ~= nil then return "success"
+ else return "failure", "malformed-request" end
+ end
+ end
+ return object;
+end
+
return _M;
--
cgit v1.2.3
From 2c8f4d3ed84300f22b1b66d4e795e6478500e047 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Fri, 28 Aug 2009 22:01:58 +0200
Subject: Store stage in SASL object.
---
util/sasl.lua | 179 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 88 insertions(+), 91 deletions(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 6fd45ce1..6b14c1b1 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -151,7 +151,7 @@ registerMechanism("PLAIN", {"plain", "plain_test"}, sasl_mechanism_plain);
--=========================
--SASL DIGEST-MD5 according to RFC 2831
-local function new_digest_md5(realm, credentials_handler)
+local function sasl_mechanism_digest_md5(self, message)
--TODO complete support for authzid
local function serialize(message)
@@ -225,112 +225,109 @@ local function new_digest_md5(realm, credentials_handler)
return message;
end
- local object = { mechanism = "DIGEST-MD5", realm = realm, credentials_handler = credentials_handler};
-
- object.nonce = generate_uuid();
- object.step = 0;
- object.nonce_count = {};
-
- function object.feed(self, message)
- self.step = self.step + 1;
- if (self.step == 1) then
- local challenge = serialize({ nonce = object.nonce,
- qop = "auth",
- charset = "utf-8",
- algorithm = "md5-sess",
- realm = self.realm});
- return "challenge", challenge;
- elseif (self.step == 2) then
- local response = parse(message);
- -- check for replay attack
- if response["nc"] then
- if self.nonce_count[response["nc"]] then return "failure", "not-authorized" end
- end
+ if not self.nonce then
+ self.nonce = generate_uuid();
+ self.step = 0;
+ self.nonce_count = {};
+ end
- -- check for username, it's REQUIRED by RFC 2831
- if not response["username"] then
- return "failure", "malformed-request";
- end
- self["username"] = response["username"];
+ self.step = self.step + 1;
+ if (self.step == 1) then
+ local challenge = serialize({ nonce = object.nonce,
+ qop = "auth",
+ charset = "utf-8",
+ algorithm = "md5-sess",
+ realm = self.realm});
+ return "challenge", challenge;
+ elseif (self.step == 2) then
+ local response = parse(message);
+ -- check for replay attack
+ if response["nc"] then
+ if self.nonce_count[response["nc"]] then return "failure", "not-authorized" end
+ end
- -- check for nonce, ...
- if not response["nonce"] then
- return "failure", "malformed-request";
- else
- -- check if it's the right nonce
- if response["nonce"] ~= tostring(self.nonce) then return "failure", "malformed-request" end
- end
+ -- check for username, it's REQUIRED by RFC 2831
+ if not response["username"] then
+ return "failure", "malformed-request";
+ end
+ self["username"] = response["username"];
+
+ -- check for nonce, ...
+ if not response["nonce"] then
+ return "failure", "malformed-request";
+ else
+ -- check if it's the right nonce
+ if response["nonce"] ~= tostring(self.nonce) then return "failure", "malformed-request" end
+ end
- if not response["cnonce"] then return "failure", "malformed-request", "Missing entry for cnonce in SASL message." end
- if not response["qop"] then response["qop"] = "auth" end
+ if not response["cnonce"] then return "failure", "malformed-request", "Missing entry for cnonce in SASL message." end
+ if not response["qop"] then response["qop"] = "auth" end
- if response["realm"] == nil or response["realm"] == "" then
- response["realm"] = "";
- elseif response["realm"] ~= self.realm then
- return "failure", "not-authorized", "Incorrect realm value";
- end
+ if response["realm"] == nil or response["realm"] == "" then
+ response["realm"] = "";
+ elseif response["realm"] ~= self.realm then
+ return "failure", "not-authorized", "Incorrect realm value";
+ end
- local decoder;
- if response["charset"] == nil then
- decoder = utf8tolatin1ifpossible;
- elseif response["charset"] ~= "utf-8" then
- return "failure", "incorrect-encoding", "The client's response uses "..response["charset"].." for encoding with isn't supported by sasl.lua. Supported encodings are latin or utf-8.";
- end
+ local decoder;
+ if response["charset"] == nil then
+ decoder = utf8tolatin1ifpossible;
+ elseif response["charset"] ~= "utf-8" then
+ return "failure", "incorrect-encoding", "The client's response uses "..response["charset"].." for encoding with isn't supported by sasl.lua. Supported encodings are latin or utf-8.";
+ end
- local domain = "";
- local protocol = "";
- if response["digest-uri"] then
- protocol, domain = response["digest-uri"]:match("(%w+)/(.*)$");
- if protocol == nil or domain == nil then return "failure", "malformed-request" end
- else
- return "failure", "malformed-request", "Missing entry for digest-uri in SASL message."
- end
+ local domain = "";
+ local protocol = "";
+ if response["digest-uri"] then
+ protocol, domain = response["digest-uri"]:match("(%w+)/(.*)$");
+ if protocol == nil or domain == nil then return "failure", "malformed-request" end
+ else
+ return "failure", "malformed-request", "Missing entry for digest-uri in SASL message."
+ end
- --TODO maybe realm support
- self.username = response["username"];
- local password_encoding, Y = self.credentials_handler("DIGEST-MD5", response["username"], self.realm, response["realm"], decoder);
- if Y == nil then return "failure", "not-authorized"
- elseif Y == false then return "failure", "account-disabled" end
- local A1 = "";
- if response.authzid then
- if response.authzid == self.username.."@"..self.realm then
- -- COMPAT
- log("warn", "Client is violating XMPP RFC. See section 6.1 of RFC 3920.");
- A1 = Y..":"..response["nonce"]..":"..response["cnonce"]..":"..response.authzid;
- else
- A1 = "?";
- end
+ --TODO maybe realm support
+ self.username = response["username"];
+ local password_encoding, Y = self.credentials_handler("DIGEST-MD5", response["username"], self.realm, response["realm"], decoder);
+ if Y == nil then return "failure", "not-authorized"
+ elseif Y == false then return "failure", "account-disabled" end
+ local A1 = "";
+ if response.authzid then
+ if response.authzid == self.username.."@"..self.realm then
+ -- COMPAT
+ log("warn", "Client is violating XMPP RFC. See section 6.1 of RFC 3920.");
+ A1 = Y..":"..response["nonce"]..":"..response["cnonce"]..":"..response.authzid;
else
- A1 = Y..":"..response["nonce"]..":"..response["cnonce"];
+ A1 = "?";
end
- local A2 = "AUTHENTICATE:"..protocol.."/"..domain;
+ else
+ A1 = Y..":"..response["nonce"]..":"..response["cnonce"];
+ end
+ local A2 = "AUTHENTICATE:"..protocol.."/"..domain;
- local HA1 = md5(A1, true);
- local HA2 = md5(A2, true);
+ local HA1 = md5(A1, true);
+ local HA2 = md5(A2, true);
- local KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2;
- local response_value = md5(KD, true);
+ local KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2;
+ local response_value = md5(KD, true);
- if response_value == response["response"] then
- -- calculate rspauth
- A2 = ":"..protocol.."/"..domain;
+ if response_value == response["response"] then
+ -- calculate rspauth
+ A2 = ":"..protocol.."/"..domain;
- HA1 = md5(A1, true);
- HA2 = md5(A2, true);
+ HA1 = md5(A1, true);
+ HA2 = md5(A2, true);
- KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2
- local rspauth = md5(KD, true);
- self.authenticated = true;
- return "challenge", serialize({rspauth = rspauth});
- else
- return "failure", "not-authorized", "The response provided by the client doesn't match the one we calculated."
- end
- elseif self.step == 3 then
- if self.authenticated ~= nil then return "success"
- else return "failure", "malformed-request" end
+ KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2
+ local rspauth = md5(KD, true);
+ self.authenticated = true;
+ return "challenge", serialize({rspauth = rspauth});
+ else
+ return "failure", "not-authorized", "The response provided by the client doesn't match the one we calculated."
end
+ elseif self.step == 3 then
+ if self.authenticated ~= nil then return "success"
+ else return "failure", "malformed-request" end
end
- return object;
end
return _M;
--
cgit v1.2.3
From 85fb108f5dd540f3ea9b3920cc8b5e1a40834c44 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Fri, 28 Aug 2009 22:03:11 +0200
Subject: Fail if mechanism has already been selected.
---
util/sasl.lua | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 6b14c1b1..36f43ec2 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -102,6 +102,10 @@ end
-- select a mechanism to use
function method:select(mechanism)
+ if self.mech_i then
+ return false;
+ end
+
self.mech_i = mechanisms[mechanism]
if self.mech_i == nil then
return false;
--
cgit v1.2.3
From 5554c334177b01d969cd5feb4d73ec2af0c80e7a Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Thu, 12 Nov 2009 21:57:37 +0100
Subject: Move each mechanism in an own file.
---
util/sasl.lua | 218 +----------------------------------------------
util/sasl/digest-md5.lua | 194 +++++++++++++++++++++++++++++++++++++++++
util/sasl/plain.lua | 53 ++++++++++++
3 files changed, 251 insertions(+), 214 deletions(-)
create mode 100644 util/sasl/digest-md5.lua
create mode 100644 util/sasl/plain.lua
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 36f43ec2..94ed3ac9 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -119,219 +119,9 @@ function method:process(message)
return self.mech_i(self, message);
end
---=========================
---SASL PLAIN according to RFC 4616
-local function sasl_mechanism_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"}, sasl_mechanism_plain);
-
---=========================
---SASL DIGEST-MD5 according to RFC 2831
-local function sasl_mechanism_digest_md5(self, message)
- --TODO complete support for authzid
-
- local function serialize(message)
- local data = ""
-
- if type(message) ~= "table" then error("serialize needs an argument of type table.") end
-
- -- testing all possible values
- if message["realm"] then data = data..[[realm="]]..message.realm..[[",]] end
- if message["nonce"] then data = data..[[nonce="]]..message.nonce..[[",]] end
- if message["qop"] then data = data..[[qop="]]..message.qop..[[",]] end
- if message["charset"] then data = data..[[charset=]]..message.charset.."," end
- if message["algorithm"] then data = data..[[algorithm=]]..message.algorithm.."," end
- if message["rspauth"] then data = data..[[rspauth=]]..message.rspauth.."," end
- data = data:gsub(",$", "")
- return data
- end
-
- local function utf8tolatin1ifpossible(passwd)
- local i = 1;
- while i <= #passwd do
- local passwd_i = to_byte(passwd:sub(i, i));
- if passwd_i > 0x7F then
- if passwd_i < 0xC0 or passwd_i > 0xC3 then
- return passwd;
- end
- i = i + 1;
- passwd_i = to_byte(passwd:sub(i, i));
- if passwd_i < 0x80 or passwd_i > 0xBF then
- return passwd;
- end
- end
- i = i + 1;
- end
-
- local p = {};
- local j = 0;
- i = 1;
- while (i <= #passwd) do
- local passwd_i = to_byte(passwd:sub(i, i));
- if passwd_i > 0x7F then
- i = i + 1;
- local passwd_i_1 = to_byte(passwd:sub(i, i));
- t_insert(p, to_char(passwd_i%4*64 + passwd_i_1%64)); -- I'm so clever
- else
- t_insert(p, to_char(passwd_i));
- end
- i = i + 1;
- end
- return t_concat(p);
- end
- local function latin1toutf8(str)
- local p = {};
- for ch in gmatch(str, ".") do
- ch = to_byte(ch);
- if (ch < 0x80) then
- t_insert(p, to_char(ch));
- elseif (ch < 0xC0) then
- t_insert(p, to_char(0xC2, ch));
- else
- t_insert(p, to_char(0xC3, ch - 64));
- end
- end
- return t_concat(p);
- end
- local function parse(data)
- local message = {}
- for k, v in gmatch(data, [[([%w%-]+)="?([^",]*)"?,?]]) do -- FIXME The hacky regex makes me shudder
- message[k] = v;
- end
- return message;
- end
-
- if not self.nonce then
- self.nonce = generate_uuid();
- self.step = 0;
- self.nonce_count = {};
- end
-
- self.step = self.step + 1;
- if (self.step == 1) then
- local challenge = serialize({ nonce = object.nonce,
- qop = "auth",
- charset = "utf-8",
- algorithm = "md5-sess",
- realm = self.realm});
- return "challenge", challenge;
- elseif (self.step == 2) then
- local response = parse(message);
- -- check for replay attack
- if response["nc"] then
- if self.nonce_count[response["nc"]] then return "failure", "not-authorized" end
- end
-
- -- check for username, it's REQUIRED by RFC 2831
- if not response["username"] then
- return "failure", "malformed-request";
- end
- self["username"] = response["username"];
-
- -- check for nonce, ...
- if not response["nonce"] then
- return "failure", "malformed-request";
- else
- -- check if it's the right nonce
- if response["nonce"] ~= tostring(self.nonce) then return "failure", "malformed-request" end
- end
-
- if not response["cnonce"] then return "failure", "malformed-request", "Missing entry for cnonce in SASL message." end
- if not response["qop"] then response["qop"] = "auth" end
-
- if response["realm"] == nil or response["realm"] == "" then
- response["realm"] = "";
- elseif response["realm"] ~= self.realm then
- return "failure", "not-authorized", "Incorrect realm value";
- end
-
- local decoder;
- if response["charset"] == nil then
- decoder = utf8tolatin1ifpossible;
- elseif response["charset"] ~= "utf-8" then
- return "failure", "incorrect-encoding", "The client's response uses "..response["charset"].." for encoding with isn't supported by sasl.lua. Supported encodings are latin or utf-8.";
- end
-
- local domain = "";
- local protocol = "";
- if response["digest-uri"] then
- protocol, domain = response["digest-uri"]:match("(%w+)/(.*)$");
- if protocol == nil or domain == nil then return "failure", "malformed-request" end
- else
- return "failure", "malformed-request", "Missing entry for digest-uri in SASL message."
- end
-
- --TODO maybe realm support
- self.username = response["username"];
- local password_encoding, Y = self.credentials_handler("DIGEST-MD5", response["username"], self.realm, response["realm"], decoder);
- if Y == nil then return "failure", "not-authorized"
- elseif Y == false then return "failure", "account-disabled" end
- local A1 = "";
- if response.authzid then
- if response.authzid == self.username.."@"..self.realm then
- -- COMPAT
- log("warn", "Client is violating XMPP RFC. See section 6.1 of RFC 3920.");
- A1 = Y..":"..response["nonce"]..":"..response["cnonce"]..":"..response.authzid;
- else
- A1 = "?";
- end
- else
- A1 = Y..":"..response["nonce"]..":"..response["cnonce"];
- end
- local A2 = "AUTHENTICATE:"..protocol.."/"..domain;
-
- local HA1 = md5(A1, true);
- local HA2 = md5(A2, true);
-
- local KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2;
- local response_value = md5(KD, true);
-
- if response_value == response["response"] then
- -- calculate rspauth
- A2 = ":"..protocol.."/"..domain;
-
- HA1 = md5(A1, true);
- HA2 = md5(A2, true);
-
- KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2
- local rspauth = md5(KD, true);
- self.authenticated = true;
- return "challenge", serialize({rspauth = rspauth});
- else
- return "failure", "not-authorized", "The response provided by the client doesn't match the one we calculated."
- end
- elseif self.step == 3 then
- if self.authenticated ~= nil then return "success"
- else return "failure", "malformed-request" end
- end
-end
+-- load the mechanisms
+require "sasl.plain"
+require "sasl.digest-md5"
+require "sasl.scram"
return _M;
diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua
new file mode 100644
index 00000000..8acbce4b
--- /dev/null
+++ b/util/sasl/digest-md5.lua
@@ -0,0 +1,194 @@
+-- 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.
+
+
+--=========================
+--SASL DIGEST-MD5 according to RFC 2831
+local function sasl_mechanism_digest_md5(self, message)
+ --TODO complete support for authzid
+
+ local function serialize(message)
+ local data = ""
+
+ if type(message) ~= "table" then error("serialize needs an argument of type table.") end
+
+ -- testing all possible values
+ if message["realm"] then data = data..[[realm="]]..message.realm..[[",]] end
+ if message["nonce"] then data = data..[[nonce="]]..message.nonce..[[",]] end
+ if message["qop"] then data = data..[[qop="]]..message.qop..[[",]] end
+ if message["charset"] then data = data..[[charset=]]..message.charset.."," end
+ if message["algorithm"] then data = data..[[algorithm=]]..message.algorithm.."," end
+ if message["rspauth"] then data = data..[[rspauth=]]..message.rspauth.."," end
+ data = data:gsub(",$", "")
+ return data
+ end
+
+ local function utf8tolatin1ifpossible(passwd)
+ local i = 1;
+ while i <= #passwd do
+ local passwd_i = to_byte(passwd:sub(i, i));
+ if passwd_i > 0x7F then
+ if passwd_i < 0xC0 or passwd_i > 0xC3 then
+ return passwd;
+ end
+ i = i + 1;
+ passwd_i = to_byte(passwd:sub(i, i));
+ if passwd_i < 0x80 or passwd_i > 0xBF then
+ return passwd;
+ end
+ end
+ i = i + 1;
+ end
+
+ local p = {};
+ local j = 0;
+ i = 1;
+ while (i <= #passwd) do
+ local passwd_i = to_byte(passwd:sub(i, i));
+ if passwd_i > 0x7F then
+ i = i + 1;
+ local passwd_i_1 = to_byte(passwd:sub(i, i));
+ t_insert(p, to_char(passwd_i%4*64 + passwd_i_1%64)); -- I'm so clever
+ else
+ t_insert(p, to_char(passwd_i));
+ end
+ i = i + 1;
+ end
+ return t_concat(p);
+ end
+ local function latin1toutf8(str)
+ local p = {};
+ for ch in gmatch(str, ".") do
+ ch = to_byte(ch);
+ if (ch < 0x80) then
+ t_insert(p, to_char(ch));
+ elseif (ch < 0xC0) then
+ t_insert(p, to_char(0xC2, ch));
+ else
+ t_insert(p, to_char(0xC3, ch - 64));
+ end
+ end
+ return t_concat(p);
+ end
+ local function parse(data)
+ local message = {}
+ for k, v in gmatch(data, [[([%w%-]+)="?([^",]*)"?,?]]) do -- FIXME The hacky regex makes me shudder
+ message[k] = v;
+ end
+ return message;
+ end
+
+ if not self.nonce then
+ self.nonce = generate_uuid();
+ self.step = 0;
+ self.nonce_count = {};
+ end
+
+ self.step = self.step + 1;
+ if (self.step == 1) then
+ local challenge = serialize({ nonce = object.nonce,
+ qop = "auth",
+ charset = "utf-8",
+ algorithm = "md5-sess",
+ realm = self.realm});
+ return "challenge", challenge;
+ elseif (self.step == 2) then
+ local response = parse(message);
+ -- check for replay attack
+ if response["nc"] then
+ if self.nonce_count[response["nc"]] then return "failure", "not-authorized" end
+ end
+
+ -- check for username, it's REQUIRED by RFC 2831
+ if not response["username"] then
+ return "failure", "malformed-request";
+ end
+ self["username"] = response["username"];
+
+ -- check for nonce, ...
+ if not response["nonce"] then
+ return "failure", "malformed-request";
+ else
+ -- check if it's the right nonce
+ if response["nonce"] ~= tostring(self.nonce) then return "failure", "malformed-request" end
+ end
+
+ if not response["cnonce"] then return "failure", "malformed-request", "Missing entry for cnonce in SASL message." end
+ if not response["qop"] then response["qop"] = "auth" end
+
+ if response["realm"] == nil or response["realm"] == "" then
+ response["realm"] = "";
+ elseif response["realm"] ~= self.realm then
+ return "failure", "not-authorized", "Incorrect realm value";
+ end
+
+ local decoder;
+ if response["charset"] == nil then
+ decoder = utf8tolatin1ifpossible;
+ elseif response["charset"] ~= "utf-8" then
+ return "failure", "incorrect-encoding", "The client's response uses "..response["charset"].." for encoding with isn't supported by sasl.lua. Supported encodings are latin or utf-8.";
+ end
+
+ local domain = "";
+ local protocol = "";
+ if response["digest-uri"] then
+ protocol, domain = response["digest-uri"]:match("(%w+)/(.*)$");
+ if protocol == nil or domain == nil then return "failure", "malformed-request" end
+ else
+ return "failure", "malformed-request", "Missing entry for digest-uri in SASL message."
+ end
+
+ --TODO maybe realm support
+ self.username = response["username"];
+ local password_encoding, Y = self.credentials_handler("DIGEST-MD5", response["username"], self.realm, response["realm"], decoder);
+ if Y == nil then return "failure", "not-authorized"
+ elseif Y == false then return "failure", "account-disabled" end
+ local A1 = "";
+ if response.authzid then
+ if response.authzid == self.username.."@"..self.realm then
+ -- COMPAT
+ log("warn", "Client is violating XMPP RFC. See section 6.1 of RFC 3920.");
+ A1 = Y..":"..response["nonce"]..":"..response["cnonce"]..":"..response.authzid;
+ else
+ A1 = "?";
+ end
+ else
+ A1 = Y..":"..response["nonce"]..":"..response["cnonce"];
+ end
+ local A2 = "AUTHENTICATE:"..protocol.."/"..domain;
+
+ local HA1 = md5(A1, true);
+ local HA2 = md5(A2, true);
+
+ local KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2;
+ local response_value = md5(KD, true);
+
+ if response_value == response["response"] then
+ -- calculate rspauth
+ A2 = ":"..protocol.."/"..domain;
+
+ HA1 = md5(A1, true);
+ HA2 = md5(A2, true);
+
+ KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2
+ local rspauth = md5(KD, true);
+ self.authenticated = true;
+ return "challenge", serialize({rspauth = rspauth});
+ else
+ return "failure", "not-authorized", "The response provided by the client doesn't match the one we calculated."
+ end
+ elseif self.step == 3 then
+ if self.authenticated ~= nil then return "success"
+ else return "failure", "malformed-request" end
+ end
+end
\ No newline at end of file
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 <tm@ayena.de>
Date: Fri, 13 Nov 2009 09:21:19 +0100
Subject: Getting PLAIN mechanism work with the new API.
---
util/sasl.lua | 9 ++++++---
util/sasl/plain.lua | 6 ++++--
2 files changed, 10 insertions(+), 5 deletions(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 94ed3ac9..e9b466ee 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -30,6 +30,8 @@ local error = error
local print = print
local setmetatable = setmetatable;
local assert = assert;
+local dofile = dofile;
+local require = require;
require "util.iterators"
local keys = keys
@@ -120,8 +122,9 @@ function method:process(message)
end
-- load the mechanisms
-require "sasl.plain"
-require "sasl.digest-md5"
-require "sasl.scram"
+m = require "util.sasl.plain"
+m.init(registerMechanism)
+--dofile "util/sasl/digest-md5.lua"
+--dofile "util/sasl/scram.lua"
return _M;
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 ed841d20a7881697a28a5497067df53f128348e3 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Fri, 13 Nov 2009 10:54:17 +0100
Subject: Add support for plain profile in digest-md5 implementation.
---
util/sasl.lua | 18 ++++++++++-------
util/sasl/digest-md5.lua | 51 ++++++++++++++++++++++++++++++++++++++++--------
2 files changed, 54 insertions(+), 15 deletions(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index e9b466ee..8fe4727e 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -16,10 +16,8 @@ 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
@@ -42,6 +40,10 @@ module "sasl"
--[[
Authentication Backend Prototypes:
+state = false : disabled
+state = true : enabled
+state = nil : non-existant
+
plain:
function(username, realm)
return password, state;
@@ -117,14 +119,16 @@ end
-- feed new messages to process into the library
function method:process(message)
- if message == "" or message == nil then return "failure", "malformed-request" end
+ --if message == "" or message == nil then return "failure", "malformed-request" end
return self.mech_i(self, message);
end
-- load the mechanisms
-m = require "util.sasl.plain"
-m.init(registerMechanism)
---dofile "util/sasl/digest-md5.lua"
---dofile "util/sasl/scram.lua"
+load_mechs = {"plain", "digest-md5"}
+for _, mech in ipairs(load_mechs) do
+ local name = "util.sasl."..mech;
+ local m = require(name);
+ m.init(registerMechanism)
+end
return _M;
diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua
index 8acbce4b..1ff0f62b 100644
--- a/util/sasl/digest-md5.lua
+++ b/util/sasl/digest-md5.lua
@@ -11,10 +11,29 @@
--
-- 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 tostring = tostring;
+local type = type;
+
+local s_gmatch = string.gmatch;
+local s_match = string.match;
+local t_concat = table.concat;
+local t_insert = table.insert;
+local to_byte, to_char = string.byte, string.char;
+
+local md5 = require "util.hashes".md5;
+local log = require "util.logger".init("sasl");
+local generate_uuid = require "util.uuid".generate;
+
+module "plain"
--=========================
--SASL DIGEST-MD5 according to RFC 2831
-local function sasl_mechanism_digest_md5(self, message)
+local function digest_response()
+
+ return response, A1, A2
+end
+
+local function digest(self, message)
--TODO complete support for authzid
local function serialize(message)
@@ -68,7 +87,7 @@ local function sasl_mechanism_digest_md5(self, message)
end
local function latin1toutf8(str)
local p = {};
- for ch in gmatch(str, ".") do
+ for ch in s_gmatch(str, ".") do
ch = to_byte(ch);
if (ch < 0x80) then
t_insert(p, to_char(ch));
@@ -82,7 +101,7 @@ local function sasl_mechanism_digest_md5(self, message)
end
local function parse(data)
local message = {}
- for k, v in gmatch(data, [[([%w%-]+)="?([^",]*)"?,?]]) do -- FIXME The hacky regex makes me shudder
+ for k, v in s_gmatch(data, [[([%w%-]+)="?([^",]*)"?,?]]) do -- FIXME The hacky regex makes me shudder
message[k] = v;
end
return message;
@@ -96,7 +115,7 @@ local function sasl_mechanism_digest_md5(self, message)
self.step = self.step + 1;
if (self.step == 1) then
- local challenge = serialize({ nonce = object.nonce,
+ local challenge = serialize({ nonce = self.nonce,
qop = "auth",
charset = "utf-8",
algorithm = "md5-sess",
@@ -150,9 +169,19 @@ local function sasl_mechanism_digest_md5(self, message)
--TODO maybe realm support
self.username = response["username"];
- local password_encoding, Y = self.credentials_handler("DIGEST-MD5", response["username"], self.realm, response["realm"], decoder);
- if Y == nil then return "failure", "not-authorized"
- elseif Y == false then return "failure", "account-disabled" end
+ if self.profile.plain then
+ local password, state = self.profile.plain(response["username"], self.realm)
+ if state == nil then return "failure", "not-authorized"
+ elseif state == false then return "failure", "account-disabled" end
+ Y = md5(response["username"]..":"..self.realm..":"..password);
+ elseif self.profile["digest-md5"] then
+ --local Y, state = self.profile["digest-md5"](response["username"], self.realm, response["charset"])
+ elseif self.profile["digest-md5-test"] then
+
+ end
+ --local password_encoding, Y = self.credentials_handler("DIGEST-MD5", response["username"], self.realm, response["realm"], decoder);
+ --if Y == nil then return "failure", "not-authorized"
+ --elseif Y == false then return "failure", "account-disabled" end
local A1 = "";
if response.authzid then
if response.authzid == self.username.."@"..self.realm then
@@ -191,4 +220,10 @@ local function sasl_mechanism_digest_md5(self, message)
if self.authenticated ~= nil then return "success"
else return "failure", "malformed-request" end
end
-end
\ No newline at end of file
+end
+
+function init(registerMechanism)
+ registerMechanism("DIGEST-MD5", {"plain"}, digest);
+end
+
+return _M;
\ No newline at end of file
--
cgit v1.2.3
From f66117f6255fa37f0e049131ade72232251c32f1 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Fri, 13 Nov 2009 11:10:06 +0100
Subject: Broken DIGEST-MD5 client support again.
---
util/sasl/digest-md5.lua | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'util')
diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua
index 1ff0f62b..df0a5b47 100644
--- a/util/sasl/digest-md5.lua
+++ b/util/sasl/digest-md5.lua
@@ -173,11 +173,11 @@ local function digest(self, message)
local password, state = self.profile.plain(response["username"], self.realm)
if state == nil then return "failure", "not-authorized"
elseif state == false then return "failure", "account-disabled" end
- Y = md5(response["username"]..":"..self.realm..":"..password);
+ Y = md5(response["username"]..":"..response["realm"]..":"..password);
elseif self.profile["digest-md5"] then
--local Y, state = self.profile["digest-md5"](response["username"], self.realm, response["charset"])
elseif self.profile["digest-md5-test"] then
-
+ -- TODO
end
--local password_encoding, Y = self.credentials_handler("DIGEST-MD5", response["username"], self.realm, response["realm"], decoder);
--if Y == nil then return "failure", "not-authorized"
--
cgit v1.2.3
From 8e7427e70d551a051ae178c882c179dec1d891dc Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Fri, 13 Nov 2009 11:21:21 +0100
Subject: Change of the digest-md5 profile.
---
util/sasl.lua | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 8fe4727e..b07f878b 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -55,7 +55,8 @@ plain-test:
end
digest-md5:
- function(username, realm, encoding)
+ function(username, domain, realm, encoding) -- domain and realm are usually the same; for some broken
+ -- implementations it's not
return digesthash, state;
end
--
cgit v1.2.3
From 8c36b99f27aaa438ce12c8183df357d3c6bd916d Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Fri, 13 Nov 2009 11:24:22 +0100
Subject: Adding support for digest-md5 profile in DIGEST-MD5 implementation.
---
util/sasl.lua | 2 +-
util/sasl/digest-md5.lua | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index b07f878b..c7aa050b 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -61,7 +61,7 @@ digest-md5:
end
digest-md5-test:
- function(username, realm, encoding, digesthash)
+ function(username, domain, realm, encoding, digesthash)
return true or false, state;
end
]]
diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua
index df0a5b47..3f50e232 100644
--- a/util/sasl/digest-md5.lua
+++ b/util/sasl/digest-md5.lua
@@ -175,7 +175,9 @@ local function digest(self, message)
elseif state == false then return "failure", "account-disabled" end
Y = md5(response["username"]..":"..response["realm"]..":"..password);
elseif self.profile["digest-md5"] then
- --local Y, state = self.profile["digest-md5"](response["username"], self.realm, response["charset"])
+ local Y, state = self.profile["digest-md5"](response["username"], self.realm, response["realm"] response["charset"])
+ if state == nil then return "failure", "not-authorized"
+ elseif state == false then return "failure", "account-disabled" end
elseif self.profile["digest-md5-test"] then
-- TODO
end
--
cgit v1.2.3
From 9a77245fd19b2421169ed765b4820678073fade2 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Fri, 13 Nov 2009 14:31:03 +0100
Subject: Adding a note for possible round trip savings.
---
util/sasl/digest-md5.lua | 1 +
1 file changed, 1 insertion(+)
(limited to 'util')
diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua
index 3f50e232..ba042933 100644
--- a/util/sasl/digest-md5.lua
+++ b/util/sasl/digest-md5.lua
@@ -214,6 +214,7 @@ local function digest(self, message)
KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2
local rspauth = md5(KD, true);
self.authenticated = true;
+ --TODO: considering sending the rspauth in a success node for saving one roundtrip; allowed according to http://tools.ietf.org/html/draft-saintandre-rfc3920bis-09#section-7.3.6
return "challenge", serialize({rspauth = rspauth});
else
return "failure", "not-authorized", "The response provided by the client doesn't match the one we calculated."
--
cgit v1.2.3
From 9a1b93edc7b012cc75a0f4bf5a5fe64cd300f6d8 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Tue, 17 Nov 2009 00:56:41 +0100
Subject: Initial commit of SCRAM SASL mechanism.
---
util/sasl/scram.lua | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 90 insertions(+)
create mode 100644 util/sasl/scram.lua
(limited to 'util')
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
new file mode 100644
index 00000000..b7507f3e
--- /dev/null
+++ b/util/sasl/scram.lua
@@ -0,0 +1,90 @@
+-- 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 s_match = string.match;
+
+local base64 = require "util.encodings".base64;
+local xor = require "bit".bxor
+local hmac_sha1 = require "util.hmac".sha1;
+local sha1 = require "util.hashes".sha1;
+
+module "plain"
+
+--=========================
+--SASL SCRAM-SHA-1 according to draft-ietf-sasl-scram-10
+local default_i = 4096
+
+local function bp( b )
+ local result = ""
+ for i=1, b:len() do
+ result = result.."\\"..b:byte(i)
+ end
+ return result
+end
+
+local function binaryXOR( a, b )
+ if string.len(a) > string.len(b) then
+ b = string.rep("\0", a:len() - b:len())..b
+ elseif string.len(a) < string.len(b) then
+ a = string.rep("\0", b:len() - a:len())..a
+ end
+ local result = ""
+ for i=1, a:len() do
+ result = result..string.char(xor(a:byte(i), b:byte(i)))
+ end
+ return result
+end
+
+-- hash algorithm independent Hi(PBKDF2) implementation
+local function Hi(hmac, str, salt, i)
+ local Ust = hmac(str, salt.."\0\0\0\1");
+ local res = Ust;
+ for n=1,i-1 do
+ Und = hmac(str, Ust)
+ res = binaryXOR(res, Und)
+ Ust = Und
+ end
+ return res
+end
+
+local function validate_username(username)
+ -- check for forbidden char sequences
+
+ -- replace =2D with , and =3D with =
+
+ -- apply SASLprep
+ return username;
+end
+
+local function scram_sha_1(self, message)
+ if not self.state then self["state"] = {} end
+
+ if not self.state.name then
+ -- we are processing client_first_message
+ self.state["name"] = string.match(client_first_message, "n=(.+),r=")
+ self.state["clientnonce"] = string.match(client_first_message, "r=([^,]+)")
+
+ self.state.name = validate_username(self.state.name);
+ if not self.state.name then
+ return "failure", "malformed-request";
+ end
+ else
+ -- we are processing client_final_message
+ end
+end
+
+function init(registerMechanism)
+ registerMechanism("SCRAM-SHA-1", {"plain"}, scram_sha_1);
+end
+
+return _M;
\ No newline at end of file
--
cgit v1.2.3
From edd37a1e348c6f989351cc9b682bbbae4f6a2a1c Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Tue, 17 Nov 2009 09:33:15 +0100
Subject: Added missing require for generate_uuid.
---
util/sasl/anonymous.lua | 1 +
1 file changed, 1 insertion(+)
(limited to 'util')
diff --git a/util/sasl/anonymous.lua b/util/sasl/anonymous.lua
index 8f2a7708..65650294 100644
--- a/util/sasl/anonymous.lua
+++ b/util/sasl/anonymous.lua
@@ -14,6 +14,7 @@
local s_match = string.match;
local log = require "util.logger".init("sasl");
+local generate_uuid = require "util.uuid".generate;
module "anonymous"
--
cgit v1.2.3
From 1fa16fc88c2492df997fa5471eb282e977602c25 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Tue, 17 Nov 2009 11:03:54 +0100
Subject: Completed SCRAM-SHA-1 implementation to a ready-to-test state.
---
util/sasl/scram.lua | 44 +++++++++++++++++++++++++++++++++++++++++---
1 file changed, 41 insertions(+), 3 deletions(-)
(limited to 'util')
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index b7507f3e..9362cca7 100644
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -17,6 +17,7 @@ local base64 = require "util.encodings".base64;
local xor = require "bit".bxor
local hmac_sha1 = require "util.hmac".sha1;
local sha1 = require "util.hashes".sha1;
+local generate_uuid = require "util.uuid".generate;
module "plain"
@@ -71,15 +72,52 @@ local function scram_sha_1(self, message)
if not self.state.name then
-- we are processing client_first_message
- self.state["name"] = string.match(client_first_message, "n=(.+),r=")
- self.state["clientnonce"] = string.match(client_first_message, "r=([^,]+)")
+ local client_first_message = message;
+ self.state["name"] = client_first_message:match("n=(.+),r=")
+ self.state["clientnonce"] = client_first_message:match("r=([^,]+)")
self.state.name = validate_username(self.state.name);
- if not self.state.name then
+ if not self.state.name or not self.state.clientnonce then
return "failure", "malformed-request";
end
+ self.state["servernonce"] = generate_uuid();
+ self.state["salt"] = generate_uuid();
+
+ local server_first_message = "r="..self.state.clientnonce..self.state.servernonce..",s="..base64.encode(self.state.salt)..",i="..default_i;
+ return "challenge", server_first_message
else
-- we are processing client_final_message
+ local client_final_message = message;
+
+ self.state["proof"] = client_final_message:match("p=(.+)");
+ self.state["nonce"] = client_final_message:match("r=(.+),p=");
+ self.state["channelbinding"] = client_final_message:match("c=(.+),r=");
+ if not self.state.proof or not self.state.nonce or not self.state.channelbinding then
+ return "failure", "malformed-request";
+ end
+
+ local password;
+ if self.profile.plain then
+ password, state = self.profile.plain(self.state.name, self.realm)
+ if state == nil then return "failure", "not-authorized"
+ elseif state == false then return "failure", "account-disabled" end
+ end
+
+ local SaltedPassword = Hi(hmac_sha1, password, self.state.salt, default_i)
+ local ClientKey = hmac_sha1(SaltedPassword, "Client Key")
+ local ServerKey = hmac_sha1(SaltedPassword, "Server Key")
+ local StoredKey = sha1(ClientKey)
+ local AuthMessage = "n=" .. s_match(client_first_message,"n=(.+)") .. "," .. server_first_message .. "," .. s_match(client_final_message, "(.+),p=.+")
+ local ClientSignature = hmac_sha1(StoredKey, AuthMessage)
+ local ClientProof = binaryXOR(ClientKey, ClientSignature)
+ local ServerSignature = hmac_sha1(ServerKey, AuthMessage)
+
+ if base64.encode(ClientProof) == self.state.proof then
+ local server_final_message = "v="..base64.encode(ServerSignature);
+ return "success", server_final_message;
+ else
+ return "failure", "not-authorized", "The response provided by the client doesn't match the one we calculated.";
+ end
end
end
--
cgit v1.2.3
From 12c7adc2e7a748941853a43102ec73e07d51850b Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Tue, 17 Nov 2009 11:31:59 +0100
Subject: Add check for forbidden char sequences in validate_username().
---
util/sasl/scram.lua | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'util')
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index 9362cca7..c3bc9600 100644
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -60,7 +60,8 @@ end
local function validate_username(username)
-- check for forbidden char sequences
-
+ for eq in s:gmatch("=(.?.?)") do
+ if eq ~= "2D" and eq ~= "3D" then return false end end return true;
-- replace =2D with , and =3D with =
-- apply SASLprep
--
cgit v1.2.3
From b0f89bf88505895e77bfda26c0e2720c14bf2918 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Tue, 17 Nov 2009 22:39:18 +0100
Subject: Making interop with libpurple. (Thanks darkrain).
---
util/sasl.lua | 2 +-
util/sasl/scram.lua | 19 ++++++++++++++-----
2 files changed, 15 insertions(+), 6 deletions(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index c8aa16a2..82fc1226 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -125,7 +125,7 @@ function method:process(message)
end
-- load the mechanisms
-load_mechs = {"plain", "digest-md5", "anonymous"}
+load_mechs = {"plain", "digest-md5", "anonymous", "scram"}
for _, mech in ipairs(load_mechs) do
local name = "util.sasl."..mech;
local m = require(name);
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index c3bc9600..a347e2f3 100644
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -12,7 +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 type = type
+local string = string
local base64 = require "util.encodings".base64;
local xor = require "bit".bxor
local hmac_sha1 = require "util.hmac".sha1;
@@ -34,7 +35,7 @@ local function bp( b )
end
local function binaryXOR( a, b )
- if string.len(a) > string.len(b) then
+ if a:len() > b:len() then
b = string.rep("\0", a:len() - b:len())..b
elseif string.len(a) < string.len(b) then
a = string.rep("\0", b:len() - a:len())..a
@@ -60,8 +61,12 @@ end
local function validate_username(username)
-- check for forbidden char sequences
- for eq in s:gmatch("=(.?.?)") do
- if eq ~= "2D" and eq ~= "3D" then return false end end return true;
+ for eq in username:gmatch("=(.?.?)") do
+ if eq ~= "2D" and eq ~= "3D" then
+ return false
+ end
+ end
+
-- replace =2D with , and =3D with =
-- apply SASLprep
@@ -74,6 +79,7 @@ local function scram_sha_1(self, message)
if not self.state.name then
-- we are processing client_first_message
local client_first_message = message;
+ self.state["client_first_message"] = client_first_message;
self.state["name"] = client_first_message:match("n=(.+),r=")
self.state["clientnonce"] = client_first_message:match("r=([^,]+)")
@@ -85,8 +91,10 @@ local function scram_sha_1(self, message)
self.state["salt"] = generate_uuid();
local server_first_message = "r="..self.state.clientnonce..self.state.servernonce..",s="..base64.encode(self.state.salt)..",i="..default_i;
+ self.state["server_first_message"] = server_first_message;
return "challenge", server_first_message
else
+ if type(message) ~= "string" then return "failure", "malformed-request" end
-- we are processing client_final_message
local client_final_message = message;
@@ -108,13 +116,14 @@ local function scram_sha_1(self, message)
local ClientKey = hmac_sha1(SaltedPassword, "Client Key")
local ServerKey = hmac_sha1(SaltedPassword, "Server Key")
local StoredKey = sha1(ClientKey)
- local AuthMessage = "n=" .. s_match(client_first_message,"n=(.+)") .. "," .. server_first_message .. "," .. s_match(client_final_message, "(.+),p=.+")
+ local AuthMessage = "n=" .. s_match(self.state.client_first_message,"n=(.+)") .. "," .. self.state.server_first_message .. "," .. s_match(client_final_message, "(.+),p=.+")
local ClientSignature = hmac_sha1(StoredKey, AuthMessage)
local ClientProof = binaryXOR(ClientKey, ClientSignature)
local ServerSignature = hmac_sha1(ServerKey, AuthMessage)
if base64.encode(ClientProof) == self.state.proof then
local server_final_message = "v="..base64.encode(ServerSignature);
+ self["username"] = self.state.name;
return "success", server_final_message;
else
return "failure", "not-authorized", "The response provided by the client doesn't match the one we calculated.";
--
cgit v1.2.3
From 7815630d28c0ffe23c63c54eeb4f401252b61d0f Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Wed, 18 Nov 2009 11:59:50 +0100
Subject: SASLprep usernames and passwords.
---
util/sasl/scram.lua | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
(limited to 'util')
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index a347e2f3..7d60ef86 100644
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -19,6 +19,8 @@ local xor = require "bit".bxor
local hmac_sha1 = require "util.hmac".sha1;
local sha1 = require "util.hashes".sha1;
local generate_uuid = require "util.uuid".generate;
+local saslprep = require "util.encodings".stringprep.saslprep;
+local log = require "util.logger".init("sasl");
module "plain"
@@ -70,6 +72,7 @@ local function validate_username(username)
-- replace =2D with , and =3D with =
-- apply SASLprep
+ username = saslprep(username);
return username;
end
@@ -83,10 +86,16 @@ local function scram_sha_1(self, message)
self.state["name"] = client_first_message:match("n=(.+),r=")
self.state["clientnonce"] = client_first_message:match("r=([^,]+)")
- self.state.name = validate_username(self.state.name);
if not self.state.name or not self.state.clientnonce then
return "failure", "malformed-request";
end
+
+ self.state.name = validate_username(self.state.name);
+ if not self.state.name then
+ log("debug", "Username violates either SASLprep or contains forbidden character sequences.")
+ return "failure", "malformed-request";
+ end
+
self.state["servernonce"] = generate_uuid();
self.state["salt"] = generate_uuid();
@@ -110,6 +119,11 @@ local function scram_sha_1(self, message)
password, state = self.profile.plain(self.state.name, self.realm)
if state == nil then return "failure", "not-authorized"
elseif state == false then return "failure", "account-disabled" end
+ password = saslprep(password);
+ if not password then
+ log("debug", "Password violates SASLprep.");
+ return "failure", "not-authorized"
+ end
end
local SaltedPassword = Hi(hmac_sha1, password, self.state.salt, default_i)
--
cgit v1.2.3
From fd57560a965a70db6591a5847a12dc320c2cdf0f Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
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')
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 2519d3119c21701d6265bd1238becbdf30873909 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Wed, 18 Nov 2009 22:56:50 +0100
Subject: Enable restriction of supported mechanisms in the SASL library.
---
util/sasl.lua | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 82fc1226..9df74c1b 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -16,6 +16,8 @@ local md5 = require "util.hashes".md5;
local log = require "util.logger".init("sasl");
local tostring = tostring;
local st = require "util.stanza";
+local set = require "util.set";
+local array = require "util.array";
local pairs, ipairs = pairs, ipairs;
local t_insert, t_concat = table.insert, table.concat;
local to_unicode = require "util.encodings".idna.to_unicode;
@@ -84,20 +86,34 @@ local function registerMechanism(name, backends, f)
end
-- create a new SASL object which can be used to authenticate clients
-function new(realm, profile)
+function new(realm, profile, forbidden)
sasl_i = {profile = profile};
sasl_i.realm = realm;
- return setmetatable(sasl_i, method);
+ s = setmetatable(sasl_i, method);
+ s:forbidden(sasl_i, forbidden)
+ return s;
+end
+
+-- set the forbidden mechanisms
+function method:forbidden( forbidden )
+ if forbidden then
+ -- set forbidden
+ self.forbidden = set.new(forbidden);
+ else
+ -- get forbidden
+ return array.collect(self.forbidden:items());
+ end
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;
+ if not sasl_i.forbidden:contains(mechanism) then
+ mechanisms[mechanism] = true;
+ end
end
end
end
--
cgit v1.2.3
From 517d02616edec5a7b3b2ca5de3040beb6a383a73 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Wed, 18 Nov 2009 22:59:43 +0100
Subject: Tidying up.
---
util/sasl.lua | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 9df74c1b..6f650a5c 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -14,23 +14,19 @@
local md5 = require "util.hashes".md5;
local log = require "util.logger".init("sasl");
-local tostring = tostring;
local st = require "util.stanza";
local set = require "util.set";
local array = require "util.array";
+local to_unicode = require "util.encodings".idna.to_unicode;
+
+local tostring = tostring;
local pairs, ipairs = pairs, ipairs;
local t_insert, t_concat = table.insert, table.concat;
-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 type = type
local error = error
-local print = print
local setmetatable = setmetatable;
local assert = assert;
-local dofile = dofile;
local require = require;
require "util.iterators"
--
cgit v1.2.3
From 406173262fb1ecc313db90d11134f2e5b50bd2d4 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Wed, 18 Nov 2009 23:25:27 +0100
Subject: Cleaning up.
---
util/sasl.lua | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 6f650a5c..7b7db024 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -91,13 +91,13 @@ function new(realm, profile, forbidden)
end
-- set the forbidden mechanisms
-function method:forbidden( forbidden )
- if forbidden then
+function method:forbidden( restrict )
+ if restrict then
-- set forbidden
- self.forbidden = set.new(forbidden);
+ self.restrict = set.new(restrict);
else
-- get forbidden
- return array.collect(self.forbidden:items());
+ return array.collect(self.restrict:items());
end
end
@@ -107,7 +107,7 @@ function method:mechanisms()
for backend, f in pairs(self.profile) do
if backend_mechanism[backend] then
for _, mechanism in ipairs(backend_mechanism[backend]) do
- if not sasl_i.forbidden:contains(mechanism) then
+ if not sasl_i.restrict:contains(mechanism) then
mechanisms[mechanism] = true;
end
end
--
cgit v1.2.3
From 6117baa28d8658b16a4de88f4183bef42bed8e0a Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Thu, 19 Nov 2009 00:04:14 +0100
Subject: Handle , and = in usernames for SCRAM.
---
util/sasl/scram.lua | 2 ++
1 file changed, 2 insertions(+)
(limited to 'util')
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index 7d60ef86..a7b21d0d 100644
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -70,6 +70,8 @@ local function validate_username(username)
end
-- replace =2D with , and =3D with =
+ username:gsub("=2D", ",");
+ username:gsub("=3D", "=");
-- apply SASLprep
username = saslprep(username);
--
cgit v1.2.3
From d5511aa898fea7f142f3b61799ea0724b4b8877f Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Thu, 19 Nov 2009 15:29:09 +0100
Subject: Typo.
---
util/sasl/digest-md5.lua | 2 +-
util/sasl/scram.lua | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'util')
diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua
index a4a4f811..1429a5c6 100644
--- a/util/sasl/digest-md5.lua
+++ b/util/sasl/digest-md5.lua
@@ -24,7 +24,7 @@ local md5 = require "util.hashes".md5;
local log = require "util.logger".init("sasl");
local generate_uuid = require "util.uuid".generate;
-module "plain"
+module "digest-md5"
--=========================
--SASL DIGEST-MD5 according to RFC 2831
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index a7b21d0d..f7b8300a 100644
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -22,7 +22,7 @@ local generate_uuid = require "util.uuid".generate;
local saslprep = require "util.encodings".stringprep.saslprep;
local log = require "util.logger".init("sasl");
-module "plain"
+module "scram"
--=========================
--SASL SCRAM-SHA-1 according to draft-ietf-sasl-scram-10
--
cgit v1.2.3
From 547b733736f76dac6fce0757ec73742377f5f99b Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
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')
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 <tm@ayena.de>
Date: Thu, 19 Nov 2009 17:17:52 +0100
Subject: Adding some human readable error messages.
---
util/sasl/plain.lua | 4 ++--
util/sasl/scram.lua | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'util')
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
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index f7b8300a..4413e2a6 100644
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -95,7 +95,7 @@ local function scram_sha_1(self, message)
self.state.name = validate_username(self.state.name);
if not self.state.name then
log("debug", "Username violates either SASLprep or contains forbidden character sequences.")
- return "failure", "malformed-request";
+ return "failure", "malformed-request", "Invalid username.";
end
self.state["servernonce"] = generate_uuid();
@@ -113,7 +113,7 @@ local function scram_sha_1(self, message)
self.state["nonce"] = client_final_message:match("r=(.+),p=");
self.state["channelbinding"] = client_final_message:match("c=(.+),r=");
if not self.state.proof or not self.state.nonce or not self.state.channelbinding then
- return "failure", "malformed-request";
+ return "failure", "malformed-request", "Missing an attribute(p, r or c) in SASL message.";
end
local password;
@@ -124,7 +124,7 @@ local function scram_sha_1(self, message)
password = saslprep(password);
if not password then
log("debug", "Password violates SASLprep.");
- return "failure", "not-authorized"
+ return "failure", "not-authorized", "Invalid password."
end
end
--
cgit v1.2.3
From 315e7ac799abb96f627be4c5b27648f007b89be7 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Thu, 19 Nov 2009 17:20:38 +0100
Subject: Reduce needed roundtrips during DIGEST-MD5 login.
---
util/sasl/digest-md5.lua | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'util')
diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua
index 1429a5c6..e80ed63a 100644
--- a/util/sasl/digest-md5.lua
+++ b/util/sasl/digest-md5.lua
@@ -214,8 +214,7 @@ local function digest(self, message)
KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2
local rspauth = md5(KD, true);
self.authenticated = true;
- --TODO: considering sending the rspauth in a success node for saving one roundtrip; allowed according to http://tools.ietf.org/html/draft-saintandre-rfc3920bis-09#section-7.3.6
- return "challenge", serialize({rspauth = rspauth});
+ return "success", serialize({rspauth = rspauth});
else
return "failure", "not-authorized", "The response provided by the client doesn't match the one we calculated."
end
--
cgit v1.2.3
From 89fa12376ae294bde2e264a665d8e22373bc5a52 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 21 Nov 2009 02:40:21 +0000
Subject: util.timer: Use libevent for lightweight timers if available and
configured (use_libevent option)
---
util/timer.lua | 68 +++++++++++++++++++++++++++++++++++++---------------------
1 file changed, 44 insertions(+), 24 deletions(-)
(limited to 'util')
diff --git a/util/timer.lua b/util/timer.lua
index c0c7f25a..4c9a3ea9 100644
--- a/util/timer.lua
+++ b/util/timer.lua
@@ -8,6 +8,8 @@
local ns_addtimer = require "net.server".addtimer;
+local event = require "net.server".event;
+
local get_time = os.time;
local t_insert = table.insert;
local t_remove = table.remove;
@@ -19,33 +21,51 @@ local new_data = {};
module "timer"
-local function _add_task(delay, func)
- local current_time = get_time();
- delay = delay + current_time;
- if delay >= current_time then
- t_insert(new_data, {delay, func});
- else func(); end
-end
-
-add_task = _add_task;
-
-ns_addtimer(function()
- local current_time = get_time();
- if #new_data > 0 then
- for _, d in pairs(new_data) do
- t_insert(data, d);
+local _add_task;
+if not event then
+ function _add_task(delay, func)
+ local current_time = get_time();
+ delay = delay + current_time;
+ if delay >= current_time then
+ t_insert(new_data, {delay, func});
+ else
+ func();
end
- new_data = {};
end
-
- for i, d in pairs(data) do
- local t, func = d[1], d[2];
- if t <= current_time then
- data[i] = nil;
- local r = func(current_time);
- if type(r) == "number" then _add_task(r, func); end
+
+ ns_addtimer(function()
+ local current_time = get_time();
+ if #new_data > 0 then
+ for _, d in pairs(new_data) do
+ t_insert(data, d);
+ end
+ new_data = {};
end
+
+ for i, d in pairs(data) do
+ local t, func = d[1], d[2];
+ if t <= current_time then
+ data[i] = nil;
+ local r = func(current_time);
+ if type(r) == "number" then _add_task(r, func); end
+ end
+ end
+ end);
+else
+ local EVENT_LEAVE = (event.core and event.core.LEAVE) or -1;
+ function _add_task(delay, func)
+ event.base:addevent(nil, event.EV_TIMEOUT, function ()
+ local ret = func();
+ if ret then
+ _add_task(ret, func);
+ else
+ return EVENT_LEAVE;
+ end
+ end
+ , delay);
end
-end);
+end
+
+add_task = _add_task;
return _M;
--
cgit v1.2.3
From 723b03c6bfeacaa3f6d04ea0a1c719216cd01494 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 21 Nov 2009 03:16:14 +0000
Subject: util.timer: Fix libevent timers (event.base doesn't exist...)
---
util/timer.lua | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'util')
diff --git a/util/timer.lua b/util/timer.lua
index 4c9a3ea9..efc1812d 100644
--- a/util/timer.lua
+++ b/util/timer.lua
@@ -9,6 +9,7 @@
local ns_addtimer = require "net.server".addtimer;
local event = require "net.server".event;
+local event_base = require "net.server".event_base;
local get_time = os.time;
local t_insert = table.insert;
@@ -54,7 +55,7 @@ if not event then
else
local EVENT_LEAVE = (event.core and event.core.LEAVE) or -1;
function _add_task(delay, func)
- event.base:addevent(nil, event.EV_TIMEOUT, function ()
+ event_base:addevent(nil, event.EV_TIMEOUT, function ()
local ret = func();
if ret then
_add_task(ret, func);
--
cgit v1.2.3
From a1cca576be8eeb34d63963f14785445d99bc355f Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 23 Nov 2009 02:58:42 +0000
Subject: util.dependencies: Make the commands line up properly in the "missing
dependency" output. Yes, this was the commit you didn't know you were waiting
for!
---
util/dependencies.lua | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'util')
diff --git a/util/dependencies.lua b/util/dependencies.lua
index 5b07072f..cbdecc10 100644
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -17,8 +17,12 @@ local function missingdep(name, sources, msg)
print("Prosody was unable to find "..tostring(name));
print("This package can be obtained in the following ways:");
print("");
- for k,v in pairs(sources) do
- print("", k, v);
+ local longest_platform = 0;
+ for platform in pairs(sources) do
+ longest_platform = math.max(longest_platform, #platform);
+ end
+ for platform, source in pairs(sources) do
+ print("", platform..":"..(" "):rep(4+longest_platform-#platform)..source);
end
print("");
print(msg or (name.." is required for Prosody to run, so we will now exit."));
--
cgit v1.2.3
From 8d13f90bed046737e1c005ed837ec09c95192d57 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Mon, 23 Nov 2009 19:35:24 +0500
Subject: util.serialization: Concise output for empty tables.
---
util/serialization.lua | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
(limited to 'util')
diff --git a/util/serialization.lua b/util/serialization.lua
index c2bbbb8d..2a1fad02 100644
--- a/util/serialization.lua
+++ b/util/serialization.lua
@@ -13,6 +13,7 @@ local t_insert = table.insert;
local t_concat = table.concat;
local error = error;
local pairs = pairs;
+local next = next;
local debug_traceback = debug.traceback;
local log = require "util.logger".init("serialization");
@@ -34,21 +35,25 @@ local function _simplesave(o, ind, t, func)
elseif type(o) == "string" then
func(t, (("%q"):format(o):gsub("\\\n", "\\n")));
elseif type(o) == "table" then
- func(t, "{\n");
- for k,v in pairs(o) do
- func(t, indent(ind));
- func(t, "[");
- func(t, basicSerialize(k));
- func(t, "] = ");
- if ind == 0 then
- _simplesave(v, 0, t, func);
- else
- _simplesave(v, ind+1, t, func);
+ if next(o) then
+ func(t, "{\n");
+ for k,v in pairs(o) do
+ func(t, indent(ind));
+ func(t, "[");
+ func(t, basicSerialize(k));
+ func(t, "] = ");
+ if ind == 0 then
+ _simplesave(v, 0, t, func);
+ else
+ _simplesave(v, ind+1, t, func);
+ end
+ func(t, ",\n");
end
- func(t, ",\n");
+ func(t, indent(ind-1));
+ func(t, "}");
+ else
+ func(t, "{}");
end
- func(t, indent(ind-1));
- func(t, "}");
elseif type(o) == "boolean" then
func(t, (o and "true" or "false"));
else
--
cgit v1.2.3
From 5b41760cecdfd2db66b84ce92454dd61e7f1341b Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Mon, 23 Nov 2009 19:50:04 +0500
Subject: util.serialization: Replaced commas with semi-colons between table
fields.
---
util/serialization.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'util')
diff --git a/util/serialization.lua b/util/serialization.lua
index 2a1fad02..07a099c9 100644
--- a/util/serialization.lua
+++ b/util/serialization.lua
@@ -47,7 +47,7 @@ local function _simplesave(o, ind, t, func)
else
_simplesave(v, ind+1, t, func);
end
- func(t, ",\n");
+ func(t, ";\n");
end
func(t, indent(ind-1));
func(t, "}");
--
cgit v1.2.3
From b3b272859867ff184d622969f903ffcc60e7b906 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 23 Nov 2009 17:31:49 +0000
Subject: util.dependencies: Add LuaFileSystem as a hard dependency
---
util/dependencies.lua | 9 +++++++++
1 file changed, 9 insertions(+)
(limited to 'util')
diff --git a/util/dependencies.lua b/util/dependencies.lua
index 5b07072f..a0f4e453 100644
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -41,6 +41,15 @@ if not socket then
fatal = true;
end
+local lfs, err = softreq "lfs"
+if not lfs then
+ missingdep("luafilesystem", { ["luarocks"] = "luarocks install luafilesystem";
+ ["Ubuntu 8.04 (Hardy)"] = "sudo apt-get install liblua5.1-luafilesystem0";
+ ["Source"] = "http://www.keplerproject.org/luafilesystem/";
+ });
+ fatal = true;
+end
+
local ssl = softreq "ssl"
if not ssl then
--
cgit v1.2.3
From 86de4680024ddfcaaaf38dee06a177efb5f3d352 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 23 Nov 2009 18:51:54 +0000
Subject: util.dependencies: Clearer message, add homepages, etc.
---
util/dependencies.lua | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
(limited to 'util')
diff --git a/util/dependencies.lua b/util/dependencies.lua
index a0f4e453..6e0cfe14 100644
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -30,23 +30,32 @@ end
local lxp = softreq "lxp"
if not lxp then
- missingdep("luaexpat", { ["Ubuntu 8.04 (Hardy)"] = "sudo apt-get install liblua5.1-expat0"; ["luarocks"] = "luarocks install luaexpat"; });
+ missingdep("luaexpat", {
+ ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-expat0";
+ ["luarocks"] = "luarocks install luaexpat";
+ ["Source"] = "http://www.keplerproject.org/luaexpat/";
+ });
fatal = true;
end
local socket = softreq "socket"
if not socket then
- missingdep("luasocket", { ["Ubuntu 8.04 (Hardy)"] = "sudo apt-get install liblua5.1-socket2"; ["luarocks"] = "luarocks install luasocket"; });
+ missingdep("luasocket", {
+ ["Ubuntu"] = "sudo apt-get install liblua5.1-socket2";
+ ["luarocks"] = "luarocks install luasocket";
+ ["Source"] = "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/";
+ });
fatal = true;
end
local lfs, err = softreq "lfs"
if not lfs then
- missingdep("luafilesystem", { ["luarocks"] = "luarocks install luafilesystem";
- ["Ubuntu 8.04 (Hardy)"] = "sudo apt-get install liblua5.1-luafilesystem0";
- ["Source"] = "http://www.keplerproject.org/luafilesystem/";
- });
+ missingdep("luafilesystem", {
+ ["luarocks"] = "luarocks install luafilesystem";
+ ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-luafilesystem0";
+ ["Source"] = "http://www.keplerproject.org/luafilesystem/";
+ });
fatal = true;
end
@@ -56,7 +65,11 @@ if not ssl then
if config.get("*", "core", "run_without_ssl") then
log("warn", "Running without SSL support because run_without_ssl is defined in the config");
else
- missingdep("LuaSec", { ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/" }, "SSL/TLS support will not be available");
+ missingdep("LuaSec", {
+ ["Debian/Ubuntu"] = "http://prosody.im/download/start#debian_and_ubuntu";
+ ["luarocks"] = "luarocks install luasec";
+ ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/";
+ }, "SSL/TLS support will not be available");
end
end
--
cgit v1.2.3
From a918d40c046d0cc4576ece7799e3b8ffc69e31d4 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 23 Nov 2009 19:59:32 +0000
Subject: util.dependencies: Missed a Debian/
---
util/dependencies.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'util')
diff --git a/util/dependencies.lua b/util/dependencies.lua
index 6e0cfe14..6decfba5 100644
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -42,7 +42,7 @@ local socket = softreq "socket"
if not socket then
missingdep("luasocket", {
- ["Ubuntu"] = "sudo apt-get install liblua5.1-socket2";
+ ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-socket2";
["luarocks"] = "luarocks install luasocket";
["Source"] = "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/";
});
--
cgit v1.2.3
From 49916630b91195f385ab4c76ee089e29da5e21a8 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 23 Nov 2009 20:18:04 +0000
Subject: util.datamanager: Replace popen(mkdir) with lfs.mkdir, keeping the
just-in-time creation until we have the new datamanager API
---
util/datamanager.lua | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'util')
diff --git a/util/datamanager.lua b/util/datamanager.lua
index 4d07d6cc..bfd69ebf 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -15,13 +15,13 @@ local loadfile, setfenv, pcall = loadfile, setfenv, pcall;
local log = require "util.logger".init("datamanager");
local io_open = io.open;
local os_remove = os.remove;
-local io_popen = io.popen;
local tostring, tonumber = tostring, tonumber;
local error = error;
local next = next;
local t_insert = table.insert;
local append = require "util.serialization".append;
local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end
+local lfs_mkdir = require "lfs".mkdir;
module "datamanager"
@@ -43,7 +43,7 @@ local _mkdir = {};
local function mkdir(path)
path = path:gsub("/", path_separator); -- TODO as an optimization, do this during path creation rather than here
if not _mkdir[path] then
- local x = io_popen("mkdir \""..path.."\" 2>&1"):read("*a");
+ lfs_mkdir(path);
_mkdir[path] = true;
end
return path;
--
cgit v1.2.3
From 38e55888e5c0a041f876281cfeb6230be406c7c3 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 25 Nov 2009 15:40:33 +0000
Subject: util.dependencies: Log an error if the current version of LuaSec
installed contains The Bug (thanks Remko)
---
util/dependencies.lua | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'util')
diff --git a/util/dependencies.lua b/util/dependencies.lua
index 6decfba5..790045eb 100644
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -71,6 +71,11 @@ if not ssl then
["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/";
}, "SSL/TLS support will not be available");
end
+else
+ local major, minor, veryminor, patched = ssl._VERSION:match("(%d+)%.(%d+)%.?(%d*)(M?)");
+ if not major or ((tonumber(major) == 0 and (tonumber(minor) or 0) <= 3 and (tonumber(veryminor) or 0) <= 2) and patched ~= "M") then
+ log("error", "This version of LuaSec contains a known bug that causes disconnects, see http://prosody.im/doc/depends");
+ end
end
local encodings, err = softreq "util.encodings"
--
cgit v1.2.3
From 212ef3eca2cb953331e3d41d07c37b2812e6e0b9 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Wed, 25 Nov 2009 19:46:22 +0100
Subject: SASL: Using locally mapped s_gmatch instead of unavailable gmatch.
---
util/sasl/digest-md5.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'util')
diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua
index 557858b3..f8e0e393 100644
--- a/util/sasl/digest-md5.lua
+++ b/util/sasl/digest-md5.lua
@@ -102,7 +102,7 @@ local function digest(self, message)
local function parse(data)
local message = {}
-- COMPAT: %z in the pattern to work around jwchat bug (sends "charset=utf-8\0")
- for k, v in gmatch(data, [[([%w%-]+)="?([^",%z]*)"?,?]]) do -- FIXME The hacky regex makes me shudder
+ for k, v in s_gmatch(data, [[([%w%-]+)="?([^",%z]*)"?,?]]) do -- FIXME The hacky regex makes me shudder
message[k] = v;
end
return message;
--
cgit v1.2.3
From 22d8917d8ced0783831e0050e1f0ca4089e273e8 Mon Sep 17 00:00:00 2001
From: Florian Zeitz <devnull@localhost>
Date: Wed, 25 Nov 2009 19:58:19 +0000
Subject: util.dataforms: Don't require type when parsing form XML
---
util/dataforms.lua | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
(limited to 'util')
diff --git a/util/dataforms.lua b/util/dataforms.lua
index 5626172e..a3bde8ca 100644
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -93,7 +93,13 @@ function form_t.data(layout, stanza)
local data = {};
for field_tag in stanza:childtags() do
- local field_type = field_tag.attr.type;
+ local field_type;
+ for n, field in ipairs(layout) do
+ if field.name == field_tag.attr.var then
+ field_type = field.type;
+ break;
+ end
+ end
local reader = field_readers[field_type];
if reader then
--
cgit v1.2.3
From 2e3f2e68d7669723ad68d149b2c943ad925cadf8 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 25 Nov 2009 23:45:45 +0000
Subject: util.serialization: Correctly serialize tables with 'false' as a key,
fixes an issue with rosters not saving (thanks mathias, Tobias)
---
util/serialization.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'util')
diff --git a/util/serialization.lua b/util/serialization.lua
index 07a099c9..7071d3f7 100644
--- a/util/serialization.lua
+++ b/util/serialization.lua
@@ -35,7 +35,7 @@ local function _simplesave(o, ind, t, func)
elseif type(o) == "string" then
func(t, (("%q"):format(o):gsub("\\\n", "\\n")));
elseif type(o) == "table" then
- if next(o) then
+ if next(o) ~= nil then
func(t, "{\n");
for k,v in pairs(o) do
func(t, indent(ind));
--
cgit v1.2.3
From 44b3480e14445945d009e6a7eb2fec94e085920c Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Thu, 26 Nov 2009 23:11:02 +0100
Subject: util.sasl: Adding clean_clone() method.
---
util/sasl.lua | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index 7b7db024..e3ae8087 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -90,6 +90,11 @@ function new(realm, profile, forbidden)
return s;
end
+-- get a fresh clone with the same realm, profiles and forbidden mechanisms
+function method:clean_clone()
+ return new(self.realm, self.profile, self:forbidden())
+end
+
-- set the forbidden mechanisms
function method:forbidden( restrict )
if restrict then
--
cgit v1.2.3
From 243dc405ce0cb16de1d1bed31197492dcc0d1f63 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 27 Nov 2009 17:33:55 +0000
Subject: util.jid: Add join(node, host, resource) function to join the
components and return nil if invalid
---
util/jid.lua | 13 +++++++++++++
1 file changed, 13 insertions(+)
(limited to 'util')
diff --git a/util/jid.lua b/util/jid.lua
index ccc8309c..b43247cc 100644
--- a/util/jid.lua
+++ b/util/jid.lua
@@ -65,4 +65,17 @@ function prep(jid)
return host;
end
+function join(node, host, resource)
+ if node and host and resource then
+ return node.."@"..host.."/"..resource;
+ elseif node and host then
+ return node.."@"..host;
+ elseif host and resource then
+ return host.."/"..resource;
+ elseif host then
+ return host;
+ end
+ return nil; -- Invalid JID
+end
+
return _M;
--
cgit v1.2.3
From 9f1852c7638c1bccecd0120a570ae3f3bfd518af Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 28 Nov 2009 15:12:43 +0000
Subject: util.sasl.plain: Fail gracefully on empty <auth/> tag
---
util/sasl/plain.lua | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
(limited to 'util')
diff --git a/util/sasl/plain.lua b/util/sasl/plain.lua
index 46a86bb9..9ebfa15d 100644
--- a/util/sasl/plain.lua
+++ b/util/sasl/plain.lua
@@ -21,10 +21,14 @@ 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]+)")
-
+
+ local authorization, authentication, password;
+ if response then
+ authorization = s_match(response, "([^%z]+)")
+ authentication = s_match(response, "%z([^%z]+)%z")
+ password = s_match(response, "%z[^%z]+%z([^%z]+)")
+ end
+
if authentication == nil or password == nil then
return "failure", "malformed-request";
end
@@ -63,4 +67,4 @@ function init(registerMechanism)
registerMechanism("PLAIN", {"plain", "plain_test"}, plain);
end
-return _M;
\ No newline at end of file
+return _M;
--
cgit v1.2.3
From d3bf83037f653b6d07c32482a863dd45c0f24584 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Sat, 28 Nov 2009 18:23:25 +0100
Subject: util.sasl: Move some variables to local space. Fix a bug.
---
util/sasl.lua | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'util')
diff --git a/util/sasl.lua b/util/sasl.lua
index e3ae8087..9c8fff78 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -83,10 +83,11 @@ end
-- create a new SASL object which can be used to authenticate clients
function new(realm, profile, forbidden)
- sasl_i = {profile = profile};
+ local sasl_i = {profile = profile};
sasl_i.realm = realm;
- s = setmetatable(sasl_i, method);
- s:forbidden(sasl_i, forbidden)
+ local s = setmetatable(sasl_i, method);
+ if forbidden == nil then forbidden = {} end
+ s:forbidden(forbidden)
return s;
end
@@ -112,7 +113,7 @@ function method:mechanisms()
for backend, f in pairs(self.profile) do
if backend_mechanism[backend] then
for _, mechanism in ipairs(backend_mechanism[backend]) do
- if not sasl_i.restrict:contains(mechanism) then
+ if not self.restrict:contains(mechanism) then
mechanisms[mechanism] = true;
end
end
--
cgit v1.2.3
From b022ba7fc29418504fcbe6890a784d3cef2cb265 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Sat, 28 Nov 2009 18:32:41 +0100
Subject: Make some more variables to locals.
---
util/sasl/digest-md5.lua | 6 +-----
util/sasl/scram.lua | 4 ++--
2 files changed, 3 insertions(+), 7 deletions(-)
(limited to 'util')
diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua
index f8e0e393..a14e875b 100644
--- a/util/sasl/digest-md5.lua
+++ b/util/sasl/digest-md5.lua
@@ -28,10 +28,6 @@ module "digest-md5"
--=========================
--SASL DIGEST-MD5 according to RFC 2831
-local function digest_response()
-
- return response, A1, A2
-end
local function digest(self, message)
--TODO complete support for authzid
@@ -174,7 +170,7 @@ local function digest(self, message)
local password, state = self.profile.plain(response["username"], self.realm)
if state == nil then return "failure", "not-authorized"
elseif state == false then return "failure", "account-disabled" end
- Y = md5(response["username"]..":"..response["realm"]..":"..password);
+ local Y = md5(response["username"]..":"..response["realm"]..":"..password);
elseif self.profile["digest-md5"] then
local Y, state = self.profile["digest-md5"](response["username"], self.realm, response["realm"], response["charset"])
if state == nil then return "failure", "not-authorized"
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index 4413e2a6..1e9c6f7d 100644
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -54,7 +54,7 @@ local function Hi(hmac, str, salt, i)
local Ust = hmac(str, salt.."\0\0\0\1");
local res = Ust;
for n=1,i-1 do
- Und = hmac(str, Ust)
+ local Und = hmac(str, Ust)
res = binaryXOR(res, Und)
Ust = Und
end
@@ -118,7 +118,7 @@ local function scram_sha_1(self, message)
local password;
if self.profile.plain then
- password, state = self.profile.plain(self.state.name, self.realm)
+ local password, state = self.profile.plain(self.state.name, self.realm)
if state == nil then return "failure", "not-authorized"
elseif state == false then return "failure", "account-disabled" end
password = saslprep(password);
--
cgit v1.2.3
From 513d6dfa4aaf3a68d89c4ecb150c3a89f25f8539 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Sat, 28 Nov 2009 18:58:58 +0100
Subject: util.sasl.digest-md5: Fixing some variable access.
---
util/sasl/digest-md5.lua | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'util')
diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua
index a14e875b..c4507d11 100644
--- a/util/sasl/digest-md5.lua
+++ b/util/sasl/digest-md5.lua
@@ -166,13 +166,14 @@ local function digest(self, message)
--TODO maybe realm support
self.username = response["username"];
+ local Y, state;
if self.profile.plain then
local password, state = self.profile.plain(response["username"], self.realm)
if state == nil then return "failure", "not-authorized"
elseif state == false then return "failure", "account-disabled" end
- local Y = md5(response["username"]..":"..response["realm"]..":"..password);
+ Y = md5(response["username"]..":"..response["realm"]..":"..password);
elseif self.profile["digest-md5"] then
- local Y, state = self.profile["digest-md5"](response["username"], self.realm, response["realm"], response["charset"])
+ Y, state = self.profile["digest-md5"](response["username"], self.realm, response["realm"], response["charset"])
if state == nil then return "failure", "not-authorized"
elseif state == false then return "failure", "account-disabled" end
elseif self.profile["digest-md5-test"] then
--
cgit v1.2.3
From 8fcbba4b0fccb299121083d97cab065e51fba9d1 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sun, 29 Nov 2009 18:30:33 +0500
Subject: util.sasl.plain: A little refactoring.
---
util/sasl/plain.lua | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
(limited to 'util')
diff --git a/util/sasl/plain.lua b/util/sasl/plain.lua
index 9ebfa15d..a4c8765d 100644
--- a/util/sasl/plain.lua
+++ b/util/sasl/plain.lua
@@ -17,26 +17,23 @@ local log = require "util.logger".init("sasl");
module "plain"
---=========================
---SASL PLAIN according to RFC 4616
+-- ================================
+-- SASL PLAIN according to RFC 4616
local function plain(self, message)
- local response = message
-
- local authorization, authentication, password;
- if response then
- authorization = s_match(response, "([^%z]+)")
- authentication = s_match(response, "%z([^%z]+)%z")
- password = s_match(response, "%z[^%z]+%z([^%z]+)")
+ if not message then
+ return "failure", "malformed-request";
end
-
- if authentication == nil or password == nil then
+
+ local authorization, authentication, password = s_match(message, "^([^%z]+)%z([^%z]+)%z([^%z]+)");
+
+ if not authorization 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 SASLprep.");
return "failure", "malformed-request", "Invalid username or password.";
--
cgit v1.2.3