Software / code / prosody
Changeset
13053:8128c4f1b08b
mod_admin_shell: Allow "*" as substitute for 'nil' for easier CLI usage
Since prosodyctl shell with additional arguments assumes the first two
are a section:command() and any following arguments are strings, passing
a bare 'nil' is not possible. In order to avoid delving into this rabbit
hole, instead produce a token that alone is not really a legal JID for
use as wildcard.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 07 Apr 2023 14:03:24 +0200 |
| parents | 13052:585bd71a1a97 |
| children | 13054:f4d7fe919969 |
| files | plugins/mod_admin_shell.lua |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_admin_shell.lua Fri Apr 07 13:58:39 2023 +0200 +++ b/plugins/mod_admin_shell.lua Fri Apr 07 14:03:24 2023 +0200 @@ -1017,7 +1017,7 @@ local function match(session) local jid = get_jid(session) - return (not match_jid) or jid_compare(jid, match_jid); + return (not match_jid) or match_jid == "*" or jid_compare(jid, match_jid); end local group_by_host = true; @@ -1100,7 +1100,7 @@ local function match(session) local host, remote = get_s2s_hosts(session); - return not match_jid or host == match_jid or remote == match_jid; + return not match_jid or match_jid == "*" or host == match_jid or remote == match_jid; end local group_by_host = true;
