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

mod_admin_shell: Use same wildcard matching in other s2s command

Browse source 
Consistency is nice.
This commit is contained in:
Kim Alvefur 2023-04-10 14:24:39 +02:00
parent f9f118178a
commit 2fc0c66f01
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/mod_admin_shell.lua
View file

@ -1191,7 +1191,7 @@ function def_env.s2s:showcert(domain)
local print = self.session.print;
local s2s_sessions = module:shared"/*/s2s/sessions";
local domain_sessions = set.new(array.collect(values(s2s_sessions)))
/function(session) return (session.to_host == domain or session.from_host == domain) and session or nil; end;
/function(session) return match_s2s_jid(session, domain) and session or nil; end;
local cert_set = {};
for session in domain_sessions do
local conn = session.conn;
@ -1294,12 +1294,11 @@ function def_env.s2s:close(from, to, text, condition)
end
for _, session in pairs(s2s_sessions) do
local id = session.id or (session.type..tostring(session):match("[a-f0-9]+$"));
if (match_id and match_id == id)
or (session.from_host == from and session.to_host == to) then
local id = session.id or (session.type .. tostring(session):match("[a-f0-9]+$"));
if (match_id and match_id == id) or ((from and match_wildcard(from, session.to_host)) or (to and match_wildcard(to, session.to_host))) then
print(("Closing connection from %s to %s [%s]"):format(session.from_host, session.to_host, id));
(session.close or s2smanager.destroy_session)(session, build_reason(text, condition));
count = count + 1 ;
count = count + 1;
end
end
return true, "Closed "..count.." s2s session"..((count == 1 and "") or "s");
@ -1309,7 +1308,7 @@ function def_env.s2s:closeall(host, text, condition)
local count = 0;
local s2s_sessions = module:shared"/*/s2s/sessions";
for _,session in pairs(s2s_sessions) do
if not host or session.from_host == host or session.to_host == host then
if not host or host == "*" or match_s2s_jid(session, host) then
session:close(build_reason(text, condition));
count = count + 1;
end