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

prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola)

Browse source
This commit is contained in:
Matthew Wild 2010-05-15 19:38:40 +01:00
parent 2830d44225
commit 7a03cd0c61
1 changed files with 41 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

47
prosodyctl
View file

@ -122,8 +122,12 @@ local error_messages = setmetatable({
hosts = prosody.hosts;
local function make_host(hostname)
return { events = prosody.events, users = require "core.usermanager".new_default_provider(hostname) };
end
for hostname, config in pairs(config.getconfig()) do
hosts[hostname] = { events = prosody.events };
hosts[hostname] = make_host(hostname);
end
require "core.modulemanager"
@ -235,14 +239,21 @@ function commands.adduser(arg)
return 1;
end
if prosodyctl.user_exists{ user = user, host = host } then
show_message [[That user already exists]];
return 1;
end
if not hosts[host] then
show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
show_warning("The user will not be able to log in until this is changed.");
hosts[host] = make_host(host);
elseif config.get(host, "core", "authentication")
and config.get(host, "core", "authentication") ~= "default" then
show_warning("The host '%s' is configured to use the '%s' authentication provider", host,
config.get(host, "core", "authentication"));
show_warning("prosodyctl currently only supports the default provider, sorry :(");
return 1;
end
if prosodyctl.user_exists{ user = user, host = host } then
show_message [[That user already exists]];
return 1;
end
local password = read_password();
@ -273,6 +284,18 @@ function commands.passwd(arg)
return 1;
end
if not hosts[host] then
show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
show_warning("The user will not be able to log in until this is changed.");
hosts[host] = make_host(host);
elseif config.get(host, "core", "authentication")
and config.get(host, "core", "authentication") ~= "default" then
show_warning("The host '%s' is configured to use the '%s' authentication provider", host,
config.get(host, "core", "authentication"));
show_warning("prosodyctl currently only supports the default provider, sorry :(");
return 1;
end
if not prosodyctl.user_exists { user = user, host = host } then
show_message [[That user does not exist, use prosodyctl adduser to create a new user]]
return 1;
@ -306,6 +329,18 @@ function commands.deluser(arg)
return 1;
end
if not hosts[host] then
show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
show_warning("The user will not be able to log in until this is changed.");
hosts[host] = make_host(host);
elseif config.get(host, "core", "authentication")
and config.get(host, "core", "authentication") ~= "default" then
show_warning("The host '%s' is configured to use the '%s' authentication provider", host,
config.get(host, "core", "authentication"));
show_warning("prosodyctl currently only supports the default provider, sorry :(");
return 1;
end
if not prosodyctl.user_exists { user = user, host = host } then
show_message [[That user does not exist on this server]]
return 1;