tools/ejabberd2prosody: Disable generating a config, as the format it generates is...
[prosody.git] / plugins / mod_admin_telnet.lua
index da40f57e0a675b871108e19dc7007da15c8003e8..131689c5fc73e58288e730ca3defe99a5d09e97e 100644 (file)
@@ -6,33 +6,41 @@
 -- COPYING file in the source package for more information.
 --
 
-module.host = "*";
+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 connlisteners_register = require "net.connlisteners".register;
+local incoming_s2s = prosody.incoming_s2s;
 
-local console_listener = { default_port = 5582; default_mode = "*l"; default_interface = "127.0.0.1" };
+local console_listener = { default_port = 5582; default_mode = "*a"; interface = "127.0.0.1" };
 
-require "util.iterators";
-local jid_bare = require "util.jid".bare;
+local iterators = require "util.iterators";
+local keys, values = iterators.keys, iterators.values;
+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 = {};
-local def_env = {};
+local commands = module:shared("commands")
+local def_env = module:shared("env");
 local default_env_mt = { __index = def_env };
-
-prosody.console = { commands = commands, env = 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
@@ -64,6 +72,64 @@ function console:new_session(conn)
        return session;
 end
 
+function console:process_line(session, line)
+       local useglobalenv;
+       
+       if line:match("^>") then
+               line = line:gsub("^>", "");
+               useglobalenv = true;
+       elseif line == "\004" then
+               commands["bye"](session, line);
+               return;
+       else
+               local command = line:match("^%w+") or line:match("%p");
+               if commands[command] then
+                       commands[command](session, line);
+                       return;
+               end
+       end
+       
+       session.env._ = line;
+       
+       local chunkname = "=console";
+       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 = envload(line, chunkname, env);
+               if not chunk then
+                       err = err:gsub("^%[string .-%]:%d+: ", "");
+                       err = err:gsub("^:%d+: ", "");
+                       err = err:gsub("'<eof>'", "the end of the line");
+                       session.print("Sorry, I couldn't understand that... "..err);
+                       return;
+               end
+       end
+       
+       local ranok, taskok, message = pcall(chunk);
+       
+       if not (ranok or message or useglobalenv) and commands[line:lower()] then
+               commands[line:lower()](session, line);
+               return;
+       end
+       
+       if not ranok then
+               session.print("Fatal error while running command, it did not complete");
+               session.print("Error: "..taskok);
+               return;
+       end
+       
+       if not message then
+               session.print("Result: "..tostring(taskok));
+               return;
+       elseif (not taskok) and message then
+               session.print("Command completed with a problem");
+               session.print("Message: "..tostring(message));
+               return;
+       end
+       
+       session.print("OK: "..tostring(message));
+end
+
 local sessions = {};
 
 function console_listener.onconnect(conn)
@@ -77,68 +143,17 @@ end
 function console_listener.onincoming(conn, data)
        local session = sessions[conn];
 
-       -- Handle data
-       (function(session, data)
-               local useglobalenv;
-               
-               if data:match("^>") then
-                       data = data:gsub("^>", "");
-                       useglobalenv = true;
-               elseif data == "\004" then
-                       commands["bye"](session, data);
-                       return;
-               else
-                       local command = data:lower();
-                       command = data:match("^%w+") or data:match("%p");
-                       if commands[command] then
-                               commands[command](session, data);
-                               return;
-                       end
-               end
+       local partial = session.partial_data;
+       if partial then
+               data = partial..data;
+       end
 
-               session.env._ = data;
-               
-               local chunkname = "=console";
-               local chunk, err = loadstring("return "..data, chunkname);
-               if not chunk then
-                       chunk, err = loadstring(data, chunkname);
-                       if not chunk then
-                               err = err:gsub("^%[string .-%]:%d+: ", "");
-                               err = err:gsub("^:%d+: ", "");
-                               err = err:gsub("'<eof>'", "the end of the line");
-                               session.print("Sorry, I couldn't understand that... "..err);
-                               return;
-                       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[data:lower()] then
-                       commands[data:lower()](session, data);
-                       return;
-               end
-               
-               if not ranok then
-                       session.print("Fatal error while running command, it did not complete");
-                       session.print("Error: "..taskok);
-                       return;
-               end
-               
-               if not message then
-                       session.print("Result: "..tostring(taskok));
-                       return;
-               elseif (not taskok) and message then
-                       session.print("Command completed with a problem");
-                       session.print("Message: "..tostring(message));
-                       return;
-               end
-               
-               session.print("OK: "..tostring(message));
-       end)(session, data);
-       
-       session.send(string.char(0));
+       for line in data:gmatch("[^\n]*[\n\004]") do
+               if session.closed then return end
+               console:process_line(session, line);
+               session.send(string.char(0));
+       end
+       session.partial_data = data:match("[^\n]+$");
 end
 
 function console_listener.ondisconnect(conn, err)
@@ -149,13 +164,12 @@ function console_listener.ondisconnect(conn, err)
        end
 end
 
-connlisteners_register('console', console_listener);
-
 -- Console commands --
 -- These are simple commands, not valid standalone in Lua
 
 function commands.bye(session)
        session.print("See you! :)");
+       session.closed = true;
        session.disconnect();
 end
 commands.quit, commands.exit = commands.bye, commands.bye;
@@ -190,7 +204,10 @@ function commands.help(session, data)
                print [[s2s - Commands to manage sessions between this server and others]]
                print [[module - Commands to load/reload/unload modules/plugins]]
                print [[host - Commands to activate, deactivate and list virtual hosts]]
+               print [[user - Commands to create and delete users, and change their passwords]]
                print [[server - Uptime, version, shutting down, etc.]]
+               print [[port - Commands to manage ports the server is listening on]]
+               print [[dns - Commands to manage and inspect the internal DNS resolver]]
                print [[config - Reloading the configuration, etc.]]
                print [[console - Help regarding the console itself]]
        elseif section == "c2s" then
@@ -201,6 +218,7 @@ function commands.help(session, data)
        elseif section == "s2s" then
                print [[s2s:show(domain) - Show all s2s connections for the given domain (or all if no domain given)]]
                print [[s2s:close(from, to) - Close a connection from one domain to another]]
+               print [[s2s:closeall(host) - Close all the incoming/outgoing s2s sessions to specified host]]
        elseif section == "module" then
                print [[module:load(module, host) - Load the specified module on the specified host (or all hosts if none given)]]
                print [[module:reload(module, host) - The same, but unloads and loads the module (saving state if the module supports it)]]
@@ -210,10 +228,25 @@ function commands.help(session, data)
                print [[host:activate(hostname) - Activates the specified host]]
                print [[host:deactivate(hostname) - Disconnects all clients on this host and deactivates]]
                print [[host:list() - List the currently-activated hosts]]
+       elseif section == "user" then
+               print [[user:create(jid, password) - Create the specified user account]]
+               print [[user:password(jid, password) - Set the password for the specified user account]]
+               print [[user:delete(jid) - Permanently remove the specified user account]]
+               print [[user:list(hostname, pattern) - List users on the specified host, optionally filtering with a pattern]]
        elseif section == "server" then
                print [[server:version() - Show the server's version number]]
                print [[server:uptime() - Show how long the server has been running]]
+               print [[server:memory() - Show details about the server's memory usage]]
                print [[server:shutdown(reason) - Shut down the server, with an optional reason to be broadcast to all connections]]
+       elseif section == "port" then
+               print [[port:list() - Lists all network ports prosody currently listens on]]
+               print [[port:close(port, interface) - Close a port]]
+       elseif section == "dns" then
+               print [[dns:lookup(name, type, class) - Do a DNS lookup]]
+               print [[dns:addnameserver(nameserver) - Add a nameserver to the list]]
+               print [[dns:setnameserver(nameserver) - Replace the list of name servers with the supplied one]]
+               print [[dns:purge() - Clear the DNS cache]]
+               print [[dns:cache() - Show cached records]]
        elseif section == "config" then
                print [[config:reload() - Reload the server configuration. Modules may need to be reloaded for changes to take effect.]]
        elseif section == "console" then
@@ -268,6 +301,26 @@ function def_env.server:shutdown(reason)
        return true, "Shutdown initiated";
 end
 
+local function human(kb)
+       local unit = "K";
+       if kb > 1024 then
+               kb, unit = kb/1024, "M";
+       end
+       return ("%0.2f%sB"):format(kb, unit);
+end
+
+function def_env.server:memory()
+       if not pposix.meminfo then
+               return true, "Lua is using "..collectgarbage("count");
+       end
+       local mem, lua_mem = pposix.meminfo(), collectgarbage("count");
+       local print = self.session.print;
+       print("Process: "..human((mem.allocated+mem.allocated_mmap)/1024));
+       print("   Used: "..human(mem.used/1024).." ("..human(lua_mem).." by Lua)");
+       print("   Free: "..human(mem.unused/1024).." ("..human(mem.returnable/1024).." returnable)");
+       return true, "OK";
+end
+
 def_env.module = {};
 
 local function get_hosts_set(hosts, module)
@@ -281,8 +334,12 @@ local function get_hosts_set(hosts, module)
                return set.new { hosts };
        elseif hosts == nil then
                local mm = require "modulemanager";
-               return set.new(array.collect(keys(prosody.hosts)))
-                       / function (host) return prosody.hosts[host].type == "local" or module and mm.is_loaded(host, module); end;
+               local hosts_set = set.new(array.collect(keys(prosody.hosts)))
+                       / function (host) return (prosody.hosts[host].type == "local" or module and mm.is_loaded(host, module)) and host or nil; end;
+               if module and mm.get_module("*", module) then
+                       hosts_set:add("*");
+               end
+               return hosts_set;
        end
 end
 
@@ -292,16 +349,22 @@ function def_env.module:load(name, hosts, config)
        hosts = get_hosts_set(hosts);
        
        -- Load the module for each host
-       local ok, err, count = true, nil, 0;
+       local ok, err, count, mod = true, nil, 0, nil;
        for host in hosts do
                if (not mm.is_loaded(host, name)) then
-                       ok, err = mm.load(host, name, config);
-                       if not ok then
+                       mod, err = mm.load(host, name, config);
+                       if not mod then
                                ok = false;
+                               if err == "global-module-already-loaded" then
+                                       if count > 0 then
+                                               ok, err, count = true, nil, 1;
+                                       end
+                                       break;
+                               end
                                self.session.print(err or "Unknown error loading module");
                        else
                                count = count + 1;
-                               self.session.print("Loaded for "..host);
+                               self.session.print("Loaded for "..mod.module.host);
                        end
                end
        end
@@ -334,11 +397,15 @@ end
 function def_env.module:reload(name, hosts)
        local mm = require "modulemanager";
 
-       hosts = get_hosts_set(hosts, name);
-       
+       hosts = array.collect(get_hosts_set(hosts, name)):sort(function (a, b)
+               if a == "*" then return true
+               elseif b == "*" then return false
+               else return a < b; end
+       end);
+
        -- Reload the module for each host
        local ok, err, count = true, nil, 0;
-       for host in hosts do
+       for _, host in ipairs(hosts) do
                if mm.is_loaded(host, name) then
                        ok, err = mm.reload(host, name);
                        if not ok then
@@ -359,6 +426,7 @@ end
 function def_env.module:list(hosts)
        if hosts == nil then
                hosts = array.collect(keys(prosody.hosts));
+               table.insert(hosts, 1, "*");
        end
        if type(hosts) == "string" then
                hosts = { hosts };
@@ -369,8 +437,8 @@ function def_env.module:list(hosts)
        
        local print = self.session.print;
        for _, host in ipairs(hosts) do
-               print(host..":");
-               local modules = array.collect(keys(prosody.hosts[host] and prosody.hosts[host].modules or {})):sort();
+               print((host == "*" and "Global" or host)..":");
+               local modules = array.collect(keys(modulemanager.get_modules(host) or {})):sort();
                if #modules == 0 then
                        if prosody.hosts[host] then
                                print("    No modules loaded");
@@ -429,6 +497,16 @@ local function show_c2s(callback)
        end
 end
 
+function def_env.c2s:count(match_jid)
+       local count = 0;
+       show_c2s(function (jid, session)
+               if (not match_jid) or jid:match(match_jid) then
+                       count = count + 1;
+               end             
+       end);
+       return true, "Total: "..count.." clients";
+end
+
 function def_env.c2s:show(match_jid)
        local print, count = self.session.print, 0;
        local curr_host;
@@ -477,7 +555,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;
@@ -487,6 +565,24 @@ function def_env.c2s:close(match_jid)
        return true, "Total: "..count.." sessions closed";
 end
 
+local function session_flags(session, line)
+       if session.cert_identity_status == "valid" then
+               line[#line+1] = "(secure)";
+       elseif session.secure then
+               line[#line+1] = "(encrypted)";
+       end
+       if session.compressed then
+               line[#line+1] = "(compressed)";
+       end
+       if session.smacks then
+               line[#line+1] = "(sm)";
+       end
+       if session.conn and session.conn:ip():match(":") then
+               line[#line+1] = "(IPv6)";
+       end
+       return table.concat(line, " ");
+end
+
 def_env.s2s = {};
 function def_env.s2s:show(match_jid)
        local _print = self.session.print;
@@ -499,7 +595,7 @@ function def_env.s2s:show(match_jid)
                for remotehost, session in pairs(host_session.s2sout) do
                        if (not match_jid) or remotehost:match(match_jid) or host:match(match_jid) then
                                count_out = count_out + 1;
-                               print("    "..host.." -> "..remotehost..(session.cert_identity_status == "valid" and " (secure)" or "")..(session.secure and " (encrypted)" or "")..(session.compressed and " (compressed)" or ""));
+                               print(session_flags(session, {"   ", host, "->", remotehost}));
                                if session.sendq then
                                        print("        There are "..#session.sendq.." queued outgoing stanzas for this connection");
                                end
@@ -536,7 +632,7 @@ function def_env.s2s:show(match_jid)
                                -- Pft! is what I say to list comprehensions
                                or (session.hosts and #array.collect(keys(session.hosts)):filter(subhost_filter)>0)) then
                                count_in = count_in + 1;
-                               print("    "..host.." <- "..(session.from_host or "(unknown)")..(session.cert_identity_status == "valid" and " (secure)" or "")..(session.secure and " (encrypted)" or "")..(session.compressed and " (compressed)" or ""));
+                               print(session_flags(session, {"   ", host, "<-", session.from_host or "(unknown)"}));
                                if session.type == "s2sin_unauthed" then
                                                print("        Connection not yet authenticated");
                                end
@@ -573,11 +669,25 @@ local function print_subject(print, subject)
        end
 end
 
+-- As much as it pains me to use the 0-based depths that OpenSSL does,
+-- I think there's going to be more confusion among operators if we
+-- break from that.
+local function print_errors(print, errors)
+       for depth, t in pairs(errors) do
+               print(
+                       ("    %d: %s"):format(
+                               depth-1,
+                               table.concat(t, "\n|        ")
+                       )
+               );
+       end
+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; end;
+               /function(session) return session.from_host == domain and session or nil; end;
        for local_host in values(prosody.hosts) do
                local s2sout = local_host.s2sout;
                if s2sout and s2sout[domain] then
@@ -588,16 +698,17 @@ function def_env.s2s:showcert(domain)
        for session in domain_sessions do
                local conn = session.conn;
                conn = conn and conn:socket();
-               if not conn.getpeercertificate then
+               if not conn.getpeerchain then
                        if conn.dohandshake then
                                error("This version of LuaSec does not support certificate viewing");
                        end
                else
                        local cert = conn:getpeercertificate();
                        if cert then
+                               local certs = conn:getpeerchain();
                                local digest = cert:digest("sha1");
                                if not cert_set[digest] then
-                                       local chain_valid, chain_err = conn:getpeerchainvalid();
+                                       local chain_valid, chain_errors = conn:getpeerverification();
                                        cert_set[digest] = {
                                                {
                                                  from = session.from_host,
@@ -605,8 +716,8 @@ function def_env.s2s:showcert(domain)
                                                  direction = session.direction
                                                };
                                                chain_valid = chain_valid;
-                                               chain_err = chain_err;
-                                               cert = cert;
+                                               chain_errors = chain_errors;
+                                               certs = certs;
                                        };
                                else
                                        table.insert(cert_set[digest], {
@@ -620,7 +731,6 @@ function def_env.s2s:showcert(domain)
        end
        local domain_certs = array.collect(values(cert_set));
        -- Phew. We now have a array of unique certificates presented by domain.
-       local print = self.session.print;
        local n_certs = #domain_certs;
        
        if n_certs == 0 then
@@ -635,7 +745,8 @@ function def_env.s2s:showcert(domain)
        end
        
        for cert_info in values(domain_certs) do
-               local cert = cert_info.cert;
+               local certs = cert_info.certs;
+               local cert = certs[1];
                print("---")
                print("Fingerprint (SHA1): "..pretty_fingerprint(cert:digest("sha1")));
                print("");
@@ -649,9 +760,15 @@ function def_env.s2s:showcert(domain)
                        end
                end
                print("");
-               local chain_valid, err = cert_info.chain_valid, cert_info.chain_err;
+               local chain_valid, errors = cert_info.chain_valid, cert_info.chain_errors;
                local valid_identity = cert_verify_identity(domain, "xmpp-server", cert);
-               print("Trusted certificate: "..(chain_valid and "Yes" or ("No ("..err..")")));
+               if chain_valid then
+                       print("Trusted certificate: Yes");
+               else
+                       print("Trusted certificate: No");
+                       print_errors(print, errors);
+               end
+               print("");
                print("Issuer: ");
                print_subject(print, cert:issuer());
                print("");
@@ -707,6 +824,40 @@ function def_env.s2s:close(from, to)
        return true, "Closed "..count.." s2s session"..((count == 1 and "") or "s");
 end
 
+function def_env.s2s:closeall(host)
+        local count = 0;
+
+        if not host or type(host) ~= "string" then return false, "wrong syntax: please use s2s:closeall('hostname.tld')"; end
+        if hosts[host] then
+                for session in pairs(incoming_s2s) do
+                        if session.to_host == host then
+                                (session.close or s2smanager.destroy_session)(session);
+                                count = count + 1;
+                        end
+                end
+                for _, session in pairs(hosts[host].s2sout) do
+                        (session.close or s2smanager.destroy_session)(session);
+                        count = count + 1;
+                end
+        else
+                for session in pairs(incoming_s2s) do
+                       if session.from_host == host then
+                               (session.close or s2smanager.destroy_session)(session);
+                               count = count + 1;
+                       end
+               end
+               for _, h in pairs(hosts) do
+                       if h.s2sout[host] then
+                               (h.s2sout[host].close or s2smanager.destroy_session)(h.s2sout[host]);
+                               count = count + 1;
+                       end
+               end
+        end
+
+       if count == 0 then return false, "No sessions to close.";
+       else return true, "Closed "..count.." s2s session"..((count == 1 and "") or "s"); end
+end
+
 def_env.host = {}; def_env.hosts = def_env.host;
 
 function def_env.host:activate(hostname, config)
@@ -726,12 +877,206 @@ function def_env.host:list()
        return true, i.." hosts";
 end
 
+def_env.port = {};
+
+function def_env.port:list()
+       local print = self.session.print;
+       local services = portmanager.get_active_services().data;
+       local ordered_services, n_ports = {}, 0;
+       for service, interfaces in pairs(services) do
+               table.insert(ordered_services, service);
+       end
+       table.sort(ordered_services);
+       for _, service in ipairs(ordered_services) do
+               local ports_list = {};
+               for interface, ports in pairs(services[service]) do
+                       for port in pairs(ports) do
+                               table.insert(ports_list, "["..interface.."]:"..port);
+                       end
+               end
+               n_ports = n_ports + #ports_list;
+               print(service..": "..table.concat(ports_list, ", "));
+       end
+       return true, #ordered_services.." services listening on "..n_ports.." ports";
+end
+
+function def_env.port:close(close_port, close_interface)
+       close_port = assert(tonumber(close_port), "Invalid port number");
+       local n_closed = 0;
+       local services = portmanager.get_active_services().data;
+       for service, interfaces in pairs(services) do
+               for interface, ports in pairs(interfaces) do
+                       if not close_interface or close_interface == interface then
+                               if ports[close_port] then
+                                       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.." "..close_port..": "..err);
+                                       else
+                                               n_closed = n_closed + 1;
+                                       end
+                               end
+                       end
+               end
+       end
+       return true, "Closed "..n_closed.." ports";
+end
+
+def_env.muc = {};
+
+local console_room_mt = {
+       __index = function (self, k) return self.room[k]; end;
+       __tostring = function (self)
+               return "MUC room <"..self.room.jid..">";
+       end;
+};
+
+local function check_muc(jid)
+       local room_name, host = jid_split(jid);
+       if not hosts[host] then
+               return nil, "No such host: "..host;
+       elseif not hosts[host].modules.muc then
+               return nil, "Host '"..host.."' is not a MUC service";
+       end
+       return room_name, host;
+end
+
+function def_env.muc:create(room_jid)
+       local room, host = check_muc(room_jid);
+       if not room then return nil, host end
+       if hosts[host].modules.muc.rooms[room_jid] then return nil, "Room exists already" end
+       return hosts[host].modules.muc.create_room(room_jid);
+end
+
+function def_env.muc:room(room_jid)
+       local room_name, host = check_muc(room_jid);
+       local room_obj = hosts[host].modules.muc.rooms[room_jid];
+       if not room_obj then
+               return nil, "No such room: "..room_jid;
+       end
+       return setmetatable({ room = room_obj }, console_room_mt);
+end
+
+local um = require"core.usermanager";
+
+def_env.user = {};
+function def_env.user:create(jid, password)
+       local username, host = jid_split(jid);
+       if not hosts[host] then
+               return nil, "No such host: "..host;
+       elseif um.user_exists(username, host) then
+               return nil, "User exists";
+       end
+       local ok, err = um.create_user(username, password, host);
+       if ok then
+               return true, "User created";
+       else
+               return nil, "Could not create user: "..err;
+       end
+end
+
+function def_env.user:delete(jid)
+       local username, host = jid_split(jid);
+       if not hosts[host] then
+               return nil, "No such host: "..host;
+       elseif not um.user_exists(username, host) then
+               return nil, "No such user";
+       end
+       local ok, err = um.delete_user(username, host);
+       if ok then
+               return true, "User deleted";
+       else
+               return nil, "Could not delete user: "..err;
+       end
+end
+
+function def_env.user:password(jid, password)
+       local username, host = jid_split(jid);
+       if not hosts[host] then
+               return nil, "No such host: "..host;
+       elseif not um.user_exists(username, host) then
+               return nil, "No such user";
+       end
+       local ok, err = um.set_password(username, password, host);
+       if ok then
+               return true, "User password changed";
+       else
+               return nil, "Could not change password for user: "..err;
+       end
+end
+
+function def_env.user:list(host, pat)
+       if not host then
+               return nil, "No host given";
+       elseif not hosts[host] then
+               return nil, "No such host";
+       end
+       local print = self.session.print;
+       local total, matches = 0, 0;
+       for user in um.users(host) do
+               if not pat or user:match(pat) then
+                       print(user.."@"..host);
+                       matches = matches + 1;
+               end
+               total = total + 1;
+       end
+       return true, "Showing "..(pat and (matches.." of ") or "all " )..total.." users";
+end
+
+def_env.xmpp = {};
+
+local st = require "util.stanza";
+function def_env.xmpp:ping(localhost, remotehost)
+       if hosts[localhost] then
+               core_post_stanza(hosts[localhost],
+                       st.iq{ from=localhost, to=remotehost, type="get", id="ping" }
+                               :tag("ping", {xmlns="urn:xmpp:ping"}));
+               return true, "Sent ping";
+       else
+               return nil, "No such host";
+       end
+end
+
+def_env.dns = {};
+local adns = require"net.adns";
+local dns = require"net.dns";
+
+function def_env.dns:lookup(name, typ, class)
+       local ret = "Query sent";
+       local print = self.session.print;
+       local function handler(...)
+               ret = "Got response";
+               print(...);
+       end
+       adns.lookup(handler, name, typ, class);
+       return true, ret;
+end
+
+function def_env.dns:addnameserver(...)
+       dns.addnameserver(...)
+       return true
+end
+
+function def_env.dns:setnameserver(...)
+       dns.setnameserver(...)
+       return true
+end
+
+function def_env.dns:purge()
+       dns.purge()
+       return true
+end
+
+function def_env.dns:cache()
+       return true, "Cache:\n"..tostring(dns.cache())
+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 [[
                    ____                \   /     _       
                     |  _ \ _ __ ___  ___  _-_   __| |_   _ 
                     | |_) | '__/ _ \/ __|/ _ \ / _` | | | |
@@ -740,20 +1085,24 @@ 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
 
-prosody.net_activate_ports("console", "console", {5582}, "tcp");
+module:provides("net", {
+       name = "console";
+       listener = console_listener;
+       default_port = 5582;
+       private = true;
+});