mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_auth_internal_*: Apply saslprep to passwords

Browse source 
Related to #1560
This commit is contained in:
Kim Alvefur 2020-05-23 14:17:04 +02:00
parent a7083d1ded
commit 71c6728e69
3 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/mod_auth_insecure.lua
View file

@ -9,6 +9,7 @@
local datamanager = require "util.datamanager"; local datamanager = require "util.datamanager";
local new_sasl = require "util.sasl".new; local new_sasl = require "util.sasl".new;
local saslprep = require "util.encodings".stringprep.saslprep;
local host = module.host; local host = module.host;
local provider = { name = "insecure" }; local provider = { name = "insecure" };
@ -21,6 +22,10 @@ end
function provider.set_password(username, password) function provider.set_password(username, password)
local account = datamanager.load(username, host, "accounts"); local account = datamanager.load(username, host, "accounts");
password = saslprep(password);
if not password then
return nil, "Password fails SASLprep.";
end
if account then if account then
account.password = password; account.password = password;
return datamanager.store(username, host, "accounts", account); return datamanager.store(username, host, "accounts", account);

7
plugins/mod_auth_internal_hashed.lua
View file

@ -15,6 +15,7 @@ local generate_uuid = require "util.uuid".generate;
local new_sasl = require "util.sasl".new; local new_sasl = require "util.sasl".new;
local hex = require"util.hex"; local hex = require"util.hex";
local to_hex, from_hex = hex.to, hex.from; local to_hex, from_hex = hex.to, hex.from;
local saslprep = require "util.encodings".stringprep.saslprep;
local log = module._log; local log = module._log;
local host = module.host; local host = module.host;
@ -32,9 +33,13 @@ local provider = {};
function provider.test_password(username, password) function provider.test_password(username, password)
log("debug", "test password for user '%s'", username); log("debug", "test password for user '%s'", username);
local credentials = accounts:get(username) or {}; local credentials = accounts:get(username) or {};
password = saslprep(password);
if not password then
return nil, "Password fails SASLprep.";
end
if credentials.password ~= nil and string.len(credentials.password) ~= 0 then if credentials.password ~= nil and string.len(credentials.password) ~= 0 then
if credentials.password ~= password then if saslprep(credentials.password) ~= password then
return nil, "Auth failed. Provided password is incorrect."; return nil, "Auth failed. Provided password is incorrect.";
end end

15
plugins/mod_auth_internal_plain.lua
View file

@ -8,6 +8,7 @@
local usermanager = require "core.usermanager"; local usermanager = require "core.usermanager";
local new_sasl = require "util.sasl".new; local new_sasl = require "util.sasl".new;
local saslprep = require "util.encodings".stringprep.saslprep;
local log = module._log; local log = module._log;
local host = module.host; local host = module.host;
@ -20,8 +21,12 @@ local provider = {};
function provider.test_password(username, password) function provider.test_password(username, password)
log("debug", "test password for user '%s'", username); log("debug", "test password for user '%s'", username);
local credentials = accounts:get(username) or {}; local credentials = accounts:get(username) or {};
password = saslprep(password);
if not password then
return nil, "Password fails SASLprep.";
end
if password == credentials.password then if password == saslprep(credentials.password) then
return true; return true;
else else
return nil, "Auth failed. Invalid username or password."; return nil, "Auth failed. Invalid username or password.";
@ -35,6 +40,10 @@ end
function provider.set_password(username, password) function provider.set_password(username, password)
log("debug", "set_password for username '%s'", username); log("debug", "set_password for username '%s'", username);
password = saslprep(password);
if not password then
return nil, "Password fails SASLprep.";
end
local account = accounts:get(username); local account = accounts:get(username);
if account then if account then
account.password = password; account.password = password;
@ -57,6 +66,10 @@ function provider.users()
end end
function provider.create_user(username, password) function provider.create_user(username, password)
password = saslprep(password);
if not password then
return nil, "Password fails SASLprep.";
end
return accounts:set(username, {password = password}); return accounts:set(username, {password = password});
end end