Software `/` code `/` prosody

Annotate

util/adminstream.lua @ 11772:e2155e2703dd

mod_s2s: Factor out procedure for newly encrypted sessions Goal is to call this if the connection is using Direct TLS, either via multiplexing or a future Direct TLS S2S port.

author	Kim Alvefur <zash@zash.se>
date	Tue, 10 Aug 2021 20:51:31 +0200
parent	10940:18e4e446a76c
child	12094:84fd6a79cda7

rev	line source
10855 70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	1 local st = require "util.stanza";
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	2 local new_xmpp_stream = require "util.xmppstream".new;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	3 local sessionlib = require "util.session";
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	4 local gettime = require "util.time".now;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	5 local runner = require "util.async".runner;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	6 local add_task = require "util.timer".add_task;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	7 local events = require "util.events";
10876 c01c39a2c7a2 util.adminstream: Import net.server [luacheck] Matthew Wild <mwild1@gmail.com> parents: 10875 diff changeset	8 local server = require "net.server";
10855 70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	9
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	10 local stream_close_timeout = 5;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	11
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	12 local log = require "util.logger".init("adminstream");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	13
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	14 local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	15
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	16 local stream_callbacks = { default_ns = "xmpp:prosody.im/admin" };
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	17
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	18 function stream_callbacks.streamopened(session, attr)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	19 -- run _streamopened in async context
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	20 session.thread:run({ stream = "opened", attr = attr });
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	21 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	22
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	23 function stream_callbacks._streamopened(session, attr) --luacheck: ignore 212/attr
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	24 if session.type ~= "client" then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	25 session:open_stream();
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	26 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	27 session.notopen = nil;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	28 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	29
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	30 function stream_callbacks.streamclosed(session, attr)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	31 -- run _streamclosed in async context
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	32 session.thread:run({ stream = "closed", attr = attr });
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	33 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	34
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	35 function stream_callbacks._streamclosed(session)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	36 session.log("debug", "Received </stream:stream>");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	37 session:close(false);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	38 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	39
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	40 function stream_callbacks.error(session, error, data)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	41 if error == "no-stream" then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	42 session.log("debug", "Invalid opening stream header (%s)", (data:gsub("^([^\1]+)\1", "{%1}")));
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	43 session:close("invalid-namespace");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	44 elseif error == "parse-error" then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	45 session.log("debug", "Client XML parse error: %s", data);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	46 session:close("not-well-formed");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	47 elseif error == "stream-error" then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	48 local condition, text = "undefined-condition";
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	49 for child in data:childtags(nil, xmlns_xmpp_streams) do
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	50 if child.name ~= "text" then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	51 condition = child.name;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	52 else
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	53 text = child:get_text();
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	54 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	55 if condition ~= "undefined-condition" and text then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	56 break;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	57 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	58 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	59 text = condition .. (text and (" ("..text..")") or "");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	60 session.log("info", "Session closed by remote with error: %s", text);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	61 session:close(nil, text);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	62 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	63 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	64
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	65 function stream_callbacks.handlestanza(session, stanza)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	66 session.thread:run(stanza);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	67 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	68
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	69 local runner_callbacks = {};
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	70
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	71 function runner_callbacks:error(err)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	72 self.data.log("error", "Traceback[c2s]: %s", err);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	73 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	74
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	75 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	76
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	77 local function destroy_session(session, reason)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	78 if session.destroyed then return; end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	79 session.destroyed = true;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	80 session.log("debug", "Destroying session: %s", reason or "unknown reason");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	81 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	82
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	83 local function session_close(session, reason)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	84 local log = session.log or log;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	85 if session.conn then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	86 if session.notopen then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	87 session:open_stream();
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	88 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	89 if reason then -- nil == no err, initiated by us, false == initiated by client
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	90 local stream_error = st.stanza("stream:error");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	91 if type(reason) == "string" then -- assume stream error
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	92 stream_error:tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' });
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	93 elseif type(reason) == "table" then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	94 if reason.condition then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	95 stream_error:tag(reason.condition, stream_xmlns_attr):up();
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	96 if reason.text then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	97 stream_error:tag("text", stream_xmlns_attr):text(reason.text):up();
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	98 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	99 if reason.extra then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	100 stream_error:add_child(reason.extra);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	101 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	102 elseif reason.name then -- a stanza
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	103 stream_error = reason;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	104 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	105 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	106 stream_error = tostring(stream_error);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	107 log("debug", "Disconnecting client, <stream:error> is: %s", stream_error);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	108 session.send(stream_error);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	109 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	110
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	111 session.send("</stream:stream>");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	112 function session.send() return false; end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	113
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	114 local reason_text = (reason and (reason.name or reason.text or reason.condition)) or reason;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	115 session.log("debug", "c2s stream for %s closed: %s", session.full_jid or session.ip or "<unknown>", reason_text or "session closed");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	116
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	117 -- Authenticated incoming stream may still be sending us stanzas, so wait for </stream:stream> from remote
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	118 local conn = session.conn;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	119 if reason_text == nil and not session.notopen and session.type == "c2s" then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	120 -- Grace time to process data from authenticated cleanly-closed stream
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	121 add_task(stream_close_timeout, function ()
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	122 if not session.destroyed then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	123 session.log("warn", "Failed to receive a stream close response, closing connection anyway...");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	124 destroy_session(session);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	125 conn:close();
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	126 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	127 end);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	128 else
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	129 destroy_session(session, reason_text);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	130 conn:close();
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	131 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	132 else
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	133 local reason_text = (reason and (reason.name or reason.text or reason.condition)) or reason;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	134 destroy_session(session, reason_text);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	135 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	136 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	137
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	138 --- Public methods
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	139
10875 09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	140 local function new_connection(socket_path, listeners)
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	141 local have_unix, unix = pcall(require, "socket.unix");
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	142 if type(unix) ~= "table" then
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	143 have_unix = false;
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	144 end
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	145 local conn, sock;
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	146
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	147 return {
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	148 connect = function ()
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	149 if not have_unix then
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	150 return nil, "no unix socket support";
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	151 end
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	152 if sock or conn then
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	153 return nil, "already connected";
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	154 end
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	155 sock = unix.stream();
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	156 sock:settimeout(0);
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	157 local ok, err = sock:connect(socket_path);
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	158 if not ok then
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	159 return nil, err;
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	160 end
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	161 conn = server.wrapclient(sock, nil, nil, listeners, "*a");
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	162 return true;
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	163 end;
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	164 disconnect = function ()
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	165 if conn then
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	166 conn:close();
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	167 conn = nil;
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	168 end
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	169 if sock then
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	170 sock:close();
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	171 sock = nil;
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	172 end
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	173 return true;
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	174 end;
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	175 };
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	176 end
09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	177
10855 70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	178 local function new_server(sessions, stanza_handler)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	179 local listeners = {};
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	180
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	181 function listeners.onconnect(conn)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	182 log("debug", "New connection");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	183 local session = sessionlib.new("admin");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	184 sessionlib.set_id(session);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	185 sessionlib.set_logger(session);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	186 sessionlib.set_conn(session, conn);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	187
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	188 session.conntime = gettime();
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	189 session.type = "admin";
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	190
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	191 local stream = new_xmpp_stream(session, stream_callbacks);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	192 session.stream = stream;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	193 session.notopen = true;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	194
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	195 session.thread = runner(function (stanza)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	196 if st.is_stanza(stanza) then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	197 stanza_handler(session, stanza);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	198 elseif stanza.stream == "opened" then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	199 stream_callbacks._streamopened(session, stanza.attr);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	200 elseif stanza.stream == "closed" then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	201 stream_callbacks._streamclosed(session, stanza.attr);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	202 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	203 end, runner_callbacks, session);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	204
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	205 function session.data(data)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	206 -- Parse the data, which will store stanzas in session.pending_stanzas
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	207 if data then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	208 local ok, err = stream:feed(data);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	209 if not ok then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	210 session.log("debug", "Received invalid XML (%s) %d bytes: %q", err, #data, data:sub(1, 300));
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	211 session:close("not-well-formed");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	212 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	213 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	214 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	215
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	216 session.close = session_close;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	217
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	218 session.send = function (t)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	219 session.log("debug", "Sending[%s]: %s", session.type, t.top_tag and t:top_tag() or t:match("^[^>]*>?"));
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	220 return session.rawsend(tostring(t));
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	221 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	222
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	223 function session.rawsend(t)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	224 local ret, err = conn:write(t);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	225 if not ret then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	226 session.log("debug", "Error writing to connection: %s", err);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	227 return false, err;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	228 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	229 return true;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	230 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	231
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	232 sessions[conn] = session;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	233 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	234
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	235 function listeners.onincoming(conn, data)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	236 local session = sessions[conn];
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	237 if session then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	238 session.data(data);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	239 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	240 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	241
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	242 function listeners.ondisconnect(conn, err)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	243 local session = sessions[conn];
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	244 if session then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	245 session.log("info", "Admin client disconnected: %s", err or "connection closed");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	246 session.conn = nil;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	247 sessions[conn] = nil;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	248 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	249 end
10900 9e6d979dd603 util.adminstream: Set a read timeout handler Kim Alvefur <zash@zash.se> parents: 10892 diff changeset	250
9e6d979dd603 util.adminstream: Set a read timeout handler Kim Alvefur <zash@zash.se> parents: 10892 diff changeset	251 function listeners.onreadtimeout(conn)
10940 18e4e446a76c util.adminstream: Prevent closure on read timeout Kim Alvefur <zash@zash.se> parents: 10900 diff changeset	252 return conn:send(" ");
10900 9e6d979dd603 util.adminstream: Set a read timeout handler Kim Alvefur <zash@zash.se> parents: 10892 diff changeset	253 end
9e6d979dd603 util.adminstream: Set a read timeout handler Kim Alvefur <zash@zash.se> parents: 10892 diff changeset	254
10855 70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	255 return {
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	256 listeners = listeners;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	257 };
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	258 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	259
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	260 local function new_client()
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	261 local client = {
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	262 type = "client";
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	263 events = events.new();
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	264 log = log;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	265 };
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	266
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	267 local listeners = {};
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	268
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	269 function listeners.onconnect(conn)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	270 log("debug", "Connected");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	271 client.conn = conn;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	272
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	273 local stream = new_xmpp_stream(client, stream_callbacks);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	274 client.stream = stream;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	275 client.notopen = true;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	276
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	277 client.thread = runner(function (stanza)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	278 if st.is_stanza(stanza) then
10892 b9ff7178787c util.adminstream: Fire event based on stanza name too for convenience Matthew Wild <mwild1@gmail.com> parents: 10876 diff changeset	279 if not client.events.fire_event("received", stanza) and not stanza.attr.xmlns then
b9ff7178787c util.adminstream: Fire event based on stanza name too for convenience Matthew Wild <mwild1@gmail.com> parents: 10876 diff changeset	280 client.events.fire_event("received/"..stanza.name, stanza);
b9ff7178787c util.adminstream: Fire event based on stanza name too for convenience Matthew Wild <mwild1@gmail.com> parents: 10876 diff changeset	281 end
10855 70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	282 elseif stanza.stream == "opened" then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	283 stream_callbacks._streamopened(client, stanza.attr);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	284 client.events.fire_event("connected");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	285 elseif stanza.stream == "closed" then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	286 client.events.fire_event("disconnected");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	287 stream_callbacks._streamclosed(client, stanza.attr);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	288 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	289 end, runner_callbacks, client);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	290
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	291 client.close = session_close;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	292
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	293 function client.send(t)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	294 client.log("debug", "Sending: %s", t.top_tag and t:top_tag() or t:match("^[^>]*>?"));
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	295 return client.rawsend(tostring(t));
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	296 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	297
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	298 function client.rawsend(t)
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	299 local ret, err = conn:write(t);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	300 if not ret then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	301 client.log("debug", "Error writing to connection: %s", err);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	302 return false, err;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	303 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	304 return true;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	305 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	306 client.log("debug", "Opening stream...");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	307 client:open_stream();
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	308 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	309
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	310 function listeners.onincoming(conn, data) --luacheck: ignore 212/conn
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	311 local ok, err = client.stream:feed(data);
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	312 if not ok then
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	313 client.log("debug", "Received invalid XML (%s) %d bytes: %q", err, #data, data:sub(1, 300));
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	314 client:close("not-well-formed");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	315 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	316 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	317
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	318 function listeners.ondisconnect(conn, err) --luacheck: ignore 212/conn
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	319 client.log("info", "Admin client disconnected: %s", err or "connection closed");
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	320 client.conn = nil;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	321 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	322
10900 9e6d979dd603 util.adminstream: Set a read timeout handler Kim Alvefur <zash@zash.se> parents: 10892 diff changeset	323 function listeners.onreadtimeout(conn)
9e6d979dd603 util.adminstream: Set a read timeout handler Kim Alvefur <zash@zash.se> parents: 10892 diff changeset	324 conn:send(" ");
9e6d979dd603 util.adminstream: Set a read timeout handler Kim Alvefur <zash@zash.se> parents: 10892 diff changeset	325 end
9e6d979dd603 util.adminstream: Set a read timeout handler Kim Alvefur <zash@zash.se> parents: 10892 diff changeset	326
10855 70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	327 client.listeners = listeners;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	328
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	329 return client;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	330 end
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	331
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	332 return {
10875 09674bbb833f util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse Matthew Wild <mwild1@gmail.com> parents: 10855 diff changeset	333 connection = new_connection;
10855 70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	334 server = new_server;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	335 client = new_client;
70ac7d23673d mod_admin_socket, util.adminstream: New module to manage a local unix domain socket for admin functionality Matthew Wild <mwild1@gmail.com> parents: diff changeset	336 };

prosody

e2155e2703dd

util/adminstream.lua

Software / code / prosody

Annotate

util/adminstream.lua @ 11772:e2155e2703dd

Software `/` code `/` prosody