mod_posix: Some (perhaps temporary) changes to re-lock the pidfile after truncating...

[prosody.git] / plugins / mod_compression.lua

diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index 3ef5a1f3a1379ae61da4bd256b3bb60911c68c80..d890931fe8bce1f5e2001208efc3932b31dadb9e 100644 (file)
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -14,6 +14,7 @@ local xmlns_compression_feature = "http://jabber.org/features/compress"
 local xmlns_compression_protocol = "http://jabber.org/protocol/compress"
 local xmlns_stream = "http://etherx.jabber.org/streams";
 local compression_stream_feature = st.stanza("compression", {xmlns=xmlns_compression_feature}):tag("method"):text("zlib"):up();
+local add_filter = require "util.filters".add_filter;
 
 local compression_level = module:get_option("compression_level");
 -- if not defined assume admin wants best compression
@@ -55,7 +56,7 @@ module:hook_stanza(xmlns_stream, "features",
                                                local algorithm = a[1]
                                                if algorithm == "zlib" then
                                                        session.sends2s(st.stanza("compress", {xmlns=xmlns_compression_protocol}):tag("method"):text("zlib"))
-                                                       session.log("info", "Enabled compression using zlib.")
+                                                       session.log("debug", "Enabled compression using zlib.")
                                                        return true;
                                                end
                                        end
@@ -94,44 +95,36 @@ end
 
 -- setup compression for a stream
 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({
-                                       condition = "undefined-condition";
-                                       text = compressed;
-                                       extra = st.stanza("failure", {xmlns="http://jabber.org/protocol/compress"}):tag("processing-failed");
-                               });
-                               module:log("warn", "%s", tostring(compressed));
-                               return;
-                       end
-                       session.conn:write(compressed);
-               end;
-       
-       if session.sends2s then session.sends2s = new_send
-       elseif session.send then session.send = new_send end
+       add_filter(session, "bytes/out", function(t)
+               local status, compressed, eof = pcall(deflate_stream, tostring(t), 'sync');
+               if status == false then
+                       module:log("warn", "%s", tostring(compressed));
+                       session:close({
+                               condition = "undefined-condition";
+                               text = compressed;
+                               extra = st.stanza("failure", {xmlns="http://jabber.org/protocol/compress"}):tag("processing-failed");
+                       });
+                       return;
+               end
+               return compressed;
+       end);   
 end
 
 -- setup decompression for a stream
 local function setup_decompression(session, inflate_stream)
-       local old_data = session.data
-       session.data = function(conn, data)
-                       local status, decompressed, eof = pcall(inflate_stream, data);
-                       if status == false then
-                               session:close({
-                                       condition = "undefined-condition";
-                                       text = decompressed;
-                                       extra = st.stanza("failure", {xmlns="http://jabber.org/protocol/compress"}):tag("processing-failed");
-                               });
-                               module:log("warn", "%s", tostring(decompressed));
-                               return;
-                       end
-                       old_data(conn, decompressed);
-               end;
+       add_filter(session, "bytes/in", function(data)
+               local status, decompressed, eof = pcall(inflate_stream, data);
+               if status == false then
+                       module:log("warn", "%s", tostring(decompressed));
+                       session:close({
+                               condition = "undefined-condition";
+                               text = decompressed;
+                               extra = st.stanza("failure", {xmlns="http://jabber.org/protocol/compress"}):tag("processing-failed");
+                       });
+                       return;
+               end
+               return decompressed;
+       end);
 end
 
 module:add_handler({"s2sout_unauthed", "s2sout"}, "compressed", xmlns_compression_protocol, 
@@ -149,12 +142,6 @@ module:add_handler({"s2sout_unauthed", "s2sout"}, "compressed", xmlns_compressio
                                
                        -- 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};
@@ -170,7 +157,7 @@ module:add_handler({"c2s_unauthed", "c2s", "s2sin_unauthed", "s2sin"}, "compress
                        if session.compressed then
                                local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("setup-failed");
                                (session.sends2s or session.send)(error_st);
-                               session.log("warn", "Tried to establish another compression layer.");
+                               session.log("debug", "Client tried to establish another compression layer.");
                                return;
                        end
                        
@@ -178,7 +165,7 @@ module:add_handler({"c2s_unauthed", "c2s", "s2sin_unauthed", "s2sin"}, "compress
                        local method = stanza:child_with_name("method");
                        method = method and (method[1] or "");
                        if method == "zlib" then
-                               session.log("debug", "%s compression selected.", tostring(method));
+                               session.log("debug", "zlib compression enabled.");
                                
                                -- create deflate and inflate streams
                                local deflate_stream = get_deflate_stream(session);
@@ -196,15 +183,9 @@ module:add_handler({"c2s_unauthed", "c2s", "s2sin_unauthed", "s2sin"}, "compress
                                -- 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.compressed = true;
                        elseif method then
-                               session.log("info", "%s compression selected, but we don't support it.", tostring(method));
+                               session.log("debug", "%s compression selected, but we don't support it.", tostring(method));
                                local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("unsupported-method");
                                (session.sends2s or session.send)(error_st);
                        else