muc.lib: return feature-not-implemented when a foregoing discovery node is specified...

[prosody.git] / plugins / mod_component.lua

diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index 5b1eefc767537797769866a9e8cb6657a3745299..738124cccf54678c2e207a6ccf4a18edfa23f193 100644 (file)
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -43,7 +43,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);
@@ -69,12 +69,14 @@ function module.add_host(module)
                if env.connected then
                        module:log("error", "Second component attempted to connect, denying connection");
                        session:close{ condition = "conflict", text = "Component already connected" };
+                       return true;
                end
                
                env.connected = true;
                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"));
        
@@ -157,6 +159,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
@@ -206,7 +209,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'?>");
@@ -243,7 +245,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]+$");