s2smanager, mod_compression, mod_tls: Changed event.session to event.origin for s2s...

[prosody.git] / plugins / mod_compression.lua

diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index b7e4cd8cda79718e3668a76f084650dcbc4c1c4e..4b1fa79f12f24b9b1aa347912473bc190dac4149 100644 (file)
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -25,28 +25,26 @@ if not compression_level or compression_level < 1 or compression_level > 9 then
        return;
 end
 
-module:add_event_hook("stream-features",
-               function (session, features)
-                       if not session.compressed then
-                               -- FIXME only advertise compression support when TLS layer has no compression enabled
-                               features:add_child(compression_stream_feature);
-                       end
-               end
-);
+module:hook("stream-features", function(event)
+       local origin, features = event.origin, event.features;
+       if not origin.compressed then
+               -- FIXME only advertise compression support when TLS layer has no compression enabled
+               features:add_child(compression_stream_feature);
+       end
+end);
 
-module:hook("s2s-stream-features",
-               function (data)
-                       local session, features = data.session, data.features;
-                       -- FIXME only advertise compression support when TLS layer has no compression enabled
-                       features:add_child(compression_stream_feature);
-               end
-);
+module:hook("s2s-stream-features", function(event)
+       local origin, features = event.origin, event.features;
+       -- FIXME only advertise compression support when TLS layer has no compression enabled
+       if not origin.compressed then 
+               features:add_child(compression_stream_feature);
+       end
+end);
 
--- S2Sout handling aka the client perspective in the S2S connection
+-- Hook to activate compression if remote server supports it.
 module:hook_stanza(xmlns_stream, "features",
                function (session, stanza)
                        if not session.compressed then
-                               module:log("debug", "FEATURES: "..stanza:pretty_print())
                                -- does remote server support compression?
                                local comp_st = stanza:child_with_name("compression");
                                if comp_st then
@@ -97,6 +95,8 @@ local function setup_compression(session, deflate_stream)
        local old_send = (session.sends2s or session.send);
        
        local new_send = function(t)
+                       --TODO: Better code injection in the sending process
+                       session.log(t)
                        local status, compressed, eof = pcall(deflate_stream, tostring(t), 'sync');
                        if status == false then
                                session:close({
@@ -107,7 +107,7 @@ local function setup_compression(session, deflate_stream)
                                module:log("warn", compressed);
                                return;
                        end
-                       old_send(compressed);
+                       session.conn:write(compressed);
                end;
        
        if session.sends2s then session.sends2s = new_send
@@ -132,10 +132,33 @@ local function setup_decompression(session, inflate_stream)
                end;
 end
 
--- TODO Support compression on S2S level too.
 module:add_handler({"s2sout_unauthed", "s2sout"}, "compressed", xmlns_compression_protocol, 
                function(session ,stanza)
                        session.log("debug", "Activating compression...")
+                       -- create deflate and inflate streams
+                       local deflate_stream = get_deflate_stream(session);
+                       if not deflate_stream then return end
+                       
+                       local inflate_stream = get_inflate_stream(session);
+                       if not inflate_stream then return end
+                       
+                       -- setup compression for session.w
+                       setup_compression(session, deflate_stream);
+                               
+                       -- setup decompression for session.data
+                       setup_decompression(session, inflate_stream);
+                       local session_reset_stream = session.reset_stream;
+                       session.reset_stream = function(session)
+                                       session_reset_stream(session);
+                                       setup_decompression(session, inflate_stream);
+                                       return true;
+                               end;
+                       session:reset_stream();
+                       local default_stream_attr = {xmlns = "jabber:server", ["xmlns:stream"] = "http://etherx.jabber.org/streams",
+                                                                               ["xmlns:db"] = 'jabber:server:dialback', version = "1.0", to = session.to_host, from = session.from_host};
+                       session.sends2s("<?xml version='1.0'?>");
+                       session.sends2s(st.stanza("stream:stream", default_stream_attr):top_tag());
+                       session.compressed = true;
                end
 );
 
@@ -144,24 +167,25 @@ module:add_handler({"c2s_unauthed", "c2s", "s2sin_unauthed", "s2sin"}, "compress
                        -- fail if we are already compressed
                        if session.compressed then
                                local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("unsupported-method");
-                               session.send(error_st);
+                               (session.sends2s or session.send)(error_st);
                                session.log("warn", "Tried to establish another compression layer.");
                        end
                        
                        -- checking if the compression method is supported
                        local method = stanza:child_with_name("method")[1];
                        if method == "zlib" then
-                               session.log("info", method.." compression selected.");
-                               (session.sends2s or session.send)(st.stanza("compressed", {xmlns=xmlns_compression_protocol}));
-                               session:reset_stream();
+                               session.log("debug", method.." compression selected.");
                                
                                -- create deflate and inflate streams
-                               deflate_stream = get_deflate_stream(session);
+                               local deflate_stream = get_deflate_stream(session);
                                if not deflate_stream then return end
                                
-                               inflate_stream = get_inflate_stream(session);
+                               local inflate_stream = get_inflate_stream(session);
                                if not inflate_stream then return end
                                
+                               (session.sends2s or session.send)(st.stanza("compressed", {xmlns=xmlns_compression_protocol}));
+                               session:reset_stream();
+                               
                                -- setup compression for session.w
                                setup_compression(session, deflate_stream);
                                        
@@ -176,7 +200,7 @@ module:add_handler({"c2s_unauthed", "c2s", "s2sin_unauthed", "s2sin"}, "compress
                                        end;
                                session.compressed = true;
                        else
-                               session.log("info", method.." compression selected. But we don't support it.");
+                               session.log("warn", method.." compression selected. But we don't support it.");
                                local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("unsupported-method");
                                (session.sends2s or session.send)(error_st);
                        end