Mercurial > prosody-modules
annotate mod_websocket/mod_websocket.lua @ 842:32df4d13f178
mod_websocket: More robust frame handling
author | Florian Zeitz <florob@babelmonkeys.de> |
---|---|
date | Fri, 05 Oct 2012 16:57:34 +0200 |
parents | f568661c9d39 |
children | a0987c0e4e1d |
rev | line source |
---|---|
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
1 -- Prosody IM |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
2 -- Copyright (C) 2008-2010 Matthew Wild |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
3 -- Copyright (C) 2008-2010 Waqas Hussain |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
4 -- Copyright (C) 2012 Florian Zeitz |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
5 -- |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
6 -- This project is MIT/X11 licensed. Please see the |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
7 -- COPYING file in the source package for more information. |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
8 -- |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
9 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
10 module:set_global(); |
129 | 11 |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
12 local add_task = require "util.timer".add_task; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
13 local new_xmpp_stream = require "util.xmppstream".new; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
14 local nameprep = require "util.encodings".stringprep.nameprep; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
15 local sessionmanager = require "core.sessionmanager"; |
129 | 16 local st = require "util.stanza"; |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
17 local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
18 local uuid_generate = require "util.uuid".generate; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
19 local sha1 = require "util.hashes".sha1; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
20 local base64 = require "util.encodings".base64.encode; |
677
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
21 local band = require "bit".band; |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
22 local bxor = require "bit".bxor; |
129 | 23 |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
24 local xpcall, tostring, type = xpcall, tostring, type; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
25 local traceback = debug.traceback; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
26 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
27 local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams"; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
28 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
29 local log = module._log; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
30 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
31 local c2s_timeout = module:get_option_number("c2s_timeout"); |
839
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
32 local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5); |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
33 local opt_keepalives = module:get_option_boolean("tcp_keepalives", false); |
692
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
34 local self_closing_stream = module:get_option_boolean("websocket_self_closing_stream", true); |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
35 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
36 local sessions = module:shared("sessions"); |
839
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
37 local core_process_stanza = prosody.core_process_stanza; |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
38 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
39 local stream_callbacks = { default_ns = "jabber:client", handlestanza = core_process_stanza }; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
40 local listener = {}; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
41 |
677
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
42 -- Websocket helpers |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
43 local function parse_frame(frame) |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
44 local result = {}; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
45 local pos = 1; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
46 local length_bytes = 0; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
47 local counter = 0; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
48 local tmp_byte; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
49 |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
50 if #frame < 2 then return; end |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
51 |
677
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
52 tmp_byte = string.byte(frame, pos); |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
53 result.FIN = band(tmp_byte, 0x80) > 0; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
54 result.RSV1 = band(tmp_byte, 0x40) > 0; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
55 result.RSV2 = band(tmp_byte, 0x20) > 0; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
56 result.RSV3 = band(tmp_byte, 0x10) > 0; |
690
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
57 result.opcode = band(tmp_byte, 0x0F); |
677
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
58 |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
59 pos = pos + 1; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
60 tmp_byte = string.byte(frame, pos); |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
61 result.MASK = band(tmp_byte, 0x80) > 0; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
62 result.length = band(tmp_byte, 0x7F); |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
63 |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
64 if result.length == 126 then |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
65 length_bytes = 2; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
66 result.length = 0; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
67 elseif result.length == 127 then |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
68 length_bytes = 8; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
69 result.length = 0; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
70 end |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
71 |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
72 if #frame < (2 + length_bytes) then return; end |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
73 |
677
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
74 for i = 1, length_bytes do |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
75 pos = pos + 1; |
840
f568661c9d39
mod_websocket: Fix frame length calculation
Florian Zeitz <florob@babelmonkeys.de>
parents:
839
diff
changeset
|
76 result.length = result.length * 256 + string.byte(frame, pos); |
677
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
77 end |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
78 |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
79 if #frame < (2 + length_bytes + (result.MASK and 4 or 0) + result.length) then return; end |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
80 |
677
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
81 if result.MASK then |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
82 result.key = {string.byte(frame, pos+1), string.byte(frame, pos+2), |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
83 string.byte(frame, pos+3), string.byte(frame, pos+4)} |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
84 |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
85 pos = pos + 5; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
86 result.data = ""; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
87 for i = pos, pos + result.length - 1 do |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
88 result.data = result.data .. string.char(bxor(result.key[counter+1], string.byte(frame, i))); |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
89 counter = (counter + 1) % 4; |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
90 end |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
91 else |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
92 result.data = frame:sub(pos + 1, pos + result.length); |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
93 end |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
94 |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
95 return result, 2 + length_bytes + (result.MASK and 4 or 0) + result.length; |
677
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
96 end |
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
97 |
687
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
98 local function build_frame(desc) |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
99 local length; |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
100 local result = ""; |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
101 local data = desc.data or ""; |
687
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
102 |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
103 result = result .. string.char(0x80 * (desc.FIN and 1 or 0) + desc.opcode); |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
104 |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
105 length = #data; |
687
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
106 if length <= 125 then -- 7-bit length |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
107 result = result .. string.char(length); |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
108 elseif length <= 0xFFFF then -- 2-byte length |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
109 result = result .. string.char(126); |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
110 result = result .. string.char(length/0x100) .. string.char(length%0x100); |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
111 else -- 8-byte length |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
112 result = result .. string.char(127); |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
113 for i = 7, 0, -1 do |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
114 result = result .. string.char(( length / (2^(8*i)) ) % 0x100); |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
115 end |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
116 end |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
117 |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
118 result = result .. data; |
687
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
119 |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
120 return result; |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
121 end |
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
122 |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
123 --- Stream events handlers |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
124 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'}; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
125 local default_stream_attr = { ["xmlns:stream"] = "http://etherx.jabber.org/streams", xmlns = stream_callbacks.default_ns, version = "1.0", id = "" }; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
126 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
127 function stream_callbacks.streamopened(session, attr) |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
128 local send = session.send; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
129 session.host = nameprep(attr.to); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
130 if not session.host then |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
131 session:close{ condition = "improper-addressing", |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
132 text = "A valid 'to' attribute is required on stream headers" }; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
133 return; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
134 end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
135 session.version = tonumber(attr.version) or 0; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
136 session.streamid = uuid_generate(); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
137 (session.log or session)("debug", "Client sent opening <stream:stream> to %s", session.host); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
138 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
139 if not hosts[session.host] then |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
140 -- We don't serve this host... |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
141 session:close{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)}; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
142 return; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
143 end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
144 |
677
eeb41cd5e9f3
mod_websocket: Move frame handling into a separate function
Florian Zeitz <florob@babelmonkeys.de>
parents:
676
diff
changeset
|
145 -- COMPAT: Current client implementations need this to be self-closing |
692
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
146 if self_closing_stream then |
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
147 send("<?xml version='1.0'?>"..tostring(st.stanza("stream:stream", { |
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
148 xmlns = 'jabber:client', ["xmlns:stream"] = 'http://etherx.jabber.org/streams'; |
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
149 id = session.streamid, from = session.host, version = '1.0', ["xml:lang"] = 'en' }))); |
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
150 else |
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
151 send("<?xml version='1.0'?>"..st.stanza("stream:stream", { |
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
152 xmlns = 'jabber:client', ["xmlns:stream"] = 'http://etherx.jabber.org/streams'; |
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
153 id = session.streamid, from = session.host, version = '1.0', ["xml:lang"] = 'en' }):top_tag()); |
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
154 end |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
155 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
156 (session.log or log)("debug", "Sent reply <stream:stream> to client"); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
157 session.notopen = nil; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
158 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
159 -- If session.secure is *false* (not nil) then it means we /were/ encrypting |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
160 -- since we now have a new stream header, session is secured |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
161 if session.secure == false then |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
162 session.secure = true; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
163 end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
164 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
165 local features = st.stanza("stream:features"); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
166 hosts[session.host].events.fire_event("stream-features", { origin = session, features = features }); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
167 module:fire_event("stream-features", session, features); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
168 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
169 send(features); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
170 end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
171 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
172 function stream_callbacks.streamclosed(session) |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
173 session.log("debug", "Received </stream:stream>"); |
839
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
174 session:close(false); |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
175 end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
176 |
129 | 177 function stream_callbacks.error(session, error, data) |
178 if error == "no-stream" then | |
179 session.log("debug", "Invalid opening stream header"); | |
180 session:close("invalid-namespace"); | |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
181 elseif error == "parse-error" then |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
182 (session.log or log)("debug", "Client XML parse error: %s", tostring(data)); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
183 session:close("not-well-formed"); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
184 elseif error == "stream-error" then |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
185 local condition, text = "undefined-condition"; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
186 for child in data:children() do |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
187 if child.attr.xmlns == xmlns_xmpp_streams then |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
188 if child.name ~= "text" then |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
189 condition = child.name; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
190 else |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
191 text = child:get_text(); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
192 end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
193 if condition ~= "undefined-condition" and text then |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
194 break; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
195 end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
196 end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
197 end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
198 text = condition .. (text and (" ("..text..")") or ""); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
199 session.log("info", "Session closed by remote with error: %s", text); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
200 session:close(nil, text); |
129 | 201 end |
202 end | |
203 | |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
204 local function handleerr(err) log("error", "Traceback[c2s]: %s: %s", tostring(err), traceback()); end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
205 function stream_callbacks.handlestanza(session, stanza) |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
206 stanza = session.filter("stanzas/in", stanza); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
207 if stanza then |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
208 return xpcall(function () return core_process_stanza(session, stanza) end, handleerr); |
129 | 209 end |
210 end | |
211 | |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
212 --- Session methods |
129 | 213 local function session_close(session, reason) |
214 local log = session.log or log; | |
215 if session.conn then | |
216 if session.notopen then | |
692
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
217 -- COMPAT: Current client implementations need this to be self-closing |
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
218 if self_closing_stream then |
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
219 session.send("<?xml version='1.0'?>"..tostring(st.stanza("stream:stream", default_stream_attr))); |
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
220 else |
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
221 session.send("<?xml version='1.0'?>"..st.stanza("stream:stream", default_stream_attr):top_tag()); |
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
222 end |
129 | 223 end |
839
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
224 if reason then -- nil == no err, initiated by us, false == initiated by client |
129 | 225 if type(reason) == "string" then -- assume stream error |
839
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
226 log("debug", "Disconnecting client, <stream:error> is: %s", reason); |
129 | 227 session.send(st.stanza("stream:error"):tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' })); |
228 elseif type(reason) == "table" then | |
229 if reason.condition then | |
230 local stanza = st.stanza("stream:error"):tag(reason.condition, stream_xmlns_attr):up(); | |
231 if reason.text then | |
232 stanza:tag("text", stream_xmlns_attr):text(reason.text):up(); | |
233 end | |
234 if reason.extra then | |
235 stanza:add_child(reason.extra); | |
236 end | |
839
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
237 log("debug", "Disconnecting client, <stream:error> is: %s", tostring(stanza)); |
129 | 238 session.send(stanza); |
239 elseif reason.name then -- a stanza | |
839
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
240 log("debug", "Disconnecting client, <stream:error> is: %s", tostring(reason)); |
129 | 241 session.send(reason); |
242 end | |
243 end | |
244 end | |
245 session.send("</stream:stream>"); | |
839
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
246 function session.send() return false; end |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
247 |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
248 local reason = (reason and (reason.text or reason.condition)) or reason; |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
249 session.log("info", "c2s stream for %s closed: %s", session.full_jid or ("<"..session.ip..">"), reason or "session closed"); |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
250 |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
251 -- Authenticated incoming stream may still be sending us stanzas, so wait for </stream:stream> from remote |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
252 local conn = session.conn; |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
253 if reason == nil and not session.notopen and session.type == "c2s" then |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
254 -- Grace time to process data from authenticated cleanly-closed stream |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
255 add_task(stream_close_timeout, function () |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
256 if not session.destroyed then |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
257 session.log("warn", "Failed to receive a stream close response, closing connection anyway..."); |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
258 sm_destroy_session(session, reason); |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
259 conn:close(); |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
260 end |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
261 end); |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
262 else |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
263 sm_destroy_session(session, reason); |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
264 conn:close(); |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
265 end |
129 | 266 end |
267 end | |
268 | |
839
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
269 module:hook_global("user-deleted", function(event) |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
270 local username, host = event.username, event.host; |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
271 local user = hosts[host].sessions[username]; |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
272 if user and user.sessions then |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
273 for jid, session in pairs(user.sessions) do |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
274 session:close{ condition = "not-authorized", text = "Account deleted" }; |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
275 end |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
276 end |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
277 end, 200); |
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
278 |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
279 --- Port listener |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
280 function listener.onconnect(conn) |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
281 local session = sm_new_session(conn); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
282 sessions[conn] = session; |
129 | 283 |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
284 session.log("info", "Client connected"); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
285 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
286 -- Client is using legacy SSL (otherwise mod_tls sets this flag) |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
287 if conn:ssl() then |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
288 session.secure = true; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
289 end |
129 | 290 |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
291 if opt_keepalives then |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
292 conn:setoption("keepalive", opt_keepalives); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
293 end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
294 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
295 session.close = session_close; |
129 | 296 |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
297 local stream = new_xmpp_stream(session, stream_callbacks); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
298 session.stream = stream; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
299 session.notopen = true; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
300 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
301 function session.reset_stream() |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
302 session.notopen = true; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
303 session.stream:reset(); |
129 | 304 end |
305 | |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
306 local function websocket_close(code, message) |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
307 local data = string.char(code/0x100) .. string.char(code%0x100) .. message; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
308 conn:write(build_frame({opcode = 0x8, FIN = true, data = data})); |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
309 conn:close(); |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
310 end |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
311 |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
312 local filter = session.filter; |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
313 local dataBuffer; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
314 local function handle_frame(frame) |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
315 module:log("debug", "Websocket received: %s (%i bytes)", frame.data, #frame.data); |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
316 |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
317 -- Error cases |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
318 if frame.RSV1 or frame.RSV2 or frame.RSV3 then -- Reserved bits non zero |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
319 websocket_close(1002, "Reserved bits not zero"); |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
320 return false; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
321 end |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
322 |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
323 if frame.opcode >= 0x8 and frame.length > 125 then -- Control frame with too much payload |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
324 websocket_close(1002, "Payload too large"); |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
325 return false; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
326 end |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
327 |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
328 if frame.opcode >= 0x8 and not frame.FIN then -- Fragmented control frame |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
329 websocket_close(1002, "Fragmented control frame"); |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
330 return false; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
331 end |
690
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
332 |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
333 if (frame.opcode > 0x2 and frame.opcode < 0x8) or (frame.opcode > 0xA) then |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
334 websocket_close(1002, "Reserved opcode"); |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
335 return false; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
336 end |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
337 |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
338 if frame.opcode == 0x0 and not dataBuffer then |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
339 websocket_close(1002, "Unexpected continuation frame"); |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
340 return false; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
341 end |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
342 |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
343 if (frame.opcode == 0x1 or frame.opcode == 0x2) and dataBuffer then |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
344 websocket_close(1002, "Continuation frame expected"); |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
345 return false; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
346 end |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
347 |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
348 -- Valid cases |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
349 if frame.opcode == 0x0 then -- Continuation frame |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
350 dataBuffer = dataBuffer .. frame.data; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
351 elseif frame.opcode == 0x1 then -- Text frame |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
352 dataBuffer = frame.data; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
353 elseif frame.opcode == 0x2 then -- Binary frame |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
354 websocket_close(1003, "Only text frames are supported"); |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
355 return false; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
356 elseif frame.opcode == 0x8 then -- Close request |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
357 websocket_close(1000, "Goodbye"); |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
358 return false; |
691
04662cc35280
mod_websocket: Answer ping frames
Florian Zeitz <florob@babelmonkeys.de>
parents:
690
diff
changeset
|
359 elseif frame.opcode == 0x9 then -- Ping frame |
04662cc35280
mod_websocket: Answer ping frames
Florian Zeitz <florob@babelmonkeys.de>
parents:
690
diff
changeset
|
360 frame.opcode = 0xA; |
04662cc35280
mod_websocket: Answer ping frames
Florian Zeitz <florob@babelmonkeys.de>
parents:
690
diff
changeset
|
361 conn:write(build_frame(frame)); |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
362 return true; |
690
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
363 else |
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
364 log("warn", "Received frame with unsupported opcode %i", frame.opcode); |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
365 return true; |
690
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
366 end |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
367 |
690
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
368 if frame.FIN then |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
369 data = dataBuffer; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
370 dataBuffer = nil; |
690
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
371 |
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
372 -- COMPAT: Current client implementations send a self-closing <stream:stream> |
692
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
373 if self_closing_stream then |
693
7d165cd6168c
mod_websocket: Only un-self-close <stream:stream>s
Florian Zeitz <florob@babelmonkeys.de>
parents:
692
diff
changeset
|
374 data = data:gsub("(<stream:stream.*)/>$", "%1>"); |
692
2de21fa40382
mod_websocket: Make sending a self-closing <stream:stream> tag configurable
Florian Zeitz <florob@babelmonkeys.de>
parents:
691
diff
changeset
|
375 end |
690
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
376 |
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
377 data = filter("bytes/in", data); |
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
378 if data then |
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
379 local ok, err = stream:feed(data); |
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
380 if ok then return; end |
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
381 log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_")); |
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
382 session:close("not-well-formed"); |
5acc203972f3
mod_websocket: Add fragmentation support
Florian Zeitz <florob@babelmonkeys.de>
parents:
689
diff
changeset
|
383 end |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
384 end |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
385 return true; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
386 end |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
387 |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
388 local frameBuffer = ""; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
389 function session.data(data) |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
390 frameBuffer = frameBuffer .. data; |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
391 local frame, length = parse_frame(frameBuffer); |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
392 |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
393 while frame do |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
394 frameBuffer = frameBuffer:sub(length + 1); |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
395 if not handle_frame(frame) then return; end |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
396 frame, length = parse_frame(frameBuffer); |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
397 end |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
398 end |
129 | 399 |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
400 function session.send(s) |
687
d141375ece4b
mod_websocket: Move frame building into a function
Florian Zeitz <florob@babelmonkeys.de>
parents:
677
diff
changeset
|
401 conn:write(build_frame({ FIN = true, opcode = 0x01, data = tostring(s)})); |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
402 end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
403 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
404 if c2s_timeout then |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
405 add_task(c2s_timeout, function () |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
406 if session.type == "c2s_unauthed" then |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
407 session:close("connection-timeout"); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
408 end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
409 end); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
410 end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
411 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
412 session.dispatch_stanza = stream_callbacks.handlestanza; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
413 end |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
414 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
415 function listener.onincoming(conn, data) |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
416 local session = sessions[conn]; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
417 if session then |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
418 session.data(data); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
419 else |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
420 listener.onconnect(conn, data); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
421 session = sessions[conn]; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
422 session.data(data); |
129 | 423 end |
424 end | |
425 | |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
426 function listener.ondisconnect(conn, err) |
129 | 427 local session = sessions[conn]; |
428 if session then | |
839
d297d76010d4
mod_websocket: Merge with current mod_c2s
Florian Zeitz <florob@babelmonkeys.de>
parents:
694
diff
changeset
|
429 (session.log or log)("info", "Client disconnected: %s", err or "connection closed"); |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
430 sm_destroy_session(session, err); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
431 sessions[conn] = nil; |
129 | 432 end |
433 end | |
434 | |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
435 function listener.associate_session(conn, session) |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
436 sessions[conn] = session; |
129 | 437 end |
438 | |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
439 function handle_request(event, path) |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
440 local request, response = event.request, event.response; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
441 |
689
4d21bd5dde49
mod_websocket: Be nice to non-websocket clients
Florian Zeitz <florob@babelmonkeys.de>
parents:
688
diff
changeset
|
442 if not request.headers.sec_websocket_key then |
4d21bd5dde49
mod_websocket: Be nice to non-websocket clients
Florian Zeitz <florob@babelmonkeys.de>
parents:
688
diff
changeset
|
443 response.headers.content_type = "text/html"; |
4d21bd5dde49
mod_websocket: Be nice to non-websocket clients
Florian Zeitz <florob@babelmonkeys.de>
parents:
688
diff
changeset
|
444 return [[<!DOCTYPE html><html><head><title>Websocket</title></head><body> |
4d21bd5dde49
mod_websocket: Be nice to non-websocket clients
Florian Zeitz <florob@babelmonkeys.de>
parents:
688
diff
changeset
|
445 <p>It works! Now point your WebSocket client to this URL to connect to Prosody.</p> |
4d21bd5dde49
mod_websocket: Be nice to non-websocket clients
Florian Zeitz <florob@babelmonkeys.de>
parents:
688
diff
changeset
|
446 </body></html>]]; |
4d21bd5dde49
mod_websocket: Be nice to non-websocket clients
Florian Zeitz <florob@babelmonkeys.de>
parents:
688
diff
changeset
|
447 end |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
448 |
842
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
449 -- TODO: Handle requested subprotocols |
32df4d13f178
mod_websocket: More robust frame handling
Florian Zeitz <florob@babelmonkeys.de>
parents:
840
diff
changeset
|
450 |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
451 response.conn:setlistener(listener); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
452 response.status = "101 Switching Protocols"; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
453 response.headers.Upgrade = "websocket"; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
454 response.headers.Connection = "Upgrade"; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
455 response.headers.Sec_WebSocket_Accept = base64(sha1(request.headers.sec_websocket_key .. "258EAFA5-E914-47DA-95CA-C5AB0DC85B11")); |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
456 response.headers.Sec_WebSocket_Protocol = "xmpp"; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
457 |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
458 return ""; |
129 | 459 end |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
460 |
688
e87678a52720
mod_websocket: Make this a shared module
Florian Zeitz <florob@babelmonkeys.de>
parents:
687
diff
changeset
|
461 function module.add_host(module) |
e87678a52720
mod_websocket: Make this a shared module
Florian Zeitz <florob@babelmonkeys.de>
parents:
687
diff
changeset
|
462 module:depends("http"); |
676
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
463 module:provides("http", { |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
464 name = "xmpp-websocket"; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
465 route = { |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
466 ["GET /*"] = handle_request; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
467 }; |
54fa9d6d7809
mod_websocket: New mod_c2s based version, still WIP
Florian Zeitz <florob@babelmonkeys.de>
parents:
129
diff
changeset
|
468 }); |
129 | 469 end |