Software /
code /
prosody
Annotate
plugins/mod_compression.lua @ 3135:f29a297471e3
util.filters: Don't traceback when trying to remove a filter from an uninitialized object
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Wed, 02 Jun 2010 12:24:07 +0100 |
parent | 3127:94639081f327 |
child | 3148:a83a995fe5db |
rev | line source |
---|---|
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
1 -- Prosody IM |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
2 -- Copyright (C) 2009 Tobias Markmann |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
3 -- |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
4 -- This project is MIT/X11 licensed. Please see the |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
5 -- COPYING file in the source package for more information. |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
6 -- |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
7 |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
8 local st = require "util.stanza"; |
1671
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
9 local zlib = require "zlib"; |
1678
79eb903d0e67
Using pcall to make save the rest from zlib fails. Emit errors on those fails.
Tobias Markmann <tm@ayena.de>
parents:
1677
diff
changeset
|
10 local pcall = pcall; |
2882
4e72048d4a24
mod_compression: Fixed various possible tracebacks in logging.
Waqas Hussain <waqas20@gmail.com>
parents:
2279
diff
changeset
|
11 local tostring = tostring; |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
12 |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
13 local xmlns_compression_feature = "http://jabber.org/features/compress" |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
14 local xmlns_compression_protocol = "http://jabber.org/protocol/compress" |
2280
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
15 local xmlns_stream = "http://etherx.jabber.org/streams"; |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
16 local compression_stream_feature = st.stanza("compression", {xmlns=xmlns_compression_feature}):tag("method"):text("zlib"):up(); |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
17 |
1676 | 18 local compression_level = module:get_option("compression_level"); |
19 -- if not defined assume admin wants best compression | |
20 if compression_level == nil then compression_level = 9 end; | |
21 | |
2279 | 22 |
1676 | 23 compression_level = tonumber(compression_level); |
24 if not compression_level or compression_level < 1 or compression_level > 9 then | |
25 module:log("warn", "Invalid compression level in config: %s", tostring(compression_level)); | |
26 module:log("warn", "Module loading aborted. Compression won't be available."); | |
27 return; | |
28 end | |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
29 |
2609
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
30 module:hook("stream-features", function(event) |
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
31 local origin, features = event.origin, event.features; |
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
32 if not origin.compressed then |
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
33 -- FIXME only advertise compression support when TLS layer has no compression enabled |
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
34 features:add_child(compression_stream_feature); |
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
35 end |
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
36 end); |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
37 |
2609
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
38 module:hook("s2s-stream-features", function(event) |
2613
afa20941e098
s2smanager, mod_compression, mod_tls: Changed event.session to event.origin for s2s-stream-features event for consistency.
Waqas Hussain <waqas20@gmail.com>
parents:
2609
diff
changeset
|
39 local origin, features = event.origin, event.features; |
2609
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
40 -- FIXME only advertise compression support when TLS layer has no compression enabled |
2613
afa20941e098
s2smanager, mod_compression, mod_tls: Changed event.session to event.origin for s2s-stream-features event for consistency.
Waqas Hussain <waqas20@gmail.com>
parents:
2609
diff
changeset
|
41 if not origin.compressed then |
2609
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
42 features:add_child(compression_stream_feature); |
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
43 end |
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
44 end); |
2280
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
45 |
2291
c6bed51c6733
mod_compression: Some comment clean up.
Tobias Markmann <tm@ayena.de>
parents:
2289
diff
changeset
|
46 -- Hook to activate compression if remote server supports it. |
2280
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
47 module:hook_stanza(xmlns_stream, "features", |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
48 function (session, stanza) |
1673
5f81cd6d4a92
Remove space at the end of a line.
Tobias Markmann <tm@ayena.de>
parents:
1672
diff
changeset
|
49 if not session.compressed then |
2280
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
50 -- does remote server support compression? |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
51 local comp_st = stanza:child_with_name("compression"); |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
52 if comp_st then |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
53 -- do we support the mechanism |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
54 for a in comp_st:children() do |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
55 local algorithm = a[1] |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
56 if algorithm == "zlib" then |
2282
6f54dac3ec2d
mod_compression: Prepare activating of compression on s2s.
Tobias Markmann <tm@ayena.de>
parents:
2280
diff
changeset
|
57 session.sends2s(st.stanza("compress", {xmlns=xmlns_compression_protocol}):tag("method"):text("zlib")) |
2280
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
58 session.log("info", "Enabled compression using zlib.") |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
59 return true; |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
60 end |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
61 end |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
62 session.log("debug", "Remote server supports no compression algorithm we support.") |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
63 end |
1672
614623f393c6
Add FIXME to remember TLS compression detection.
Tobias Markmann <tm@ayena.de>
parents:
1671
diff
changeset
|
64 end |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
65 end |
2280
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
66 , 250); |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
67 |
2285
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
68 |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
69 -- returns either nil or a fully functional ready to use inflate stream |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
70 local function get_deflate_stream(session) |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
71 local status, deflate_stream = pcall(zlib.deflate, compression_level); |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
72 if status == false then |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
73 local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("setup-failed"); |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
74 (session.sends2s or session.send)(error_st); |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
75 session.log("error", "Failed to create zlib.deflate filter."); |
2887
765e7070d0a8
Merge with 0.6 (into 0.7, namely mod_compression fixes)
Matthew Wild <mwild1@gmail.com>
diff
changeset
|
76 module:log("error", "%s", tostring(deflate_stream)); |
2285
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
77 return |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
78 end |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
79 return deflate_stream |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
80 end |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
81 |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
82 -- returns either nil or a fully functional ready to use inflate stream |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
83 local function get_inflate_stream(session) |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
84 local status, inflate_stream = pcall(zlib.inflate); |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
85 if status == false then |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
86 local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("setup-failed"); |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
87 (session.sends2s or session.send)(error_st); |
2887
765e7070d0a8
Merge with 0.6 (into 0.7, namely mod_compression fixes)
Matthew Wild <mwild1@gmail.com>
diff
changeset
|
88 session.log("error", "Failed to create zlib.inflate filter."); |
765e7070d0a8
Merge with 0.6 (into 0.7, namely mod_compression fixes)
Matthew Wild <mwild1@gmail.com>
diff
changeset
|
89 module:log("error", "%s", tostring(inflate_stream)); |
2285
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
90 return |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
91 end |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
92 return inflate_stream |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
93 end |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
94 |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
95 -- setup compression for a stream |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
96 local function setup_compression(session, deflate_stream) |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
97 local old_send = (session.sends2s or session.send); |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
98 |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
99 local new_send = function(t) |
2286
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
100 --TODO: Better code injection in the sending process |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
101 session.log(t) |
2285
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
102 local status, compressed, eof = pcall(deflate_stream, tostring(t), 'sync'); |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
103 if status == false then |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
104 session:close({ |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
105 condition = "undefined-condition"; |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
106 text = compressed; |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
107 extra = st.stanza("failure", {xmlns="http://jabber.org/protocol/compress"}):tag("processing-failed"); |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
108 }); |
2887
765e7070d0a8
Merge with 0.6 (into 0.7, namely mod_compression fixes)
Matthew Wild <mwild1@gmail.com>
diff
changeset
|
109 module:log("warn", "%s", tostring(compressed)); |
2285
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
110 return; |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
111 end |
2286
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
112 session.conn:write(compressed); |
2285
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
113 end; |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
114 |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
115 if session.sends2s then session.sends2s = new_send |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
116 elseif session.send then session.send = new_send end |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
117 end |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
118 |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
119 -- setup decompression for a stream |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
120 local function setup_decompression(session, inflate_stream) |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
121 local old_data = session.data |
3127
94639081f327
mod_compression: Update for new session.data() syntax, fixes invalid XML errors after compression negotiation (thanks hg bisect)
Matthew Wild <mwild1@gmail.com>
parents:
2892
diff
changeset
|
122 session.data = function(data) |
2285
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
123 local status, decompressed, eof = pcall(inflate_stream, data); |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
124 if status == false then |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
125 session:close({ |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
126 condition = "undefined-condition"; |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
127 text = decompressed; |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
128 extra = st.stanza("failure", {xmlns="http://jabber.org/protocol/compress"}):tag("processing-failed"); |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
129 }); |
2887
765e7070d0a8
Merge with 0.6 (into 0.7, namely mod_compression fixes)
Matthew Wild <mwild1@gmail.com>
diff
changeset
|
130 module:log("warn", "%s", tostring(decompressed)); |
2285
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
131 return; |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
132 end |
3127
94639081f327
mod_compression: Update for new session.data() syntax, fixes invalid XML errors after compression negotiation (thanks hg bisect)
Matthew Wild <mwild1@gmail.com>
parents:
2892
diff
changeset
|
133 old_data(decompressed); |
2285
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
134 end; |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
135 end |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
136 |
2282
6f54dac3ec2d
mod_compression: Prepare activating of compression on s2s.
Tobias Markmann <tm@ayena.de>
parents:
2280
diff
changeset
|
137 module:add_handler({"s2sout_unauthed", "s2sout"}, "compressed", xmlns_compression_protocol, |
6f54dac3ec2d
mod_compression: Prepare activating of compression on s2s.
Tobias Markmann <tm@ayena.de>
parents:
2280
diff
changeset
|
138 function(session ,stanza) |
6f54dac3ec2d
mod_compression: Prepare activating of compression on s2s.
Tobias Markmann <tm@ayena.de>
parents:
2280
diff
changeset
|
139 session.log("debug", "Activating compression...") |
2286
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
140 -- create deflate and inflate streams |
2292
9c5941198719
mod_compression: Declaring the de-/compression pipes as local.
Tobias Markmann <tm@ayena.de>
parents:
2291
diff
changeset
|
141 local deflate_stream = get_deflate_stream(session); |
2286
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
142 if not deflate_stream then return end |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
143 |
2292
9c5941198719
mod_compression: Declaring the de-/compression pipes as local.
Tobias Markmann <tm@ayena.de>
parents:
2291
diff
changeset
|
144 local inflate_stream = get_inflate_stream(session); |
2286
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
145 if not inflate_stream then return end |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
146 |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
147 -- setup compression for session.w |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
148 setup_compression(session, deflate_stream); |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
149 |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
150 -- setup decompression for session.data |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
151 setup_decompression(session, inflate_stream); |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
152 local session_reset_stream = session.reset_stream; |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
153 session.reset_stream = function(session) |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
154 session_reset_stream(session); |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
155 setup_decompression(session, inflate_stream); |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
156 return true; |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
157 end; |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
158 session:reset_stream(); |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
159 local default_stream_attr = {xmlns = "jabber:server", ["xmlns:stream"] = "http://etherx.jabber.org/streams", |
2288
3c17fc919f7b
mod_compression: Define db (dialback) namespace in stream header.
Tobias Markmann <tm@ayena.de>
parents:
2286
diff
changeset
|
160 ["xmlns:db"] = 'jabber:server:dialback', version = "1.0", to = session.to_host, from = session.from_host}; |
2286
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
161 session.sends2s("<?xml version='1.0'?>"); |
2293
abd28ed5d8b0
mod_compression: Removing trailing whitespace.
Tobias Markmann <tm@ayena.de>
parents:
2292
diff
changeset
|
162 session.sends2s(st.stanza("stream:stream", default_stream_attr):top_tag()); |
2286
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
163 session.compressed = true; |
2282
6f54dac3ec2d
mod_compression: Prepare activating of compression on s2s.
Tobias Markmann <tm@ayena.de>
parents:
2280
diff
changeset
|
164 end |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
165 ); |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
166 |
2280
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
167 module:add_handler({"c2s_unauthed", "c2s", "s2sin_unauthed", "s2sin"}, "compress", xmlns_compression_protocol, |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
168 function(session, stanza) |
1719
cf103398e643
Don't allow double compression.
Tobias Markmann <tm@ayena.de>
parents:
1718
diff
changeset
|
169 -- fail if we are already compressed |
cf103398e643
Don't allow double compression.
Tobias Markmann <tm@ayena.de>
parents:
1718
diff
changeset
|
170 if session.compressed then |
2886
3baee526d714
mod_compression: Return <setup-failed/> instead of <unsupported-method/> where applicable.
Waqas Hussain <waqas20@gmail.com>
parents:
2885
diff
changeset
|
171 local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("setup-failed"); |
2286
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
172 (session.sends2s or session.send)(error_st); |
2890
6273d4672cb4
mod_compression: Improved and lowered log level of some logged messages.
Waqas Hussain <waqas20@gmail.com>
parents:
2886
diff
changeset
|
173 session.log("debug", "Client tried to establish another compression layer."); |
2884
6807f5fa0eb4
mod_compression: Don't succeed after indicating a failure.
Waqas Hussain <waqas20@gmail.com>
parents:
2883
diff
changeset
|
174 return; |
1719
cf103398e643
Don't allow double compression.
Tobias Markmann <tm@ayena.de>
parents:
1718
diff
changeset
|
175 end |
cf103398e643
Don't allow double compression.
Tobias Markmann <tm@ayena.de>
parents:
1718
diff
changeset
|
176 |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
177 -- checking if the compression method is supported |
2885
ae72c0dd6f1f
mod_compression: More robust stanza processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2884
diff
changeset
|
178 local method = stanza:child_with_name("method"); |
2886
3baee526d714
mod_compression: Return <setup-failed/> instead of <unsupported-method/> where applicable.
Waqas Hussain <waqas20@gmail.com>
parents:
2885
diff
changeset
|
179 method = method and (method[1] or ""); |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
180 if method == "zlib" then |
2892 | 181 session.log("debug", "zlib compression enabled."); |
1671
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
182 |
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
183 -- create deflate and inflate streams |
2292
9c5941198719
mod_compression: Declaring the de-/compression pipes as local.
Tobias Markmann <tm@ayena.de>
parents:
2291
diff
changeset
|
184 local deflate_stream = get_deflate_stream(session); |
2285
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
185 if not deflate_stream then return end |
1671
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
186 |
2292
9c5941198719
mod_compression: Declaring the de-/compression pipes as local.
Tobias Markmann <tm@ayena.de>
parents:
2291
diff
changeset
|
187 local inflate_stream = get_inflate_stream(session); |
2285
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
188 if not inflate_stream then return end |
1671
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
189 |
2286
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
190 (session.sends2s or session.send)(st.stanza("compressed", {xmlns=xmlns_compression_protocol})); |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
191 session:reset_stream(); |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2285
diff
changeset
|
192 |
1671
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
193 -- setup compression for session.w |
2285
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
194 setup_compression(session, deflate_stream); |
1671
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
195 |
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
196 -- setup decompression for session.data |
2285
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
197 setup_decompression(session, inflate_stream); |
1671
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
198 |
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
199 local session_reset_stream = session.reset_stream; |
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
200 session.reset_stream = function(session) |
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
201 session_reset_stream(session); |
2285
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
202 setup_decompression(session, inflate_stream); |
1671
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
203 return true; |
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
204 end; |
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
205 session.compressed = true; |
2886
3baee526d714
mod_compression: Return <setup-failed/> instead of <unsupported-method/> where applicable.
Waqas Hussain <waqas20@gmail.com>
parents:
2885
diff
changeset
|
206 elseif method then |
2890
6273d4672cb4
mod_compression: Improved and lowered log level of some logged messages.
Waqas Hussain <waqas20@gmail.com>
parents:
2886
diff
changeset
|
207 session.log("debug", "%s compression selected, but we don't support it.", tostring(method)); |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
208 local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("unsupported-method"); |
2280
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
209 (session.sends2s or session.send)(error_st); |
2886
3baee526d714
mod_compression: Return <setup-failed/> instead of <unsupported-method/> where applicable.
Waqas Hussain <waqas20@gmail.com>
parents:
2885
diff
changeset
|
210 else |
2887
765e7070d0a8
Merge with 0.6 (into 0.7, namely mod_compression fixes)
Matthew Wild <mwild1@gmail.com>
diff
changeset
|
211 (session.sends2s or session.send)(st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("setup-failed")); |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
212 end |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
213 end |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
214 ); |
2280
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2279
diff
changeset
|
215 |