module.host = "*" -- Global module
+local hosts = _G.hosts;
local lxp = require "lxp";
local init_xmlhandlers = require "core.xmlhandlers"
local server = require "net.server";
local fire_event = require "core.eventmanager".fire_event;
local core_process_stanza = core_process_stanza;
local st = require "util.stanza";
-local log = require "util.logger".init("bosh");
+local logger = require "util.logger";
+local log = logger.init("mod_bosh");
local stream_callbacks = { stream_tag = "http://jabber.org/protocol/httpbind|body" };
local config = require "core.configmanager";
local xmlns_bosh = "http://jabber.org/protocol/httpbind"; -- (hard-coded into a literal in session.send)
local BOSH_DEFAULT_REQUESTS = tonumber(config.get("*", "core", "bosh_max_requests")) or 2;
local BOSH_DEFAULT_MAXPAUSE = tonumber(config.get("*", "core", "bosh_max_pause")) or 300;
+local default_headers = { ["Content-Type"] = "text/xml; charset=utf-8" };
+
local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
local os_time = os.time;
local waiting_requests = {};
function on_destroy_request(request)
waiting_requests[request] = nil;
+ local session = sessions[request.sid];
+ if session then
+ local requests = session.requests;
+ for i,r in pairs(requests) do
+ if r == request then requests[i] = nil; break; end
+ end
+
+ -- If this session now has no requests open, mark it as inactive
+ if #requests == 0 and session.bosh_max_inactive and not inactive_sessions[session] then
+ inactive_sessions[session] = os_time();
+ (session.log or log)("debug", "BOSH session marked as inactive at %d", inactive_sessions[session]);
+ end
+ end
end
function handle_request(method, body, request)
log("debug", "Request %s suffered error %s", tostring(request.id), body);
return;
end
- log("debug", "Handling new request %s: %s\n----------", request.id, tostring(body));
+ --log("debug", "Handling new request %s: %s\n----------", request.id, tostring(body));
request.notopen = true;
request.log = log;
local parser = lxp.new(init_xmlhandlers(request, stream_callbacks), "|");
waiting_requests[request] = true;
end
- log("debug", "Had nothing to say, so leaving request unanswered for now");
+ log("debug", "Have nothing to say, so leaving request unanswered for now");
return true;
end
end
local function bosh_reset_stream(session) session.notopen = true; end
-local session_close_reply = st.stanza("body", { xmlns = xmlns_bosh, type = "terminate" });
+local session_close_reply = { headers = default_headers, body = st.stanza("body", { xmlns = xmlns_bosh, type = "terminate" }), attr = {} };
local function bosh_close_stream(session, reason)
(session.log or log)("info", "BOSH client disconnected");
session_close_reply.attr.condition = reason;
end
function stream_callbacks.streamopened(request, attr)
- print("Attr:")
- for k,v in pairs(attr) do print("", k, v); end
log("debug", "BOSH body open (sid: %s)", attr.sid);
local sid = attr.sid
if not sid then
-- TODO: Sanity checks here (rid, to, known host, etc.)
if not hosts[attr.to] then
-- Unknown host
+ log("debug", "BOSH client tried to connect to unknown host: %s", tostring(attr.to));
session_close_reply.attr.condition = "host-unknown";
- request:send(tostring(session_close_reply));
+ request:send{ headers = default_headers, body = tostring(session_close_reply) };
request.notopen = nil
return;
end
-- New session
- sid = tostring(new_uuid());
+ sid = new_uuid();
local session = { type = "c2s_unauthed", conn = {}, sid = sid, rid = attr.rid, host = attr.to, bosh_version = attr.ver, bosh_wait = attr.wait, streamid = sid,
bosh_hold = BOSH_DEFAULT_HOLD, bosh_max_inactive = BOSH_DEFAULT_INACTIVITY,
- requests = { }, send_buffer = {}, reset_stream = bosh_reset_stream, close = bosh_close_stream, dispatch_stanza = core_process_stanza };
+ requests = { }, send_buffer = {}, reset_stream = bosh_reset_stream, close = bosh_close_stream,
+ dispatch_stanza = core_process_stanza, log = logger.init("bosh"..sid) };
sessions[sid] = session;
+
log("info", "New BOSH session, assigned it sid '%s'", sid);
local r, send_buffer = session.requests, session.send_buffer;
- local response = { }
+ local response = { headers = default_headers }
function session.send(s)
log("debug", "Sending BOSH data: %s", tostring(s));
local oldest_request = r[1];
log("debug", "We have an open request, so using that to send with");
response.body = t_concat{"<body xmlns='http://jabber.org/protocol/httpbind' sid='", sid, "' xmlns:stream = 'http://etherx.jabber.org/streams'>", tostring(s), "</body>" };
oldest_request:send(response);
- log("debug", "Sent");
+ --log("debug", "Sent");
if oldest_request.stayopen then
if #r>1 then
-- Move front request to back
end
elseif s ~= "" then
log("debug", "Saved to send buffer because there are %d open requests", #r);
- if session.bosh_max_inactive and not inactive_sessions[session] then
- inactive_sessions[session] = os_time();
- (session.log or log)("debug", "BOSH session marked as inactive at %d", inactive_sessions[session]);
- end
-- Hmm, no requests are open :(
t_insert(session.send_buffer, tostring(s));
log("debug", "There are now %d things in the send_buffer", #session.send_buffer);
--xmpp:version='1.0' xmlns:xmpp='urn:xmpp:xbosh'
local response = st.stanza("body", { xmlns = xmlns_bosh,
inactivity = tostring(BOSH_DEFAULT_INACTIVITY), polling = tostring(BOSH_DEFAULT_POLLING), requests = tostring(BOSH_DEFAULT_REQUESTS), hold = tostring(session.bosh_hold), maxpause = "120",
- sid = sid, ver = '1.6', from = session.host, secure = 'true', ["xmpp:version"] = "1.0",
+ sid = sid, authid = sid, ver = '1.6', from = session.host, secure = 'true', ["xmpp:version"] = "1.0",
["xmlns:xmpp"] = "urn:xmpp:xbosh", ["xmlns:stream"] = "http://etherx.jabber.org/streams" }):add_child(features);
- request:send(tostring(response));
+ request:send{ headers = default_headers, body = tostring(response) };
request.sid = sid;
return;
if not session then
-- Unknown sid
log("info", "Client tried to use sid '%s' which we don't know about", sid);
- request:send(tostring(st.stanza("body", { xmlns = xmlns_bosh, type = "terminate", condition = "item-not-found" })));
+ request:send{ headers = default_headers, body = tostring(st.stanza("body", { xmlns = xmlns_bosh, type = "terminate", condition = "item-not-found" })) };
request.notopen = nil;
return;
end
end
function stream_callbacks.handlestanza(request, stanza)
- log("debug", "BOSH stanza received: %s\n", stanza:pretty_print());
+ log("debug", "BOSH stanza received: %s\n", stanza:top_tag());
local session = sessions[request.sid];
if session then
if stanza.attr.xmlns == xmlns_bosh then
projects / prosody.git / blobdiff