mod_legacyauth: Don't allow server-generated resource identifiers, as these are not...

[prosody.git] / plugins / mod_compression.lua

diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index c07edb057626ddb4dab320608f402646e5883632..f1cae7378e23019ae8b6063eb4a8aa9a6582cda7 100644 (file)
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -35,8 +35,15 @@ module:add_event_hook("stream-features",
 );
 
 -- TODO Support compression on S2S level too.
-module:add_handler("c2s_unauthed", "compress", xmlns_compression_protocol,
+module:add_handler({"c2s_unauthed", "c2s"}, "compress", xmlns_compression_protocol,
                function(session, stanza)
+                       -- 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: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
@@ -70,11 +77,11 @@ module:add_handler("c2s_unauthed", "compress", xmlns_compression_protocol,
                                                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");
+                                                               condition = "undefined-condition";
+                                                               text = compressed;
+                                                               extra = st.stanza("failure", {xmlns="http://jabber.org/protocol/compress"}):tag("processing-failed");
                                                        });
-                                                       module:log("error", compressed);
+                                                       module:log("warn", compressed);
                                                        return;
                                                end
                                                old_send(compressed);
@@ -87,11 +94,11 @@ module:add_handler("c2s_unauthed", "compress", xmlns_compression_protocol,
                                                        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");
+                                                                       condition = "undefined-condition";
+                                                                       text = decompressed;
+                                                                       extra = st.stanza("failure", {xmlns="http://jabber.org/protocol/compress"}):tag("processing-failed");
                                                                });
-                                                               module:log("error", decompressed);
+                                                               module:log("warn", decompressed);
                                                                return;
                                                        end
                                                        old_data(conn, decompressed);