From 2b289f34f929a69424a22bb0de3b668a58ba80cd Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 8 Dec 2018 17:09:55 +0100
Subject: various: Don't rely on _G.unpack existing

---
 plugins/mod_admin_telnet.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 1cbe27a4..8a3508db 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -22,6 +22,7 @@ local prosody = _G.prosody;
 
 local console_listener = { default_port = 5582; default_mode = "*a"; interface = "127.0.0.1" };
 
+local unpack = table.unpack or unpack; -- luacheck: ignore 113
 local iterators = require "util.iterators";
 local keys, values = iterators.keys, iterators.values;
 local jid_bare, jid_split, jid_join = import("util.jid", "bare", "prepped_split", "join");
-- 
cgit v1.2.3


From 738a1171dc1415544b2289591578670333250d9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= <pep@bouah.net>
Date: Tue, 18 Dec 2018 20:23:33 +0000
Subject: admin_telnet: show when bidi is used on s2s

---
 plugins/mod_admin_telnet.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 8a3508db..63136d63 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -521,6 +521,9 @@ local function session_flags(session, line)
 	if session.remote then
 		line[#line+1] = "(remote)";
 	end
+	if session.is_bidi then
+		line[#line+1] = "(bidi)";
+	end
 	return table.concat(line, " ");
 end
 
-- 
cgit v1.2.3


From 9a412b02e9ab54e2201986bae39e5c7c1d664d3d Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 28 Dec 2018 20:56:01 +0100
Subject: mod_admin_telnet: Invert host existence check

Simplifies and reduces indentation
---
 plugins/mod_admin_telnet.lua | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 63136d63..5ba88b84 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -1067,13 +1067,12 @@ def_env.xmpp = {};
 
 local st = require "util.stanza";
 function def_env.xmpp:ping(localhost, remotehost)
-	if prosody.hosts[localhost] then
-		module:send(st.iq{ from=localhost, to=remotehost, type="get", id="ping" }
-				:tag("ping", {xmlns="urn:xmpp:ping"}), prosody.hosts[localhost]);
-		return true, "Sent ping";
-	else
+	if not prosody.hosts[localhost] then
 		return nil, "No such host";
 	end
+	module:send(st.iq{ from=localhost, to=remotehost, type="get", id="ping" }
+			:tag("ping", {xmlns="urn:xmpp:ping"}), prosody.hosts[localhost]);
+	return true, "Sent ping";
 end
 
 def_env.dns = {};
-- 
cgit v1.2.3


From 851f33034886b3d25d698497139cb51bf40ed506 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 27 Dec 2018 02:53:34 +0100
Subject: mod_admin_telnet: Enable async processing using util.async

---
 plugins/mod_admin_telnet.lua | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 5ba88b84..bb97a09b 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -31,6 +31,7 @@ local cert_verify_identity = require "util.x509".verify_identity;
 local envload = require "util.envload".envload;
 local envloadfile = require "util.envload".envloadfile;
 local has_pposix, pposix = pcall(require, "util.pposix");
+local async = require "util.async";
 
 local commands = module:shared("commands")
 local def_env = module:shared("env");
@@ -48,6 +49,21 @@ end
 
 console = {};
 
+local runner_callbacks = {};
+
+function runner_callbacks:ready()
+	self.data.conn:resume();
+end
+
+function runner_callbacks:waiting()
+	self.data.conn:pause();
+end
+
+function runner_callbacks:error(err)
+	module:log("error", "Traceback[telnet]: %s", err);
+end
+
+
 function console:new_session(conn)
 	local w = function(s) conn:write(s:gsub("\n", "\r\n")); end;
 	local session = { conn = conn;
@@ -63,6 +79,11 @@ function console:new_session(conn)
 			};
 	session.env = setmetatable({}, default_env_mt);
 
+	session.thread = async.runner(function (line)
+		console:process_line(session, line);
+		session.send(string.char(0));
+	end, runner_callbacks, session);
+
 	-- Load up environment with helper objects
 	for name, t in pairs(def_env) do
 		if type(t) == "table" then
@@ -151,8 +172,7 @@ function console_listener.onincoming(conn, data)
 
 	for line in data:gmatch("[^\n]*[\n\004]") do
 		if session.closed then return end
-		console:process_line(session, line);
-		session.send(string.char(0));
+		session.thread:run(line);
 	end
 	session.partial_data = data:match("[^\n]+$");
 end
-- 
cgit v1.2.3


From f1f0c276bc41aa4290f06a7b308671d88ee54050 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 28 Dec 2018 20:59:10 +0100
Subject: mod_admin_telnet: Make xmpp:ping command wait and report the reply

---
 plugins/mod_admin_telnet.lua | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index bb97a09b..ee6a4176 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -1086,13 +1086,28 @@ end
 def_env.xmpp = {};
 
 local st = require "util.stanza";
-function def_env.xmpp:ping(localhost, remotehost)
+local new_id = require "util.id".medium;
+function def_env.xmpp:ping(localhost, remotehost, timeout)
 	if not prosody.hosts[localhost] then
 		return nil, "No such host";
 	end
-	module:send(st.iq{ from=localhost, to=remotehost, type="get", id="ping" }
-			:tag("ping", {xmlns="urn:xmpp:ping"}), prosody.hosts[localhost]);
-	return true, "Sent ping";
+	local iq = st.iq{ from=localhost, to=remotehost, type="get", id=new_id()}
+			:tag("ping", {xmlns="urn:xmpp:ping"});
+	local ret, err;
+	local wait, done = async.waiter();
+	module:context(localhost):send_iq(iq, nil, timeout)
+		:next(function (ret_) ret = ret_; end,
+			function (err_) err = err_; end)
+		:finally(done);
+	wait();
+	if ret then
+		return true, "pong from " .. ret.stanza.attr.from;
+	elseif type(err) == "table" and st.is_stanza(err.stanza) then
+		local t, cond, text = err.stanza:get_error();
+		return false, text or cond or t;
+	else
+		return false, tostring(err);
+	end
 end
 
 def_env.dns = {};
-- 
cgit v1.2.3


From 5eb327274aa1ab27ec45b49e419943c264bd237d Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 29 Dec 2018 03:21:13 +0100
Subject: mod_admin_telnet: Validate hostnames in xmpp:ping command

Attempt to ping some invalid hostnames cause weird behavior
---
 plugins/mod_admin_telnet.lua | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index ee6a4176..f3731c8a 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -1088,8 +1088,17 @@ def_env.xmpp = {};
 local st = require "util.stanza";
 local new_id = require "util.id".medium;
 function def_env.xmpp:ping(localhost, remotehost, timeout)
-	if not prosody.hosts[localhost] then
-		return nil, "No such host";
+	localhost = select(2, jid_split(localhost));
+	remotehost = select(2, jid_split(remotehost));
+	if not localhost then
+		return nil, "Invalid sender hostname";
+	elseif not prosody.hosts[localhost] then
+		return nil, "No such local host";
+	end
+	if not remotehost then
+		return nil, "Invalid destination hostname";
+	elseif prosody.hosts[remotehost] then
+		return nil, "Both hosts are local";
 	end
 	local iq = st.iq{ from=localhost, to=remotehost, type="get", id=new_id()}
 			:tag("ping", {xmlns="urn:xmpp:ping"});
-- 
cgit v1.2.3


From f102941562aa2228e1949261c91045ecbf71c18d Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 30 Dec 2018 16:03:15 +0100
Subject: core.moduleapi: Use util.error for :send_iq errors

---
 plugins/mod_admin_telnet.lua | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index f3731c8a..5bb9361e 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -1111,9 +1111,6 @@ function def_env.xmpp:ping(localhost, remotehost, timeout)
 	wait();
 	if ret then
 		return true, "pong from " .. ret.stanza.attr.from;
-	elseif type(err) == "table" and st.is_stanza(err.stanza) then
-		local t, cond, text = err.stanza:get_error();
-		return false, text or cond or t;
 	else
 		return false, tostring(err);
 	end
-- 
cgit v1.2.3


From 11b2a79872902ae26905c006a2171aaecbcb4300 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 4 Jan 2019 13:38:30 +0100
Subject: mod_admin_telnet: Remove the long gone 'section' argument in the
 undocumented config:get command

---
 plugins/mod_admin_telnet.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 5bb9361e..4c049b95 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -495,9 +495,9 @@ function def_env.config:load(filename, format)
 	return true, "Config loaded";
 end
 
-function def_env.config:get(host, section, key)
+function def_env.config:get(host, key)
 	local config_get = require "core.configmanager".get
-	return true, tostring(config_get(host, section, key));
+	return true, tostring(config_get(host, key));
 end
 
 function def_env.config:reload()
-- 
cgit v1.2.3


From 5fb717bbcec4af6aee2bc709f97fbea7b88f3fe6 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 4 Jan 2019 13:39:13 +0100
Subject: mod_admin_telnet: config:get: Assume the global section if only one
 argument is given

---
 plugins/mod_admin_telnet.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 4c049b95..c6b67b95 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -496,6 +496,9 @@ function def_env.config:load(filename, format)
 end
 
 function def_env.config:get(host, key)
+	if key == nil then
+		host, key = "*", host;
+	end
 	local config_get = require "core.configmanager".get
 	return true, tostring(config_get(host, key));
 end
-- 
cgit v1.2.3


From d020a0b57782846653d6145d388143df5b616c64 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 4 Jan 2019 13:41:39 +0100
Subject: mod_admin_telnet: Serialize config values (table: 0x123abc isn't
 useful)

---
 plugins/mod_admin_telnet.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index c6b67b95..cd9f8078 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -32,6 +32,7 @@ local envload = require "util.envload".envload;
 local envloadfile = require "util.envload".envloadfile;
 local has_pposix, pposix = pcall(require, "util.pposix");
 local async = require "util.async";
+local serialize = require "util.serialization".new({ fatal = false, unquoted = true});
 
 local commands = module:shared("commands")
 local def_env = module:shared("env");
@@ -500,7 +501,7 @@ function def_env.config:get(host, key)
 		host, key = "*", host;
 	end
 	local config_get = require "core.configmanager".get
-	return true, tostring(config_get(host, key));
+	return true, serialize(config_get(host, key));
 end
 
 function def_env.config:reload()
-- 
cgit v1.2.3


From 51c4d0a0e4d0b1d83bdcfc779bcc9e83be4f3d08 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 4 Jan 2019 15:13:52 +0100
Subject: mod_admin_telnet: Sort stats by name

---
 plugins/mod_admin_telnet.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index cd9f8078..5ce504f8 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -1543,7 +1543,7 @@ function def_env.stats:show(filter)
 	local stats, changed, extra = require "core.statsmanager".get_stats();
 	local available, displayed = 0, 0;
 	local displayed_stats = new_stats_context(self);
-	for name, value in pairs(stats) do
+	for name, value in iterators.sorted_pairs(stats) do
 		available = available + 1;
 		if not filter or name:match(filter) then
 			displayed = displayed + 1;
-- 
cgit v1.2.3


From b2c3b2f740d777f1e04df40494f2be0637f946a6 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Wed, 16 Jan 2019 14:20:16 +0100
Subject: mod_admin_telnet: sttas:show: Use format option that allows float
 numbers

string.format("%d", 0.5) causes an error on Lua 5.3
---
 plugins/mod_admin_telnet.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 5ce504f8..7fae8983 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -1255,7 +1255,7 @@ local function format_stat(type, value, ref_value)
 	--do return tostring(value) end
 	if type == "duration" then
 		if ref_value < 0.001 then
-			return ("%d µs"):format(value*1000000);
+			return ("%g µs"):format(value*1000000);
 		elseif ref_value < 0.9 then
 			return ("%0.2f ms"):format(value*1000);
 		end
-- 
cgit v1.2.3


From ab545f19a339c76afe6d24912a79e05ee5f4d94c Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 19 Mar 2019 09:05:37 +0000
Subject: mod_admin_telnet: Show module status in module:list()

---
 plugins/mod_admin_telnet.lua | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 7fae8983..34cc4dc6 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -480,7 +480,12 @@ function def_env.module:list(hosts)
 			end
 		else
 			for _, name in ipairs(modules) do
-				print("    "..name);
+				local status, status_text = modulemanager.get_module(host, name).module:get_status();
+				local status_summary = "";
+				if status == "warn" or status == "error" then
+					status_summary = (" (%s: %s)"):format(status, status_text);
+				end
+				print(("    %s%s"):format(name, status_summary));
 			end
 		end
 	end
-- 
cgit v1.2.3


From 196ac28ab5b002063f2b25dc60bd809c707b8ab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Wed, 17 Apr 2019 10:11:22 -0700
Subject: mod_admin_telnet: Adds c2s:closeall() (Fixes #1315)

---
 plugins/mod_admin_telnet.lua | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 34cc4dc6..c66630ca 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -250,6 +250,7 @@ function commands.help(session, data)
 		print [[c2s:show_secure() - Show all encrypted client connections]]
 		print [[c2s:show_tls() - Show TLS cipher info for encrypted sessions]]
 		print [[c2s:close(jid) - Close all sessions for the specified JID]]
+		print [[c2s:closeall() - Close all active c2s connections ]]
 	elseif section == "s2s" then
 		print [[s2s:show(domain) - Show all s2s connections for the given domain (or all if no domain given)]]
 		print [[s2s:show_tls(domain) - Show TLS cipher info for encrypted sessions]]
@@ -661,6 +662,16 @@ function def_env.c2s:close(match_jid)
 	return true, "Total: "..count.." sessions closed";
 end
 
+function def_env.c2s:closeall()
+	local count = 0;
+	--luacheck: ignore 212/jid
+	show_c2s(function (jid, session)
+		count = count + 1;
+		session:close();
+	end);
+	return true, "Total: "..count.." sessions closed";
+end
+
 
 def_env.s2s = {};
 function def_env.s2s:show(match_jid, annotate)
-- 
cgit v1.2.3


From bbc0bd0b8aa6cca380e0e4b81a9ebc6051224b20 Mon Sep 17 00:00:00 2001
From: Arc Riley <arcriley@gmail.com>
Date: Thu, 2 May 2019 16:33:14 -0700
Subject: mod_admin_telnet: include BOSH connections in c2s session commands
 (#998)

---
 plugins/mod_admin_telnet.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index c66630ca..5ee25771 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -591,6 +591,7 @@ end
 
 local function show_c2s(callback)
 	local c2s = array.collect(values(module:shared"/*/c2s/sessions"));
+	c2s:append(values(module:shared"/*/bosh/sessions"));
 	c2s:sort(function(a, b)
 		if a.host == b.host then
 			if a.username == b.username then
-- 
cgit v1.2.3


From ed8b36a84b47e6ab21347d6cf9c616a69e0b3f7d Mon Sep 17 00:00:00 2001
From: Arc Riley <arcriley@gmail.com>
Date: Thu, 2 May 2019 17:28:49 -0700
Subject: mod_admin_telnet: added "(bosh)" and "(websocket)" connection flags
 (#998)

---
 plugins/mod_admin_telnet.lua | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 5ee25771..248d6b07 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -554,6 +554,12 @@ local function session_flags(session, line)
 	if session.is_bidi then
 		line[#line+1] = "(bidi)";
 	end
+	if session.bosh_version then
+		line[#line+1] = "(bosh)";
+	end
+	if session.websocket_request then
+		line[#line+1] = "(websocket)";
+	end
 	return table.concat(line, " ");
 end
 
-- 
cgit v1.2.3


From a16b70c96df75d562734f84e5dbda7bae2d41eed Mon Sep 17 00:00:00 2001
From: Arc Riley <arcriley@gmail.com>
Date: Thu, 2 May 2019 17:44:21 -0700
Subject: mod_admin_telnet: include BOSH connections in c2s:count (#998)

---
 plugins/mod_admin_telnet.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 248d6b07..0fbd3ff9 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -612,7 +612,9 @@ local function show_c2s(callback)
 end
 
 function def_env.c2s:count()
-	return true, "Total: "..  iterators.count(values(module:shared"/*/c2s/sessions")) .." clients";
+	local c2s_count = iterators.count(values(module:shared"/*/c2s/sessions"))
+	local bosh_count = iterators.count(values(module:shared"/*/bosh/sessions"))
+	return true, "Total: "..  c2s_count + bosh_count .." clients";
 end
 
 function def_env.c2s:show(match_jid, annotate)
-- 
cgit v1.2.3


From 2bb05d010d9b237a088bd9b4c997451407191d3f Mon Sep 17 00:00:00 2001
From: Michel Le Bihan <michel@lebihan.pl>
Date: Mon, 3 Jun 2019 20:51:15 +0200
Subject: mod_admin_telnet: Collect array from Bosh connections when appending
 to connection list

Fixes #1356
---
 plugins/mod_admin_telnet.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 0fbd3ff9..fa03840b 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -597,7 +597,7 @@ end
 
 local function show_c2s(callback)
 	local c2s = array.collect(values(module:shared"/*/c2s/sessions"));
-	c2s:append(values(module:shared"/*/bosh/sessions"));
+	c2s:append(array.collect(values(module:shared"/*/bosh/sessions")));
 	c2s:sort(function(a, b)
 		if a.host == b.host then
 			if a.username == b.username then
-- 
cgit v1.2.3


From f9f7ac859acc839ac4b7ff95de811717ab2afd7e Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 10 May 2019 01:28:09 +0200
Subject: mod_admin_telnet: Check for simple commands before executing in
 sandbox

This makes fixing yield over pcall boundry issue easier since it would
have jumped to the thread error handler instead of proceeding to
checking for simple commands.
---
 plugins/mod_admin_telnet.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index fa03840b..50753f04 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -114,6 +114,11 @@ function console:process_line(session, line)
 
 	session.env._ = line;
 
+	if not useglobalenv and commands[line:lower()] then
+		commands[line:lower()](session, line);
+		return;
+	end
+
 	local chunkname = "=console";
 	local env = (useglobalenv and redirect_output(_G, session)) or session.env or nil
 	local chunk, err = envload("return "..line, chunkname, env);
@@ -130,11 +135,6 @@ function console:process_line(session, line)
 
 	local ranok, taskok, message = pcall(chunk);
 
-	if not (ranok or message or useglobalenv) and commands[line:lower()] then
-		commands[line:lower()](session, line);
-		return;
-	end
-
 	if not ranok then
 		session.print("Fatal error while running command, it did not complete");
 		session.print("Error: "..taskok);
-- 
cgit v1.2.3


From a7e58a0c50dd7bf8d5321b50467707e93effc994 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 10 May 2019 01:29:26 +0200
Subject: mod_admin_telnet: Move error handling to thread callback (fixes
 #1391)

Avoids yielding over pcall boundry, fixes xmpp:ping() command on Lua 5.1
---
 plugins/mod_admin_telnet.lua | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 50753f04..55ed89b8 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -62,6 +62,9 @@ end
 
 function runner_callbacks:error(err)
 	module:log("error", "Traceback[telnet]: %s", err);
+
+	self.data.print("Fatal error while running command, it did not complete");
+	self.data.print("Error: "..tostring(err));
 end
 
 
@@ -133,13 +136,7 @@ function console:process_line(session, line)
 		end
 	end
 
-	local ranok, taskok, message = pcall(chunk);
-
-	if not ranok then
-		session.print("Fatal error while running command, it did not complete");
-		session.print("Error: "..taskok);
-		return;
-	end
+	local taskok, message = chunk();
 
 	if not message then
 		session.print("Result: "..tostring(taskok));
-- 
cgit v1.2.3


From 3effd36ff0bb97de406768b838cf51c9d7c0af41 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 26 Jul 2019 20:25:15 +0200
Subject: mod_admin_telnet: Include both c2s connections and sessions in
 c2s:show()

This way both incomplete connections and hibernating c2s sessions are shown.
---
 plugins/mod_admin_telnet.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 55ed89b8..af0ac9e7 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -593,8 +593,10 @@ local function get_jid(session)
 end
 
 local function show_c2s(callback)
-	local c2s = array.collect(values(module:shared"/*/c2s/sessions"));
+	local c2s = array.collect(values(prosody.full_sessions));
+	c2s:append(array.collect(values(module:shared"/*/c2s/sessions")));
 	c2s:append(array.collect(values(module:shared"/*/bosh/sessions")));
+	c2s:unique();
 	c2s:sort(function(a, b)
 		if a.host == b.host then
 			if a.username == b.username then
-- 
cgit v1.2.3


From 65b25e80b00cd99a78a3d8ee9b5a916795e53774 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 26 Jul 2019 21:05:13 +0200
Subject: mod_admin_telnet: Factor out function for collecting all c2s sessions
 for easier reuse

---
 plugins/mod_admin_telnet.lua | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index af0ac9e7..4e34455c 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -592,12 +592,16 @@ local function get_jid(session)
 	return jid_join("["..ip.."]:"..clientport, session.host or "["..serverip.."]:"..serverport);
 end
 
-local function show_c2s(callback)
+local function get_c2s()
 	local c2s = array.collect(values(prosody.full_sessions));
 	c2s:append(array.collect(values(module:shared"/*/c2s/sessions")));
 	c2s:append(array.collect(values(module:shared"/*/bosh/sessions")));
 	c2s:unique();
-	c2s:sort(function(a, b)
+	return c2s;
+end
+
+local function show_c2s(callback)
+	get_c2s():sort(function(a, b)
 		if a.host == b.host then
 			if a.username == b.username then
 				return (a.resource or "") > (b.resource or "");
-- 
cgit v1.2.3


From 54e39ab881929efad96e45c115e7d857b42f456b Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 26 Jul 2019 21:06:47 +0200
Subject: mod_admin_telnet: Make c2s:count() consistent with c2s:show()

Both now operate on the same complete set of c2s sessions
---
 plugins/mod_admin_telnet.lua | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 4e34455c..a7ba41b8 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -615,9 +615,8 @@ local function show_c2s(callback)
 end
 
 function def_env.c2s:count()
-	local c2s_count = iterators.count(values(module:shared"/*/c2s/sessions"))
-	local bosh_count = iterators.count(values(module:shared"/*/bosh/sessions"))
-	return true, "Total: "..  c2s_count + bosh_count .." clients";
+	local c2s = get_c2s();
+	return true, "Total: "..  #c2s .." clients";
 end
 
 function def_env.c2s:show(match_jid, annotate)
-- 
cgit v1.2.3


From 1ede2571be5c8c7fa75c1be64b9951b5898915e8 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 26 Jul 2019 21:10:42 +0200
Subject: mod_admin_telnet: Add c2s:count() to help

---
 plugins/mod_admin_telnet.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index a7ba41b8..40160765 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -246,6 +246,7 @@ function commands.help(session, data)
 		print [[c2s:show_insecure() - Show all unencrypted client connections]]
 		print [[c2s:show_secure() - Show all encrypted client connections]]
 		print [[c2s:show_tls() - Show TLS cipher info for encrypted sessions]]
+		print [[c2s:count() - Count sessions without listing them]]
 		print [[c2s:close(jid) - Close all sessions for the specified JID]]
 		print [[c2s:closeall() - Close all active c2s connections ]]
 	elseif section == "s2s" then
-- 
cgit v1.2.3


From a8db3548e41edddef094c82ec1b8029834a5c47f Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 26 Jul 2019 21:13:17 +0200
Subject: mod_admin_telnet: Add xmpp:ping to help

---
 plugins/mod_admin_telnet.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 40160765..7f324999 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -239,6 +239,7 @@ function commands.help(session, data)
 		print [[server - Uptime, version, shutting down, etc.]]
 		print [[port - Commands to manage ports the server is listening on]]
 		print [[dns - Commands to manage and inspect the internal DNS resolver]]
+		print [[xmpp - Commands for sending XMPP stanzas]]
 		print [[config - Reloading the configuration, etc.]]
 		print [[console - Help regarding the console itself]]
 	elseif section == "c2s" then
@@ -282,6 +283,8 @@ function commands.help(session, data)
 		print [[dns:setnameserver(nameserver) - Replace the list of name servers with the supplied one]]
 		print [[dns:purge() - Clear the DNS cache]]
 		print [[dns:cache() - Show cached records]]
+	elseif section == "xmpp" then
+		print [[xmpp:ping(localhost, remotehost) -- Sends a ping to a remote XMPP server and reports the response]]
 	elseif section == "config" then
 		print [[config:reload() - Reload the server configuration. Modules may need to be reloaded for changes to take effect.]]
 	elseif section == "console" then
-- 
cgit v1.2.3


From 49b3e1479cef50bc69f72b5e32ff115c7975c062 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 28 Jul 2019 01:39:47 +0200
Subject: mod_admin_telnet: Allow specifying a reason when closing sessions
 (#1400)

---
 plugins/mod_admin_telnet.lua | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 7f324999..df702b91 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -666,23 +666,32 @@ function def_env.c2s:show_tls(match_jid)
 	return self:show(match_jid, tls_info);
 end
 
-function def_env.c2s:close(match_jid)
+local function build_reason(text, condition)
+	if text or condition then
+		return {
+			text = text,
+			condition = condition or "undefined-condition",
+		};
+	end
+end
+
+function def_env.c2s:close(match_jid, text, condition)
 	local count = 0;
 	show_c2s(function (jid, session)
 		if jid == match_jid or jid_bare(jid) == match_jid then
 			count = count + 1;
-			session:close();
+			session:close(build_reason(text, condition));
 		end
 	end);
 	return true, "Total: "..count.." sessions closed";
 end
 
-function def_env.c2s:closeall()
+function def_env.c2s:closeall(text, condition)
 	local count = 0;
 	--luacheck: ignore 212/jid
 	show_c2s(function (jid, session)
 		count = count + 1;
-		session:close();
+		session:close(build_reason(text, condition));
 	end);
 	return true, "Total: "..count.." sessions closed";
 end
@@ -887,7 +896,7 @@ function def_env.s2s:showcert(domain)
 		.." presented by "..domain..".");
 end
 
-function def_env.s2s:close(from, to)
+function def_env.s2s:close(from, to, text, condition)
 	local print, count = self.session.print, 0;
 	local s2s_sessions = module:shared"/*/s2s/sessions";
 
@@ -905,19 +914,19 @@ function def_env.s2s:close(from, to)
 		if (match_id and match_id == id)
 		or (session.from_host == from and session.to_host == to) then
 			print(("Closing connection from %s to %s [%s]"):format(session.from_host, session.to_host, id));
-			(session.close or s2smanager.destroy_session)(session);
+			(session.close or s2smanager.destroy_session)(session, build_reason(text, condition));
 			count = count + 1 ;
 		end
 	end
 	return true, "Closed "..count.." s2s session"..((count == 1 and "") or "s");
 end
 
-function def_env.s2s:closeall(host)
+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
-			session:close();
+			session:close(build_reason(text, condition));
 			count = count + 1;
 		end
 	end
-- 
cgit v1.2.3


From 9e57e0279736a1ec952d4915b02735b14ddb6d19 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 28 Jul 2019 01:43:10 +0200
Subject: mod_admin_telnet: Use already generated session id

Don't need to construct it from components again
---
 plugins/mod_admin_telnet.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index df702b91..b6cdfe82 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -910,7 +910,7 @@ function def_env.s2s:close(from, to, text, condition)
 	end
 
 	for _, session in pairs(s2s_sessions) do
-		local id = session.type..tostring(session):match("[a-f0-9]+$");
+		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
 			print(("Closing connection from %s to %s [%s]"):format(session.from_host, session.to_host, id));
-- 
cgit v1.2.3


From 60fddf5c7c7a2272f0235cc5d702f7a89c0e9568 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 7 Sep 2019 15:53:05 +0200
Subject: mod_admin_telnet: Identify bidi-capable s2sout sessions (fixes #1403)

---
 plugins/mod_admin_telnet.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index b6cdfe82..c184924c 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -552,7 +552,7 @@ local function session_flags(session, line)
 	if session.remote then
 		line[#line+1] = "(remote)";
 	end
-	if session.is_bidi then
+	if session.is_bidi or session.bidi_session then
 		line[#line+1] = "(bidi)";
 	end
 	if session.bosh_version then
-- 
cgit v1.2.3


From 2a9da5b8f04ce7b13d9db194fa01a36ec4b6ac91 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 8 Sep 2019 18:51:15 +0200
Subject: mod_admin_telnet: Identify native bidi sessions

---
 plugins/mod_admin_telnet.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index c184924c..5c08b8d1 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -552,7 +552,9 @@ local function session_flags(session, line)
 	if session.remote then
 		line[#line+1] = "(remote)";
 	end
-	if session.is_bidi or session.bidi_session then
+	if session.incoming and session.outgoing then
+		line[#line+1] = "(bidi)";
+	elseif session.is_bidi or session.bidi_session then
 		line[#line+1] = "(bidi)";
 	end
 	if session.bosh_version then
-- 
cgit v1.2.3


From f304a306dd05b8f99ba5ef26d301ea33731d2007 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 29 Sep 2019 18:44:58 +0200
Subject: mod_admin_telnet: Use new compact function for waiting on promises

---
 plugins/mod_admin_telnet.lua | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 5c08b8d1..24230257 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -1148,13 +1148,7 @@ function def_env.xmpp:ping(localhost, remotehost, timeout)
 	end
 	local iq = st.iq{ from=localhost, to=remotehost, type="get", id=new_id()}
 			:tag("ping", {xmlns="urn:xmpp:ping"});
-	local ret, err;
-	local wait, done = async.waiter();
-	module:context(localhost):send_iq(iq, nil, timeout)
-		:next(function (ret_) ret = ret_; end,
-			function (err_) err = err_; end)
-		:finally(done);
-	wait();
+	local ret, err = async.wait(module:context(localhost):send_iq(iq, nil, timeout));
 	if ret then
 		return true, "pong from " .. ret.stanza.attr.from;
 	else
-- 
cgit v1.2.3


From 7b43531fa9779ba0ec001e87cbe5004cc8e303f1 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 6 Oct 2019 19:35:35 +0200
Subject: mod_admin_telnet: xmpp:ping: Log ping time

---
 plugins/mod_admin_telnet.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 24230257..afb4fb4b 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -33,6 +33,7 @@ local envloadfile = require "util.envload".envloadfile;
 local has_pposix, pposix = pcall(require, "util.pposix");
 local async = require "util.async";
 local serialize = require "util.serialization".new({ fatal = false, unquoted = true});
+local time = require "util.time";
 
 local commands = module:shared("commands")
 local def_env = module:shared("env");
@@ -1148,9 +1149,10 @@ function def_env.xmpp:ping(localhost, remotehost, timeout)
 	end
 	local iq = st.iq{ from=localhost, to=remotehost, type="get", id=new_id()}
 			:tag("ping", {xmlns="urn:xmpp:ping"});
+	local time_start = time.now();
 	local ret, err = async.wait(module:context(localhost):send_iq(iq, nil, timeout));
 	if ret then
-		return true, "pong from " .. ret.stanza.attr.from;
+		return true, ("pong from %s in %gs"):format(ret.stanza.attr.from, time.now() - time_start);
 	else
 		return false, tostring(err);
 	end
-- 
cgit v1.2.3


From 1a78e0a7ac93b3d0b4251a865eb994bcd3e5eaba Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 2 Nov 2019 16:02:37 +0100
Subject: mod_admin_telnet: Show s2s authentication method (probably) used

---
 plugins/mod_admin_telnet.lua | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index afb4fb4b..2bbd367b 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -538,6 +538,12 @@ local function session_flags(session, line)
 	if session.cert_identity_status == "valid" then
 		line[#line+1] = "(authenticated)";
 	end
+	if session.dialback_key then
+		line[#line+1] = "(dialback)";
+	end
+	if session.external_auth then
+		line[#line+1] = "(SASL)";
+	end
 	if session.secure then
 		line[#line+1] = "(encrypted)";
 	end
-- 
cgit v1.2.3


From e130b377970996b9eb3d36c74db121835ed0a57e Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Wed, 20 Nov 2019 21:31:46 +0100
Subject: mod_admin_telnet: Show SNI name in show_tls() if available

---
 plugins/mod_admin_telnet.lua | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 2bbd367b..cef79d25 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -584,6 +584,12 @@ local function tls_info(session, line)
 		else
 			line[#line+1] = "(cipher info unavailable)";
 		end
+		if sock.getsniname then
+			local name = sock:getsniname();
+			if name then
+				line[#line+1] = ("(SNI:%q)"):format(name);
+			end
+		end
 	else
 		line[#line+1] = "(insecure)";
 	end
-- 
cgit v1.2.3


From 593c04436f5052d8ed201dc6a2f29e52ff5ab622 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 21 Nov 2019 00:16:20 +0100
Subject: mod_admin_telnet: Display ALPN in show_tls() if supported and
 available

---
 plugins/mod_admin_telnet.lua | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index cef79d25..f3ab9597 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -590,6 +590,12 @@ local function tls_info(session, line)
 				line[#line+1] = ("(SNI:%q)"):format(name);
 			end
 		end
+		if sock.getalpn then
+			local proto = sock:getalpn();
+			if proto then
+				line[#line+1] = ("(ALPN:%q)"):format(proto);
+			end
+		end
 	else
 		line[#line+1] = "(insecure)";
 	end
-- 
cgit v1.2.3


From 3d63c139e666e1a89f5caa0eb96afc20ac43fc2a Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 30 Nov 2019 21:56:21 +0100
Subject: mod_admin_telnet: Sort hosts

Groups by domain in DNS hierarchy order or something.

Why not split on '.' you ask? Well becasue that's not what I typed here. Also "[^.]" is longer than "%P".
---
 plugins/mod_admin_telnet.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index f3ab9597..8427f811 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -964,11 +964,15 @@ function def_env.host:deactivate(hostname, reason)
 	return hostmanager.deactivate(hostname, reason);
 end
 
+local function compare_hosts(a, b)
+	return a:gsub("%P", string.reverse):reverse() < b:gsub("%P", string.reverse):reverse();
+end
+
 function def_env.host:list()
 	local print = self.session.print;
 	local i = 0;
 	local type;
-	for host, host_session in iterators.sorted_pairs(prosody.hosts) do
+	for host, host_session in iterators.sorted_pairs(prosody.hosts, compare_hosts) do
 		i = i + 1;
 		type = host_session.type;
 		if type == "local" then
-- 
cgit v1.2.3


From 655294f93e53175928cf6523b82952134e268495 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 8 Dec 2019 13:38:48 +0100
Subject: mod_admin_telnet: Avoid using LuaSocket for timestamps

Using util.time will make it easier to move away from LuaSocket if we
ever wanted to do that.
---
 plugins/mod_admin_telnet.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 8427f811..60f92cda 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -1265,7 +1265,6 @@ function def_env.debug:events(host, event)
 end
 
 function def_env.debug:timers()
-	local socket = require "socket";
 	local print = self.session.print;
 	local add_task = require"util.timer".add_task;
 	local h, params = add_task.h, add_task.params;
@@ -1293,7 +1292,7 @@ function def_env.debug:timers()
 	if h then
 		local next_time = h:peek();
 		if next_time then
-			return true, os.date("Next event at %F %T (in %%.6fs)", next_time):format(next_time - socket.gettime());
+			return true, os.date("Next event at %F %T (in %%.6fs)", next_time):format(next_time - time.now());
 		end
 	end
 	return true;
-- 
cgit v1.2.3


From d7570eee7e9f2ff351a58ee541395522d5cf7385 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 15 Dec 2019 20:43:02 +0100
Subject: mod_admin_telnet: Fix host sorting

Reversing each %P is a noop
---
 plugins/mod_admin_telnet.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 60f92cda..940c3533 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -965,7 +965,7 @@ function def_env.host:deactivate(hostname, reason)
 end
 
 local function compare_hosts(a, b)
-	return a:gsub("%P", string.reverse):reverse() < b:gsub("%P", string.reverse):reverse();
+	return a:gsub("%P+", string.reverse):reverse() < b:gsub("%P+", string.reverse):reverse();
 end
 
 function def_env.host:list()
-- 
cgit v1.2.3


From d0cd5469d272364bede91196edbb783e3fe1f769 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 15 Dec 2019 20:44:10 +0100
Subject: mod_admin_telnet: Sort by complete labels

Might as well.
---
 plugins/mod_admin_telnet.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 940c3533..6dc7c5c3 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -965,7 +965,7 @@ function def_env.host:deactivate(hostname, reason)
 end
 
 local function compare_hosts(a, b)
-	return a:gsub("%P+", string.reverse):reverse() < b:gsub("%P+", string.reverse):reverse();
+	return a:gsub("[^.]+", string.reverse):reverse() < b:gsub("[^.]+", string.reverse):reverse();
 end
 
 function def_env.host:list()
-- 
cgit v1.2.3


From d146d6b8acb261c4a2e1f6d721fdd44243805fd3 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 15 Dec 2019 21:42:42 +0100
Subject: mod_admin_telnet: Merge hostname comparison functions

Missed that there existed one already when writing the one for host:list
---
 plugins/mod_admin_telnet.lua | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 6dc7c5c3..6ed36258 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -433,7 +433,7 @@ end
 local function _sort_hosts(a, b)
 	if a == "*" then return true
 	elseif b == "*" then return false
-	else return a < b; end
+	else return a:gsub("[^.]+", string.reverse):reverse() < b:gsub("[^.]+", string.reverse):reverse(); end
 end
 
 function def_env.module:reload(name, hosts)
@@ -964,15 +964,11 @@ function def_env.host:deactivate(hostname, reason)
 	return hostmanager.deactivate(hostname, reason);
 end
 
-local function compare_hosts(a, b)
-	return a:gsub("[^.]+", string.reverse):reverse() < b:gsub("[^.]+", string.reverse):reverse();
-end
-
 function def_env.host:list()
 	local print = self.session.print;
 	local i = 0;
 	local type;
-	for host, host_session in iterators.sorted_pairs(prosody.hosts, compare_hosts) do
+	for host, host_session in iterators.sorted_pairs(prosody.hosts, _sort_hosts) do
 		i = i + 1;
 		type = host_session.type;
 		if type == "local" then
-- 
cgit v1.2.3


From 7b64b46af18c1ff2816547f6f6f0f046fdabf88f Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 15 Dec 2019 22:07:24 +0100
Subject: mod_admin_telnet: Refactor internal function for listing hosts

Splits out a function that doesn't deal with modules for reuse elsewhere
---
 plugins/mod_admin_telnet.lua | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 6ed36258..fffab4cf 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -364,7 +364,7 @@ end
 
 def_env.module = {};
 
-local function get_hosts_set(hosts, module)
+local function get_hosts_set(hosts)
 	if type(hosts) == "table" then
 		if hosts[1] then
 			return set.new(hosts);
@@ -374,17 +374,23 @@ local function get_hosts_set(hosts, module)
 	elseif type(hosts) == "string" then
 		return set.new { hosts };
 	elseif hosts == nil then
-		local hosts_set = set.new(array.collect(keys(prosody.hosts)))
-			/ function (host) return (prosody.hosts[host].type == "local" or module and modulemanager.is_loaded(host, module)) and host or nil; end;
-		if module and modulemanager.get_module("*", module) then
-			hosts_set:add("*");
-		end
-		return hosts_set;
+		return set.new(array.collect(keys(prosody.hosts)));
+	end
+end
+
+-- Hosts with a module or all virtualhosts if no module given
+-- matching modules_enabled in the global section
+local function get_hosts_with_module(hosts, module)
+	local hosts_set = get_hosts_set(hosts)
+	/ function (host) return (prosody.hosts[host].type == "local" or module and modulemanager.is_loaded(host, module)) and host or nil; end;
+	if module and modulemanager.get_module("*", module) then
+		hosts_set:add("*");
 	end
+	return hosts_set;
 end
 
 function def_env.module:load(name, hosts, config)
-	hosts = get_hosts_set(hosts);
+	hosts = get_hosts_with_module(hosts);
 
 	-- Load the module for each host
 	local ok, err, count, mod = true, nil, 0;
@@ -411,7 +417,7 @@ function def_env.module:load(name, hosts, config)
 end
 
 function def_env.module:unload(name, hosts)
-	hosts = get_hosts_set(hosts, name);
+	hosts = get_hosts_with_module(hosts, name);
 
 	-- Unload the module for each host
 	local ok, err, count = true, nil, 0;
@@ -437,7 +443,7 @@ local function _sort_hosts(a, b)
 end
 
 function def_env.module:reload(name, hosts)
-	hosts = array.collect(get_hosts_set(hosts, name)):sort(_sort_hosts)
+	hosts = array.collect(get_hosts_with_module(hosts, name)):sort(_sort_hosts)
 
 	-- Reload the module for each host
 	local ok, err, count = true, nil, 0;
-- 
cgit v1.2.3


From 567e4183b5e2ba4fe92ef0ef86b34327f036e9f1 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 15 Dec 2019 22:08:20 +0100
Subject: mod_admin_telnet: Sort hosts in module:list

---
 plugins/mod_admin_telnet.lua | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index fffab4cf..fbaa80d0 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -466,16 +466,7 @@ function def_env.module:reload(name, hosts)
 end
 
 function def_env.module:list(hosts)
-	if hosts == nil then
-		hosts = array.collect(keys(prosody.hosts));
-		table.insert(hosts, 1, "*");
-	end
-	if type(hosts) == "string" then
-		hosts = { hosts };
-	end
-	if type(hosts) ~= "table" then
-		return false, "Please supply a host or a list of hosts you would like to see";
-	end
+	hosts = array.collect(set.new({ not hosts and "*" or nil }) + get_hosts_set(hosts)):sort(_sort_hosts);
 
 	local print = self.session.print;
 	for _, host in ipairs(hosts) do
-- 
cgit v1.2.3


From 13622b141e299ba3df60b82153084f34bdcb8e6f Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 15 Dec 2019 21:44:58 +0100
Subject: mod_admin_telnet: Use existing host comparison when comparing JIDs

---
 plugins/mod_admin_telnet.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index fbaa80d0..a454f568 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -630,7 +630,7 @@ local function show_c2s(callback)
 			end
 			return (a.username or "") > (b.username or "");
 		end
-		return (a.host or "") > (b.host or "");
+		return _sort_hosts(a.host or "", b.host or "");
 	end):map(function (session)
 		callback(get_jid(session), session)
 	end);
-- 
cgit v1.2.3


From fac877feaa6c394469614b4604f1723b6bb3b681 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 15 Dec 2019 22:15:52 +0100
Subject: mod_admin_telnet: Use common sort function in s2s:show

---
 plugins/mod_admin_telnet.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index a454f568..9468be62 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -781,8 +781,8 @@ function def_env.s2s:show(match_jid, annotate)
 
 	-- Sort by local host, then remote host
 	table.sort(s2s_list, function(a,b)
-		if a.l == b.l then return a.r < b.r; end
-		return a.l < b.l;
+		if a.l == b.l then return _sort_hosts(a.r, b.r); end
+		return _sort_hosts(a.l, b.l);
 	end);
 	local lasthost;
 	for _, sess_lines in ipairs(s2s_list) do
-- 
cgit v1.2.3


From 6183e7a303d4fed16b368b55dcd0fddc34b20739 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 22 Dec 2019 20:10:20 +0100
Subject: mod_admin_telnet: Include config:get() in help text

---
 plugins/mod_admin_telnet.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 9468be62..f298ad2f 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -288,6 +288,7 @@ function commands.help(session, data)
 		print [[xmpp:ping(localhost, remotehost) -- Sends a ping to a remote XMPP server and reports the response]]
 	elseif section == "config" then
 		print [[config:reload() - Reload the server configuration. Modules may need to be reloaded for changes to take effect.]]
+		print [[config:get([host,] option) - Show the value of a config option.]]
 	elseif section == "console" then
 		print [[Hey! Welcome to Prosody's admin console.]]
 		print [[First thing, if you're ever wondering how to get out, simply type 'quit'.]]
-- 
cgit v1.2.3


From d7df11baf30a0308a8ed1c40b365051a19c74f92 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Mon, 23 Dec 2019 21:38:19 +0100
Subject: mod_admin_telnet: Silence luacheck warnings

---
 plugins/mod_admin_telnet.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'plugins/mod_admin_telnet.lua')

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index f298ad2f..7df63da9 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -125,6 +125,7 @@ function console:process_line(session, line)
 
 	local chunkname = "=console";
 	local env = (useglobalenv and redirect_output(_G, session)) or session.env or nil
+	-- luacheck: ignore 311/err
 	local chunk, err = envload("return "..line, chunkname, env);
 	if not chunk then
 		chunk, err = envload(line, chunkname, env);
@@ -1427,7 +1428,7 @@ end
 
 function stats_methods:cfgraph()
 	for _, stat_info in ipairs(self) do
-		local name, type, value, data = unpack(stat_info, 1, 4);
+		local name, type, value, data = unpack(stat_info, 1, 4); -- luacheck: ignore 211
 		local function print(s)
 			table.insert(stat_info.output, s);
 		end
@@ -1493,7 +1494,7 @@ end
 
 function stats_methods:histogram()
 	for _, stat_info in ipairs(self) do
-		local name, type, value, data = unpack(stat_info, 1, 4);
+		local name, type, value, data = unpack(stat_info, 1, 4); -- luacheck: ignore 211
 		local function print(s)
 			table.insert(stat_info.output, s);
 		end
@@ -1593,6 +1594,7 @@ local function new_stats_context(self)
 end
 
 function def_env.stats:show(filter)
+	-- luacheck: ignore 211/changed
 	local stats, changed, extra = require "core.statsmanager".get_stats();
 	local available, displayed = 0, 0;
 	local displayed_stats = new_stats_context(self);
-- 
cgit v1.2.3