mod_admin_telnet: Don't rely on getpeerchain returning an empty list

[prosody.git] / plugins / mod_bosh.lua

diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index f31db684605d9ee77adc53db64aab1ea5782a682..19f191c8bf6335a924d2de2876885d62453b184e 100644 (file)
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -18,6 +18,8 @@ local core_process_stanza = prosody.core_process_stanza;
 local st = require "util.stanza";
 local logger = require "util.logger";
 local log = logger.init("mod_bosh");
+local initialize_filters = require "util.filters".initialize;
+local math_min = math.min;
 
 local xmlns_streams = "http://etherx.jabber.org/streams";
 local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
@@ -30,10 +32,11 @@ local BOSH_DEFAULT_HOLD = module:get_option_number("bosh_default_hold", 1);
 local BOSH_DEFAULT_INACTIVITY = module:get_option_number("bosh_max_inactivity", 60);
 local BOSH_DEFAULT_POLLING = module:get_option_number("bosh_max_polling", 5);
 local BOSH_DEFAULT_REQUESTS = module:get_option_number("bosh_max_requests", 2);
+local bosh_max_wait = module:get_option_number("bosh_max_wait", 120);
 
 local consider_bosh_secure = module:get_option_boolean("consider_bosh_secure");
 
-local default_headers = { ["Content-Type"] = "text/xml; charset=utf-8" };
+local default_headers = { ["Content-Type"] = "text/xml; charset=utf-8", ["Connection"] = "keep-alive" };
 
 local cross_domain = module:get_option("cross_domain_bosh", false);
 if cross_domain then
@@ -70,8 +73,8 @@ end
 local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
 local os_time = os.time;
 
-local sessions = {};
-local inactive_sessions = {}; -- Sessions which have no open requests
+-- All sessions, and sessions that have no requests open
+local sessions, inactive_sessions = module:shared("sessions", "inactive_sessions");
 
 -- Used to respond to idle sessions (those with waiting requests)
 local waiting_requests = {};
@@ -243,24 +246,22 @@ function stream_callbacks.streamopened(context, attr)
                sid = new_uuid();
                local session = {
                        type = "c2s_unauthed", conn = {}, sid = sid, rid = tonumber(attr.rid)-1, host = attr.to,
-                       bosh_version = attr.ver, bosh_wait = attr.wait, streamid = sid,
+                       bosh_version = attr.ver, bosh_wait = math_min(attr.wait, bosh_max_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,
+                       close = bosh_close_stream, dispatch_stanza = core_process_stanza, notopen = true,
                        log = logger.init("bosh"..sid), secure = consider_bosh_secure or request.secure,
                        ip = get_ip_from_request(request);
                };
                sessions[sid] = session;
                
+               local filter = initialize_filters(session);
+               
                session.log("debug", "BOSH session created for request from %s", session.ip);
                log("info", "New BOSH session, assigned it sid '%s'", sid);
 
                -- Send creation response
                local creating_session = true;
-               local features = st.stanza("stream:features");
-               hosts[session.host].events.fire_event("stream-features", { origin = session, features = features });
-               fire_event("stream-features", session, features);
-               table.insert(session.send_buffer, tostring(features));
 
                local r = session.requests;
                function session.send(s)
@@ -269,6 +270,7 @@ function stream_callbacks.streamopened(context, attr)
                                s = st.clone(s);
                                s.attr.xmlns = "jabber:client";
                        end
+                       s = filter("stanzas/out", s);
                        --log("debug", "Sending BOSH data: %s", tostring(s));
                        t_insert(session.send_buffer, tostring(s));
 
@@ -282,10 +284,10 @@ function stream_callbacks.streamopened(context, attr)
                                        sid = sid;
                                };
                                if creating_session then
-                                       body_attr.wait = attr.wait;
                                        body_attr.inactivity = tostring(BOSH_DEFAULT_INACTIVITY);
                                        body_attr.polling = tostring(BOSH_DEFAULT_POLLING);
                                        body_attr.requests = tostring(BOSH_DEFAULT_REQUESTS);
+                                       body_attr.wait = tostring(session.bosh_wait);
                                        body_attr.hold = tostring(session.bosh_hold);
                                        body_attr.authid = sid;
                                        body_attr.secure = "true";
@@ -356,6 +358,7 @@ function stream_callbacks.handlestanza(context, stanza)
                if stanza.attr.xmlns == xmlns_bosh then
                        stanza.attr.xmlns = nil;
                end
+               stanza = session.filter("stanzas/in", stanza);
                core_process_stanza(session, stanza);
        end
 end