Tue, 22 Jun 2010 20:52:43 +0100
mod_auth_internal_hashed: Remove far too many instances of inline hex conversion using gsub, which was creating useless closures and what-not
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:
2277
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" |
2278
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
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(); |
3148
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
17 | local add_filter = require "util.filters".add_filter; |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
18 | |
1676 | 19 | local compression_level = module:get_option("compression_level"); |
20 | -- if not defined assume admin wants best compression | |
21 | if compression_level == nil then compression_level = 9 end; | |
22 | ||
2277 | 23 | |
1676 | 24 | compression_level = tonumber(compression_level); |
25 | if not compression_level or compression_level < 1 or compression_level > 9 then | |
26 | module:log("warn", "Invalid compression level in config: %s", tostring(compression_level)); | |
27 | module:log("warn", "Module loading aborted. Compression won't be available."); | |
28 | return; | |
29 | end | |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
30 | |
2609
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
31 | 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
|
32 | 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
|
33 | 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
|
34 | -- 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
|
35 | 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
|
36 | end |
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
37 | end); |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
38 | |
2609
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
39 | 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
|
40 | 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
|
41 | -- 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
|
42 | 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
|
43 | 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
|
44 | end |
2ee28cae530a
mod_compression: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2324
diff
changeset
|
45 | end); |
2278
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
46 | |
2289
c6bed51c6733
mod_compression: Some comment clean up.
Tobias Markmann <tm@ayena.de>
parents:
2287
diff
changeset
|
47 | -- Hook to activate compression if remote server supports it. |
2278
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
48 | module:hook_stanza(xmlns_stream, "features", |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
49 | function (session, stanza) |
1673
5f81cd6d4a92
Remove space at the end of a line.
Tobias Markmann <tm@ayena.de>
parents:
1672
diff
changeset
|
50 | if not session.compressed then |
2278
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
51 | -- does remote server support compression? |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
52 | local comp_st = stanza:child_with_name("compression"); |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
53 | if comp_st then |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
54 | -- do we support the mechanism |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
55 | for a in comp_st:children() do |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
56 | local algorithm = a[1] |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
57 | if algorithm == "zlib" then |
2280
6f54dac3ec2d
mod_compression: Prepare activating of compression on s2s.
Tobias Markmann <tm@ayena.de>
parents:
2278
diff
changeset
|
58 | session.sends2s(st.stanza("compress", {xmlns=xmlns_compression_protocol}):tag("method"):text("zlib")) |
2278
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
59 | session.log("info", "Enabled compression using zlib.") |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
60 | return true; |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
61 | end |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
62 | end |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
63 | 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:
2277
diff
changeset
|
64 | end |
1672
614623f393c6
Add FIXME to remember TLS compression detection.
Tobias Markmann <tm@ayena.de>
parents:
1671
diff
changeset
|
65 | end |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
66 | end |
2278
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
67 | , 250); |
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
68 | |
2283
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
69 | |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
70 | -- returns either nil or a fully functional ready to use inflate stream |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
71 | local function get_deflate_stream(session) |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
72 | local status, deflate_stream = pcall(zlib.deflate, compression_level); |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
73 | if status == false then |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
74 | 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:
2282
diff
changeset
|
75 | (session.sends2s or session.send)(error_st); |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
76 | 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
|
77 | module:log("error", "%s", tostring(deflate_stream)); |
2283
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
78 | return |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
79 | end |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
80 | return deflate_stream |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
81 | end |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
82 | |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
83 | -- returns either nil or a fully functional ready to use inflate stream |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
84 | local function get_inflate_stream(session) |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
85 | local status, inflate_stream = pcall(zlib.inflate); |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
86 | if status == false then |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
87 | 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:
2282
diff
changeset
|
88 | (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
|
89 | 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
|
90 | module:log("error", "%s", tostring(inflate_stream)); |
2283
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
91 | return |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
92 | end |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
93 | return inflate_stream |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
94 | end |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
95 | |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
96 | -- setup compression for a stream |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
97 | local function setup_compression(session, deflate_stream) |
3148
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
98 | add_filter(session, "bytes/out", function(t) |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
99 | local status, compressed, eof = pcall(deflate_stream, tostring(t), 'sync'); |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
100 | if status == false then |
3226
69e920d7c968
mod_compression: Move logging of compression/decompression errors to before the closing of the stream, to make logs a bit easier to follow
Matthew Wild <mwild1@gmail.com>
parents:
3223
diff
changeset
|
101 | module:log("warn", "%s", tostring(compressed)); |
3148
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
102 | session:close({ |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
103 | condition = "undefined-condition"; |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
104 | text = compressed; |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
105 | extra = st.stanza("failure", {xmlns="http://jabber.org/protocol/compress"}):tag("processing-failed"); |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
106 | }); |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
107 | return; |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
108 | end |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
109 | return compressed; |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
110 | end); |
2283
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
111 | end |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
112 | |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
113 | -- setup decompression for a stream |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
114 | local function setup_decompression(session, inflate_stream) |
3148
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
115 | add_filter(session, "bytes/in", function(data) |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
116 | local status, decompressed, eof = pcall(inflate_stream, data); |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
117 | if status == false then |
3226
69e920d7c968
mod_compression: Move logging of compression/decompression errors to before the closing of the stream, to make logs a bit easier to follow
Matthew Wild <mwild1@gmail.com>
parents:
3223
diff
changeset
|
118 | module:log("warn", "%s", tostring(decompressed)); |
3148
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
119 | session:close({ |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
120 | condition = "undefined-condition"; |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
121 | text = decompressed; |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
122 | extra = st.stanza("failure", {xmlns="http://jabber.org/protocol/compress"}):tag("processing-failed"); |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
123 | }); |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
124 | return; |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
125 | end |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
126 | return decompressed; |
a83a995fe5db
mod_compression: Use filters! \o/
Matthew Wild <mwild1@gmail.com>
parents:
3127
diff
changeset
|
127 | end); |
2283
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
128 | end |
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
129 | |
2280
6f54dac3ec2d
mod_compression: Prepare activating of compression on s2s.
Tobias Markmann <tm@ayena.de>
parents:
2278
diff
changeset
|
130 | 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:
2278
diff
changeset
|
131 | function(session ,stanza) |
6f54dac3ec2d
mod_compression: Prepare activating of compression on s2s.
Tobias Markmann <tm@ayena.de>
parents:
2278
diff
changeset
|
132 | session.log("debug", "Activating compression...") |
2284
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
133 | -- create deflate and inflate streams |
2290
9c5941198719
mod_compression: Declaring the de-/compression pipes as local.
Tobias Markmann <tm@ayena.de>
parents:
2289
diff
changeset
|
134 | local deflate_stream = get_deflate_stream(session); |
2284
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
135 | if not deflate_stream then return end |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
136 | |
2290
9c5941198719
mod_compression: Declaring the de-/compression pipes as local.
Tobias Markmann <tm@ayena.de>
parents:
2289
diff
changeset
|
137 | local inflate_stream = get_inflate_stream(session); |
2284
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
138 | if not inflate_stream then return end |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
139 | |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
140 | -- setup compression for session.w |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
141 | setup_compression(session, deflate_stream); |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
142 | |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
143 | -- setup decompression for session.data |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
144 | setup_decompression(session, inflate_stream); |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
145 | session:reset_stream(); |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
146 | local default_stream_attr = {xmlns = "jabber:server", ["xmlns:stream"] = "http://etherx.jabber.org/streams", |
2286
3c17fc919f7b
mod_compression: Define db (dialback) namespace in stream header.
Tobias Markmann <tm@ayena.de>
parents:
2284
diff
changeset
|
147 | ["xmlns:db"] = 'jabber:server:dialback', version = "1.0", to = session.to_host, from = session.from_host}; |
2284
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
148 | session.sends2s("<?xml version='1.0'?>"); |
2291
abd28ed5d8b0
mod_compression: Removing trailing whitespace.
Tobias Markmann <tm@ayena.de>
parents:
2290
diff
changeset
|
149 | session.sends2s(st.stanza("stream:stream", default_stream_attr):top_tag()); |
2284
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
150 | session.compressed = true; |
2280
6f54dac3ec2d
mod_compression: Prepare activating of compression on s2s.
Tobias Markmann <tm@ayena.de>
parents:
2278
diff
changeset
|
151 | end |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
152 | ); |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
153 | |
2278
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
154 | 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
|
155 | function(session, stanza) |
1719
cf103398e643
Don't allow double compression.
Tobias Markmann <tm@ayena.de>
parents:
1718
diff
changeset
|
156 | -- fail if we are already compressed |
cf103398e643
Don't allow double compression.
Tobias Markmann <tm@ayena.de>
parents:
1718
diff
changeset
|
157 | 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
|
158 | local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("setup-failed"); |
2284
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
159 | (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
|
160 | 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
|
161 | return; |
1719
cf103398e643
Don't allow double compression.
Tobias Markmann <tm@ayena.de>
parents:
1718
diff
changeset
|
162 | end |
cf103398e643
Don't allow double compression.
Tobias Markmann <tm@ayena.de>
parents:
1718
diff
changeset
|
163 | |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
164 | -- checking if the compression method is supported |
2885
ae72c0dd6f1f
mod_compression: More robust stanza processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2884
diff
changeset
|
165 | 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
|
166 | method = method and (method[1] or ""); |
1669
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
167 | if method == "zlib" then |
2892 | 168 | 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
|
169 | |
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
170 | -- create deflate and inflate streams |
2290
9c5941198719
mod_compression: Declaring the de-/compression pipes as local.
Tobias Markmann <tm@ayena.de>
parents:
2289
diff
changeset
|
171 | local deflate_stream = get_deflate_stream(session); |
2283
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
172 | 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
|
173 | |
2290
9c5941198719
mod_compression: Declaring the de-/compression pipes as local.
Tobias Markmann <tm@ayena.de>
parents:
2289
diff
changeset
|
174 | local inflate_stream = get_inflate_stream(session); |
2283
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
175 | 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
|
176 | |
2284
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
177 | (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:
2283
diff
changeset
|
178 | session:reset_stream(); |
e0b2d934f316
mod_compression: Enabeling compression for outgoing s2s streams.
Tobias Markmann <tm@ayena.de>
parents:
2283
diff
changeset
|
179 | |
1671
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
180 | -- setup compression for session.w |
2283
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
181 | 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
|
182 | |
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
183 | -- setup decompression for session.data |
2283
3dd7fdee9035
mod_compression: Some further refactoring.
Tobias Markmann <tm@ayena.de>
parents:
2282
diff
changeset
|
184 | 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
|
185 | |
d196ac213104
Actually inject de- and compression into the reading/writing functions.
Tobias Markmann <tm@ayena.de>
parents:
1670
diff
changeset
|
186 | 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
|
187 | 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
|
188 | 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
|
189 | local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("unsupported-method"); |
2278
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
190 | (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
|
191 | else |
2887
765e7070d0a8
Merge with 0.6 (into 0.7, namely mod_compression fixes)
Matthew Wild <mwild1@gmail.com>
diff
changeset
|
192 | (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
|
193 | end |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
194 | end |
b8eec163a823
Commit initial version of mod_compression.
Tobias Markmann <tm@ayena.de>
parents:
diff
changeset
|
195 | ); |
2278
0b0fe49e5251
Enable one way stream compression on s2s links.
Tobias Markmann <tm@ayena.de>
parents:
2277
diff
changeset
|
196 |