Merge 0.6->0.7

[prosody.git] / plugins / mod_bosh.lua

diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index 1d4d8096fdf8476a9202b8cacfa639ea754e2b23..66a79785dea936ba77779028c768039ccdb8fcb0 100644 (file)
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -16,18 +16,14 @@ local httpserver = require "net.httpserver";
 local sm = require "core.sessionmanager";
 local sm_destroy_session = sm.destroy_session;
 local new_uuid = require "util.uuid".generate;
-local fire_event = prosody.events.fire_event;
+local fire_event = require "core.eventmanager".fire_event;
 local core_process_stanza = core_process_stanza;
 local st = require "util.stanza";
 local logger = require "util.logger";
 local log = logger.init("mod_bosh");
 
-local xmlns_streams = "http://etherx.jabber.org/streams";
-local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
 local xmlns_bosh = "http://jabber.org/protocol/httpbind"; -- (hard-coded into a literal in session.send)
-
-local stream_callbacks = {
-       stream_ns = xmlns_bosh, stream_tag = "body", default_ns = "jabber:client" };
+local stream_callbacks = { stream_ns = "http://jabber.org/protocol/httpbind", stream_tag = "body", default_ns = "jabber:client" };
 
 local BOSH_DEFAULT_HOLD = tonumber(module:get_option("bosh_default_hold")) or 1;
 local BOSH_DEFAULT_INACTIVITY = tonumber(module:get_option("bosh_max_inactivity")) or 60;
@@ -38,6 +34,7 @@ local BOSH_DEFAULT_MAXPAUSE = tonumber(module:get_option("bosh_max_pause")) or 3
 local consider_bosh_secure = module:get_option_boolean("consider_bosh_secure");
 
 local default_headers = { ["Content-Type"] = "text/xml; charset=utf-8" };
+local session_close_reply = { headers = default_headers, body = st.stanza("body", { xmlns = xmlns_bosh, type = "terminate" }), attr = {} };
 
 local cross_domain = module:get_option("cross_domain_bosh");
 if cross_domain then
@@ -149,42 +146,11 @@ end
 
 local function bosh_reset_stream(session) session.notopen = true; end
 
-local stream_xmlns_attr = { xmlns = "urn:ietf:params:xml:ns:xmpp-streams" };
-
 local function bosh_close_stream(session, reason)
        (session.log or log)("info", "BOSH client disconnected");
-       
-       local close_reply = st.stanza("body", { xmlns = xmlns_bosh, type = "terminate",
-               ["xmlns:streams"] = xmlns_streams });
-       
-
-       if reason then
-               close_reply.attr.condition = "remote-stream-error";
-               if type(reason) == "string" then -- assume stream error
-                       close_reply:tag("stream:error")
-                               :tag(reason, {xmlns = xmlns_xmpp_streams});
-               elseif type(reason) == "table" then
-                       if reason.condition then
-                               close_reply:tag("stream:error")
-                                       :tag(reason.condition, stream_xmlns_attr):up();
-                               if reason.text then
-                                       close_reply:tag("text", stream_xmlns_attr):text(reason.text):up();
-                               end
-                               if reason.extra then
-                                       close_reply:add_child(reason.extra);
-                               end
-                       elseif reason.name then -- a stanza
-                               close_reply = reason;
-                       end
-               end
-               log("info", "Disconnecting client, <stream:error> is: %s", tostring(close_reply));
-       end
-
-       local session_close_response = { headers = default_headers, body = tostring(close_reply) };
-
-       --FIXME: Quite sure we shouldn't reply to all requests with the error
+       session_close_reply.attr.condition = reason;
        for _, held_request in ipairs(session.requests) do
-               held_request:send(session_close_response);
+               held_request:send(session_close_reply);
                held_request:destroy();
        end
        sessions[session.sid]  = nil;
@@ -224,11 +190,6 @@ function stream_callbacks.streamopened(request, attr)
                local r, send_buffer = session.requests, session.send_buffer;
                local response = { headers = default_headers }
                function session.send(s)
-                       -- We need to ensure that outgoing stanzas have the jabber:client xmlns
-                       if s.attr and not s.attr.xmlns then
-                               s = st.clone(s);
-                               s.attr.xmlns = "jabber:client";
-                       end
                        --log("debug", "Sending BOSH data: %s", tostring(s));
                        local oldest_request = r[1];
                        if oldest_request then
@@ -327,21 +288,6 @@ function stream_callbacks.handlestanza(request, stanza)
        end
 end
 
-function stream_callbacks.error(request, error)
-       log("debug", "Error parsing BOSH request payload; %s", error);
-       if not request.sid then
-               request:send({ headers = default_headers, status = "400 Bad Request" });
-               return;
-       end
-       
-       local session = sessions[request.sid];
-       if error == "stream-error" then -- Remote stream error, we close normally
-               session:close();
-       else
-               session:close({ condition = "bad-format", text = "Error processing stream" });
-       end
-end
-
 local dead_sessions = {};
 function on_timer()
        -- log("debug", "Checking for requests soon to timeout...");