From 6876deedcd6fb44398ae198f1dc2d8c456fc275c Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 10 Jan 2016 00:01:28 +0100 Subject: mod_admin_telnet: Remove compat warning about 'console_banner' as a function --- plugins/mod_admin_telnet.lua | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'plugins/mod_admin_telnet.lua') diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index b77a1f56..e4dcf080 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -1125,8 +1125,8 @@ end ------------- function printbanner(session) - local option = module:get_option("console_banner"); - if option == nil or option == "full" or option == "graphic" then + local option = module:get_option_string("console_banner", "full"); + if option == "full" or option == "graphic" then session.print [[ ____ \ / _ | _ \ _ __ ___ ___ _-_ __| |_ _ @@ -1137,17 +1137,13 @@ function printbanner(session) ]] end - if option == nil or option == "short" or option == "full" then + if option == "short" or option == "full" then session.print("Welcome to the Prosody administration console. For a list of commands, type: help"); session.print("You may find more help on using this console in our online documentation at "); session.print("http://prosody.im/doc/console\n"); end - if option and option ~= "short" and option ~= "full" and option ~= "graphic" then - if type(option) == "string" then - session.print(option) - elseif type(option) == "function" then - module:log("warn", "Using functions as value for the console_banner option is no longer supported"); - end + if option ~= "short" and option ~= "full" and option ~= "graphic" then + session.print(option); end end -- cgit v1.2.3 From 4ad60283f8f36dcf5ec29c7bd97cd089df46a5d6 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 9 Jan 2016 23:58:43 +0100 Subject: mod_admin_telnet: c2s:show() etc, list all sessions including unauthenticated or not with no stream opened --- plugins/mod_admin_telnet.lua | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'plugins/mod_admin_telnet.lua') diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index e4dcf080..c3434d33 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -22,7 +22,7 @@ local console_listener = { default_port = 5582; default_mode = "*a"; interface = local iterators = require "util.iterators"; local keys, values = iterators.keys, iterators.values; -local jid_bare, jid_split = import("util.jid", "bare", "prepped_split"); +local jid_bare, jid_split, jid_join = import("util.jid", "bare", "prepped_split", "join"); local set, array = require "util.set", require "util.array"; local cert_verify_identity = require "util.x509".verify_identity; local envload = require "util.envload".envload; @@ -539,15 +539,26 @@ end def_env.c2s = {}; +local function get_jid(session) + if session.username then + return session.full_jid or jid_join(session.username, session.host, session.resource); + end + return "(unknown)"; +end + local function show_c2s(callback) - for hostname, host in pairs(hosts) do - for username, user in pairs(host.sessions or {}) do - for resource, session in pairs(user.sessions or {}) do - local jid = username.."@"..hostname.."/"..resource; - callback(jid, session); + local c2s = array.collect(values(module:shared"/*/c2s/sessions")); + c2s:sort(function(a, b) + if a.host == b.host then + if a.username == b.username then + return a.resource or "" > b.resource or ""; end + return a.username or "" > b.username or ""; end - end + return a.host or "" > b.host or ""; + end):map(function (session) + callback(get_jid(session), session) + end); end function def_env.c2s:count(match_jid) @@ -563,11 +574,11 @@ end function def_env.c2s:show(match_jid, annotate) local print, count = self.session.print, 0; annotate = annotate or session_flags; - local curr_host; + local curr_host = false; show_c2s(function (jid, session) if curr_host ~= session.host then curr_host = session.host; - print(curr_host); + print(curr_host or "(not connected to any host yet)"); end if (not match_jid) or jid:match(match_jid) then count = count + 1; -- cgit v1.2.3 From 1e0c45235c480931de7c51ae5f8b0e205e977306 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 9 Jan 2016 23:59:31 +0100 Subject: mod_admin_telnet: Show unauthenticated clients identified by local/remote IP and port --- plugins/mod_admin_telnet.lua | 8 +++++++- 1 file changed, 7 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 c3434d33..b45db3ef 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -543,7 +543,13 @@ local function get_jid(session) if session.username then return session.full_jid or jid_join(session.username, session.host, session.resource); end - return "(unknown)"; + + local conn = session.conn; + local ip = session.ip or "?"; + local clientport = conn and conn:clientport() or "?"; + local serverip = conn and conn.server and conn:server():ip() or "?"; + local serverport = conn and conn:serverport() or "?" + return jid_join("["..ip.."]:"..clientport, session.host or "["..serverip.."]:"..serverport); end local function show_c2s(callback) -- cgit v1.2.3 From fa8f996af8dca13fbbe567f94a4ab8ff9606da15 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 10 Jan 2016 00:00:22 +0100 Subject: mod_admin_telnet: c2s:count in less lines --- 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 b45db3ef..73698ada 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -568,13 +568,7 @@ local function show_c2s(callback) end function def_env.c2s:count(match_jid) - local count = 0; - show_c2s(function (jid, session) - if (not match_jid) or jid:match(match_jid) then - count = count + 1; - end - end); - return true, "Total: "..count.." clients"; + return true, "Total: ".. iterators.count(values(module:shared"/*/c2s/sessions")) .." clients"; end function def_env.c2s:show(match_jid, annotate) -- cgit v1.2.3