aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-23 15:38:38 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-23 15:38:38 +0100
commitc953a057a8fb1e0b0617dd090ab4ff7a643956c3 (patch)
tree6c5314d0829139cb9ef4d305679085eb744b1577
parent9c847957b9e4e7a90fcdf39ac349f48eb93c4a21 (diff)
parent5468423a19fc09b010d0c4aa92e486ecbe0c9dae (diff)
downloadprosody-c953a057a8fb1e0b0617dd090ab4ff7a643956c3.tar.gz
prosody-c953a057a8fb1e0b0617dd090ab4ff7a643956c3.zip
Merge 0.9->trunk
-rw-r--r--plugins/mod_admin_adhoc.lua1173
-rw-r--r--util/adhoc.lua31
2 files changed, 561 insertions, 643 deletions
diff --git a/plugins/mod_admin_adhoc.lua b/plugins/mod_admin_adhoc.lua
index ff672fc9..31c4bde4 100644
--- a/plugins/mod_admin_adhoc.lua
+++ b/plugins/mod_admin_adhoc.lua
@@ -10,6 +10,8 @@ local prosody = _G.prosody;
local hosts = prosody.hosts;
local t_concat = table.concat;
+local module_host = module:get_host();
+
local keys = require "util.iterators".keys;
local usermanager_user_exists = require "core.usermanager".user_exists;
local usermanager_create_user = require "core.usermanager".create_user;
@@ -25,6 +27,8 @@ local dataforms_new = require "util.dataforms".new;
local array = require "util.array";
local modulemanager = require "modulemanager";
local core_post_stanza = prosody.core_post_stanza;
+local adhoc_simple = require "util.adhoc".new_simple_form;
+local adhoc_initial = require "util.adhoc".new_initial_data_form;
module:depends("adhoc");
local adhoc_new = module:require "adhoc".new;
@@ -37,82 +41,69 @@ local function generate_error_message(errors)
return { status = "completed", error = { message = t_concat(errmsg, "\n") } };
end
-function add_user_command_handler(self, data, state)
- local add_user_layout = dataforms_new{
- title = "Adding a User";
- instructions = "Fill out this form to add a user.";
+-- Adding a new user
+local add_user_layout = dataforms_new{
+ title = "Adding a User";
+ instructions = "Fill out this form to add a user.";
- { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
- { name = "accountjid", type = "jid-single", required = true, label = "The Jabber ID for the account to be added" };
- { name = "password", type = "text-private", label = "The password for this account" };
- { name = "password-verify", type = "text-private", label = "Retype password" };
- };
+ { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
+ { name = "accountjid", type = "jid-single", required = true, label = "The Jabber ID for the account to be added" };
+ { name = "password", type = "text-private", label = "The password for this account" };
+ { name = "password-verify", type = "text-private", label = "Retype password" };
+};
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
- end
- local fields, err = add_user_layout:data(data.form);
- if err then
- return generate_error_message(err);
- end
- local username, host, resource = jid.split(fields.accountjid);
- if data.to ~= host then
- return { status = "completed", error = { message = "Trying to add a user on " .. host .. " but command was sent to " .. data.to}};
- end
- if (fields["password"] == fields["password-verify"]) and username and host then
- if usermanager_user_exists(username, host) then
- return { status = "completed", error = { message = "Account already exists" } };
+local add_user_command_handler = adhoc_simple(add_user_layout, function(fields, err)
+ if err then
+ return generate_error_message(err);
+ end
+ local username, host, resource = jid.split(fields.accountjid);
+ if module_host ~= host then
+ return { status = "completed", error = { message = "Trying to add a user on " .. host .. " but command was sent to " .. module_host}};
+ end
+ if (fields["password"] == fields["password-verify"]) and username and host then
+ if usermanager_user_exists(username, host) then
+ return { status = "completed", error = { message = "Account already exists" } };
+ else
+ if usermanager_create_user(username, fields.password, host) then
+ module:log("info", "Created new account %s@%s", username, host);
+ return { status = "completed", info = "Account successfully created" };
else
- if usermanager_create_user(username, fields.password, host) then
- module:log("info", "Created new account %s@%s", username, host);
- return { status = "completed", info = "Account successfully created" };
- else
- return { status = "completed", error = { message = "Failed to write data to disk" } };
- end
+ return { status = "completed", error = { message = "Failed to write data to disk" } };
end
- else
- module:log("debug", "Invalid data, password mismatch or empty username while creating account for %s", fields.accountjid or "<nil>");
- return { status = "completed", error = { message = "Invalid data.\nPassword mismatch, or empty username" } };
end
else
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = add_user_layout }, "executing";
+ module:log("debug", "Invalid data, password mismatch or empty username while creating account for %s", fields.accountjid or "<nil>");
+ return { status = "completed", error = { message = "Invalid data.\nPassword mismatch, or empty username" } };
end
-end
+end);
-function change_user_password_command_handler(self, data, state)
- local change_user_password_layout = dataforms_new{
- title = "Changing a User Password";
- instructions = "Fill out this form to change a user's password.";
+-- Changing a user's password
+local change_user_password_layout = dataforms_new{
+ title = "Changing a User Password";
+ instructions = "Fill out this form to change a user's password.";
- { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
- { name = "accountjid", type = "jid-single", required = true, label = "The Jabber ID for this account" };
- { name = "password", type = "text-private", required = true, label = "The password for this account" };
- };
+ { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
+ { name = "accountjid", type = "jid-single", required = true, label = "The Jabber ID for this account" };
+ { name = "password", type = "text-private", required = true, label = "The password for this account" };
+};
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
- end
- local fields, err = change_user_password_layout:data(data.form);
- if err then
- return generate_error_message(err);
- end
- local username, host, resource = jid.split(fields.accountjid);
- if data.to ~= host then
- return { status = "completed", error = { message = "Trying to change the password of a user on " .. host .. " but command was sent to " .. data.to}};
- end
- if usermanager_user_exists(username, host) and usermanager_set_password(username, fields.password, host) then
- return { status = "completed", info = "Password successfully changed" };
- else
- return { status = "completed", error = { message = "User does not exist" } };
- end
+local change_user_password_command_handler = adhoc_simple(change_user_password_layout, function(fields, err)
+ if err then
+ return generate_error_message(err);
+ end
+ local username, host, resource = jid.split(fields.accountjid);
+ if module_host ~= host then
+ return { status = "completed", error = { message = "Trying to change the password of a user on " .. host .. " but command was sent to " .. module_host}};
+ end
+ if usermanager_user_exists(username, host) and usermanager_set_password(username, fields.password, host) then
+ return { status = "completed", info = "Password successfully changed" };
else
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = change_user_password_layout }, "executing";
+ return { status = "completed", error = { message = "User does not exist" } };
end
-end
+end);
-function config_reload_handler(self, data, state)
+-- Reloading the config
+local function config_reload_handler(self, data, state)
local ok, err = prosody.reload_config();
if ok then
return { status = "completed", info = "Configuration reloaded (modules may need to be reloaded for this to have an effect)" };
@@ -121,46 +112,39 @@ function config_reload_handler(self, data, state)
end
end
+-- Deleting a user's account
+local delete_user_layout = dataforms_new{
+ title = "Deleting a User";
+ instructions = "Fill out this form to delete a user.";
-function delete_user_command_handler(self, data, state)
- local delete_user_layout = dataforms_new{
- title = "Deleting a User";
- instructions = "Fill out this form to delete a user.";
+ { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
+ { name = "accountjids", type = "jid-multi", label = "The Jabber ID(s) to delete" };
+};
- { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
- { name = "accountjids", type = "jid-multi", label = "The Jabber ID(s) to delete" };
- };
-
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
- end
- local fields, err = delete_user_layout:data(data.form);
- if err then
- return generate_error_message(err);
- end
- local failed = {};
- local succeeded = {};
- for _, aJID in ipairs(fields.accountjids) do
- local username, host, resource = jid.split(aJID);
- if (host == data.to) and usermanager_user_exists(username, host) and usermanager_delete_user(username, host) then
- module:log("debug", "User %s has been deleted", aJID);
- succeeded[#succeeded+1] = aJID;
- else
- module:log("debug", "Tried to delete non-existant user %s", aJID);
- failed[#failed+1] = aJID;
- end
+local delete_user_command_handler = adhoc_simple(delete_user_layout, function(fields, err)
+ if err then
+ return generate_error_message(err);
+ end
+ local failed = {};
+ local succeeded = {};
+ for _, aJID in ipairs(fields.accountjids) do
+ local username, host, resource = jid.split(aJID);
+ if (host == module_host) and usermanager_user_exists(username, host) and usermanager_delete_user(username, host) then
+ module:log("debug", "User %s has been deleted", aJID);
+ succeeded[#succeeded+1] = aJID;
+ else
+ module:log("debug", "Tried to delete non-existant user %s", aJID);
+ failed[#failed+1] = aJID;
end
- return {status = "completed", info = (#succeeded ~= 0 and
- "The following accounts were successfully deleted:\n"..t_concat(succeeded, "\n").."\n" or "")..
- (#failed ~= 0 and
- "The following accounts could not be deleted:\n"..t_concat(failed, "\n") or "") };
- else
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = delete_user_layout }, "executing";
end
-end
-
-function disconnect_user(match_jid)
+ return {status = "completed", info = (#succeeded ~= 0 and
+ "The following accounts were successfully deleted:\n"..t_concat(succeeded, "\n").."\n" or "")..
+ (#failed ~= 0 and
+ "The following accounts could not be deleted:\n"..t_concat(failed, "\n") or "") };
+end);
+
+-- Ending a user's session
+local function disconnect_user(match_jid)
local node, hostname, givenResource = jid.split(match_jid);
local host = hosts[hostname];
local sessions = host.sessions[node] and host.sessions[node].sessions;
@@ -173,447 +157,382 @@ function disconnect_user(match_jid)
return true;
end
-function end_user_session_handler(self, data, state)
- local end_user_session_layout = dataforms_new{
- title = "Ending a User Session";
- instructions = "Fill out this form to end a user's session.";
+local end_user_session_layout = dataforms_new{
+ title = "Ending a User Session";
+ instructions = "Fill out this form to end a user's session.";
- { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
- { name = "accountjids", type = "jid-multi", label = "The Jabber ID(s) for which to end sessions" };
- };
-
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
- end
+ { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
+ { name = "accountjids", type = "jid-multi", label = "The Jabber ID(s) for which to end sessions" };
+};
- local fields, err = end_user_session_layout:data(data.form);
- if err then
- return generate_error_message(err);
- end
- local failed = {};
- local succeeded = {};
- for _, aJID in ipairs(fields.accountjids) do
- local username, host, resource = jid.split(aJID);
- if (host == data.to) and usermanager_user_exists(username, host) and disconnect_user(aJID) then
- succeeded[#succeeded+1] = aJID;
- else
- failed[#failed+1] = aJID;
- end
- end
- return {status = "completed", info = (#succeeded ~= 0 and
- "The following accounts were successfully disconnected:\n"..t_concat(succeeded, "\n").."\n" or "")..
- (#failed ~= 0 and
- "The following accounts could not be disconnected:\n"..t_concat(failed, "\n") or "") };
- else
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = end_user_session_layout }, "executing";
+local end_user_session_handler = adhoc_simple(end_user_session_layout, function(fields, err)
+ if err then
+ return generate_error_message(err);
end
-end
-
-function get_user_password_handler(self, data, state)
- local get_user_password_layout = dataforms_new{
- title = "Getting User's Password";
- instructions = "Fill out this form to get a user's password.";
-
- { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
- { name = "accountjid", type = "jid-single", required = true, label = "The Jabber ID for which to retrieve the password" };
- };
-
- local get_user_password_result_layout = dataforms_new{
- { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
- { name = "accountjid", type = "jid-single", label = "JID" };
- { name = "password", type = "text-single", label = "Password" };
- };
-
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
- end
- local fields, err = get_user_password_layout:data(data.form);
- if err then
- return generate_error_message(err);
- end
- local user, host, resource = jid.split(fields.accountjid);
- local accountjid = "";
- local password = "";
- if host ~= data.to then
- return { status = "completed", error = { message = "Tried to get password for a user on " .. host .. " but command was sent to " .. data.to } };
- elseif usermanager_user_exists(user, host) then
- accountjid = fields.accountjid;
- password = usermanager_get_password(user, host);
+ local failed = {};
+ local succeeded = {};
+ for _, aJID in ipairs(fields.accountjids) do
+ local username, host, resource = jid.split(aJID);
+ if (host == module_host) and usermanager_user_exists(username, host) and disconnect_user(aJID) then
+ succeeded[#succeeded+1] = aJID;
else
- return { status = "completed", error = { message = "User does not exist" } };
+ failed[#failed+1] = aJID;
end
- return { status = "completed", result = { layout = get_user_password_result_layout, values = {accountjid = accountjid, password = password} } };
+ end
+ return {status = "completed", info = (#succeeded ~= 0 and
+ "The following accounts were successfully disconnected:\n"..t_concat(succeeded, "\n").."\n" or "")..
+ (#failed ~= 0 and
+ "The following accounts could not be disconnected:\n"..t_concat(failed, "\n") or "") };
+end);
+
+-- Getting a user's password
+local get_user_password_layout = dataforms_new{
+ title = "Getting User's Password";
+ instructions = "Fill out this form to get a user's password.";
+
+ { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
+ { name = "accountjid", type = "jid-single", required = true, label = "The Jabber ID for which to retrieve the password" };
+};
+
+local get_user_password_result_layout = dataforms_new{
+ { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
+ { name = "accountjid", type = "jid-single", label = "JID" };
+ { name = "password", type = "text-single", label = "Password" };
+};
+
+local get_user_password_handler = adhoc_simple(get_user_password_layout, function(fields, err)
+ if err then
+ return generate_error_message(err);
+ end
+ local user, host, resource = jid.split(fields.accountjid);
+ local accountjid = "";
+ local password = "";
+ if host ~= module_host then
+ return { status = "completed", error = { message = "Tried to get password for a user on " .. host .. " but command was sent to " .. module_host } };
+ elseif usermanager_user_exists(user, host) then
+ accountjid = fields.accountjid;
+ password = usermanager_get_password(user, host);
else
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = get_user_password_layout }, "executing";
+ return { status = "completed", error = { message = "User does not exist" } };
+ end
+ return { status = "completed", result = { layout = get_user_password_result_layout, values = {accountjid = accountjid, password = password} } };
+end);
+
+-- Getting a user's roster
+local get_user_roster_layout = dataforms_new{
+ { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
+ { name = "accountjid", type = "jid-single", required = true, label = "The Jabber ID for which to retrieve the roster" };
+};
+
+local get_user_roster_result_layout = dataforms_new{
+ { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
+ { name = "accountjid", type = "jid-single", label = "This is the roster for" };
+ { name = "roster", type = "text-multi", label = "Roster XML" };
+};
+
+local get_user_roster_handler = adhoc_simple(get_user_roster_layout, function(fields, err)
+ if err then
+ return generate_error_message(err);
end
-end
-
-function get_user_roster_handler(self, data, state)
- local get_user_roster_layout = dataforms_new{
- { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
- { name = "accountjid", type = "jid-single", required = true, label = "The Jabber ID for which to retrieve the roster" };
- };
-
- local get_user_roster_result_layout = dataforms_new{
- { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
- { name = "accountjid", type = "jid-single", label = "This is the roster for" };
- { name = "roster", type = "text-multi", label = "Roster XML" };
- };
-
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
- end
-
- local fields, err = get_user_roster_layout:data(data.form);
-
- if err then
- return generate_error_message(err);
- end
- local user, host, resource = jid.split(fields.accountjid);
- if host ~= data.to then
- return { status = "completed", error = { message = "Tried to get roster for a user on " .. host .. " but command was sent to " .. data.to } };
- elseif not usermanager_user_exists(user, host) then
- return { status = "completed", error = { message = "User does not exist" } };
- end
- local roster = rm_load_roster(user, host);
-
- local query = st.stanza("query", { xmlns = "jabber:iq:roster" });
- for jid in pairs(roster) do
- if jid ~= "pending" and jid then
- query:tag("item", {
- jid = jid,
- subscription = roster[jid].subscription,
- ask = roster[jid].ask,
- name = roster[jid].name,
- });
- for group in pairs(roster[jid].groups) do
- query:tag("group"):text(group):up();
- end
- query:up();
+ local user, host, resource = jid.split(fields.accountjid);
+ if host ~= module_host then
+ return { status = "completed", error = { message = "Tried to get roster for a user on " .. host .. " but command was sent to " .. module_host } };
+ elseif not usermanager_user_exists(user, host) then
+ return { status = "completed", error = { message = "User does not exist" } };
+ end
+ local roster = rm_load_roster(user, host);
+
+ local query = st.stanza("query", { xmlns = "jabber:iq:roster" });
+ for jid in pairs(roster) do
+ if jid ~= "pending" and jid then
+ query:tag("item", {
+ jid = jid,
+ subscription = roster[jid].subscription,
+ ask = roster[jid].ask,
+ name = roster[jid].name,
+ });
+ for group in pairs(roster[jid].groups) do
+ query:tag("group"):text(group):up();
end
+ query:up();
end
-
- local query_text = tostring(query):gsub("><", ">\n<");
-
- local result = get_user_roster_result_layout:form({ accountjid = user.."@"..host, roster = query_text }, "result");
- result:add_child(query);
- return { status = "completed", other = result };
- else
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = get_user_roster_layout }, "executing";
end
-end
-function get_user_stats_handler(self, data, state)
- local get_user_stats_layout = dataforms_new{
- title = "Get User Statistics";
- instructions = "Fill out this form to gather user statistics.";
+ local query_text = tostring(query):gsub("><", ">\n<");
- { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
- { name = "accountjid", type = "jid-single", required = true, label = "The Jabber ID for statistics" };
- };
+ local result = get_user_roster_result_layout:form({ accountjid = user.."@"..host, roster = query_text }, "result");
+ result:add_child(query);
+ return { status = "completed", other = result };
+end);
- local get_user_stats_result_layout = dataforms_new{
- { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
- { name = "ipaddresses", type = "text-multi", label = "IP Addresses" };
- { name = "rostersize", type = "text-single", label = "Roster size" };
- { name = "onlineresources", type = "text-multi", label = "Online Resources" };
- };
+-- Getting user statistics
+local get_user_stats_layout = dataforms_new{
+ title = "Get User Statistics";
+ instructions = "Fill out this form to gather user statistics.";
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
- end
-
- local fields, err = get_user_stats_layout:data(data.form);
+ { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
+ { name = "accountjid", type = "jid-single", required = true, label = "The Jabber ID for statistics" };
+};
- if err then
- return generate_error_message(err);
- end
+local get_user_stats_result_layout = dataforms_new{
+ { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
+ { name = "ipaddresses", type = "text-multi", label = "IP Addresses" };
+ { name = "rostersize", type = "text-single", label = "Roster size" };
+ { name = "onlineresources", type = "text-multi", label = "Online Resources" };
+};
- local user, host, resource = jid.split(fields.accountjid);
- if host ~= data.to then
- return { status = "completed", error = { message = "Tried to get stats for a user on " .. host .. " but command was sent to " .. data.to } };
- elseif not usermanager_user_exists(user, host) then
- return { status = "completed", error = { message = "User does not exist" } };
- end
- local roster = rm_load_roster(user, host);
- local rostersize = 0;
- local IPs = "";
- local resources = "";
- for jid in pairs(roster) do
- if jid ~= "pending" and jid then
- rostersize = rostersize + 1;
- end
- end
- for resource, session in pairs((hosts[host].sessions[user] and hosts[host].sessions[user].sessions) or {}) do
- resources = resources .. "\n" .. resource;
- IPs = IPs .. "\n" .. session.ip;
- end
- return { status = "completed", result = {layout = get_user_stats_result_layout, values = {ipaddresses = IPs, rostersize = tostring(rostersize),
- onlineresources = resources}} };
- else
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = get_user_stats_layout }, "executing";
+local get_user_stats_handler = adhoc_simple(get_user_stats_layout, function(fields, err)
+ if err then
+ return generate_error_message(err);
end
-end
-function get_online_users_command_handler(self, data, state)
- local get_online_users_layout = dataforms_new{
- title = "Getting List of Online Users";
- instructions = "How many users should be returned at most?";
-
- { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
- { name = "max_items", type = "list-single", label = "Maximum number of users",
- value = { "25", "50", "75", "100", "150", "200", "all" } };
- { name = "details", type = "boolean", label = "Show details" };
- };
-
- local get_online_users_result_layout = dataforms_new{
- { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
- { name = "onlineuserjids", type = "text-multi", label = "The list of all online users" };
- };
-
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
- end
-
- local fields, err = get_online_users_layout:data(data.form);
-
- if err then
- return generate_error_message(err);
+ local user, host, resource = jid.split(fields.accountjid);
+ if host ~= module_host then
+ return { status = "completed", error = { message = "Tried to get stats for a user on " .. host .. " but command was sent to " .. module_host } };
+ elseif not usermanager_user_exists(user, host) then
+ return { status = "completed", error = { message = "User does not exist" } };
+ end
+ local roster = rm_load_roster(user, host);
+ local rostersize = 0;
+ local IPs = "";
+ local resources = "";
+ for jid in pairs(roster) do
+ if jid ~= "pending" and jid then
+ rostersize = rostersize + 1;
end
+ end
+ for resource, session in pairs((hosts[host].sessions[user] and hosts[host].sessions[user].sessions) or {}) do
+ resources = resources .. "\n" .. resource;
+ IPs = IPs .. "\n" .. session.ip;
+ end
+ return { status = "completed", result = {layout = get_user_stats_result_layout, values = {ipaddresses = IPs, rostersize = tostring(rostersize),
+ onlineresources = resources}} };
+end);
+
+-- Getting a list of online users
+local get_online_users_layout = dataforms_new{
+ title = "Getting List of Online Users";
+ instructions = "How many users should be returned at most?";
+
+ { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
+ { name = "max_items", type = "list-single", label = "Maximum number of users",
+ value = { "25", "50", "75", "100", "150", "200", "all" } };
+ { name = "details", type = "boolean", label = "Show details" };
+};
+
+local get_online_users_result_layout = dataforms_new{
+ { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
+ { name = "onlineuserjids", type = "text-multi", label = "The list of all online users" };
+};
+
+local get_online_users_command_handler = adhoc_simple(get_online_users_layout, function(fields, err)
+ if err then
+ return generate_error_message(err);
+ end
- local max_items = nil
- if fields.max_items ~= "all" then
- max_items = tonumber(fields.max_items);
- end
- local count = 0;
- local users = {};
- for username, user in pairs(hosts[data.to].sessions or {}) do
- if (max_items ~= nil) and (count >= max_items) then
- break;
- end
- users[#users+1] = username.."@"..data.to;
- count = count + 1;
- if fields.details then
- for resource, session in pairs(user.sessions or {}) do
- local status, priority = "unavailable", tostring(session.priority or "-");
- if session.presence then
- status = session.presence:child_with_name("show");
- if status then
- status = status:get_text() or "[invalid!]";
- else
- status = "available";
- end
+ local max_items = nil
+ if fields.max_items ~= "all" then
+ max_items = tonumber(fields.max_items);
+ end
+ local count = 0;
+ local users = {};
+ for username, user in pairs(hosts[module_host].sessions or {}) do
+ if (max_items ~= nil) and (count >= max_items) then
+ break;
+ end
+ users[#users+1] = username.."@"..module_host;
+ count = count + 1;
+ if fields.details then
+ for resource, session in pairs(user.sessions or {}) do
+ local status, priority = "unavailable", tostring(session.priority or "-");
+ if session.presence then
+ status = session.presence:child_with_name("show");
+ if status then
+ status = status:get_text() or "[invalid!]";
+ else
+ status = "available";
end
- users[#users+1] = " - "..resource..": "..status.."("..priority..")";
end
+ users[#users+1] = " - "..resource..": "..status.."("..priority..")";
end
end
- return { status = "completed", result = {layout = get_online_users_result_layout, values = {onlineuserjids=t_concat(users, "\n")}} };
- else
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = get_online_users_layout }, "executing";
end
-end
+ return { status = "completed", result = {layout = get_online_users_result_layout, values = {onlineuserjids=t_concat(users, "\n")}} };
+end);
-function list_modules_handler(self, data, state)
- local result = dataforms_new {
- title = "List of loaded modules";
+-- Getting a list of loaded modules
+local list_modules_result = dataforms_new {
+ title = "List of loaded modules";
- { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/modules#list" };
- { name = "modules", type = "text-multi", label = "The following modules are loaded:" };
- };
-
- local modules = array.collect(keys(hosts[data.to].modules)):sort():concat("\n");
+ { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/modules#list" };
+ { name = "modules", type = "text-multi", label = "The following modules are loaded:" };
+};
- return { status = "completed", result = { layout = result; values = { modules = modules } } };
+local function list_modules_handler(self, data, state)
+ local modules = array.collect(keys(hosts[module_host].modules)):sort():concat("\n");
+ return { status = "completed", result = { layout = list_modules_result; values = { modules = modules } } };
end
-function load_module_handler(self, data, state)
- local layout = dataforms_new {
- title = "Load module";
- instructions = "Specify the module to be loaded";
+-- Loading a module
+local load_module_layout = dataforms_new {
+ title = "Load module";
+ instructions = "Specify the module to be loaded";
- { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/modules#load" };
- { name = "module", type = "text-single", required = true, label = "Module to be loaded:"};
- };
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
- end
- local fields, err = layout:data(data.form);
- if err then
- return generate_error_message(err);
- end
- if modulemanager.is_loaded(data.to, fields.module) then
- return { status = "completed", info = "Module already loaded" };
- end
- local ok, err = modulemanager.load(data.to, fields.module);
- if ok then
- return { status = "completed", info = 'Module "'..fields.module..'" successfully loaded on host "'..data.to..'".' };
- else
- return { status = "completed", error = { message = 'Failed to load module "'..fields.module..'" on host "'..data.to..
- '". Error was: "'..tostring(err or "<unspecified>")..'"' } };
- end
+ { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/modules#load" };
+ { name = "module", type = "text-single", required = true, label = "Module to be loaded:"};
+};
+
+local load_module_handler = adhoc_simple(load_module_layout, function(fields, err)
+ if err then
+ return generate_error_message(err);
+ end
+ if modulemanager.is_loaded(module_host, fields.module) then
+ return { status = "completed", info = "Module already loaded" };
+ end
+ local ok, err = modulemanager.load(module_host, fields.module);
+ if ok then
+ return { status = "completed", info = 'Module "'..fields.module..'" successfully loaded on host "'..module_host..'".' };
else
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = layout }, "executing";
+ return { status = "completed", error = { message = 'Failed to load module "'..fields.module..'" on host "'..module_host..
+ '". Error was: "'..tostring(err or "<unspecified>")..'"' } };
end
-end
-
-local function globally_load_module_handler(self, data, state)
- local layout = dataforms_new {
- title = "Globally load module";
- instructions = "Specify the module to be loaded on all hosts";
-
- { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/modules#global-load" };
- { name = "module", type = "text-single", required = true, label = "Module to globally load:"};
- };
- if state then
- local ok_list, err_list = {}, {};
+end);
- if data.action == "cancel" then
- return { status = "canceled" };
- end
+-- Globally loading a module
+local globally_load_module_layout = dataforms_new {
+ title = "Globally load module";
+ instructions = "Specify the module to be loaded on all hosts";
- local fields, err = layout:data(data.form);
- if err then
- return generate_error_message(err);
- end
+ { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/modules#global-load" };
+ { name = "module", type = "text-single", required = true, label = "Module to globally load:"};
+};
- local ok, err = modulemanager.load(data.to, fields.module);
- if ok then
- ok_list[#ok_list + 1] = data.to;
- else
- err_list[#err_list + 1] = data.to .. " (Error: " .. tostring(err) .. ")";
- end
+local globally_load_module_handler = adhoc_simple(globally_load_module_layout, function(fields, err)
+ local ok_list, err_list = {}, {};
- -- Is this a global module?
- if modulemanager.is_loaded("*", fields.module) and not modulemanager.is_loaded(data.to, fields.module) then
- return { status = "completed", info = 'Global module '..fields.module..' loaded.' };
- end
-
- -- This is either a shared or "normal" module, load it on all other hosts
- for host_name, host in pairs(hosts) do
- if host_name ~= data.to and host.type == "local" then
- local ok, err = modulemanager.load(host_name, fields.module);
- if ok then
- ok_list[#ok_list + 1] = host_name;
- else
- err_list[#err_list + 1] = host_name .. " (Error: " .. tostring(err) .. ")";
- end
- end
- end
+ if err then
+ return generate_error_message(err);
+ end
- local info = (#ok_list > 0 and ("The module "..fields.module.." was successfully loaded onto the hosts:\n"..t_concat(ok_list, "\n")) or "")
- .. ((#ok_list > 0 and #err_list > 0) and "\n" or "") ..
- (#err_list > 0 and ("Failed to load the module "..fields.module.." onto the hosts:\n"..t_concat(err_list, "\n")) or "");
- return { status = "completed", info = info };
+ local ok, err = modulemanager.load(module_host, fields.module);
+ if ok then
+ ok_list[#ok_list + 1] = module_host;
else
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = layout }, "executing";
+ err_list[#err_list + 1] = module_host .. " (Error: " .. tostring(err) .. ")";
end
-end
-function reload_modules_handler(self, data, state)
- local layout = dataforms_new {
- title = "Reload modules";
- instructions = "Select the modules to be reloaded";
+ -- Is this a global module?
+ if modulemanager.is_loaded("*", fields.module) and not modulemanager.is_loaded(module_host, fields.module) then
+ return { status = "completed", info = 'Global module '..fields.module..' loaded.' };
+ end
- { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/modules#reload" };
- { name = "modules", type = "list-multi", required = true, label = "Modules to be reloaded:"};
- };
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
- end
- local fields, err = layout:data(data.form);
- if err then
- return generate_error_message(err);
- end
- local ok_list, err_list = {}, {};
- for _, module in ipairs(fields.modules) do
- local ok, err = modulemanager.reload(data.to, module);
+ -- This is either a shared or "normal" module, load it on all other hosts
+ for host_name, host in pairs(hosts) do
+ if host_name ~= module_host and host.type == "local" then
+ local ok, err = modulemanager.load(host_name, fields.module);
if ok then
- ok_list[#ok_list + 1] = module;
+ ok_list[#ok_list + 1] = host_name;
else
- err_list[#err_list + 1] = module .. "(Error: " .. tostring(err) .. ")";
+ err_list[#err_list + 1] = host_name .. " (Error: " .. tostring(err) .. ")";
end
end
- local info = (#ok_list > 0 and ("The following modules were successfully reloaded on host "..data.to..":\n"..t_concat(ok_list, "\n")) or "")
- .. ((#ok_list > 0 and #err_list > 0) and "\n" or "") ..
- (#err_list > 0 and ("Failed to reload the following modules on host "..data.to..":\n"..t_concat(err_list, "\n")) or "");
- return { status = "completed", info = info };
- else
- local modules = array.collect(keys(hosts[data.to].modules)):sort();
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = { layout = layout; values = { modules = modules } } }, "executing";
end
-end
-local function globally_reload_module_handler(self, data, state)
- local layout = dataforms_new {
- title = "Globally reload module";
- instructions = "Specify the module to reload on all hosts";
-
- { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/modules#global-reload" };
- { name = "module", type = "list-single", required = true, label = "Module to globally reload:"};
- };
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
- end
-
- local is_global = false;
- local fields, err = layout:data(data.form);
- if err then
- return generate_error_message(err);
+ local info = (#ok_list > 0 and ("The module "..fields.module.." was successfully loaded onto the hosts:\n"..t_concat(ok_list, "\n")) or "")
+ .. ((#ok_list > 0 and #err_list > 0) and "\n" or "") ..
+ (#err_list > 0 and ("Failed to load the module "..fields.module.." onto the hosts:\n"..t_concat(err_list, "\n")) or "");
+ return { status = "completed", info = info };
+end);
+
+-- Reloading modules
+local reload_modules_layout = dataforms_new {
+ title = "Reload modules";
+ instructions = "Select the modules to be reloaded";
+
+ { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/modules#reload" };
+ { name = "modules", type = "list-multi", required = true, label = "Modules to be reloaded:"};
+};
+
+local reload_modules_handler = adhoc_initial(reload_modules_layout, function()
+ return { modules = array.collect(keys(hosts[module_host].modules)):sort() };
+end, function(fields, err)
+ if err then
+ return generate_error_message(err);
+ end
+ local ok_list, err_list = {}, {};
+ for _, module in ipairs(fields.modules) do
+ local ok, err = modulemanager.reload(module_host, module);
+ if ok then
+ ok_list[#ok_list + 1] = module;
+ else
+ err_list[#err_list + 1] = module .. "(Error: " .. tostring(err) .. ")";
end
+ end
+ local info = (#ok_list > 0 and ("The following modules were successfully reloaded on host "..module_host..":\n"..t_concat(ok_list, "\n")) or "")
+ .. ((#ok_list > 0 and #err_list > 0) and "\n" or "") ..
+ (#err_list > 0 and ("Failed to reload the following modules on host "..module_host..":\n"..t_concat(err_list, "\n")) or "");
+ return { status = "completed", info = info };
+end);
+
+-- Globally reloading a module
+local globally_reload_module_layout = dataforms_new {
+ title = "Globally reload module";
+ instructions = "Specify the module to reload on all hosts";
+
+ { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/modules#global-reload" };
+ { name = "module", type = "list-single", required = true, label = "Module to globally reload:"};
+};
+
+local globally_reload_module_handler = adhoc_initial(globally_reload_module_layout, function()
+ local loaded_modules = array(keys(modulemanager.get_modules("*")));
+ for _, host in pairs(hosts) do
+ loaded_modules:append(array(keys(host.modules)));
+ end
+ loaded_modules = array(keys(set.new(loaded_modules):items())):sort();
+ return { module = loaded_modules };
+end, function(fields, err)
+ local is_global = false;
- if modulemanager.is_loaded("*", fields.module) then
- local ok, err = modulemanager.reload("*", fields.module);
- if not ok then
- return { status = "completed", info = 'Global module '..fields.module..' failed to reload: '..err };
- end
- is_global = true;
- end
+ if err then
+ return generate_error_message(err);
+ end
- local ok_list, err_list = {}, {};
- for host_name, host in pairs(hosts) do
- if modulemanager.is_loaded(host_name, fields.module) then
- local ok, err = modulemanager.reload(host_name, fields.module);
- if ok then
- ok_list[#ok_list + 1] = host_name;
- else
- err_list[#err_list + 1] = host_name .. " (Error: " .. tostring(err) .. ")";
- end
- end
+ if modulemanager.is_loaded("*", fields.module) then
+ local ok, err = modulemanager.reload("*", fields.module);
+ if not ok then
+ return { status = "completed", info = 'Global module '..fields.module..' failed to reload: '..err };
end
+ is_global = true;
+ end
- if #ok_list == 0 and #err_list == 0 then
- if is_global then
- return { status = "completed", info = 'Successfully reloaded global module '..fields.module };
+ local ok_list, err_list = {}, {};
+ for host_name, host in pairs(hosts) do
+ if modulemanager.is_loaded(host_name, fields.module) then
+ local ok, err = modulemanager.reload(host_name, fields.module);
+ if ok then
+ ok_list[#ok_list + 1] = host_name;
else
- return { status = "completed", info = 'Module '..fields.module..' not loaded on any host.' };
+ err_list[#err_list + 1] = host_name .. " (Error: " .. tostring(err) .. ")";
end
end
+ end
- local info = (#ok_list > 0 and ("The module "..fields.module.." was successfully reloaded on the hosts:\n"..t_concat(ok_list, "\n")) or "")
- .. ((#ok_list > 0 and #err_list > 0) and "\n" or "") ..
- (#err_list > 0 and ("Failed to reload the module "..fields.module.." on the hosts:\n"..t_concat(err_list, "\n")) or "");
- return { status = "completed", info = info };
- else
- local loaded_modules = array(keys(modulemanager.get_modules("*")));
- for _, host in pairs(hosts) do
- loaded_modules:append(array(keys(host.modules)));
+ if #ok_list == 0 and #err_list == 0 then
+ if is_global then
+ return { status = "completed", info = 'Successfully reloaded global module '..fields.module };
+ else
+ return { status = "completed", info = 'Module '..fields.module..' not loaded on any host.' };
end
- loaded_modules = array(keys(set.new(loaded_modules):items())):sort();
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = { layout = layout, values = { module = loaded_modules } } }, "executing";
end
-end
-function send_to_online(message, server)
+ local info = (#ok_list > 0 and ("The module "..fields.module.." was successfully reloaded on the hosts:\n"..t_concat(ok_list, "\n")) or "")
+ .. ((#ok_list > 0 and #err_list > 0) and "\n" or "") ..
+ (#err_list > 0 and ("Failed to reload the module "..fields.module.." on the hosts:\n"..t_concat(err_list, "\n")) or "");
+ return { status = "completed", info = info };
+end);
+
+local function send_to_online(message, server)
if server then
sessions = { [server] = hosts[server] };
else
@@ -633,202 +552,170 @@ function send_to_online(message, server)
return c;
end
-function shut_down_service_handler(self, data, state)
- local shut_down_service_layout = dataforms_new{
- title = "Shutting Down the Service";
- instructions = "Fill out this form to shut down the service.";
-
- { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
- { name = "delay", type = "list-single", label = "Time delay before shutting down",
- value = { {label = "30 seconds", value = "30"},
- {label = "60 seconds", value = "60"},
- {label = "90 seconds", value = "90"},
- {label = "2 minutes", value = "120"},
- {label = "3 minutes", value = "180"},
- {label = "4 minutes", value = "240"},
- {label = "5 minutes", value = "300"},
- };
+-- Shutting down the service
+local shut_down_service_layout = dataforms_new{
+ title = "Shutting Down the Service";
+ instructions = "Fill out this form to shut down the service.";
+
+ { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
+ { name = "delay", type = "list-single", label = "Time delay before shutting down",
+ value = { {label = "30 seconds", value = "30"},
+ {label = "60 seconds", value = "60"},
+ {label = "90 seconds", value = "90"},
+ {label = "2 minutes", value = "120"},
+ {label = "3 minutes", value = "180"},
+ {label = "4 minutes", value = "240"},
+ {label = "5 minutes", value = "300"},
};
- { name = "announcement", type = "text-multi", label = "Announcement" };
};
+ { name = "announcement", type = "text-multi", label = "Announcement" };
+};
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
- end
+local shut_down_service_handler = adhoc_simple(shut_down_service_layout, function(fields, err)
+ if err then
+ return generate_error_message(err);
+ end
- local fields, err = shut_down_service_layout:data(data.form);
+ if fields.announcement and #fields.announcement > 0 then
+ local message = st.message({type = "headline"}, fields.announcement):up()
+ :tag("subject"):text("Server is shutting down");
+ send_to_online(message);
+ end
- if err then
- return generate_error_message(err);
- end
+ timer_add_task(tonumber(fields.delay or "5"), function(time) prosody.shutdown("Shutdown by adhoc command") end);
- if fields.announcement and #fields.announcement > 0 then
- local message = st.message({type = "headline"}, fields.announcement):up()
- :tag("subject"):text("Server is shutting down");
- send_to_online(message);
- end
+ return { status = "completed", info = "Server is about to shut down" };
+end);
- timer_add_task(tonumber(fields.delay or "5"), function(time) prosody.shutdown("Shutdown by adhoc command") end);
+-- Unloading modules
+local unload_modules_layout = dataforms_new {
+ title = "Unload modules";
+ instructions = "Select the modules to be unloaded";
- return { status = "completed", info = "Server is about to shut down" };
- else
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = shut_down_service_layout }, "executing";
- end
-end
-
-function unload_modules_handler(self, data, state)
- local layout = dataforms_new {
- title = "Unload modules";
- instructions = "Select the modules to be unloaded";
+ { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/modules#unload" };
+ { name = "modules", type = "list-multi", required = true, label = "Modules to be unloaded:"};
+};
- { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/modules#unload" };
- { name = "modules", type = "list-multi", required = true, label = "Modules to be unloaded:"};
- };
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
+local unload_modules_handler = adhoc_initial(unload_modules_layout, function()
+ return { modules = array.collect(keys(hosts[module_host].modules)):sort() };
+end, function(fields, err)
+ if err then
+ return generate_error_message(err);
+ end
+ local ok_list, err_list = {}, {};
+ for _, module in ipairs(fields.modules) do
+ local ok, err = modulemanager.unload(module_host, module);
+ if ok then
+ ok_list[#ok_list + 1] = module;
+ else
+ err_list[#err_list + 1] = module .. "(Error: " .. tostring(err) .. ")";
end
- local fields, err = layout:data(data.form);
- if err then
- return generate_error_message(err);
+ end
+ local info = (#ok_list > 0 and ("The following modules were successfully unloaded on host "..module_host..":\n"..t_concat(ok_list, "\n")) or "")
+ .. ((#ok_list > 0 and #err_list > 0) and "\n" or "") ..
+ (#err_list > 0 and ("Failed to unload the following modules on host "..module_host..":\n"..t_concat(err_list, "\n")) or "");
+ return { status = "completed", info = info };
+end);
+
+-- Globally unloading a module
+local globally_unload_module_layout = dataforms_new {
+ title = "Globally unload module";
+ instructions = "Specify a module to unload on all hosts";
+
+ { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/modules#global-unload" };
+ { name = "module", type = "list-single", required = true, label = "Module to globally unload:"};
+};
+
+local globally_unload_module_handler = adhoc_initial(globally_unload_module_layout, function()
+ local loaded_modules = array(keys(modulemanager.get_modules("*")));
+ for _, host in pairs(hosts) do
+ loaded_modules:append(array(keys(host.modules)));
+ end
+ loaded_modules = array(keys(set.new(loaded_modules):items())):sort();
+ return { module = loaded_modules };
+end, function(fields, err)
+ local is_global = false;
+ if err then
+ return generate_error_message(err);
+ end
+
+ if modulemanager.is_loaded("*", fields.module) then
+ local ok, err = modulemanager.unload("*", fields.module);
+ if not ok then
+ return { status = "completed", info = 'Global module '..fields.module..' failed to unload: '..err };
end
- local ok_list, err_list = {}, {};
- for _, module in ipairs(fields.modules) do
- local ok, err = modulemanager.unload(data.to, module);
+ is_global = true;
+ end
+
+ local ok_list, err_list = {}, {};
+ for host_name, host in pairs(hosts) do
+ if modulemanager.is_loaded(host_name, fields.module) then
+ local ok, err = modulemanager.unload(host_name, fields.module);
if ok then
- ok_list[#ok_list + 1] = module;
+ ok_list[#ok_list + 1] = host_name;
else
- err_list[#err_list + 1] = module .. "(Error: " .. tostring(err) .. ")";
+ err_list[#err_list + 1] = host_name .. " (Error: " .. tostring(err) .. ")";
end
end
- local info = (#ok_list > 0 and ("The following modules were successfully unloaded on host "..data.to..":\n"..t_concat(ok_list, "\n")) or "")
- .. ((#ok_list > 0 and #err_list > 0) and "\n" or "") ..
- (#err_list > 0 and ("Failed to unload the following modules on host "..data.to..":\n"..t_concat(err_list, "\n")) or "");
- return { status = "completed", info = info };
- else
- local modules = array.collect(keys(hosts[data.to].modules)):sort();
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = { layout = layout; values = { modules = modules } } }, "executing";
end
-end
-
-local function globally_unload_module_handler(self, data, state)
- local layout = dataforms_new {
- title = "Globally unload module";
- instructions = "Specify a module to unload on all hosts";
- { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/modules#global-unload" };
- { name = "module", type = "list-single", required = true, label = "Module to globally unload:"};
- };
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
+ if #ok_list == 0 and #err_list == 0 then
+ if is_global then
+ return { status = "completed", info = 'Successfully unloaded global module '..fields.module };
+ else
+ return { status = "completed", info = 'Module '..fields.module..' not loaded on any host.' };
end
+ end
- local is_global = false;
- local fields, err = layout:data(data.form);
- if err then
- return generate_error_message(err);
- end
+ local info = (#ok_list > 0 and ("The module "..fields.module.." was successfully unloaded on the hosts:\n"..t_concat(ok_list, "\n")) or "")
+ .. ((#ok_list > 0 and #err_list > 0) and "\n" or "") ..
+ (#err_list > 0 and ("Failed to unload the module "..fields.module.." on the hosts:\n"..t_concat(err_list, "\n")) or "");
+ return { status = "completed", info = info };
+end);
- if modulemanager.is_loaded("*", fields.module) then
- local ok, err = modulemanager.unload("*", fields.module);
- if not ok then
- return { status = "completed", info = 'Global module '..fields.module..' failed to unload: '..err };
- end
- is_global = true;
- end
+-- Activating a host
+local activate_host_layout = dataforms_new {
+ title = "Activate host";
+ instructions = "";
- local ok_list, err_list = {}, {};
- for host_name, host in pairs(hosts) do
- if modulemanager.is_loaded(host_name, fields.module) then
- local ok, err = modulemanager.unload(host_name, fields.module);
- if ok then
- ok_list[#ok_list + 1] = host_name;
- else
- err_list[#err_list + 1] = host_name .. " (Error: " .. tostring(err) .. ")";
- end
- end
- end
+ { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/hosts#activate" };
+ { name = "host", type = "text-single", required = true, label = "Host:"};
+};
- if #ok_list == 0 and #err_list == 0 then
- if is_global then
- return { status = "completed", info = 'Successfully unloaded global module '..fields.module };
- else
- return { status = "completed", info = 'Module '..fields.module..' not loaded on any host.' };
- end
- end
+local activate_host_handler = adhoc_simple(activate_host_layout, function(fields, err)
+ if err then
+ return generate_error_message(err);
+ end
+ local ok, err = hostmanager_activate(fields.host);
- local info = (#ok_list > 0 and ("The module "..fields.module.." was successfully unloaded on the hosts:\n"..t_concat(ok_list, "\n")) or "")
- .. ((#ok_list > 0 and #err_list > 0) and "\n" or "") ..
- (#err_list > 0 and ("Failed to unload the module "..fields.module.." on the hosts:\n"..t_concat(err_list, "\n")) or "");
- return { status = "completed", info = info };
+ if ok then
+ return { status = "completed", info = fields.host .. " activated" };
else
- local loaded_modules = array(keys(modulemanager.get_modules("*")));
- for _, host in pairs(hosts) do
- loaded_modules:append(array(keys(host.modules)));
- end
- loaded_modules = array(keys(set.new(loaded_modules):items())):sort();
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = { layout = layout, values = { module = loaded_modules } } }, "executing";
+ return { status = "canceled", error = err }
end
-end
+end);
+-- Deactivating a host
+local deactivate_host_layout = dataforms_new {
+ title = "Deactivate host";
+ instructions = "";
-function activate_host_handler(self, data, state)
- local layout = dataforms_new {
- title = "Activate host";
- instructions = "";
+ { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/hosts#activate" };
+ { name = "host", type = "text-single", required = true, label = "Host:"};
+};
- { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/hosts#activate" };
- { name = "host", type = "text-single", required = true, label = "Host:"};
- };
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
- end
- local fields, err = layout:data(data.form);
- if err then
- return generate_error_message(err);
- end
- local ok, err = hostmanager_activate(fields.host);
-
- if ok then
- return { status = "completed", info = fields.host .. " activated" };
- else
- return { status = "canceled", error = err }
- end
- else
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = { layout = layout } }, "executing";
+local deactivate_host_handler = adhoc_simple(deactivate_host_layout, function(fields, err)
+ if err then
+ return generate_error_message(err);
end
-end
-
-function deactivate_host_handler(self, data, state)
- local layout = dataforms_new {
- title = "Deactivate host";
- instructions = "";
+ local ok, err = hostmanager_deactivate(fields.host);
- { name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/hosts#activate" };
- { name = "host", type = "text-single", required = true, label = "Host:"};
- };
- if state then
- if data.action == "cancel" then
- return { status = "canceled" };
- end
- local fields, err = layout:data(data.form);
- if err then
- return generate_error_message(err);
- end
- local ok, err = hostmanager_deactivate(fields.host);
-
- if ok then
- return { status = "completed", info = fields.host .. " deactivated" };
- else
- return { status = "canceled", error = err }
- end
+ if ok then
+ return { status = "completed", info = fields.host .. " deactivated" };
else
- return { status = "executing", actions = {"next", "complete", default = "complete"}, form = { layout = layout } }, "executing";
+ return { status = "canceled", error = err }
end
-end
+end);
local add_user_desc = adhoc_new("Add User", "http://jabber.org/protocol/admin#add-user", add_user_command_handler, "admin");
diff --git a/util/adhoc.lua b/util/adhoc.lua
new file mode 100644
index 00000000..671e85cf
--- /dev/null
+++ b/util/adhoc.lua
@@ -0,0 +1,31 @@
+local function new_simple_form(form, result_handler)
+ return function(self, data, state)
+ if state then
+ if data.action == "cancel" then
+ return { status = "canceled" };
+ end
+ local fields, err = form:data(data.form);
+ return result_handler(fields, err, data);
+ else
+ return { status = "executing", actions = {"next", "complete", default = "complete"}, form = form }, "executing";
+ end
+ end
+end
+
+local function new_initial_data_form(form, initial_data, result_handler)
+ return function(self, data, state)
+ if state then
+ if data.action == "cancel" then
+ return { status = "canceled" };
+ end
+ local fields, err = form:data(data.form);
+ return result_handler(fields, err, data);
+ else
+ return { status = "executing", actions = {"next", "complete", default = "complete"},
+ form = { layout = form, values = initial_data() } }, "executing";
+ end
+ end
+end
+
+return { new_simple_form = new_simple_form,
+ new_initial_data_form = new_initial_data_form };