X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_console.lua;h=5e6b684661bedc38ac1352e46af61734faf22af8;hb=e43ae724053d3607a0744cf2ed54f128ce093250;hp=b9d30716b929744ec56fe9a99c5e840faa0cc86a;hpb=e8e49a3dbdfa7a5d170d4a4f9b34e725f7768fdc;p=prosody.git diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua index b9d30716..5e6b6846 100644 --- a/plugins/mod_console.lua +++ b/plugins/mod_console.lua @@ -33,11 +33,11 @@ end console = {}; function console:new_session(conn) - local w = function(s) conn.write(s:gsub("\n", "\r\n")); end; + local w = function(s) conn:write(s:gsub("\n", "\r\n")); end; local session = { conn = conn; send = function (t) w(tostring(t)); end; print = function (t) w("| "..tostring(t).."\n"); end; - disconnect = function () conn.close(); end; + disconnect = function () conn:close(); end; }; session.env = setmetatable({}, default_env_mt); @@ -53,7 +53,7 @@ end local sessions = {}; -function console_listener.listener(conn, data) +function console_listener.onincoming(conn, data) local session = sessions[conn]; if not session then @@ -70,6 +70,9 @@ function console_listener.listener(conn, data) 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"); @@ -123,8 +126,12 @@ function console_listener.listener(conn, data) session.send(string.char(0)); end -function console_listener.disconnect(conn, err) - +function console_listener.ondisconnect(conn, err) + local session = sessions[conn]; + if session then + session.disconnect(); + sessions[conn] = nil; + end end connlisteners_register('console', console_listener); @@ -167,6 +174,7 @@ 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 [[server - Uptime, version, shutting down, etc.]] + print [[config - Reloading the configuration, etc.]] print [[console - Help regarding the console itself]] elseif section == "c2s" then print [[c2s:show(jid) - Show all client sessions with the specified JID (or all if no JID given)]] @@ -185,6 +193,8 @@ function commands.help(session, data) print [[server:version() - Show the server's version number]] print [[server:uptime() - Show how long the server has been running]] --print [[server:shutdown(reason) - Shut down the server, with an optional reason to be broadcast to all connections]] + 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 print [[Hey! Welcome to Prosody's admin console.]] print [[First thing, if you're ever wondering how to get out, simply type 'quit'.]] @@ -206,7 +216,8 @@ end -- Anything in def_env will be accessible within the session as a global variable def_env.server = {}; -function def_env.server:reload() + +function def_env.server:insane_reload() prosody.unlock_globals(); dofile "prosody" prosody = _G.prosody; @@ -231,6 +242,11 @@ function def_env.server:uptime() minutes, (minutes ~= 1 and "s") or "", os.date("%c", prosody.start_time)); end +function def_env.server:shutdown(reason) + prosody.shutdown(reason); + return true, "Shutdown initiated"; +end + def_env.module = {}; local function get_hosts_set(hosts, module) @@ -333,9 +349,13 @@ 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].modules or {})):sort(); + local modules = array.collect(keys(prosody.hosts[host] and prosody.hosts[host].modules or {})):sort(); if #modules == 0 then - print(" No modules loaded"); + if prosody.hosts[host] then + print(" No modules loaded"); + else + print(" Host not found"); + end else for _, name in ipairs(modules) do print(" "..name); @@ -359,6 +379,11 @@ function def_env.config:get(host, section, key) return true, tostring(config_get(host, section, key)); end +function def_env.config:reload() + local ok, err = prosody.reload_config(); + return ok, (ok and "Config reloaded (you may need to reload modules to take effect)") or tostring(err); +end + def_env.hosts = {}; function def_env.hosts:list() for host, host_session in pairs(hosts) do @@ -385,7 +410,12 @@ end function def_env.c2s:show(match_jid) local print, count = self.session.print, 0; + local curr_host; show_c2s(function (jid, session) + if curr_host ~= session.host then + curr_host = session.host; + print(curr_host); + end if (not match_jid) or jid:match(match_jid) then count = count + 1; local status, priority = "unavailable", tostring(session.priority or "-"); @@ -397,7 +427,7 @@ function def_env.c2s:show(match_jid) status = "available"; end end - print(jid.." - "..status.."("..priority..")"); + print(" "..jid.." - "..status.."("..priority..")"); end end); return true, "Total: "..count.." clients"; @@ -448,7 +478,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); + print(" "..host.." -> "..remotehost..(session.secure and " (encrypted)" or "")..(session.compressed and " (compressed)" or "")); if session.sendq then print(" There are "..#session.sendq.." queued outgoing stanzas for this connection"); end @@ -476,12 +506,16 @@ function def_env.s2s:show(match_jid) end end end - + local subhost_filter = function (h) + return (match_jid and h:match(match_jid)); + end for session in pairs(incoming_s2s) do if session.to_host == host and ((not match_jid) or host:match(match_jid) - or (session.from_host and session.from_host:match(match_jid))) then + or (session.from_host and session.from_host:match(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)")); + print(" "..host.." <- "..(session.from_host or "(unknown)")..(session.secure and " (encrypted)" or "")..(session.compressed and " (compressed)" or "")); if session.type == "s2sin_unauthed" then print(" Connection not yet authenticated"); end @@ -549,6 +583,44 @@ function def_env.s2s:close(from, to) return true, "Closed "..count.." s2s session"..((count == 1 and "") or "s"); end +def_env.host = {}; def_env.hosts = def_env.host; +function def_env.host:activate(hostname, config) + local hostmanager_activate = require "core.hostmanager".activate; + if hosts[hostname] then + return false, "The host "..tostring(hostname).." is already activated"; + end + + local defined_hosts = config or configmanager.getconfig(); + if not config and not defined_hosts[hostname] then + return false, "Couldn't find "..tostring(hostname).." defined in the config, perhaps you need to config:reload()?"; + end + hostmanager_activate(hostname, config or defined_hosts[hostname]); + return true, "Host "..tostring(hostname).." activated"; +end + +function def_env.host:deactivate(hostname, reason) + local hostmanager_deactivate = require "core.hostmanager".deactivate; + local host = hosts[hostname]; + if not host then + return false, "The host "..tostring(hostname).." is not activated"; + end + if reason then + reason = { condition = "host-gone", text = reason }; + end + hostmanager_deactivate(hostname, reason); + return true, "Host "..tostring(hostname).." deactivated"; +end + +function def_env.host:list() + local print = self.session.print; + local i = 0; + for host in values(array.collect(keys(prosody.hosts)):sort()) do + i = i + 1; + print(host); + end + return true, i.." hosts"; +end + ------------- function printbanner(session) @@ -578,3 +650,5 @@ if option and option ~= "short" and option ~= "full" and option ~= "graphic" the end end end + +prosody.net_activate_ports("console", "console", {5582}, "tcp");