prosody: plugins/mod_bosh.lua@2fef108d7eb7 (annotated)

1522 569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1112 diff changeset	1	-- Prosody IM
2923 b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2814 diff changeset	2	-- Copyright (C) 2008-2010 Matthew Wild
b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2814 diff changeset	3	-- Copyright (C) 2008-2010 Waqas Hussain
1522 569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1112 diff changeset	4	--
569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1112 diff changeset	5	-- This project is MIT/X11 licensed. Please see the
569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1112 diff changeset	6	-- COPYING file in the source package for more information.
569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1112 diff changeset	7	--
569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1112 diff changeset	8
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	9	module.host = "*" -- Global module
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	10
1042 a3d77353c18a mod_: Fix a load of global accesses Matthew Wild <mwild1@gmail.com>* parents: 947 diff changeset	11	local hosts = _G.hosts;
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	12	local lxp = require "lxp";
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	13	local init_xmlhandlers = require "core.xmlhandlers"
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	14	local server = require "net.server";
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	15	local httpserver = require "net.httpserver";
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	16	local sm = require "core.sessionmanager";
679 9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	17	local sm_destroy_session = sm.destroy_session;
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	18	local new_uuid = require "util.uuid".generate;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	19	local fire_event = require "core.eventmanager".fire_event;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	20	local core_process_stanza = core_process_stanza;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	21	local st = require "util.stanza";
1109 bb21eb3cd364 mod_bosh: Give BOSH sessions a logger (thanks Florob) Matthew Wild <mwild1@gmail.com> parents: 1049 diff changeset	22	local logger = require "util.logger";
bb21eb3cd364 mod_bosh: Give BOSH sessions a logger (thanks Florob) Matthew Wild <mwild1@gmail.com> parents: 1049 diff changeset	23	local log = logger.init("mod_bosh");
1665 2c72b725384e mod_bosh: Strip BOSH namespace from stanzas to allow for some clients which may send them without the correct xmlns Matthew Wild <mwild1@gmail.com> parents: 1664 diff changeset	24
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	25	local xmlns_bosh = "http://jabber.org/protocol/httpbind"; -- (hard-coded into a literal in session.send)
2959 62a3f824292a mod_bosh: Default stanza namespace should be jabber:client (fixes BOSH to work with recent namespace fix) Matthew Wild <mwild1@gmail.com> parents: 2923 diff changeset	26	local stream_callbacks = { stream_tag = "http://jabber.org/protocol/httpbind\1body", default_ns = "jabber:client" };
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	27
1655 dc42bf326713 mod_bosh: Updated to use module:get_option instead of configmanager Waqas Hussain <waqas20@gmail.com> parents: 1633 diff changeset	28	local BOSH_DEFAULT_HOLD = tonumber(module:get_option("bosh_default_hold")) or 1;
dc42bf326713 mod_bosh: Updated to use module:get_option instead of configmanager Waqas Hussain <waqas20@gmail.com> parents: 1633 diff changeset	29	local BOSH_DEFAULT_INACTIVITY = tonumber(module:get_option("bosh_max_inactivity")) or 60;
dc42bf326713 mod_bosh: Updated to use module:get_option instead of configmanager Waqas Hussain <waqas20@gmail.com> parents: 1633 diff changeset	30	local BOSH_DEFAULT_POLLING = tonumber(module:get_option("bosh_max_polling")) or 5;
dc42bf326713 mod_bosh: Updated to use module:get_option instead of configmanager Waqas Hussain <waqas20@gmail.com> parents: 1633 diff changeset	31	local BOSH_DEFAULT_REQUESTS = tonumber(module:get_option("bosh_max_requests")) or 2;
dc42bf326713 mod_bosh: Updated to use module:get_option instead of configmanager Waqas Hussain <waqas20@gmail.com> parents: 1633 diff changeset	32	local BOSH_DEFAULT_MAXPAUSE = tonumber(module:get_option("bosh_max_pause")) or 300;
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	33
866 8958fe4b2391 mod_bosh: Set Content-Type in response headers Matthew Wild <mwild1@gmail.com> parents: 816 diff changeset	34	local default_headers = { ["Content-Type"] = "text/xml; charset=utf-8" };
1662 b31ea419dff5 mod_bosh: Correct reply when closing sessions Matthew Wild <mwild1@gmail.com> parents: 1655 diff changeset	35	local session_close_reply = { headers = default_headers, body = st.stanza("body", { xmlns = xmlns_bosh, type = "terminate" }), attr = {} };
866 8958fe4b2391 mod_bosh: Set Content-Type in response headers Matthew Wild <mwild1@gmail.com> parents: 816 diff changeset	36
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	37	local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	38	local os_time = os.time;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	39
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	40	local sessions = {};
679 9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	41	local inactive_sessions = {}; -- Sessions which have no open requests
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	42
679 9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	43	-- Used to respond to idle sessions (those with waiting requests)
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	44	local waiting_requests = {};
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	45	function on_destroy_request(request)
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	46	waiting_requests[request] = nil;
947 84202314ab7f mod_bosh: Fix to correctly timeout idle sessions Matthew Wild <mwild1@gmail.com> parents: 866 diff changeset	47	local session = sessions[request.sid];
816 c031ead9896d mod_bosh: Possible fix for invalid key to next crash Matthew Wild <mwild1@gmail.com> parents: 772 diff changeset	48	if session then
c031ead9896d mod_bosh: Possible fix for invalid key to next crash Matthew Wild <mwild1@gmail.com> parents: 772 diff changeset	49	local requests = session.requests;
3039 2fef108d7eb7 mod_bosh: Remove requests from the session table using table.remove(), prevents the possibility of holes in the array. Matthew Wild <mwild1@gmail.com> parents: 2959 diff changeset	50	for i,r in ipairs(requests) do
2fef108d7eb7 mod_bosh: Remove requests from the session table using table.remove(), prevents the possibility of holes in the array. Matthew Wild <mwild1@gmail.com> parents: 2959 diff changeset	51	if r == request then
2fef108d7eb7 mod_bosh: Remove requests from the session table using table.remove(), prevents the possibility of holes in the array. Matthew Wild <mwild1@gmail.com> parents: 2959 diff changeset	52	t_remove(requests, i);
2fef108d7eb7 mod_bosh: Remove requests from the session table using table.remove(), prevents the possibility of holes in the array. Matthew Wild <mwild1@gmail.com> parents: 2959 diff changeset	53	break;
2fef108d7eb7 mod_bosh: Remove requests from the session table using table.remove(), prevents the possibility of holes in the array. Matthew Wild <mwild1@gmail.com> parents: 2959 diff changeset	54	end
816 c031ead9896d mod_bosh: Possible fix for invalid key to next crash Matthew Wild <mwild1@gmail.com> parents: 772 diff changeset	55	end
c031ead9896d mod_bosh: Possible fix for invalid key to next crash Matthew Wild <mwild1@gmail.com> parents: 772 diff changeset	56
c031ead9896d mod_bosh: Possible fix for invalid key to next crash Matthew Wild <mwild1@gmail.com> parents: 772 diff changeset	57	-- If this session now has no requests open, mark it as inactive
c031ead9896d mod_bosh: Possible fix for invalid key to next crash Matthew Wild <mwild1@gmail.com> parents: 772 diff changeset	58	if #requests == 0 and session.bosh_max_inactive and not inactive_sessions[session] then
c031ead9896d mod_bosh: Possible fix for invalid key to next crash Matthew Wild <mwild1@gmail.com> parents: 772 diff changeset	59	inactive_sessions[session] = os_time();
c031ead9896d mod_bosh: Possible fix for invalid key to next crash Matthew Wild <mwild1@gmail.com> parents: 772 diff changeset	60	(session.log or log)("debug", "BOSH session marked as inactive at %d", inactive_sessions[session]);
c031ead9896d mod_bosh: Possible fix for invalid key to next crash Matthew Wild <mwild1@gmail.com> parents: 772 diff changeset	61	end
c031ead9896d mod_bosh: Possible fix for invalid key to next crash Matthew Wild <mwild1@gmail.com> parents: 772 diff changeset	62	end
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	63	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	64
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	65	function handle_request(method, body, request)
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	66	if (not body) or request.method ~= "POST" then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	67	return "<html><body>You really don't look like a BOSH client to me... what do you want?</body></html>";
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	68	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	69	if not method then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	70	log("debug", "Request %s suffered error %s", tostring(request.id), body);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	71	return;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	72	end
771 ecdf72f9b085 Remove redundant logging and debug printing from mod_bosh Matthew Wild <mwild1@gmail.com> parents: 763 diff changeset	73	--log("debug", "Handling new request %s: %s\n----------", request.id, tostring(body));
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	74	request.notopen = true;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	75	request.log = log;
2077 e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1869 diff changeset	76	local parser = lxp.new(init_xmlhandlers(request, stream_callbacks), "\1");
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	77
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	78	parser:parse(body);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	79
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	80	local session = sessions[request.sid];
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	81	if session then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	82	local r = session.requests;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	83	log("debug", "Session %s has %d out of %d requests open", request.sid, #r, session.bosh_hold);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	84	log("debug", "and there are %d things in the send_buffer", #session.send_buffer);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	85	if #r > session.bosh_hold then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	86	-- We are holding too many requests, send what's in the buffer,
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	87	log("debug", "We are holding too many requests, so...");
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	88	if #session.send_buffer > 0 then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	89	log("debug", "...sending what is in the buffer")
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	90	session.send(t_concat(session.send_buffer));
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	91	session.send_buffer = {};
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	92	else
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	93	-- or an empty response
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	94	log("debug", "...sending an empty response");
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	95	session.send("");
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	96	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	97	elseif #session.send_buffer > 0 then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	98	log("debug", "Session has data in the send buffer, will send now..");
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	99	local resp = t_concat(session.send_buffer);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	100	session.send_buffer = {};
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	101	session.send(resp);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	102	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	103
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	104	if not request.destroyed and session.bosh_wait then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	105	request.reply_before = os_time() + session.bosh_wait;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	106	request.on_destroy = on_destroy_request;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	107	waiting_requests[request] = true;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	108	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	109
771 ecdf72f9b085 Remove redundant logging and debug printing from mod_bosh Matthew Wild <mwild1@gmail.com> parents: 763 diff changeset	110	log("debug", "Have nothing to say, so leaving request unanswered for now");
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	111	return true;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	112	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	113	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	114
684 b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	115
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	116	local function bosh_reset_stream(session) session.notopen = true; end
684 b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	117
b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	118	local function bosh_close_stream(session, reason)
b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	119	(session.log or log)("info", "BOSH client disconnected");
b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	120	session_close_reply.attr.condition = reason;
b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	121	for _, held_request in ipairs(session.requests) do
b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	122	held_request:send(session_close_reply);
b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	123	held_request:destroy();
b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	124	end
b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	125	sessions[session.sid] = nil;
b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	126	sm_destroy_session(session);
b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	127	end
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	128
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	129	function stream_callbacks.streamopened(request, attr)
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	130	log("debug", "BOSH body open (sid: %s)", attr.sid);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	131	local sid = attr.sid
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	132	if not sid then
679 9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	133	-- New session request
684 b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	134	request.notopen = nil; -- Signals that we accept this opening tag
b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	135
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	136	-- TODO: Sanity checks here (rid, to, known host, etc.)
684 b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	137	if not hosts[attr.to] then
b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	138	-- Unknown host
1048 45fc590539cd mod_bosh: Add log message for clients connecting to unknown host Matthew Wild <mwild1@gmail.com> parents: 1047 diff changeset	139	log("debug", "BOSH client tried to connect to unknown host: %s", tostring(attr.to));
1633 7812459eeed7 mod_bosh: Fix error reply for host-unknown errors Matthew Wild <mwild1@gmail.com> parents: 1551 diff changeset	140	session_close_reply.body.attr.condition = "host-unknown";
7812459eeed7 mod_bosh: Fix error reply for host-unknown errors Matthew Wild <mwild1@gmail.com> parents: 1551 diff changeset	141	request:send(session_close_reply);
684 b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	142	request.notopen = nil
b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	143	return;
b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	144	end
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	145
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	146	-- New session
763 8e77a39826c2 mod_bosh: No need to tostring() uuids now Matthew Wild <mwild1@gmail.com> parents: 725 diff changeset	147	sid = new_uuid();
1663 b30c4d0bbe84 mod_bosh: Basic handling of rids (more to come) Matthew Wild <mwild1@gmail.com> parents: 1662 diff changeset	148	local session = { type = "c2s_unauthed", conn = {}, sid = sid, rid = tonumber(attr.rid), host = attr.to, bosh_version = attr.ver, bosh_wait = attr.wait, streamid = sid,
679 9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	149	bosh_hold = BOSH_DEFAULT_HOLD, bosh_max_inactive = BOSH_DEFAULT_INACTIVITY,
1109 bb21eb3cd364 mod_bosh: Give BOSH sessions a logger (thanks Florob) Matthew Wild <mwild1@gmail.com> parents: 1049 diff changeset	150	requests = { }, send_buffer = {}, reset_stream = bosh_reset_stream, close = bosh_close_stream,
1541 591732da1306 mod_bosh: Mark a session as secure if it is created with HTTPS Matthew Wild <mwild1@gmail.com> parents: 1537 diff changeset	151	dispatch_stanza = core_process_stanza, log = logger.init("bosh"..sid), secure = request.secure };
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	152	sessions[sid] = session;
1109 bb21eb3cd364 mod_bosh: Give BOSH sessions a logger (thanks Florob) Matthew Wild <mwild1@gmail.com> parents: 1049 diff changeset	153
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	154	log("info", "New BOSH session, assigned it sid '%s'", sid);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	155	local r, send_buffer = session.requests, session.send_buffer;
866 8958fe4b2391 mod_bosh: Set Content-Type in response headers Matthew Wild <mwild1@gmail.com> parents: 816 diff changeset	156	local response = { headers = default_headers }
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	157	function session.send(s)
2814 752182f12c35 mod_bosh: Don't log response XML Matthew Wild <mwild1@gmail.com> parents: 2084 diff changeset	158	--log("debug", "Sending BOSH data: %s", tostring(s));
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	159	local oldest_request = r[1];
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	160	while oldest_request and oldest_request.destroyed do
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	161	t_remove(r, 1);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	162	waiting_requests[oldest_request] = nil;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	163	oldest_request = r[1];
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	164	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	165	if oldest_request then
2814 752182f12c35 mod_bosh: Don't log response XML Matthew Wild <mwild1@gmail.com> parents: 2084 diff changeset	166	log("debug", "We have an open request, so sending on that");
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	167	response.body = t_concat{"<body xmlns='http://jabber.org/protocol/httpbind' sid='", sid, "' xmlns:stream = 'http://etherx.jabber.org/streams'>", tostring(s), "</body>" };
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	168	oldest_request:send(response);
771 ecdf72f9b085 Remove redundant logging and debug printing from mod_bosh Matthew Wild <mwild1@gmail.com> parents: 763 diff changeset	169	--log("debug", "Sent");
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	170	if oldest_request.stayopen then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	171	if #r>1 then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	172	-- Move front request to back
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	173	t_insert(r, oldest_request);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	174	t_remove(r, 1);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	175	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	176	else
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	177	log("debug", "Destroying the request now...");
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	178	oldest_request:destroy();
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	179	t_remove(r, 1);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	180	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	181	elseif s ~= "" then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	182	log("debug", "Saved to send buffer because there are %d open requests", #r);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	183	-- Hmm, no requests are open :(
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	184	t_insert(session.send_buffer, tostring(s));
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	185	log("debug", "There are now %d things in the send_buffer", #session.send_buffer);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	186	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	187	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	188
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	189	-- Send creation response
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	190
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	191	local features = st.stanza("stream:features");
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	192	fire_event("stream-features", session, features);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	193	--xmpp:version='1.0' xmlns:xmpp='urn:xmpp:xbosh'
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	194	local response = st.stanza("body", { xmlns = xmlns_bosh,
679 9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	195	inactivity = tostring(BOSH_DEFAULT_INACTIVITY), polling = tostring(BOSH_DEFAULT_POLLING), requests = tostring(BOSH_DEFAULT_REQUESTS), hold = tostring(session.bosh_hold), maxpause = "120",
1049 c476bceaf2db mod_bosh: Put dummy authid in session creation response to keep JSJaC happy Matthew Wild <mwild1@gmail.com> parents: 1048 diff changeset	196	sid = sid, authid = sid, ver = '1.6', from = session.host, secure = 'true', ["xmpp:version"] = "1.0",
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	197	["xmlns:xmpp"] = "urn:xmpp:xbosh", ["xmlns:stream"] = "http://etherx.jabber.org/streams" }):add_child(features);
866 8958fe4b2391 mod_bosh: Set Content-Type in response headers Matthew Wild <mwild1@gmail.com> parents: 816 diff changeset	198	request:send{ headers = default_headers, body = tostring(response) };
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	199
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	200	request.sid = sid;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	201	return;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	202	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	203
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	204	local session = sessions[sid];
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	205	if not session then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	206	-- Unknown sid
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	207	log("info", "Client tried to use sid '%s' which we don't know about", sid);
866 8958fe4b2391 mod_bosh: Set Content-Type in response headers Matthew Wild <mwild1@gmail.com> parents: 816 diff changeset	208	request:send{ headers = default_headers, body = tostring(st.stanza("body", { xmlns = xmlns_bosh, type = "terminate", condition = "item-not-found" })) };
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	209	request.notopen = nil;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	210	return;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	211	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	212
1663 b30c4d0bbe84 mod_bosh: Basic handling of rids (more to come) Matthew Wild <mwild1@gmail.com> parents: 1662 diff changeset	213	if session.rid then
b30c4d0bbe84 mod_bosh: Basic handling of rids (more to come) Matthew Wild <mwild1@gmail.com> parents: 1662 diff changeset	214	local rid = tonumber(attr.rid);
1664 6587b6c2678e mod_bosh: Calculate rid difference just once Matthew Wild <mwild1@gmail.com> parents: 1663 diff changeset	215	local diff = rid - session.rid;
6587b6c2678e mod_bosh: Calculate rid difference just once Matthew Wild <mwild1@gmail.com> parents: 1663 diff changeset	216	if diff > 1 then
1663 b30c4d0bbe84 mod_bosh: Basic handling of rids (more to come) Matthew Wild <mwild1@gmail.com> parents: 1662 diff changeset	217	session.log("warn", "rid too large (means a request was lost). Last rid: %d New rid: %s", session.rid, attr.rid);
1664 6587b6c2678e mod_bosh: Calculate rid difference just once Matthew Wild <mwild1@gmail.com> parents: 1663 diff changeset	218	elseif diff <= 0 then
1663 b30c4d0bbe84 mod_bosh: Basic handling of rids (more to come) Matthew Wild <mwild1@gmail.com> parents: 1662 diff changeset	219	-- Repeated, ignore
b30c4d0bbe84 mod_bosh: Basic handling of rids (more to come) Matthew Wild <mwild1@gmail.com> parents: 1662 diff changeset	220	session.log("debug", "rid repeated (on request %s), ignoring: %d", request.id, session.rid);
b30c4d0bbe84 mod_bosh: Basic handling of rids (more to come) Matthew Wild <mwild1@gmail.com> parents: 1662 diff changeset	221	request.notopen = nil;
b30c4d0bbe84 mod_bosh: Basic handling of rids (more to come) Matthew Wild <mwild1@gmail.com> parents: 1662 diff changeset	222	t_insert(session.requests, request);
b30c4d0bbe84 mod_bosh: Basic handling of rids (more to come) Matthew Wild <mwild1@gmail.com> parents: 1662 diff changeset	223	return;
b30c4d0bbe84 mod_bosh: Basic handling of rids (more to come) Matthew Wild <mwild1@gmail.com> parents: 1662 diff changeset	224	end
b30c4d0bbe84 mod_bosh: Basic handling of rids (more to come) Matthew Wild <mwild1@gmail.com> parents: 1662 diff changeset	225	session.rid = rid;
b30c4d0bbe84 mod_bosh: Basic handling of rids (more to come) Matthew Wild <mwild1@gmail.com> parents: 1662 diff changeset	226	end
b30c4d0bbe84 mod_bosh: Basic handling of rids (more to come) Matthew Wild <mwild1@gmail.com> parents: 1662 diff changeset	227
679 9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	228	if attr.type == "terminate" then
9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	229	-- Client wants to end this session
684 b7d85c6a0002 Implement session:close() for BOSH, and add checking for attempts to connect to hosts we don't serve Matthew Wild <mwild1@gmail.com> parents: 683 diff changeset	230	session:close();
679 9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	231	request.notopen = nil;
9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	232	return;
9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	233	end
9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	234
9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	235	-- If session was inactive, make sure it is now marked as not
9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	236	if #session.requests == 0 then
9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	237	(session.log or log)("debug", "BOSH client now active again at %d", os_time());
9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	238	inactive_sessions[session] = nil;
9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	239	end
9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	240
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	241	if session.notopen then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	242	local features = st.stanza("stream:features");
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	243	fire_event("stream-features", session, features);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	244	session.send(features);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	245	session.notopen = nil;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	246	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	247
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	248	request.notopen = nil; -- Signals that we accept this opening tag
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	249	t_insert(session.requests, request);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	250	request.sid = sid;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	251	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	252
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	253	function stream_callbacks.handlestanza(request, stanza)
725 96110075288b Replacing pretty_print() with top_tag() for logging Matthew Wild <mwild1@gmail.com> parents: 701 diff changeset	254	log("debug", "BOSH stanza received: %s\n", stanza:top_tag());
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	255	local session = sessions[request.sid];
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	256	if session then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	257	if stanza.attr.xmlns == xmlns_bosh then
2959 62a3f824292a mod_bosh: Default stanza namespace should be jabber:client (fixes BOSH to work with recent namespace fix) Matthew Wild <mwild1@gmail.com> parents: 2923 diff changeset	258	stanza.attr.xmlns = nil;
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	259	end
2084 ded03b7b040e mod_bosh: Set session.ip for BOSH sessions. Waqas Hussain <waqas20@gmail.com> parents: 2077 diff changeset	260	session.ip = request.handler.ip();
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	261	core_process_stanza(session, stanza);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	262	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	263	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	264
1864 b9389286eece mod_bosh: Fix for 'invalid key to next' error when 2 clients lose connection at the same time Matthew Wild <mwild1@gmail.com> parents: 1633 diff changeset	265	local dead_sessions = {};
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	266	function on_timer()
660 b2c4a7ec31c6 Remove some old debugging code from mod_bosh Matthew Wild <mwild1@gmail.com> parents: 636 diff changeset	267	-- log("debug", "Checking for requests soon to timeout...");
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	268	-- Identify requests timing out within the next few seconds
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	269	local now = os_time() + 3;
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	270	for request in pairs(waiting_requests) do
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	271	if request.reply_before <= now then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	272	log("debug", "%s was soon to timeout, sending empty response", request.id);
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	273	-- Send empty response to let the
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	274	-- client know we're still here
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	275	if request.conn then
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	276	sessions[request.sid].send("");
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	277	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	278	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	279	end
679 9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	280
9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	281	now = now - 3;
1864 b9389286eece mod_bosh: Fix for 'invalid key to next' error when 2 clients lose connection at the same time Matthew Wild <mwild1@gmail.com> parents: 1633 diff changeset	282	local n_dead_sessions = 0;
679 9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	283	for session, inactive_since in pairs(inactive_sessions) do
692 4a218377f4e3 BOSH: Fix for error when closed session was in inactive_sessions list Matthew Wild <mwild1@gmail.com> parents: 684 diff changeset	284	if session.bosh_max_inactive then
4a218377f4e3 BOSH: Fix for error when closed session was in inactive_sessions list Matthew Wild <mwild1@gmail.com> parents: 684 diff changeset	285	if now - inactive_since > session.bosh_max_inactive then
4a218377f4e3 BOSH: Fix for error when closed session was in inactive_sessions list Matthew Wild <mwild1@gmail.com> parents: 684 diff changeset	286	(session.log or log)("debug", "BOSH client inactive too long, destroying session at %d", now);
4a218377f4e3 BOSH: Fix for error when closed session was in inactive_sessions list Matthew Wild <mwild1@gmail.com> parents: 684 diff changeset	287	sessions[session.sid] = nil;
4a218377f4e3 BOSH: Fix for error when closed session was in inactive_sessions list Matthew Wild <mwild1@gmail.com> parents: 684 diff changeset	288	inactive_sessions[session] = nil;
1864 b9389286eece mod_bosh: Fix for 'invalid key to next' error when 2 clients lose connection at the same time Matthew Wild <mwild1@gmail.com> parents: 1633 diff changeset	289	n_dead_sessions = n_dead_sessions + 1;
b9389286eece mod_bosh: Fix for 'invalid key to next' error when 2 clients lose connection at the same time Matthew Wild <mwild1@gmail.com> parents: 1633 diff changeset	290	dead_sessions[n_dead_sessions] = session;
692 4a218377f4e3 BOSH: Fix for error when closed session was in inactive_sessions list Matthew Wild <mwild1@gmail.com> parents: 684 diff changeset	291	end
693 d8b793e612a9 BOSH: Make previous fix a bit more efficient Matthew Wild <mwild1@gmail.com> parents: 692 diff changeset	292	else
679 9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	293	inactive_sessions[session] = nil;
9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	294	end
9506bf204b1a Numerous BOSH improvements... handle client disconnects, either explicit or implicit through inactivity; allow specifying BOSH default parameters through config; fix to prevent prematurely closing request connections in some cases, before they were replied to Matthew Wild <mwild1@gmail.com> parents: 660 diff changeset	295	end
1864 b9389286eece mod_bosh: Fix for 'invalid key to next' error when 2 clients lose connection at the same time Matthew Wild <mwild1@gmail.com> parents: 1633 diff changeset	296
b9389286eece mod_bosh: Fix for 'invalid key to next' error when 2 clients lose connection at the same time Matthew Wild <mwild1@gmail.com> parents: 1633 diff changeset	297	for i=1,n_dead_sessions do
b9389286eece mod_bosh: Fix for 'invalid key to next' error when 2 clients lose connection at the same time Matthew Wild <mwild1@gmail.com> parents: 1633 diff changeset	298	local session = dead_sessions[i];
b9389286eece mod_bosh: Fix for 'invalid key to next' error when 2 clients lose connection at the same time Matthew Wild <mwild1@gmail.com> parents: 1633 diff changeset	299	dead_sessions[i] = nil;
b9389286eece mod_bosh: Fix for 'invalid key to next' error when 2 clients lose connection at the same time Matthew Wild <mwild1@gmail.com> parents: 1633 diff changeset	300	sm_destroy_session(session, "BOSH client silent for over "..session.bosh_max_inactive.." seconds");
b9389286eece mod_bosh: Fix for 'invalid key to next' error when 2 clients lose connection at the same time Matthew Wild <mwild1@gmail.com> parents: 1633 diff changeset	301	end
636 9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	302	end
9c9c671ecc50 Initial mod_bosh, works, kind of, but quite incomplete Matthew Wild <mwild1@gmail.com> parents: diff changeset	303
1655 dc42bf326713 mod_bosh: Updated to use module:get_option instead of configmanager Waqas Hussain <waqas20@gmail.com> parents: 1633 diff changeset	304	local ports = module:get_option("bosh_ports") or { 5280 };
1869 7456bb2a3458 mod_bosh: Update to use new httpserver.new_from_config syntax Matthew Wild <mwild1@gmail.com> parents: 1865 diff changeset	305	httpserver.new_from_config(ports, handle_request, { base = "http-bind" });
701 dc67e3cffff4 BOSH: Allow BOSH servers to be configured through config file Matthew Wild <mwild1@gmail.com> parents: 693 diff changeset	306
660 b2c4a7ec31c6 Remove some old debugging code from mod_bosh Matthew Wild <mwild1@gmail.com> parents: 636 diff changeset	307	server.addtimer(on_timer);

author	Matthew Wild <mwild1@gmail.com>
	Mon, 17 May 2010 11:42:53 +0100
changeset 3039	2fef108d7eb7
parent 2959	62a3f824292a
child 3040	c02d0e7e088e
permissions	-rw-r--r--