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

Merge 13.0->trunk

Browse source
This commit is contained in:
Matthew Wild 2025-03-31 17:32:11 +01:00
commit 9f728624b2
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/mod_admin_shell.lua
View file

@ -205,7 +205,13 @@ module:hook("admin/repl-requested-input", function (event)
event.origin.send(st.stanza("repl-result", { type = "error" }):text("Internal error - unexpected input"));
return true;
end
input_promise.resolve(event.stanza:get_text());
local status = event.stanza.attr.status or "submit";
local text = event.stanza:get_text();
if status == "submit" then
input_promise.resolve(text);
else
input_promise.reject(status == "cancel" and (text ~= "" and text) or "cancelled");
end
return true;
end);

6
util/prosodyctl/shell.lua
View file

@ -134,7 +134,11 @@ local function start(arg) --luacheck: ignore 212/arg
end
if stanza.attr.type == "password" then
local password = human_io.read_password();
client.send(st.stanza("repl-requested-input", { type = stanza.attr.type, id = stanza.attr.id }):text(password));
client.send(st.stanza("repl-requested-input", {
type = stanza.attr.type;
id = stanza.attr.id;
status = password and "submit" or "cancel";
}):text(password or ""));
else
io.stderr:write("Internal error - unexpected input request type "..tostring(stanza.attr.type).."\n");
os.exit(1);