mod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways mean encry...

[prosody.git] / plugins / mod_compression.lua

diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index 82403016d9e936c47503a18e21ca863f5dede10d..f44e8a6d6ac80257f5a8d5e2cb696f0831eb9cd8 100644 (file)
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2009 Tobias Markmann
--- 
+-- Copyright (C) 2009-2012 Tobias Markmann
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -16,12 +16,8 @@ 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
-if compression_level == nil then compression_level = 9 end;
-
+local compression_level = module:get_option_number("compression_level", 7);
 
-compression_level = tonumber(compression_level);
 if not compression_level or compression_level < 1 or compression_level > 9 then
        module:log("warn", "Invalid compression level in config: %s", tostring(compression_level));
        module:log("warn", "Module loading aborted. Compression won't be available.");
@@ -30,7 +26,7 @@ end
 
 module:hook("stream-features", function(event)
        local origin, features = event.origin, event.features;
-       if not origin.compressed then
+       if not origin.compressed and (origin.type == "c2s" or origin.type == "s2sin" or origin.type == "s2sout") then
                -- FIXME only advertise compression support when TLS layer has no compression enabled
                features:add_child(compression_stream_feature);
        end
@@ -39,7 +35,7 @@ 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
+       if not origin.compressed and (origin.type == "c2s" or origin.type == "s2sin" or origin.type == "s2sout") then
                features:add_child(compression_stream_feature);
        end
 end);
@@ -47,7 +43,7 @@ end);
 -- Hook to activate compression if remote server supports it.
 module:hook_stanza(xmlns_stream, "features",
                function (session, stanza)
-                       if not session.compressed then
+                       if not session.compressed and (session.type == "c2s" or session.type == "s2sin" or session.type == "s2sout") then
                                -- does remote server support compression?
                                local comp_st = stanza:child_with_name("compression");
                                if comp_st then
@@ -107,7 +103,7 @@ local function setup_compression(session, deflate_stream)
                        return;
                end
                return compressed;
-       end);   
+       end);
 end
 
 -- setup decompression for a stream
@@ -129,26 +125,23 @@ end
 
 module:hook("stanza/http://jabber.org/protocol/compress:compressed", function(event)
        local session = event.origin;
-       
+
        if session.type == "s2sout_unauthed" or session.type == "s2sout" then
                session.log("debug", "Activating compression...")
                -- create deflate and inflate streams
                local deflate_stream = get_deflate_stream(session);
                if not deflate_stream then return true; end
-               
+
                local inflate_stream = get_inflate_stream(session);
                if not inflate_stream then return true; end
-               
+
                -- setup compression for session.w
                setup_compression(session, deflate_stream);
-                       
+
                -- setup decompression for session.data
                setup_decompression(session, inflate_stream);
                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:open_stream(session.from_host, session.to_host);
                session.compressed = true;
                return true;
        end
@@ -165,29 +158,29 @@ module:hook("stanza/http://jabber.org/protocol/compress:compress", function(even
                        session.log("debug", "Client tried to establish another compression layer.");
                        return true;
                end
-               
+
                -- checking if the compression method is supported
                local method = stanza:child_with_name("method");
                method = method and (method[1] or "");
                if method == "zlib" then
                        session.log("debug", "zlib compression enabled.");
-                       
+
                        -- create deflate and inflate streams
                        local deflate_stream = get_deflate_stream(session);
                        if not deflate_stream then return true; end
-                       
+
                        local inflate_stream = get_inflate_stream(session);
                        if not inflate_stream then return true; 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);
-                               
+
                        -- setup decompression for session.data
                        setup_decompression(session, inflate_stream);
-                       
+
                        session.compressed = true;
                elseif method then
                        session.log("debug", "%s compression selected, but we don't support it.", tostring(method));