Software `/` code `/` prosody

Annotate

plugins/mod_admin_telnet.lua @ 5023:dcc8e789df36

mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on modules setting globals

author	Florian Zeitz <florob@babelmonkeys.de>
date	Sat, 09 Jun 2012 02:27:44 +0200
parent	5021:85b2689dbcfe
child	5024:d25e1b9332cc

rev	line source
1523 841d61be198f Remove version number from copyright headers Matthew Wild <mwild1@gmail.com> parents: 1506 diff changeset	1 -- Prosody IM
2923 b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2870 diff changeset	2 -- Copyright (C) 2008-2010 Matthew Wild
b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2870 diff changeset	3 -- Copyright (C) 2008-2010 Waqas Hussain
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 461 diff changeset	4 --
758 b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 736 diff changeset	5 -- This project is MIT/X11 licensed. Please see the
b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 736 diff changeset	6 -- COPYING file in the source package for more information.
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 461 diff changeset	7 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 461 diff changeset	8
4623 403b56b78018 mod_posix, mod_bosh, mod_admin_telnet: Use module:set_global() Kim Alvefur <zash@zash.se> parents: 4582 diff changeset	9 module:set_global();
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 461 diff changeset	10
1342 947d94e3619f mod_console: Redirect print() to console session when executing commands in global environment Matthew Wild <mwild1@gmail.com> parents: 1341 diff changeset	11 local _G = _G;
947d94e3619f mod_console: Redirect print() to console session when executing commands in global environment Matthew Wild <mwild1@gmail.com> parents: 1341 diff changeset	12
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	13 local prosody = _G.prosody;
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	14 local hosts = prosody.hosts;
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	15
4550 1c41e4a846a2 mod_admin_telnet: Port to portmanager Matthew Wild <mwild1@gmail.com> parents: 4540 diff changeset	16 local console_listener = { default_port = 5582; default_mode = "*l"; interface = "127.0.0.1" };
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	17
5023 dcc8e789df36 mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on modules setting globals Florian Zeitz <florob@babelmonkeys.de> parents: 5021 diff changeset	18 local hostmanager = require "core.hostmanager";
dcc8e789df36 mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on modules setting globals Florian Zeitz <florob@babelmonkeys.de> parents: 5021 diff changeset	19 local modulemanager = require "core.modulemanager";
dcc8e789df36 mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on modules setting globals Florian Zeitz <florob@babelmonkeys.de> parents: 5021 diff changeset	20
4582 542afb9c2ab1 mod_admin_telnet: Import util.iterators properly Kim Alvefur <zash@zash.se> parents: 4571 diff changeset	21 local iterators = require "util.iterators";
542afb9c2ab1 mod_admin_telnet: Import util.iterators properly Kim Alvefur <zash@zash.se> parents: 4571 diff changeset	22 local keys, values = iterators.keys, iterators.values;
4807 2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	23 local jid = require "util.jid";
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	24 local jid_bare, jid_split = jid.bare, jid.split;
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	25 local set, array = require "util.set", require "util.array";
3733 26571a99f6e6 core.s2smanager, mod_console, mod_saslauth, util.certverification: rename util.certverification to util.x509 Kim Alvefur <zash@zash.se> parents: 3718 diff changeset	26 local cert_verify_identity = require "util.x509".verify_identity;
5021 85b2689dbcfe Eliminate direct setfenv usage Florian Zeitz <florob@babelmonkeys.de> parents: 4913 diff changeset	27 local envload = require "util.envload".envload;
85b2689dbcfe Eliminate direct setfenv usage Florian Zeitz <florob@babelmonkeys.de> parents: 4913 diff changeset	28 local envloadfile = require "util.envload".envloadfile;
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	29
4540 ddce5b1bdfca mod_admin_telnet: Use module:shared() to expose commands table and default console environment Matthew Wild <mwild1@gmail.com> parents: 4328 diff changeset	30 local commands = module:shared("commands")
ddce5b1bdfca mod_admin_telnet: Use module:shared() to expose commands table and default console environment Matthew Wild <mwild1@gmail.com> parents: 4328 diff changeset	31 local def_env = module:shared("env");
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	32 local default_env_mt = { __index = def_env };
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	33
1342 947d94e3619f mod_console: Redirect print() to console session when executing commands in global environment Matthew Wild <mwild1@gmail.com> parents: 1341 diff changeset	34 local function redirect_output(_G, session)
3557 58ab7e61d220 mod_console: Keep global variable assignments sandboxed by default. Waqas Hussain <waqas20@gmail.com> parents: 3540 diff changeset	35 local env = setmetatable({ print = session.print }, { __index = function (t, k) return rawget(_G, k); end });
3407 15f633285755 mod_console: Override dofile() in the console environment (this lets print() print to the console session for example). Waqas Hussain <waqas20@gmail.com> parents: 3404 diff changeset	36 env.dofile = function(name)
5021 85b2689dbcfe Eliminate direct setfenv usage Florian Zeitz <florob@babelmonkeys.de> parents: 4913 diff changeset	37 local f, err = envloadfile(name, env);
3407 15f633285755 mod_console: Override dofile() in the console environment (this lets print() print to the console session for example). Waqas Hussain <waqas20@gmail.com> parents: 3404 diff changeset	38 if not f then return f, err; end
5021 85b2689dbcfe Eliminate direct setfenv usage Florian Zeitz <florob@babelmonkeys.de> parents: 4913 diff changeset	39 return f();
3407 15f633285755 mod_console: Override dofile() in the console environment (this lets print() print to the console session for example). Waqas Hussain <waqas20@gmail.com> parents: 3404 diff changeset	40 end;
15f633285755 mod_console: Override dofile() in the console environment (this lets print() print to the console session for example). Waqas Hussain <waqas20@gmail.com> parents: 3404 diff changeset	41 return env;
1342 947d94e3619f mod_console: Redirect print() to console session when executing commands in global environment Matthew Wild <mwild1@gmail.com> parents: 1341 diff changeset	42 end
947d94e3619f mod_console: Redirect print() to console session when executing commands in global environment Matthew Wild <mwild1@gmail.com> parents: 1341 diff changeset	43
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	44 console = {};
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	45
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	46 function console:new_session(conn)
2145 daeb6ebf304c mod_console: Update for new net.server API Matthew Wild <mwild1@gmail.com> parents: 2087 diff changeset	47 local w = function(s) conn:write(s:gsub("\n", "\r\n")); end;
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	48 local session = { conn = conn;
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	49 send = function (t) w(tostring(t)); end;
3404 33c81ee280e3 mod_console: Added support for multiple arguments to print(). Waqas Hussain <waqas20@gmail.com> parents: 3044 diff changeset	50 print = function (...)
33c81ee280e3 mod_console: Added support for multiple arguments to print(). Waqas Hussain <waqas20@gmail.com> parents: 3044 diff changeset	51 local t = {};
33c81ee280e3 mod_console: Added support for multiple arguments to print(). Waqas Hussain <waqas20@gmail.com> parents: 3044 diff changeset	52 for i=1,select("#", ...) do
33c81ee280e3 mod_console: Added support for multiple arguments to print(). Waqas Hussain <waqas20@gmail.com> parents: 3044 diff changeset	53 t[i] = tostring(select(i, ...));
33c81ee280e3 mod_console: Added support for multiple arguments to print(). Waqas Hussain <waqas20@gmail.com> parents: 3044 diff changeset	54 end
33c81ee280e3 mod_console: Added support for multiple arguments to print(). Waqas Hussain <waqas20@gmail.com> parents: 3044 diff changeset	55 w("\| "..table.concat(t, "\t").."\n");
33c81ee280e3 mod_console: Added support for multiple arguments to print(). Waqas Hussain <waqas20@gmail.com> parents: 3044 diff changeset	56 end;
2253 a3537266a916 mod_console: Update for new server API, fixes traceback when closing console sessions Matthew Wild <mwild1@gmail.com> parents: 2145 diff changeset	57 disconnect = function () conn:close(); end;
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	58 };
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	59 session.env = setmetatable({}, default_env_mt);
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	60
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	61 -- Load up environment with helper objects
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	62 for name, t in pairs(def_env) do
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	63 if type(t) == "table" then
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	64 session.env[name] = setmetatable({ session = session }, { __index = t });
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	65 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	66 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	67
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	68 return session;
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	69 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	70
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	71 local sessions = {};
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	72
3009 06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	73 function console_listener.onconnect(conn)
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	74 -- Handle new connection
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	75 local session = console:new_session(conn);
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	76 sessions[conn] = session;
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	77 printbanner(session);
669 9255abbb3068 mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response Waqas Hussain <waqas20@gmail.com> parents: 615 diff changeset	78 session.send(string.char(0));
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	79 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	80
2145 daeb6ebf304c mod_console: Update for new net.server API Matthew Wild <mwild1@gmail.com> parents: 2087 diff changeset	81 function console_listener.onincoming(conn, data)
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	82 local session = sessions[conn];
1317 f6e56a555c37 mod_console: Allow running code in the global environment by prefixing with '>' Matthew Wild <mwild1@gmail.com> parents: 1316 diff changeset	83
3009 06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	84 -- Handle data
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	85 (function(session, data)
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	86 local useglobalenv;
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	87
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	88 if data:match("^>") then
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	89 data = data:gsub("^>", "");
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	90 useglobalenv = true;
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	91 elseif data == "\004" then
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	92 commands["bye"](session, data);
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	93 return;
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	94 else
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	95 local command = data:lower();
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	96 command = data:match("^%w+") or data:match("%p");
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	97 if commands[command] then
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	98 commands[command](session, data);
1502 0f895c06e03f mod_console: Check for commands when not executing in the global environment Matthew Wild <mwild1@gmail.com> parents: 1496 diff changeset	99 return;
0f895c06e03f mod_console: Check for commands when not executing in the global environment Matthew Wild <mwild1@gmail.com> parents: 1496 diff changeset	100 end
3009 06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	101 end
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	102
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	103 session.env._ = data;
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	104
3028 e095d2a98936 Merge 0.6->0.7 Waqas Hussain <waqas20@gmail.com> parents: 3025 3027 diff changeset	105 local chunkname = "=console";
5021 85b2689dbcfe Eliminate direct setfenv usage Florian Zeitz <florob@babelmonkeys.de> parents: 4913 diff changeset	106 local env = (useglobalenv and redirect_output(_G, session)) or session.env or nil
85b2689dbcfe Eliminate direct setfenv usage Florian Zeitz <florob@babelmonkeys.de> parents: 4913 diff changeset	107 local chunk, err = envload("return "..data, chunkname, env);
3009 06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	108 if not chunk then
5021 85b2689dbcfe Eliminate direct setfenv usage Florian Zeitz <florob@babelmonkeys.de> parents: 4913 diff changeset	109 chunk, err = envload(data, chunkname, env);
3009 06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	110 if not chunk then
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	111 err = err:gsub("^%[string .-%]:%d+: ", "");
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	112 err = err:gsub("^:%d+: ", "");
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	113 err = err:gsub("'<eof>'", "the end of the line");
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	114 session.print("Sorry, I couldn't understand that... "..err);
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	115 return;
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	116 end
3009 06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	117 end
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	118
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	119 local ranok, taskok, message = pcall(chunk);
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	120
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	121 if not (ranok or message or useglobalenv) and commands[data:lower()] then
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	122 commands[data:lower()](session, data);
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	123 return;
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	124 end
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	125
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	126 if not ranok then
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	127 session.print("Fatal error while running command, it did not complete");
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	128 session.print("Error: "..taskok);
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	129 return;
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	130 end
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	131
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	132 if not message then
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	133 session.print("Result: "..tostring(taskok));
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	134 return;
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	135 elseif (not taskok) and message then
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	136 session.print("Command completed with a problem");
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	137 session.print("Message: "..tostring(message));
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	138 return;
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	139 end
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	140
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	141 session.print("OK: "..tostring(message));
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	142 end)(session, data);
06f7d8054065 mod_console: Make use of the new onconnect callback to initialise session and send banner Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	143
669 9255abbb3068 mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response Waqas Hussain <waqas20@gmail.com> parents: 615 diff changeset	144 session.send(string.char(0));
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	145 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	146
2145 daeb6ebf304c mod_console: Update for new net.server API Matthew Wild <mwild1@gmail.com> parents: 2087 diff changeset	147 function console_listener.ondisconnect(conn, err)
2054 a43aea9b0bd1 mod_console: Added proper cleanup for disconnected console sessions. Waqas Hussain <waqas20@gmail.com> parents: 2010 diff changeset	148 local session = sessions[conn];
a43aea9b0bd1 mod_console: Added proper cleanup for disconnected console sessions. Waqas Hussain <waqas20@gmail.com> parents: 2010 diff changeset	149 if session then
a43aea9b0bd1 mod_console: Added proper cleanup for disconnected console sessions. Waqas Hussain <waqas20@gmail.com> parents: 2010 diff changeset	150 session.disconnect();
a43aea9b0bd1 mod_console: Added proper cleanup for disconnected console sessions. Waqas Hussain <waqas20@gmail.com> parents: 2010 diff changeset	151 sessions[conn] = nil;
a43aea9b0bd1 mod_console: Added proper cleanup for disconnected console sessions. Waqas Hussain <waqas20@gmail.com> parents: 2010 diff changeset	152 end
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	153 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	154
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	155 -- Console commands --
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	156 -- These are simple commands, not valid standalone in Lua
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	157
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	158 function commands.bye(session)
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	159 session.print("See you! :)");
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	160 session.disconnect();
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	161 end
1503 5970e06d9335 mod_console: Add quit and exit as aliases for 'bye' command Matthew Wild <mwild1@gmail.com> parents: 1502 diff changeset	162 commands.quit, commands.exit = commands.bye, commands.bye;
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	163
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	164 commands["!"] = function (session, data)
3614 8b436cc88c0e mod_console: Don't allow bang bang as the first command in a session, or when the last command is unknown (fixes #218) Matthew Wild <mwild1@gmail.com> parents: 3557 diff changeset	165 if data:match("^!!") and session.env._ then
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	166 session.print("!> "..session.env._);
2512 d04b0eeeb954 mod_console: Update !! shortcut for new connection API Matthew Wild <mwild1@gmail.com> parents: 2296 diff changeset	167 return console_listener.onincoming(session.conn, session.env._);
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	168 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	169 local old, new = data:match("^!(.-[^\\])!(.-)!$");
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	170 if old and new then
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	171 local ok, res = pcall(string.gsub, session.env._, old, new);
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	172 if not ok then
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	173 session.print(res)
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	174 return;
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	175 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	176 session.print("!> "..res);
2512 d04b0eeeb954 mod_console: Update !! shortcut for new connection API Matthew Wild <mwild1@gmail.com> parents: 2296 diff changeset	177 return console_listener.onincoming(session.conn, res);
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	178 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	179 session.print("Sorry, not sure what you want");
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	180 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	181
3452 2d1a5d8893c2 mod_console: Add host:* commands to help (thanks Zash) Matthew Wild <mwild1@gmail.com> parents: 3407 diff changeset	182
1616 80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	183 function commands.help(session, data)
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	184 local print = session.print;
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	185 local section = data:match("^help (%w+)");
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	186 if not section then
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	187 print [[Commands are divided into multiple sections. For help on a particular section, ]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	188 print [[type: help SECTION (for example, 'help c2s'). Sections are: ]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	189 print [[]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	190 print [[c2s - Commands to manage local client-to-server sessions]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	191 print [[s2s - Commands to manage sessions between this server and others]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	192 print [[module - Commands to load/reload/unload modules/plugins]]
3452 2d1a5d8893c2 mod_console: Add host:* commands to help (thanks Zash) Matthew Wild <mwild1@gmail.com> parents: 3407 diff changeset	193 print [[host - Commands to activate, deactivate and list virtual hosts]]
1616 80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	194 print [[server - Uptime, version, shutting down, etc.]]
2009 3f9cce29c57d mod_console: Added help text for config:reload(). Waqas Hussain <waqas20@gmail.com> parents: 2007 diff changeset	195 print [[config - Reloading the configuration, etc.]]
1616 80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	196 print [[console - Help regarding the console itself]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	197 elseif section == "c2s" then
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	198 print [[c2s:show(jid) - Show all client sessions with the specified JID (or all if no JID given)]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	199 print [[c2s:show_insecure() - Show all unencrypted client connections]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	200 print [[c2s:show_secure() - Show all encrypted client connections]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	201 print [[c2s:close(jid) - Close all sessions for the specified JID]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	202 elseif section == "s2s" then
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	203 print [[s2s:show(domain) - Show all s2s connections for the given domain (or all if no domain given)]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	204 print [[s2s:close(from, to) - Close a connection from one domain to another]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	205 elseif section == "module" then
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	206 print [[module:load(module, host) - Load the specified module on the specified host (or all hosts if none given)]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	207 print [[module:reload(module, host) - The same, but unloads and loads the module (saving state if the module supports it)]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	208 print [[module:unload(module, host) - The same, but just unloads the module from memory]]
1907 1dd4443e7d93 mod_console: Add module:list() to help Matthew Wild <mwild1@gmail.com> parents: 1906 diff changeset	209 print [[module:list(host) - List the modules loaded on the specified host]]
3452 2d1a5d8893c2 mod_console: Add host:* commands to help (thanks Zash) Matthew Wild <mwild1@gmail.com> parents: 3407 diff changeset	210 elseif section == "host" then
2d1a5d8893c2 mod_console: Add host:* commands to help (thanks Zash) Matthew Wild <mwild1@gmail.com> parents: 3407 diff changeset	211 print [[host:activate(hostname) - Activates the specified host]]
2d1a5d8893c2 mod_console: Add host:* commands to help (thanks Zash) Matthew Wild <mwild1@gmail.com> parents: 3407 diff changeset	212 print [[host:deactivate(hostname) - Disconnects all clients on this host and deactivates]]
2d1a5d8893c2 mod_console: Add host:* commands to help (thanks Zash) Matthew Wild <mwild1@gmail.com> parents: 3407 diff changeset	213 print [[host:list() - List the currently-activated hosts]]
1616 80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	214 elseif section == "server" then
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	215 print [[server:version() - Show the server's version number]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	216 print [[server:uptime() - Show how long the server has been running]]
2870 471c3acffb2a mod_console: Uncomment the help for server:shutdown() - thanks darkrain Matthew Wild <mwild1@gmail.com> parents: 2087 diff changeset	217 print [[server:shutdown(reason) - Shut down the server, with an optional reason to be broadcast to all connections]]
2009 3f9cce29c57d mod_console: Added help text for config:reload(). Waqas Hussain <waqas20@gmail.com> parents: 2007 diff changeset	218 elseif section == "config" then
3f9cce29c57d mod_console: Added help text for config:reload(). Waqas Hussain <waqas20@gmail.com> parents: 2007 diff changeset	219 print [[config:reload() - Reload the server configuration. Modules may need to be reloaded for changes to take effect.]]
1616 80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	220 elseif section == "console" then
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	221 print [[Hey! Welcome to Prosody's admin console.]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	222 print [[First thing, if you're ever wondering how to get out, simply type 'quit'.]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	223 print [[Secondly, note that we don't support the full telnet protocol yet (it's coming)]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	224 print [[so you may have trouble using the arrow keys, etc. depending on your system.]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	225 print [[]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	226 print [[For now we offer a couple of handy shortcuts:]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	227 print [[!! - Repeat the last command]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	228 print [[!old!new! - repeat the last command, but with 'old' replaced by 'new']]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	229 print [[]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	230 print [[For those well-versed in Prosody's internals, or taking instruction from those who are,]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	231 print [[you can prefix a command with > to escape the console sandbox, and access everything in]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	232 print [[the running server. Great fun, but be careful not to break anything :)]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	233 end
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	234 print [[]]
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	235 end
80ea744f2643 mod_console: Finally add in the missing 'help' command \o/ Matthew Wild <mwild1@gmail.com> parents: 1575 diff changeset	236
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	237 -- Session environment --
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	238 -- Anything in def_env will be accessible within the session as a global variable
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	239
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	240 def_env.server = {};
1558 e15917530285 mod_console: Add config:reload() command Matthew Wild <mwild1@gmail.com> parents: 1556 diff changeset	241
1556 8154aa1fbe6c mod_console: Rename server:reload() to server:insane_reload() (basically no-one should use it except me...) Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	242 function def_env.server:insane_reload()
1316 28ae044f1aaf mod_console: Some "improvements" to the useless server:reload() command :) Matthew Wild <mwild1@gmail.com> parents: 1315 diff changeset	243 prosody.unlock_globals();
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	244 dofile "prosody"
1316 28ae044f1aaf mod_console: Some "improvements" to the useless server:reload() command :) Matthew Wild <mwild1@gmail.com> parents: 1315 diff changeset	245 prosody = _G.prosody;
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	246 return true, "Server reloaded";
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	247 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	248
1496 4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	249 function def_env.server:version()
4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	250 return true, tostring(prosody.version or "unknown");
4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	251 end
4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	252
4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	253 function def_env.server:uptime()
4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	254 local t = os.time()-prosody.start_time;
4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	255 local seconds = t%60;
4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	256 t = (t - seconds)/60;
4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	257 local minutes = t%60;
4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	258 t = (t - minutes)/60;
4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	259 local hours = t%24;
4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	260 t = (t - hours)/24;
4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	261 local days = t;
3540 bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3452 diff changeset	262 return true, string.format("This server has been running for %d day%s, %d hour%s and %d minute%s (since %s)",
bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3452 diff changeset	263 days, (days ~= 1 and "s") or "", hours, (hours ~= 1 and "s") or "",
1496 4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	264 minutes, (minutes ~= 1 and "s") or "", os.date("%c", prosody.start_time));
4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	265 end
4fa337035f46 mod_console: server:version() and server:uptime() commands Matthew Wild <mwild1@gmail.com> parents: 1491 diff changeset	266
1559 831649bb1922 mod_console: Add server:shutdown() command Matthew Wild <mwild1@gmail.com> parents: 1558 diff changeset	267 function def_env.server:shutdown(reason)
831649bb1922 mod_console: Add server:shutdown() command Matthew Wild <mwild1@gmail.com> parents: 1558 diff changeset	268 prosody.shutdown(reason);
831649bb1922 mod_console: Add server:shutdown() command Matthew Wild <mwild1@gmail.com> parents: 1558 diff changeset	269 return true, "Shutdown initiated";
831649bb1922 mod_console: Add server:shutdown() command Matthew Wild <mwild1@gmail.com> parents: 1558 diff changeset	270 end
831649bb1922 mod_console: Add server:shutdown() command Matthew Wild <mwild1@gmail.com> parents: 1558 diff changeset	271
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	272 def_env.module = {};
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	273
1433 e7bd00e70973 mod_console: Reload/unload a module on a component host if it is loaded there Matthew Wild <mwild1@gmail.com> parents: 1342 diff changeset	274 local function get_hosts_set(hosts, module)
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	275 if type(hosts) == "table" then
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	276 if hosts[1] then
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	277 return set.new(hosts);
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	278 elseif hosts._items then
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	279 return hosts;
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	280 end
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	281 elseif type(hosts) == "string" then
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	282 return set.new { hosts };
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	283 elseif hosts == nil then
1433 e7bd00e70973 mod_console: Reload/unload a module on a component host if it is loaded there Matthew Wild <mwild1@gmail.com> parents: 1342 diff changeset	284 local mm = require "modulemanager";
4644 fb067c8a8d2e mod_admin_telnet: get_host_set(): Include '' in the set if no specific hosts are specified and the module is loaded there Matthew Wild <mwild1@gmail.com>* parents: 4623 diff changeset	285 local hosts_set = set.new(array.collect(keys(prosody.hosts)))
4912 8d0643281fe2 mod_admin_telnet: Code found and updated, which depended on pre-8c5b5ebaacb0 behaviour. Kim Alvefur <zash@zash.se> parents: 4807 diff changeset	286 / function (host) return (prosody.hosts[host].type == "local" or module and mm.is_loaded(host, module)) and host or nil; end;
4644 fb067c8a8d2e mod_admin_telnet: get_host_set(): Include '' in the set if no specific hosts are specified and the module is loaded there Matthew Wild <mwild1@gmail.com>* parents: 4623 diff changeset	287 if module and mm.get_module("*", module) then
fb067c8a8d2e mod_admin_telnet: get_host_set(): Include '' in the set if no specific hosts are specified and the module is loaded there Matthew Wild <mwild1@gmail.com>* parents: 4623 diff changeset	288 hosts_set:add("*");
fb067c8a8d2e mod_admin_telnet: get_host_set(): Include '' in the set if no specific hosts are specified and the module is loaded there Matthew Wild <mwild1@gmail.com>* parents: 4623 diff changeset	289 end
fb067c8a8d2e mod_admin_telnet: get_host_set(): Include '' in the set if no specific hosts are specified and the module is loaded there Matthew Wild <mwild1@gmail.com>* parents: 4623 diff changeset	290 return hosts_set;
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	291 end
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	292 end
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	293
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	294 function def_env.module:load(name, hosts, config)
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	295 local mm = require "modulemanager";
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	296
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	297 hosts = get_hosts_set(hosts);
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	298
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	299 -- Load the module for each host
4647 57a4f863e48f mod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors when successfully loading a global module (fixes #228) Matthew Wild <mwild1@gmail.com> parents: 4646 diff changeset	300 local ok, err, count, mod = true, nil, 0, nil;
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	301 for host in hosts do
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	302 if (not mm.is_loaded(host, name)) then
4647 57a4f863e48f mod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors when successfully loading a global module (fixes #228) Matthew Wild <mwild1@gmail.com> parents: 4646 diff changeset	303 mod, err = mm.load(host, name, config);
57a4f863e48f mod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors when successfully loading a global module (fixes #228) Matthew Wild <mwild1@gmail.com> parents: 4646 diff changeset	304 if not mod then
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	305 ok = false;
4647 57a4f863e48f mod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors when successfully loading a global module (fixes #228) Matthew Wild <mwild1@gmail.com> parents: 4646 diff changeset	306 if err == "global-module-already-loaded" then
57a4f863e48f mod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors when successfully loading a global module (fixes #228) Matthew Wild <mwild1@gmail.com> parents: 4646 diff changeset	307 if count > 0 then
57a4f863e48f mod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors when successfully loading a global module (fixes #228) Matthew Wild <mwild1@gmail.com> parents: 4646 diff changeset	308 ok, err, count = true, nil, 1;
57a4f863e48f mod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors when successfully loading a global module (fixes #228) Matthew Wild <mwild1@gmail.com> parents: 4646 diff changeset	309 end
57a4f863e48f mod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors when successfully loading a global module (fixes #228) Matthew Wild <mwild1@gmail.com> parents: 4646 diff changeset	310 break;
57a4f863e48f mod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors when successfully loading a global module (fixes #228) Matthew Wild <mwild1@gmail.com> parents: 4646 diff changeset	311 end
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	312 self.session.print(err or "Unknown error loading module");
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	313 else
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	314 count = count + 1;
4647 57a4f863e48f mod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors when successfully loading a global module (fixes #228) Matthew Wild <mwild1@gmail.com> parents: 4646 diff changeset	315 self.session.print("Loaded for "..mod.module.host);
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	316 end
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	317 end
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	318 end
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	319
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	320 return ok, (ok and "Module loaded onto "..count.." host"..(count ~= 1 and "s" or "")) or ("Last error: "..tostring(err));
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	321 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	322
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	323 function def_env.module:unload(name, hosts)
712 56410c0cd846 mod_console: Added module:reload Waqas Hussain <waqas20@gmail.com> parents: 669 diff changeset	324 local mm = require "modulemanager";
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	325
1433 e7bd00e70973 mod_console: Reload/unload a module on a component host if it is loaded there Matthew Wild <mwild1@gmail.com> parents: 1342 diff changeset	326 hosts = get_hosts_set(hosts, name);
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	327
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	328 -- Unload the module for each host
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	329 local ok, err, count = true, nil, 0;
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	330 for host in hosts do
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	331 if mm.is_loaded(host, name) then
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	332 ok, err = mm.unload(host, name);
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	333 if not ok then
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	334 ok = false;
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	335 self.session.print(err or "Unknown error unloading module");
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	336 else
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	337 count = count + 1;
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	338 self.session.print("Unloaded from "..host);
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	339 end
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	340 end
712 56410c0cd846 mod_console: Added module:reload Waqas Hussain <waqas20@gmail.com> parents: 669 diff changeset	341 end
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	342 return ok, (ok and "Module unloaded from "..count.." host"..(count ~= 1 and "s" or "")) or ("Last error: "..tostring(err));
712 56410c0cd846 mod_console: Added module:reload Waqas Hussain <waqas20@gmail.com> parents: 669 diff changeset	343 end
56410c0cd846 mod_console: Added module:reload Waqas Hussain <waqas20@gmail.com> parents: 669 diff changeset	344
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	345 function def_env.module:reload(name, hosts)
712 56410c0cd846 mod_console: Added module:reload Waqas Hussain <waqas20@gmail.com> parents: 669 diff changeset	346 local mm = require "modulemanager";
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	347
4645 4539e99be743 mod_admin_telnet: module:reload(): If module is loaded on , reload it there first (ensuring shared module code is reloaded before per-host children of that module) Matthew Wild <mwild1@gmail.com>* parents: 4644 diff changeset	348 hosts = array.collect(get_hosts_set(hosts, name)):sort(function (a, b)
4539e99be743 mod_admin_telnet: module:reload(): If module is loaded on , reload it there first (ensuring shared module code is reloaded before per-host children of that module) Matthew Wild <mwild1@gmail.com>* parents: 4644 diff changeset	349 if a == "*" then return true
4539e99be743 mod_admin_telnet: module:reload(): If module is loaded on , reload it there first (ensuring shared module code is reloaded before per-host children of that module) Matthew Wild <mwild1@gmail.com>* parents: 4644 diff changeset	350 elseif b == "*" then return false
4539e99be743 mod_admin_telnet: module:reload(): If module is loaded on , reload it there first (ensuring shared module code is reloaded before per-host children of that module) Matthew Wild <mwild1@gmail.com>* parents: 4644 diff changeset	351 else return a < b; end
4539e99be743 mod_admin_telnet: module:reload(): If module is loaded on , reload it there first (ensuring shared module code is reloaded before per-host children of that module) Matthew Wild <mwild1@gmail.com>* parents: 4644 diff changeset	352 end);
4539e99be743 mod_admin_telnet: module:reload(): If module is loaded on , reload it there first (ensuring shared module code is reloaded before per-host children of that module) Matthew Wild <mwild1@gmail.com>* parents: 4644 diff changeset	353
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	354 -- Reload the module for each host
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	355 local ok, err, count = true, nil, 0;
4645 4539e99be743 mod_admin_telnet: module:reload(): If module is loaded on , reload it there first (ensuring shared module code is reloaded before per-host children of that module) Matthew Wild <mwild1@gmail.com>* parents: 4644 diff changeset	356 for _, host in ipairs(hosts) do
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	357 if mm.is_loaded(host, name) then
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	358 ok, err = mm.reload(host, name);
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	359 if not ok then
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	360 ok = false;
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	361 self.session.print(err or "Unknown error reloading module");
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	362 else
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	363 count = count + 1;
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	364 if ok == nil then
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	365 ok = true;
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	366 end
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	367 self.session.print("Reloaded on "..host);
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	368 end
bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	369 end
712 56410c0cd846 mod_console: Added module:reload Waqas Hussain <waqas20@gmail.com> parents: 669 diff changeset	370 end
1315 bfcd3f0a49df mod_console: Much improved module load/unload/reload commands Matthew Wild <mwild1@gmail.com> parents: 1241 diff changeset	371 return ok, (ok and "Module reloaded on "..count.." host"..(count ~= 1 and "s" or "")) or ("Last error: "..tostring(err));
712 56410c0cd846 mod_console: Added module:reload Waqas Hussain <waqas20@gmail.com> parents: 669 diff changeset	372 end
56410c0cd846 mod_console: Added module:reload Waqas Hussain <waqas20@gmail.com> parents: 669 diff changeset	373
1906 88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	374 function def_env.module:list(hosts)
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	375 if hosts == nil then
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	376 hosts = array.collect(keys(prosody.hosts));
4646 e0bd8587f2fb mod_admin_telnet: module:list(): List global modules (part-fixes #228) Matthew Wild <mwild1@gmail.com> parents: 4645 diff changeset	377 table.insert(hosts, 1, "*");
1906 88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	378 end
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	379 if type(hosts) == "string" then
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	380 hosts = { hosts };
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	381 end
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	382 if type(hosts) ~= "table" then
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	383 return false, "Please supply a host or a list of hosts you would like to see";
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	384 end
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	385
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	386 local print = self.session.print;
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	387 for _, host in ipairs(hosts) do
4646 e0bd8587f2fb mod_admin_telnet: module:list(): List global modules (part-fixes #228) Matthew Wild <mwild1@gmail.com> parents: 4645 diff changeset	388 print((host == "*" and "Global" or host)..":");
e0bd8587f2fb mod_admin_telnet: module:list(): List global modules (part-fixes #228) Matthew Wild <mwild1@gmail.com> parents: 4645 diff changeset	389 local modules = array.collect(keys(modulemanager.get_modules(host) or {})):sort();
1906 88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	390 if #modules == 0 then
2010 1a4f14ea39b6 mod_console: Fixed traceback occuring on using module:list on unknown hosts. Waqas Hussain <waqas20@gmail.com> parents: 2009 diff changeset	391 if prosody.hosts[host] then
1a4f14ea39b6 mod_console: Fixed traceback occuring on using module:list on unknown hosts. Waqas Hussain <waqas20@gmail.com> parents: 2009 diff changeset	392 print(" No modules loaded");
1a4f14ea39b6 mod_console: Fixed traceback occuring on using module:list on unknown hosts. Waqas Hussain <waqas20@gmail.com> parents: 2009 diff changeset	393 else
1a4f14ea39b6 mod_console: Fixed traceback occuring on using module:list on unknown hosts. Waqas Hussain <waqas20@gmail.com> parents: 2009 diff changeset	394 print(" Host not found");
1a4f14ea39b6 mod_console: Fixed traceback occuring on using module:list on unknown hosts. Waqas Hussain <waqas20@gmail.com> parents: 2009 diff changeset	395 end
1906 88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	396 else
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	397 for _, name in ipairs(modules) do
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	398 print(" "..name);
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	399 end
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	400 end
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	401 end
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	402 end
88c61368e669 mod_console: Add module:list() command to show modules loaded on a host Matthew Wild <mwild1@gmail.com> parents: 1821 diff changeset	403
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	404 def_env.config = {};
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	405 function def_env.config:load(filename, format)
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	406 local config_load = require "core.configmanager".load;
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	407 local ok, err = config_load(filename, format);
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	408 if not ok then
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	409 return false, err or "Unknown error loading config";
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	410 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	411 return true, "Config loaded";
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	412 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	413
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	414 function def_env.config:get(host, section, key)
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	415 local config_get = require "core.configmanager".get
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	416 return true, tostring(config_get(host, section, key));
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	417 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	418
1558 e15917530285 mod_console: Add config:reload() command Matthew Wild <mwild1@gmail.com> parents: 1556 diff changeset	419 function def_env.config:reload()
e15917530285 mod_console: Add config:reload() command Matthew Wild <mwild1@gmail.com> parents: 1556 diff changeset	420 local ok, err = prosody.reload_config();
e15917530285 mod_console: Add config:reload() command Matthew Wild <mwild1@gmail.com> parents: 1556 diff changeset	421 return ok, (ok and "Config reloaded (you may need to reload modules to take effect)") or tostring(err);
e15917530285 mod_console: Add config:reload() command Matthew Wild <mwild1@gmail.com> parents: 1556 diff changeset	422 end
e15917530285 mod_console: Add config:reload() command Matthew Wild <mwild1@gmail.com> parents: 1556 diff changeset	423
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	424 def_env.hosts = {};
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	425 function def_env.hosts:list()
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	426 for host, host_session in pairs(hosts) do
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	427 self.session.print(host);
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	428 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	429 return true, "Done";
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	430 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	431
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	432 function def_env.hosts:add(name)
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	433 end
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	434
1241 9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	435 def_env.c2s = {};
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	436
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	437 local function show_c2s(callback)
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	438 for hostname, host in pairs(hosts) do
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	439 for username, user in pairs(host.sessions or {}) do
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	440 for resource, session in pairs(user.sessions or {}) do
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	441 local jid = username.."@"..hostname.."/"..resource;
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	442 callback(jid, session);
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	443 end
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	444 end
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	445 end
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	446 end
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	447
4779 9f2639b3d9b1 mod_admin_telnet: Add c2s:count() which shows number of connected users. Kim Alvefur <zash@zash.se> parents: 4684 diff changeset	448 function def_env.c2s:count(match_jid)
9f2639b3d9b1 mod_admin_telnet: Add c2s:count() which shows number of connected users. Kim Alvefur <zash@zash.se> parents: 4684 diff changeset	449 local count = 0;
9f2639b3d9b1 mod_admin_telnet: Add c2s:count() which shows number of connected users. Kim Alvefur <zash@zash.se> parents: 4684 diff changeset	450 show_c2s(function (jid, session)
9f2639b3d9b1 mod_admin_telnet: Add c2s:count() which shows number of connected users. Kim Alvefur <zash@zash.se> parents: 4684 diff changeset	451 if (not match_jid) or jid:match(match_jid) then
9f2639b3d9b1 mod_admin_telnet: Add c2s:count() which shows number of connected users. Kim Alvefur <zash@zash.se> parents: 4684 diff changeset	452 count = count + 1;
9f2639b3d9b1 mod_admin_telnet: Add c2s:count() which shows number of connected users. Kim Alvefur <zash@zash.se> parents: 4684 diff changeset	453 end
9f2639b3d9b1 mod_admin_telnet: Add c2s:count() which shows number of connected users. Kim Alvefur <zash@zash.se> parents: 4684 diff changeset	454 end);
9f2639b3d9b1 mod_admin_telnet: Add c2s:count() which shows number of connected users. Kim Alvefur <zash@zash.se> parents: 4684 diff changeset	455 return true, "Total: "..count.." clients";
9f2639b3d9b1 mod_admin_telnet: Add c2s:count() which shows number of connected users. Kim Alvefur <zash@zash.se> parents: 4684 diff changeset	456 end
9f2639b3d9b1 mod_admin_telnet: Add c2s:count() which shows number of connected users. Kim Alvefur <zash@zash.se> parents: 4684 diff changeset	457
1241 9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	458 function def_env.c2s:show(match_jid)
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	459 local print, count = self.session.print, 0;
1763 9e4ff3b66ed1 mod_console: c2s:show(): Group listed clients by host Matthew Wild <mwild1@gmail.com> parents: 1623 diff changeset	460 local curr_host;
1798 4c8f3fa9d926 mod_console: Show status and priority of clients Matthew Wild <mwild1@gmail.com> parents: 1616 diff changeset	461 show_c2s(function (jid, session)
1763 9e4ff3b66ed1 mod_console: c2s:show(): Group listed clients by host Matthew Wild <mwild1@gmail.com> parents: 1623 diff changeset	462 if curr_host ~= session.host then
9e4ff3b66ed1 mod_console: c2s:show(): Group listed clients by host Matthew Wild <mwild1@gmail.com> parents: 1623 diff changeset	463 curr_host = session.host;
9e4ff3b66ed1 mod_console: c2s:show(): Group listed clients by host Matthew Wild <mwild1@gmail.com> parents: 1623 diff changeset	464 print(curr_host);
9e4ff3b66ed1 mod_console: c2s:show(): Group listed clients by host Matthew Wild <mwild1@gmail.com> parents: 1623 diff changeset	465 end
1241 9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	466 if (not match_jid) or jid:match(match_jid) then
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	467 count = count + 1;
1798 4c8f3fa9d926 mod_console: Show status and priority of clients Matthew Wild <mwild1@gmail.com> parents: 1616 diff changeset	468 local status, priority = "unavailable", tostring(session.priority or "-");
4c8f3fa9d926 mod_console: Show status and priority of clients Matthew Wild <mwild1@gmail.com> parents: 1616 diff changeset	469 if session.presence then
4c8f3fa9d926 mod_console: Show status and priority of clients Matthew Wild <mwild1@gmail.com> parents: 1616 diff changeset	470 status = session.presence:child_with_name("show");
4c8f3fa9d926 mod_console: Show status and priority of clients Matthew Wild <mwild1@gmail.com> parents: 1616 diff changeset	471 if status then
4c8f3fa9d926 mod_console: Show status and priority of clients Matthew Wild <mwild1@gmail.com> parents: 1616 diff changeset	472 status = status:get_text() or "[invalid!]";
4c8f3fa9d926 mod_console: Show status and priority of clients Matthew Wild <mwild1@gmail.com> parents: 1616 diff changeset	473 else
4c8f3fa9d926 mod_console: Show status and priority of clients Matthew Wild <mwild1@gmail.com> parents: 1616 diff changeset	474 status = "available";
4c8f3fa9d926 mod_console: Show status and priority of clients Matthew Wild <mwild1@gmail.com> parents: 1616 diff changeset	475 end
4c8f3fa9d926 mod_console: Show status and priority of clients Matthew Wild <mwild1@gmail.com> parents: 1616 diff changeset	476 end
1763 9e4ff3b66ed1 mod_console: c2s:show(): Group listed clients by host Matthew Wild <mwild1@gmail.com> parents: 1623 diff changeset	477 print(" "..jid.." - "..status.."("..priority..")");
1241 9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	478 end
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	479 end);
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	480 return true, "Total: "..count.." clients";
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	481 end
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	482
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	483 function def_env.c2s:show_insecure(match_jid)
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	484 local print, count = self.session.print, 0;
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	485 show_c2s(function (jid, session)
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	486 if ((not match_jid) or jid:match(match_jid)) and not session.secure then
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	487 count = count + 1;
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	488 print(jid);
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	489 end
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	490 end);
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	491 return true, "Total: "..count.." insecure client connections";
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	492 end
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	493
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	494 function def_env.c2s:show_secure(match_jid)
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	495 local print, count = self.session.print, 0;
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	496 show_c2s(function (jid, session)
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	497 if ((not match_jid) or jid:match(match_jid)) and session.secure then
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	498 count = count + 1;
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	499 print(jid);
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	500 end
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	501 end);
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	502 return true, "Total: "..count.." secure client connections";
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	503 end
9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	504
1491 694a0a00e1a5 mod_console: Add c2s:close() command Matthew Wild <mwild1@gmail.com> parents: 1483 diff changeset	505 function def_env.c2s:close(match_jid)
694a0a00e1a5 mod_console: Add c2s:close() command Matthew Wild <mwild1@gmail.com> parents: 1483 diff changeset	506 local print, count = self.session.print, 0;
694a0a00e1a5 mod_console: Add c2s:close() command Matthew Wild <mwild1@gmail.com> parents: 1483 diff changeset	507 show_c2s(function (jid, session)
694a0a00e1a5 mod_console: Add c2s:close() command Matthew Wild <mwild1@gmail.com> parents: 1483 diff changeset	508 if jid == match_jid or jid_bare(jid) == match_jid then
694a0a00e1a5 mod_console: Add c2s:close() command Matthew Wild <mwild1@gmail.com> parents: 1483 diff changeset	509 count = count + 1;
694a0a00e1a5 mod_console: Add c2s:close() command Matthew Wild <mwild1@gmail.com> parents: 1483 diff changeset	510 session:close();
694a0a00e1a5 mod_console: Add c2s:close() command Matthew Wild <mwild1@gmail.com> parents: 1483 diff changeset	511 end
694a0a00e1a5 mod_console: Add c2s:close() command Matthew Wild <mwild1@gmail.com> parents: 1483 diff changeset	512 end);
694a0a00e1a5 mod_console: Add c2s:close() command Matthew Wild <mwild1@gmail.com> parents: 1483 diff changeset	513 return true, "Total: "..count.." sessions closed";
694a0a00e1a5 mod_console: Add c2s:close() command Matthew Wild <mwild1@gmail.com> parents: 1483 diff changeset	514 end
1241 9c53fb182044 mod_console: c2s:show(), c2s:show_secure(), c2s:show_insecure() Matthew Wild <mwild1@gmail.com> parents: 1240 diff changeset	515
4514 ae48e0abc233 mod_admin_telnet: Commond and flexible way to show stream properties. Kim Alvefur <zash@zash.se> parents: 4328 diff changeset	516 local function session_flags(session, line)
ae48e0abc233 mod_admin_telnet: Commond and flexible way to show stream properties. Kim Alvefur <zash@zash.se> parents: 4328 diff changeset	517 if session.cert_identity_status == "valid" then
ae48e0abc233 mod_admin_telnet: Commond and flexible way to show stream properties. Kim Alvefur <zash@zash.se> parents: 4328 diff changeset	518 line[#line+1] = "(secure)";
4515 e2774644688d mod_admin_telnet: (encrypted) is redundant in combination with (secure) Kim Alvefur <zash@zash.se> parents: 4514 diff changeset	519 elseif session.secure then
4514 ae48e0abc233 mod_admin_telnet: Commond and flexible way to show stream properties. Kim Alvefur <zash@zash.se> parents: 4328 diff changeset	520 line[#line+1] = "(encrypted)";
ae48e0abc233 mod_admin_telnet: Commond and flexible way to show stream properties. Kim Alvefur <zash@zash.se> parents: 4328 diff changeset	521 end
ae48e0abc233 mod_admin_telnet: Commond and flexible way to show stream properties. Kim Alvefur <zash@zash.se> parents: 4328 diff changeset	522 if session.compressed then
ae48e0abc233 mod_admin_telnet: Commond and flexible way to show stream properties. Kim Alvefur <zash@zash.se> parents: 4328 diff changeset	523 line[#line+1] = "(compressed)";
ae48e0abc233 mod_admin_telnet: Commond and flexible way to show stream properties. Kim Alvefur <zash@zash.se> parents: 4328 diff changeset	524 end
4516 24bb3994df7a mod_admin_telnet: Add flag for stream management. Kim Alvefur <zash@zash.se> parents: 4515 diff changeset	525 if session.smacks then
24bb3994df7a mod_admin_telnet: Add flag for stream management. Kim Alvefur <zash@zash.se> parents: 4515 diff changeset	526 line[#line+1] = "(sm)";
24bb3994df7a mod_admin_telnet: Add flag for stream management. Kim Alvefur <zash@zash.se> parents: 4515 diff changeset	527 end
4517 2e274e088ddc mod_admin_telnet: Add flag for IPv6 Kim Alvefur <zash@zash.se> parents: 4516 diff changeset	528 if session.conn and session.conn:ip():match(":") then
2e274e088ddc mod_admin_telnet: Add flag for IPv6 Kim Alvefur <zash@zash.se> parents: 4516 diff changeset	529 line[#line+1] = "(IPv6)";
2e274e088ddc mod_admin_telnet: Add flag for IPv6 Kim Alvefur <zash@zash.se> parents: 4516 diff changeset	530 end
4514 ae48e0abc233 mod_admin_telnet: Commond and flexible way to show stream properties. Kim Alvefur <zash@zash.se> parents: 4328 diff changeset	531 return table.concat(line, " ");
ae48e0abc233 mod_admin_telnet: Commond and flexible way to show stream properties. Kim Alvefur <zash@zash.se> parents: 4328 diff changeset	532 end
ae48e0abc233 mod_admin_telnet: Commond and flexible way to show stream properties. Kim Alvefur <zash@zash.se> parents: 4328 diff changeset	533
1085 1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	534 def_env.s2s = {};
1240 397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	535 function def_env.s2s:show(match_jid)
1085 1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	536 local _print = self.session.print;
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	537 local print = self.session.print;
1322 33d103b0283f mod_console: Show total incoming/outgoing s2s connections Matthew Wild <mwild1@gmail.com> parents: 1317 diff changeset	538
33d103b0283f mod_console: Show total incoming/outgoing s2s connections Matthew Wild <mwild1@gmail.com> parents: 1317 diff changeset	539 local count_in, count_out = 0,0;
33d103b0283f mod_console: Show total incoming/outgoing s2s connections Matthew Wild <mwild1@gmail.com> parents: 1317 diff changeset	540
1085 1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	541 for host, host_session in pairs(hosts) do
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	542 print = function (...) _print(host); _print(...); print = _print; end
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	543 for remotehost, session in pairs(host_session.s2sout) do
1240 397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	544 if (not match_jid) or remotehost:match(match_jid) or host:match(match_jid) then
1322 33d103b0283f mod_console: Show total incoming/outgoing s2s connections Matthew Wild <mwild1@gmail.com> parents: 1317 diff changeset	545 count_out = count_out + 1;
4514 ae48e0abc233 mod_admin_telnet: Commond and flexible way to show stream properties. Kim Alvefur <zash@zash.se> parents: 4328 diff changeset	546 print(session_flags(session, {" ", host, "->", remotehost}));
1240 397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	547 if session.sendq then
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	548 print(" There are "..#session.sendq.." queued outgoing stanzas for this connection");
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	549 end
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	550 if session.type == "s2sout_unauthed" then
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	551 if session.connecting then
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	552 print(" Connection not yet established");
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	553 if not session.srv_hosts then
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	554 if not session.conn then
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	555 print(" We do not yet have a DNS answer for this host's SRV records");
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	556 else
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	557 print(" This host has no SRV records, using A record instead");
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	558 end
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	559 elseif session.srv_choice then
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	560 print(" We are on SRV record "..session.srv_choice.." of "..#session.srv_hosts);
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	561 local srv_choice = session.srv_hosts[session.srv_choice];
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	562 print(" Using "..(srv_choice.target or ".")..":"..(srv_choice.port or 5269));
1085 1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	563 end
1240 397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	564 elseif session.notopen then
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	565 print(" The <stream> has not yet been opened");
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	566 elseif not session.dialback_key then
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	567 print(" Dialback has not been initiated yet");
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	568 elseif session.dialback_key then
397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	569 print(" Dialback has been requested, but no result received");
1085 1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	570 end
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	571 end
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	572 end
1240 397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	573 end
3540 bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3452 diff changeset	574 local subhost_filter = function (h)
1924 75e6ba240888 mod_console: Also search piggy-backed, er, multiplexed domains when passing a filter to s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1914 diff changeset	575 return (match_jid and h:match(match_jid));
75e6ba240888 mod_console: Also search piggy-backed, er, multiplexed domains when passing a filter to s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1914 diff changeset	576 end
1085 1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	577 for session in pairs(incoming_s2s) do
3540 bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3452 diff changeset	578 if session.to_host == host and ((not match_jid) or host:match(match_jid)
1924 75e6ba240888 mod_console: Also search piggy-backed, er, multiplexed domains when passing a filter to s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1914 diff changeset	579 or (session.from_host and session.from_host:match(match_jid))
75e6ba240888 mod_console: Also search piggy-backed, er, multiplexed domains when passing a filter to s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1914 diff changeset	580 -- Pft! is what I say to list comprehensions
75e6ba240888 mod_console: Also search piggy-backed, er, multiplexed domains when passing a filter to s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1914 diff changeset	581 or (session.hosts and #array.collect(keys(session.hosts)):filter(subhost_filter)>0)) then
1322 33d103b0283f mod_console: Show total incoming/outgoing s2s connections Matthew Wild <mwild1@gmail.com> parents: 1317 diff changeset	582 count_in = count_in + 1;
4514 ae48e0abc233 mod_admin_telnet: Commond and flexible way to show stream properties. Kim Alvefur <zash@zash.se> parents: 4328 diff changeset	583 print(session_flags(session, {" ", host, "<-", session.from_host or "(unknown)"}));
1085 1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	584 if session.type == "s2sin_unauthed" then
1240 397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	585 print(" Connection not yet authenticated");
1085 1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	586 end
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	587 for name in pairs(session.hosts) do
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	588 if name ~= session.from_host then
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	589 print(" also hosts "..tostring(name));
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	590 end
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	591 end
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	592 end
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	593 end
1240 397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	594
1085 1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	595 print = _print;
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	596 end
1240 397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	597
1085 1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	598 for session in pairs(incoming_s2s) do
1240 397b6e9c1568 mod_console: Allow restricting results to matching JIDs in s2s:show() Matthew Wild <mwild1@gmail.com> parents: 1085 diff changeset	599 if not session.to_host and ((not match_jid) or session.from_host and session.from_host:match(match_jid)) then
1322 33d103b0283f mod_console: Show total incoming/outgoing s2s connections Matthew Wild <mwild1@gmail.com> parents: 1317 diff changeset	600 count_in = count_in + 1;
1085 1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	601 print("Other incoming s2s connections");
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	602 print(" (unknown) <- "..(session.from_host or "(unknown)"));
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	603 end
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	604 end
1322 33d103b0283f mod_console: Show total incoming/outgoing s2s connections Matthew Wild <mwild1@gmail.com> parents: 1317 diff changeset	605
33d103b0283f mod_console: Show total incoming/outgoing s2s connections Matthew Wild <mwild1@gmail.com> parents: 1317 diff changeset	606 return true, "Total: "..count_out.." outgoing, "..count_in.." incoming connections";
1085 1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	607 end
1ac11fb753ca mod_console: Add s2s:show() command to list s2s connections Matthew Wild <mwild1@gmail.com> parents: 1042 diff changeset	608
3669 4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	609 local function print_subject(print, subject)
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	610 for _, entry in ipairs(subject) do
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	611 print(
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	612 (" %s: %q"):format(
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	613 entry.name or entry.oid,
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	614 entry.value:gsub("[\r\n%z%c]", " ")
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	615 )
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	616 );
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	617 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	618 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	619
4328 c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	620 -- As much as it pains me to use the 0-based depths that OpenSSL does,
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	621 -- I think there's going to be more confusion among operators if we
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	622 -- break from that.
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	623 local function print_errors(print, errors)
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	624 for depth, t in ipairs(errors) do
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	625 print(
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	626 (" %d: %s"):format(
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	627 depth-1,
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	628 table.concat(t, "\n\| ")
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	629 )
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	630 );
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	631 end
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	632 end
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	633
3669 4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	634 function def_env.s2s:showcert(domain)
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	635 local ser = require "util.serialization".serialize;
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	636 local print = self.session.print;
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	637 local domain_sessions = set.new(array.collect(keys(incoming_s2s)))
4913 02dbed57a355 mod_admin_telnet: More code found and updated, which depended on pre-8c5b5ebaacb0 behaviour. Kim Alvefur <zash@zash.se> parents: 4912 diff changeset	638 /function(session) return session.from_host == domain and session or nil; end;
3669 4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	639 for local_host in values(prosody.hosts) do
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	640 local s2sout = local_host.s2sout;
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	641 if s2sout and s2sout[domain] then
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	642 domain_sessions:add(s2sout[domain]);
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	643 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	644 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	645 local cert_set = {};
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	646 for session in domain_sessions do
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	647 local conn = session.conn;
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	648 conn = conn and conn:socket();
4328 c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	649 if not conn.getpeerchain then
3669 4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	650 if conn.dohandshake then
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	651 error("This version of LuaSec does not support certificate viewing");
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	652 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	653 else
4328 c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	654 local certs = conn:getpeerchain();
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	655 local cert = certs[1];
3669 4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	656 if cert then
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	657 local digest = cert:digest("sha1");
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	658 if not cert_set[digest] then
4328 c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	659 local chain_valid, chain_errors = conn:getpeerverification();
3669 4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	660 cert_set[digest] = {
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	661 {
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	662 from = session.from_host,
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	663 to = session.to_host,
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	664 direction = session.direction
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	665 };
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	666 chain_valid = chain_valid;
4328 c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	667 chain_errors = chain_errors;
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	668 certs = certs;
3669 4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	669 };
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	670 else
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	671 table.insert(cert_set[digest], {
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	672 from = session.from_host,
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	673 to = session.to_host,
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	674 direction = session.direction
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	675 });
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	676 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	677 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	678 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	679 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	680 local domain_certs = array.collect(values(cert_set));
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	681 -- Phew. We now have a array of unique certificates presented by domain.
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	682 local print = self.session.print;
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	683 local n_certs = #domain_certs;
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	684
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	685 if n_certs == 0 then
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	686 return "No certificates found for "..domain;
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	687 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	688
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	689 local function _capitalize_and_colon(byte)
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	690 return string.upper(byte)..":";
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	691 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	692 local function pretty_fingerprint(hash)
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	693 return hash:gsub("..", _capitalize_and_colon):sub(1, -2);
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	694 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	695
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	696 for cert_info in values(domain_certs) do
4328 c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	697 local certs = cert_info.certs;
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	698 local cert = certs[1];
3669 4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	699 print("---")
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	700 print("Fingerprint (SHA1): "..pretty_fingerprint(cert:digest("sha1")));
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	701 print("");
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	702 local n_streams = #cert_info;
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	703 print("Currently used on "..n_streams.." stream"..(n_streams==1 and "" or "s")..":");
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	704 for _, stream in ipairs(cert_info) do
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	705 if stream.direction == "incoming" then
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	706 print(" "..stream.to.." <- "..stream.from);
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	707 else
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	708 print(" "..stream.from.." -> "..stream.to);
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	709 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	710 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	711 print("");
4328 c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	712 local chain_valid, errors = cert_info.chain_valid, cert_info.chain_errors;
3669 4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	713 local valid_identity = cert_verify_identity(domain, "xmpp-server", cert);
4328 c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	714 if chain_valid then
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	715 print("Trusted certificate: Yes");
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	716 else
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	717 print("Trusted certificate: No");
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	718 print_errors(print, errors);
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	719 end
c71777a8b9c7 mod_admin_telnet: Update to newer luasec. Paul Aurich <paul@darkrain42.org> parents: 3899 diff changeset	720 print("");
3669 4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	721 print("Issuer: ");
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	722 print_subject(print, cert:issuer());
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	723 print("");
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	724 print("Valid for "..domain..": "..(valid_identity and "Yes" or "No"));
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	725 print("Subject:");
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	726 print_subject(print, cert:subject());
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	727 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	728 print("---");
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	729 return ("Showing "..n_certs.." certificate"
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	730 ..(n_certs==1 and "" or "s")
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	731 .." presented by "..domain..".");
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	732 end
4b56cd1302d4 mod_console: Add s2s:showcert() command to show the certificate for a domain Matthew Wild <mwild1@gmail.com> parents: 3652 diff changeset	733
1340 f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	734 function def_env.s2s:close(from, to)
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	735 local print, count = self.session.print, 0;
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	736
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	737 if not (from and to) then
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	738 return false, "Syntax: s2s:close('from', 'to') - Closes all s2s sessions from 'from' to 'to'";
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	739 elseif from == to then
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	740 return false, "Both from and to are the same... you can't do that :)";
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	741 end
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	742
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	743 if hosts[from] and not hosts[to] then
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	744 -- Is an outgoing connection
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	745 local session = hosts[from].s2sout[to];
3540 bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3452 diff changeset	746 if not session then
1340 f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	747 print("No outgoing connection from "..from.." to "..to)
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	748 else
1821 05ed826da89b mod_console: s2s:close: Use session:close() if that exists, otherwise just destroy the session Matthew Wild <mwild1@gmail.com> parents: 1798 diff changeset	749 (session.close or s2smanager.destroy_session)(session);
1340 f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	750 count = count + 1;
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	751 print("Closed outgoing session from "..from.." to "..to);
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	752 end
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	753 elseif hosts[to] and not hosts[from] then
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	754 -- Is an incoming connection
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	755 for session in pairs(incoming_s2s) do
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	756 if session.to_host == to and session.from_host == from then
1821 05ed826da89b mod_console: s2s:close: Use session:close() if that exists, otherwise just destroy the session Matthew Wild <mwild1@gmail.com> parents: 1798 diff changeset	757 (session.close or s2smanager.destroy_session)(session);
1340 f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	758 count = count + 1;
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	759 end
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	760 end
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	761
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	762 if count == 0 then
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	763 print("No incoming connections from "..from.." to "..to);
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	764 else
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	765 print("Closed "..count.." incoming session"..((count == 1 and "") or "s").." from "..from.." to "..to);
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	766 end
1341 53decd1ee351 mod_console: Fix syntax error Matthew Wild <mwild1@gmail.com> parents: 1340 diff changeset	767 elseif hosts[to] and hosts[from] then
1340 f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	768 return false, "Both of the hostnames you specified are local, there are no s2s sessions to close";
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	769 else
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	770 return false, "Neither of the hostnames you specified are being used on this server";
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	771 end
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	772
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	773 return true, "Closed "..count.." s2s session"..((count == 1 and "") or "s");
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	774 end
f707d0957155 mod_console: Add s2s:close() to close s2s sessions between two hosts Matthew Wild <mwild1@gmail.com> parents: 1322 diff changeset	775
1977 325a49f8edab mod_console: Add commands host:activate(host, config) and host:deactivate(host, reason) to add/remove hosts at runtime Matthew Wild <mwild1@gmail.com> parents: 1927 diff changeset	776 def_env.host = {}; def_env.hosts = def_env.host;
3840 abcbce5e4240 mod_console: Removed redundant code for host:activate() and host:deactivate(), now that hostmanager has error checking. Waqas Hussain <waqas20@gmail.com> parents: 3614 diff changeset	777
1977 325a49f8edab mod_console: Add commands host:activate(host, config) and host:deactivate(host, reason) to add/remove hosts at runtime Matthew Wild <mwild1@gmail.com> parents: 1927 diff changeset	778 function def_env.host:activate(hostname, config)
3840 abcbce5e4240 mod_console: Removed redundant code for host:activate() and host:deactivate(), now that hostmanager has error checking. Waqas Hussain <waqas20@gmail.com> parents: 3614 diff changeset	779 return hostmanager.activate(hostname, config);
1977 325a49f8edab mod_console: Add commands host:activate(host, config) and host:deactivate(host, reason) to add/remove hosts at runtime Matthew Wild <mwild1@gmail.com> parents: 1927 diff changeset	780 end
325a49f8edab mod_console: Add commands host:activate(host, config) and host:deactivate(host, reason) to add/remove hosts at runtime Matthew Wild <mwild1@gmail.com> parents: 1927 diff changeset	781 function def_env.host:deactivate(hostname, reason)
3840 abcbce5e4240 mod_console: Removed redundant code for host:activate() and host:deactivate(), now that hostmanager has error checking. Waqas Hussain <waqas20@gmail.com> parents: 3614 diff changeset	782 return hostmanager.deactivate(hostname, reason);
1977 325a49f8edab mod_console: Add commands host:activate(host, config) and host:deactivate(host, reason) to add/remove hosts at runtime Matthew Wild <mwild1@gmail.com> parents: 1927 diff changeset	783 end
325a49f8edab mod_console: Add commands host:activate(host, config) and host:deactivate(host, reason) to add/remove hosts at runtime Matthew Wild <mwild1@gmail.com> parents: 1927 diff changeset	784
2007 b89d61db74d1 mod_console: Add missing hosts:list() command Matthew Wild <mwild1@gmail.com> parents: 1977 diff changeset	785 function def_env.host:list()
b89d61db74d1 mod_console: Add missing hosts:list() command Matthew Wild <mwild1@gmail.com> parents: 1977 diff changeset	786 local print = self.session.print;
b89d61db74d1 mod_console: Add missing hosts:list() command Matthew Wild <mwild1@gmail.com> parents: 1977 diff changeset	787 local i = 0;
b89d61db74d1 mod_console: Add missing hosts:list() command Matthew Wild <mwild1@gmail.com> parents: 1977 diff changeset	788 for host in values(array.collect(keys(prosody.hosts)):sort()) do
b89d61db74d1 mod_console: Add missing hosts:list() command Matthew Wild <mwild1@gmail.com> parents: 1977 diff changeset	789 i = i + 1;
b89d61db74d1 mod_console: Add missing hosts:list() command Matthew Wild <mwild1@gmail.com> parents: 1977 diff changeset	790 print(host);
b89d61db74d1 mod_console: Add missing hosts:list() command Matthew Wild <mwild1@gmail.com> parents: 1977 diff changeset	791 end
b89d61db74d1 mod_console: Add missing hosts:list() command Matthew Wild <mwild1@gmail.com> parents: 1977 diff changeset	792 return true, i.." hosts";
b89d61db74d1 mod_console: Add missing hosts:list() command Matthew Wild <mwild1@gmail.com> parents: 1977 diff changeset	793 end
b89d61db74d1 mod_console: Add missing hosts:list() command Matthew Wild <mwild1@gmail.com> parents: 1977 diff changeset	794
4674 f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	795 def_env.port = {};
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	796
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	797 function def_env.port:list()
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	798 local print = self.session.print;
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	799 local services = portmanager.get_active_services().data;
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	800 local ordered_services, n_ports = {}, 0;
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	801 for service, interfaces in pairs(services) do
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	802 table.insert(ordered_services, service);
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	803 end
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	804 table.sort(ordered_services);
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	805 for _, service in ipairs(ordered_services) do
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	806 local ports_list = {};
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	807 for interface, ports in pairs(services[service]) do
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	808 for port in pairs(ports) do
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	809 table.insert(ports_list, "["..interface.."]:"..port);
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	810 end
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	811 end
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	812 n_ports = n_ports + #ports_list;
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	813 print(service..": "..table.concat(ports_list, ", "));
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	814 end
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	815 return true, #ordered_services.." services listening on "..n_ports.." ports";
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	816 end
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	817
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	818 function def_env.port:close(close_port, close_interface)
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	819 close_port = assert(tonumber(close_port), "Invalid port number");
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	820 local n_closed = 0;
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	821 local services = portmanager.get_active_services().data;
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	822 for service, interfaces in pairs(services) do
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	823 for interface, ports in pairs(interfaces) do
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	824 if not close_interface or close_interface == interface then
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	825 if ports[close_port] then
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	826 self.session.print("Closing ["..interface.."]:"..close_port.."...");
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	827 local ok, err = portmanager.close(interface, close_port)
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	828 if not ok then
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	829 self.session.print("Failed to close "..interface.." "..port..": "..err);
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	830 else
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	831 n_closed = n_closed + 1;
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	832 end
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	833 end
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	834 end
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	835 end
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	836 end
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	837 return true, "Closed "..n_closed.." ports";
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	838 end
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	839
4807 2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	840 def_env.muc = {};
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	841
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	842 local console_room_mt = {
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	843 __index = function (self, k) return self.room[k]; end;
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	844 __tostring = function (self)
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	845 return "MUC room <"..self.room.jid..">";
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	846 end;
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	847 };
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	848
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	849 function def_env.muc:room(room_jid)
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	850 local room_name, host = jid_split(room_jid);
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	851 if not hosts[host] then
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	852 return nil, "No such host: "..host;
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	853 elseif not hosts[host].modules.muc then
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	854 return nil, "Host '"..host.."' is not a MUC service";
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	855 end
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	856 local room_obj = hosts[host].modules.muc.rooms[room_jid];
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	857 if not room_obj then
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	858 return nil, "No such room: "..room_jid;
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	859 end
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	860 return setmetatable({ room = room_obj }, console_room_mt);
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	861 end
2999f0fd1347 mod_admin_telnet: Add muc:room(jid) command to get the MUC room object Matthew Wild <mwild1@gmail.com> parents: 4779 diff changeset	862
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	863 -------------
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	864
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	865 function printbanner(session)
1483 efd19cdda6ca mod_console: Allow customisation/suppression of the banner Matthew Wild <mwild1@gmail.com> parents: 1433 diff changeset	866 local option = config.get("*", "core", "console_banner");
efd19cdda6ca mod_console: Allow customisation/suppression of the banner Matthew Wild <mwild1@gmail.com> parents: 1433 diff changeset	867 if option == nil or option == "full" or option == "graphic" then
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	868 session.print [[
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	869 ____ \ / _
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	870 \| _ \ _ __ ___ ___ _-_ __\| \|_ _
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	871 \| \|_) \| '__/ _ \/ __\|/ _ \ / _` \| \| \| \|
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	872 \| __/\| \| \| (_) \__ \ \|_\| \| (_\| \| \|_\| \|
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	873 \|_\| \|_\| \___/\|___/\___/ \__,_\|\__, \|
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	874 A study in simplicity \|___/
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	875
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	876 ]]
1483 efd19cdda6ca mod_console: Allow customisation/suppression of the banner Matthew Wild <mwild1@gmail.com> parents: 1433 diff changeset	877 end
efd19cdda6ca mod_console: Allow customisation/suppression of the banner Matthew Wild <mwild1@gmail.com> parents: 1433 diff changeset	878 if option == nil or option == "short" or option == "full" then
736 7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	879 session.print("Welcome to the Prosody administration console. For a list of commands, type: help");
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	880 session.print("You may find more help on using this console in our online documentation at ");
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	881 session.print("http://prosody.im/doc/console\n");
7cbae2d16fd6 mod_console: Make global Matthew Wild <mwild1@gmail.com> parents: 712 diff changeset	882 end
1483 efd19cdda6ca mod_console: Allow customisation/suppression of the banner Matthew Wild <mwild1@gmail.com> parents: 1433 diff changeset	883 if option and option ~= "short" and option ~= "full" and option ~= "graphic" then
efd19cdda6ca mod_console: Allow customisation/suppression of the banner Matthew Wild <mwild1@gmail.com> parents: 1433 diff changeset	884 if type(option) == "string" then
efd19cdda6ca mod_console: Allow customisation/suppression of the banner Matthew Wild <mwild1@gmail.com> parents: 1433 diff changeset	885 session.print(option)
efd19cdda6ca mod_console: Allow customisation/suppression of the banner Matthew Wild <mwild1@gmail.com> parents: 1433 diff changeset	886 elseif type(option) == "function" then
5021 85b2689dbcfe Eliminate direct setfenv usage Florian Zeitz <florob@babelmonkeys.de> parents: 4913 diff changeset	887 module:log("warn", "Using functions as value for the console_banner option is no longer supported");
1483 efd19cdda6ca mod_console: Allow customisation/suppression of the banner Matthew Wild <mwild1@gmail.com> parents: 1433 diff changeset	888 end
efd19cdda6ca mod_console: Allow customisation/suppression of the banner Matthew Wild <mwild1@gmail.com> parents: 1433 diff changeset	889 end
efd19cdda6ca mod_console: Allow customisation/suppression of the banner Matthew Wild <mwild1@gmail.com> parents: 1433 diff changeset	890 end
2087 5efd79871205 mod_console: Moved activation of the console port from the main file to mod_console. Waqas Hussain <waqas20@gmail.com> parents: 2054 diff changeset	891
4674 f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	892 module:add_item("net-provider", {
f44726a910a0 mod_admin_telnet: Add initial port:list() and port:close() commands Matthew Wild <mwild1@gmail.com> parents: 4647 diff changeset	893 name = "console";
4550 1c41e4a846a2 mod_admin_telnet: Port to portmanager Matthew Wild <mwild1@gmail.com> parents: 4540 diff changeset	894 listener = console_listener;
1c41e4a846a2 mod_admin_telnet: Port to portmanager Matthew Wild <mwild1@gmail.com> parents: 4540 diff changeset	895 default_port = 5582;
4571 32d532b95dc7 mod_admin_telnet: make service private. Marco Cirillo <maranda@lightwitch.org> parents: 4550 diff changeset	896 private = true;
4550 1c41e4a846a2 mod_admin_telnet: Port to portmanager Matthew Wild <mwild1@gmail.com> parents: 4540 diff changeset	897 });

prosody

dcc8e789df36

plugins/mod_admin_telnet.lua

Software / code / prosody

Annotate

plugins/mod_admin_telnet.lua @ 5023:dcc8e789df36

Software `/` code `/` prosody