projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.9 -> 0.10
[prosody.git]
/
plugins
/
mod_auth_internal_plain.lua
diff --git
a/plugins/mod_auth_internal_plain.lua
b/plugins/mod_auth_internal_plain.lua
index 7514164d6f71ee6b1d99afcabb079e855b6069e6..db5284320e78e495f2bebda1999619da40715f63 100644
(file)
--- a/
plugins/mod_auth_internal_plain.lua
+++ b/
plugins/mod_auth_internal_plain.lua
@@
-6,21
+6,20
@@
-- COPYING file in the source package for more information.
--
-- COPYING file in the source package for more information.
--
-local datamanager = require "util.datamanager";
local usermanager = require "core.usermanager";
local new_sasl = require "util.sasl".new;
local usermanager = require "core.usermanager";
local new_sasl = require "util.sasl".new;
-local nodeprep = require "util.encodings".stringprep.nodeprep;
local log = module._log;
local host = module.host;
local log = module._log;
local host = module.host;
+local accounts = module:open_store("accounts");
+
-- define auth provider
local provider = {};
-- define auth provider
local provider = {};
-log("debug", "initializing internal_plain authentication provider for host '%s'", host);
function provider.test_password(username, password)
function provider.test_password(username, password)
- log("debug", "test password
'%s' for user %s at host %s", password, username, host
);
- local credentials =
datamanager.load(username, host, "accounts"
) or {};
+ log("debug", "test password
for user '%s'", username
);
+ local credentials =
accounts:get(username
) or {};
if password == credentials.password then
return true;
if password == credentials.password then
return true;
@@
-30,49
+29,45
@@
function provider.test_password(username, password)
end
function provider.get_password(username)
end
function provider.get_password(username)
- log("debug", "get_password for username '%s'
at host '%s'", username, host
);
- return (
datamanager.load(username, host, "accounts"
) or {}).password;
+ log("debug", "get_password for username '%s'
", username
);
+ return (
accounts:get(username
) or {}).password;
end
function provider.set_password(username, password)
end
function provider.set_password(username, password)
- local account = datamanager.load(username, host, "accounts");
+ log("debug", "set_password for username '%s'", username);
+ local account = accounts:get(username);
if account then
account.password = password;
if account then
account.password = password;
- return
datamanager.store(username, host, "accounts"
, account);
+ return
accounts:set(username
, account);
end
return nil, "Account not available.";
end
function provider.user_exists(username)
end
return nil, "Account not available.";
end
function provider.user_exists(username)
- local account =
datamanager.load(username, host, "accounts"
);
+ local account =
accounts:get(username
);
if not account then
if not account then
- log("debug", "account not found for username '%s'
at host '%s'", username, host
);
+ log("debug", "account not found for username '%s'
", username
);
return nil, "Auth failed. Invalid username";
end
return true;
end
function provider.users()
return nil, "Auth failed. Invalid username";
end
return true;
end
function provider.users()
- return
datamanager.users(host, "accounts"
);
+ return
accounts:users(
);
end
function provider.create_user(username, password)
end
function provider.create_user(username, password)
- return
datamanager.store(username, host, "accounts"
, {password = password});
+ return
accounts:set(username
, {password = password});
end
function provider.delete_user(username)
end
function provider.delete_user(username)
- return
datamanager.store(username, host, "accounts"
, nil);
+ return
accounts:set(username
, nil);
end
function provider.get_sasl_handler()
local getpass_authentication_profile = {
plain = function(sasl, username, realm)
end
function provider.get_sasl_handler()
local getpass_authentication_profile = {
plain = function(sasl, username, realm)
- local prepped_username = nodeprep(username);
- if not prepped_username then
- log("debug", "NODEprep failed on username: %s", username);
- return "", nil;
- end
- local password = usermanager.get_password(prepped_username, realm);
+ local password = usermanager.get_password(username, realm);
if not password then
return "", nil;
end
if not password then
return "", nil;
end
@@
-81,6
+76,6
@@
function provider.get_sasl_handler()
};
return new_sasl(host, getpass_authentication_profile);
end
};
return new_sasl(host, getpass_authentication_profile);
end
-
+
module:provides("auth", provider);
module:provides("auth", provider);