net.http.server: Properly handle persistent connections

[prosody.git] / plugins / mod_dialback.lua

diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index c239250225c5cb5b86f59f5e4fd29464e9e30f5b..b2f846034adb46b7005cac817de12db569e43801 100644 (file)
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -6,8 +6,6 @@
 -- COPYING file in the source package for more information.
 --
 
-local format = string.format;
-
 local hosts = _G.hosts;
 local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
 
@@ -28,7 +26,7 @@ end
 function initiate_dialback(session)
        -- generate dialback key
        session.dialback_key = generate_dialback(session.streamid, session.to_host, session.from_host);
-       session.sends2s(format("<db:result from='%s' to='%s'>%s</db:result>", session.from_host, session.to_host, session.dialback_key));
+       session.sends2s(st.stanza("db:result", { from = session.from_host, to = session.to_host }):text(session.dialback_key));
        session.log("info", "sent dialback key on outgoing s2s stream");
 end
 
@@ -43,6 +41,11 @@ module:hook("stanza/jabber:server:dialback:verify", function(event)
                -- We are being asked to verify the key, to ensure it was generated by us
                origin.log("debug", "verifying that dialback key is ours...");
                local attr = stanza.attr;
+               if attr.type then
+                       module:log("warn", "Ignoring incoming session from %s claiming a dialback key for %s is %s",
+                               origin.from_host or "(unknown)", attr.from or "(unknown)", attr.type);
+                       return true;
+               end
                -- COMPAT: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34
                --if attr.from ~= origin.to_host then error("invalid-from"); end
                local type;
@@ -65,37 +68,30 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
                -- he wants to be identified through dialback
                -- We need to check the key with the Authoritative server
                local attr = stanza.attr;
-               local to, from = attr.to, attr.from;
-               
-               origin.hosts[from] = { dialback_key = stanza[1] };
+               local to, from = nameprep(attr.to), nameprep(attr.from);
                
                if not hosts[to] then
                        -- Not a host that we serve
                        origin.log("info", "%s tried to connect to %s, which we don't serve", from, to);
                        origin:close("host-unknown");
                        return true;
+               elseif not from then
+                       origin:close("improper-addressing");
                end
                
+               origin.hosts[from] = { dialback_key = stanza[1] };
+               
                dialback_requests[from.."/"..origin.streamid] = origin;
                
                -- COMPAT: ejabberd, gmail and perhaps others do not always set 'to' and 'from'
                -- on streams. We fill in the session's to/from here instead.
                if not origin.from_host then
-                       origin.from_host = nameprep(attr.from);
-                       if not origin.from_host then
-                               origin.log("debug", "We need to know where to connect but remote server blindly refuses to tell us and to comply to specs, closing connection.");
-                               origin:close("invalid-from");
-                       end
+                       origin.from_host = from;
                end
                if not origin.to_host then
-                       origin.to_host = nameprep(attr.to);
+                       origin.to_host = to;
                end
 
-               if not origin.from_host and not origin.to_host then
-                       origin.log("debug", "Improper addressing supplied, no to or from?");
-                       origin:close("improper-addressing");
-               end
-               
                origin.log("debug", "asking %s if key %s belongs to them", from, stanza[1]);
                module:fire_event("route/remote", {
                        from_host = to, to_host = from;
@@ -111,7 +107,6 @@ module:hook("stanza/jabber:server:dialback:verify", function(event)
        if origin.type == "s2sout_unauthed" or origin.type == "s2sout" then
                local attr = stanza.attr;
                local dialback_verifying = dialback_requests[attr.from.."/"..(attr.id or "")];
-               module:log("debug", tostring(dialback_verifying).." "..attr.from.." "..origin.to_host);
                if dialback_verifying and attr.from == origin.to_host then
                        local valid;
                        if attr.type == "valid" then
@@ -119,10 +114,10 @@ module:hook("stanza/jabber:server:dialback:verify", function(event)
                                valid = "valid";
                        else
                                -- Warn the original connection that is was not verified successfully
-                               log("warn", "authoritative server for "..(attr.from or "(unknown)").." denied the key");
+                               log("warn", "authoritative server for %s denied the key", attr.from or "(unknown)");
                                valid = "invalid";
                        end
-                       if not dialback_verifying.sends2s then
+                       if dialback_verifying.destroyed then
                                log("warn", "Incoming s2s session %s was closed in the meantime, so we can't notify it of the db result", tostring(dialback_verifying):match("%w+$"));
                        else
                                dialback_verifying.sends2s(