aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2023-02-16 17:20:09 +0100
committerKim Alvefur <zash@zash.se>2023-02-16 17:20:09 +0100
commit67ea0ee50ecd5886099e639f847acff9f28fd6e2 (patch)
tree52b4268f8f8c7d69f8c5edde02e5fd21f7502c8d /plugins
parentbc1e51eb8357bcb377f6010b79bd15607286302c (diff)
downloadprosody-67ea0ee50ecd5886099e639f847acff9f28fd6e2.tar.gz
prosody-67ea0ee50ecd5886099e639f847acff9f28fd6e2.zip
mod_admin_socket: Return error on unhandled input to prevent apparent freeze
When mod_admin_socket is loaded without mod_admin_shell, attempt to use `prosodyctl shell` will appear to freeze after any input, since no response is returned.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_admin_shell.lua1
-rw-r--r--plugins/mod_admin_socket.lua7
2 files changed, 7 insertions, 1 deletions
diff --git a/plugins/mod_admin_shell.lua b/plugins/mod_admin_shell.lua
index dda35f08..e1016425 100644
--- a/plugins/mod_admin_shell.lua
+++ b/plugins/mod_admin_shell.lua
@@ -198,6 +198,7 @@ module:hook("admin/repl-input", function (event)
if not ok then
event.origin.send(st.stanza("repl-result", { type = "error" }):text(err));
end
+ return true;
end);
-- Console commands --
diff --git a/plugins/mod_admin_socket.lua b/plugins/mod_admin_socket.lua
index c4e1d260..157e746c 100644
--- a/plugins/mod_admin_socket.lua
+++ b/plugins/mod_admin_socket.lua
@@ -19,6 +19,7 @@ end
local server = require "net.server";
local adminstream = require "util.adminstream";
+local st = require "util.stanza";
local socket_path = module:get_option_path("admin_socket", "prosody.sock", "data");
@@ -35,7 +36,11 @@ local function fire_admin_event(session, stanza)
event_name = "admin/"..stanza.name;
end
module:log("debug", "Firing %s", event_name);
- return module:fire_event(event_name, event_data);
+ local ret = module:fire_event(event_name, event_data);
+ if ret == nil then
+ session.send(st.stanza("repl-result", { type = "error" }):text("No module handled this query. Is mod_admin_shell enabled?"));
+ end
+ return ret;
end
module:hook("server-stopping", function ()