X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_admin_telnet.lua;h=2f7bb57e1a592cc89d9c8d3a174e5c263a0da458;hb=996c7284375f40589d2fc13b8ff82411f54a363d;hp=7b176d730bbfc4fb960d41c5d8f9393f5fa07327;hpb=dfa3599bee30c1ec6843e9b485fb0e10494e8deb;p=prosody.git

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 7b176d73..2f7bb57e 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -8,10 +8,16 @@
 
 module:set_global();
 
+local hostmanager = require "core.hostmanager";
+local modulemanager = require "core.modulemanager";
+local s2smanager = require "core.s2smanager";
+local portmanager = require "core.portmanager";
+
 local _G = _G;
 
 local prosody = _G.prosody;
 local hosts = prosody.hosts;
+local incoming_s2s = prosody.incoming_s2s;
 
 local console_listener = { default_port = 5582; default_mode = "*a"; interface = "127.0.0.1" };
 
@@ -21,17 +27,20 @@ local jid = require "util.jid";
 local jid_bare, jid_split = jid.bare, jid.split;
 local set, array = require "util.set", require "util.array";
 local cert_verify_identity = require "util.x509".verify_identity;
+local envload = require "util.envload".envload;
+local envloadfile = require "util.envload".envloadfile;
 
 local commands = module:shared("commands")
 local def_env = module:shared("env");
 local default_env_mt = { __index = def_env };
+local core_post_stanza = prosody.core_post_stanza;
 
 local function redirect_output(_G, session)
 	local env = setmetatable({ print = session.print }, { __index = function (t, k) return rawget(_G, k); end });
 	env.dofile = function(name)
-		local f, err = loadfile(name);
+		local f, err = envloadfile(name, env);
 		if not f then return f, err; end
-		return setfenv(f, env)();
+		return f();
 	end;
 	return env;
 end
@@ -103,9 +112,10 @@ function console_listener.onincoming(conn, data)
 			session.env._ = line;
 			
 			local chunkname = "=console";
-			local chunk, err = loadstring("return "..line, chunkname);
+			local env = (useglobalenv and redirect_output(_G, session)) or session.env or nil
+			local chunk, err = envload("return "..line, chunkname, env);
 			if not chunk then
-				chunk, err = loadstring(line, chunkname);
+				chunk, err = envload(line, chunkname, env);
 				if not chunk then
 					err = err:gsub("^%[string .-%]:%d+: ", "");
 					err = err:gsub("^:%d+: ", "");
@@ -114,9 +124,7 @@ function console_listener.onincoming(conn, data)
 					break;
 				end
 			end
-			
-			setfenv(chunk, (useglobalenv and redirect_output(_G, session)) or session.env or nil);
-			
+		
 			local ranok, taskok, message = pcall(chunk);
 			
 			if not (ranok or message or useglobalenv) and commands[line:lower()] then
@@ -512,7 +520,7 @@ function def_env.c2s:show_secure(match_jid)
 end
 
 function def_env.c2s:close(match_jid)
-	local print, count = self.session.print, 0;
+	local count = 0;
 	show_c2s(function (jid, session)
 		if jid == match_jid or jid_bare(jid) == match_jid then
 			count = count + 1;
@@ -641,6 +649,7 @@ local function print_errors(print, errors)
 end
 
 function def_env.s2s:showcert(domain)
+	local ser = require "util.serialization".serialize;
 	local print = self.session.print;
 	local domain_sessions = set.new(array.collect(keys(incoming_s2s)))
 		/function(session) return session.from_host == domain and session or nil; end;
@@ -867,7 +876,7 @@ function def_env.port:close(close_port, close_interface)
 					self.session.print("Closing ["..interface.."]:"..close_port.."...");
 					local ok, err = portmanager.close(interface, close_port)
 					if not ok then
-						self.session.print("Failed to close "..interface.." "..port..": "..err);
+						self.session.print("Failed to close "..interface.." "..close_port..": "..err);
 					else
 						n_closed = n_closed + 1;
 					end
@@ -951,9 +960,9 @@ end
 -------------
 
 function printbanner(session)
-	local option = config.get("*", "core", "console_banner");
-if option == nil or option == "full" or option == "graphic" then
-session.print [[
+	local option = module:get_option("console_banner");
+	if option == nil or option == "full" or option == "graphic" then
+		session.print [[
                    ____                \   /     _       
                     |  _ \ _ __ ___  ___  _-_   __| |_   _ 
                     | |_) | '__/ _ \/ __|/ _ \ / _` | | | |
@@ -962,20 +971,19 @@ session.print [[
                     A study in simplicity            |___/ 
 
 ]]
-end
-if option == nil or option == "short" or option == "full" then
-session.print("Welcome to the Prosody administration console. For a list of commands, type: help");
-session.print("You may find more help on using this console in our online documentation at ");
-session.print("http://prosody.im/doc/console\n");
-end
-if option and option ~= "short" and option ~= "full" and option ~= "graphic" then
-	if type(option) == "string" then
-		session.print(option)
-	elseif type(option) == "function" then
-		setfenv(option, redirect_output(_G, session));
-		pcall(option, session);
 	end
-end
+	if option == nil or option == "short" or option == "full" then
+	session.print("Welcome to the Prosody administration console. For a list of commands, type: help");
+	session.print("You may find more help on using this console in our online documentation at ");
+	session.print("http://prosody.im/doc/console\n");
+	end
+	if option and option ~= "short" and option ~= "full" and option ~= "graphic" then
+		if type(option) == "string" then
+			session.print(option)
+		elseif type(option) == "function" then
+			module:log("warn", "Using functions as value for the console_banner option is no longer supported");
+		end
+	end
 end
 
 module:add_item("net-provider", {