net.http.server: Properly handle persistent connections

[prosody.git] / plugins / mod_component.lua

diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index 98eaa6deffa95b9b22304e10e06f8cfc0812df69..16084a78a69b08f8bf79221f67bfdaec85fba69b 100644 (file)
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -18,6 +18,8 @@ local jid_split = require "util.jid".split;
 local new_xmpp_stream = require "util.xmppstream".new;
 local uuid_gen = require "util.uuid".generate;
 
+local core_process_stanza = prosody.core_process_stanza;
+
 
 local log = module._log;
 
@@ -43,7 +45,7 @@ function module.add_host(module)
        local function handle_component_auth(event)
                local session, stanza = event.origin, event.stanza;
                
-               if session.type ~= "component" then return; end
+               if session.type ~= "component_unauthed" then return; end
        
                if (not session.host) or #stanza.tags > 0 then
                        (session.log or log)("warn", "Invalid component handshake for host: %s", session.host);
@@ -76,6 +78,7 @@ function module.add_host(module)
                send = session.send;
                session.on_destroy = on_destroy;
                session.component_validate_from = module:get_option_boolean("validate_from_addresses", true);
+               session.type = "component";
                module:log("info", "External component successfully authenticated");
                session.send(st.stanza("handshake"));
        
@@ -90,6 +93,18 @@ function module.add_host(module)
                        stanza.attr.xmlns = nil;
                        send(stanza);
                else
+                       if stanza.name == "iq" and stanza.attr.type == "get" and stanza.attr.to == module.host then
+                               local query = stanza.tags[1];
+                               local node = query.attr.node;
+                               if query.name == "query" and query.attr.xmlns == "http://jabber.org/protocol/disco#info" and (not node or node == "") then
+                                       local name = module:get_option_string("name");
+                                       if name then
+                                               event.origin.send(st.reply(stanza):tag("query", { xmlns = "http://jabber.org/protocol/disco#info" })
+                                                       :tag("identity", { category = "component", type = "generic", name = module:get_option_string("name", "Prosody") }))
+                                               return true;
+                                       end
+                               end
+                       end
                        module:log("warn", "Component not connected, bouncing error for: %s", stanza:top_tag());
                        if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
                                event.origin.send(st.error_reply(stanza, "wait", "service-unavailable", "Component unavailable"));
@@ -123,7 +138,7 @@ local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
 
 function stream_callbacks.error(session, error, data, data2)
        if session.destroyed then return; end
-       module:log("warn", "Error processing component stream: "..tostring(error));
+       module:log("warn", "Error processing component stream: %s", tostring(error));
        if error == "no-stream" then
                session:close("invalid-namespace");
        elseif error == "parse-error" then
@@ -158,6 +173,7 @@ function stream_callbacks.streamopened(session, attr)
        session.streamid = uuid_gen();
        session.notopen = nil;
        -- Return stream header
+       session.send("<?xml version='1.0'?>");
        session.send(st.stanza("stream:stream", { xmlns=xmlns_component,
                        ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.host }):top_tag());
 end
@@ -167,8 +183,6 @@ function stream_callbacks.streamclosed(session)
        session:close();
 end
 
-local core_process_stanza = core_process_stanza;
-
 function stream_callbacks.handlestanza(session, stanza)
        -- Namespaces are icky.
        if not stanza.attr.xmlns and stanza.name == "handshake" then
@@ -207,7 +221,6 @@ local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
 local default_stream_attr = { ["xmlns:stream"] = "http://etherx.jabber.org/streams", xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
 local function session_close(session, reason)
        if session.destroyed then return; end
-       local log = session.log or log;
        if session.conn then
                if session.notopen then
                        session.send("<?xml version='1.0'?>");
@@ -244,7 +257,7 @@ end
 
 function listener.onconnect(conn)
        local _send = conn.write;
-       local session = { type = "component", conn = conn, send = function (data) return _send(conn, tostring(data)); end };
+       local session = { type = "component_unauthed", conn = conn, send = function (data) return _send(conn, tostring(data)); end };
 
        -- Logging functions --
        local conn_name = "jcp"..tostring(conn):match("[a-f0-9]+$");
@@ -294,8 +307,9 @@ function listener.ondisconnect(conn, err)
        end
 end
 
-module:add_item("net-provider", {
+module:provides("net", {
        name = "component";
+       private = true;
        listener = listener;
        default_port = 5347;
        multiplex = {