Software / code / prosody
Annotate
net/xmppserver_listener.lua @ 990:235abebc896e
xmppserver_listener: Add session:close() method to outgoing s2s connections too
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 12 Apr 2009 02:55:49 +0100 |
| parent | 974:82f7261c0482 |
| child | 1040:4c79b28bce64 |
| rev | line source |
|---|---|
| 896 | 1 -- Prosody IM v0.4 |
|
760
90ce865eebd8
Update copyright notices for 2009
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
2 -- Copyright (C) 2008-2009 Matthew Wild |
|
90ce865eebd8
Update copyright notices for 2009
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
3 -- Copyright (C) 2008-2009 Waqas Hussain |
|
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
4 -- |
| 758 | 5 -- This project is MIT/X11 licensed. Please see the |
| 6 -- COPYING file in the source package for more information. | |
|
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
7 -- |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
8 |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
9 |
| 148 | 10 |
| 11 local logger = require "logger"; | |
| 12 local lxp = require "lxp" | |
| 13 local init_xmlhandlers = require "core.xmlhandlers" | |
| 14 local sm_new_session = require "core.sessionmanager".new_session; | |
| 15 local s2s_new_incoming = require "core.s2smanager".new_incoming; | |
| 16 local s2s_streamopened = require "core.s2smanager".streamopened; | |
|
342
52f75260a22d
Incorrect function set as callback
Matthew Wild <mwild1@gmail.com>
parents:
333
diff
changeset
|
17 local s2s_streamclosed = require "core.s2smanager".streamclosed; |
|
163
3fec9b512d4e
Clean up session when s2s connections are disconnected
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
18 local s2s_destroy_session = require "core.s2smanager".destroy_session; |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
431
diff
changeset
|
19 local s2s_attempt_connect = require "core.s2smanager".attempt_connection; |
|
900
686e3e4a7e15
net.xmppserver_listener: Set default namespace to jabber:server
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
20 local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams|stream", |
|
686e3e4a7e15
net.xmppserver_listener: Set default namespace to jabber:server
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
21 default_ns = "jabber:server", |
|
686e3e4a7e15
net.xmppserver_listener: Set default namespace to jabber:server
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
22 streamopened = s2s_streamopened, streamclosed = s2s_streamclosed, handlestanza = core_process_stanza }; |
|
557
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
23 |
|
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
24 function stream_callbacks.error(session, error, data) |
|
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
25 if error == "no-stream" then |
|
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
26 session:close("invalid-namespace"); |
|
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
27 else |
|
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
28 session.log("debug", "Server-to-server XML parse error: %s", tostring(error)); |
|
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
29 session:close("xml-not-well-formed"); |
|
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
30 end |
|
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
31 end |
| 331 | 32 |
|
611
7bb91fcddaf8
Fix blank tracebacks for c2s/s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
604
diff
changeset
|
33 local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), debug.traceback()); end |
|
585
033817e12ddb
Code tidying for xmpp{client,server}_listeners
Matthew Wild <mwild1@gmail.com>
parents:
557
diff
changeset
|
34 function stream_callbacks.handlestanza(a, b) |
|
033817e12ddb
Code tidying for xmpp{client,server}_listeners
Matthew Wild <mwild1@gmail.com>
parents:
557
diff
changeset
|
35 xpcall(function () core_process_stanza(a, b) end, handleerr); |
|
033817e12ddb
Code tidying for xmpp{client,server}_listeners
Matthew Wild <mwild1@gmail.com>
parents:
557
diff
changeset
|
36 end |
|
033817e12ddb
Code tidying for xmpp{client,server}_listeners
Matthew Wild <mwild1@gmail.com>
parents:
557
diff
changeset
|
37 |
| 148 | 38 local connlisteners_register = require "net.connlisteners".register; |
| 39 | |
| 40 local t_insert = table.insert; | |
| 41 local t_concat = table.concat; | |
| 42 local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end | |
| 43 local m_random = math.random; | |
| 44 local format = string.format; | |
| 45 local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session"); | |
| 46 local st = stanza; | |
| 47 | |
| 48 local sessions = {}; | |
|
451
e9f269e5204e
No more reading 1 byte at a time from sockets
Matthew Wild <mwild1@gmail.com>
parents:
434
diff
changeset
|
49 local xmppserver = { default_port = 5269, default_mode = "*a" }; |
| 148 | 50 |
| 51 -- These are session methods -- | |
| 52 | |
| 53 local function session_reset_stream(session) | |
| 54 -- Reset stream | |
| 331 | 55 local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "|"); |
| 148 | 56 session.parser = parser; |
| 57 | |
| 58 session.notopen = true; | |
| 59 | |
| 60 function session.data(conn, data) | |
|
557
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
61 local ok, err = parser:parse(data); |
|
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
62 if ok then return; end |
|
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
63 session:close("xml-not-well-formed"); |
| 148 | 64 end |
|
557
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
65 |
| 148 | 66 return true; |
| 67 end | |
| 68 | |
|
330
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
69 |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
70 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'}; |
|
333
8d15b073fdbe
session:disconnect() -> session:close() for consistency with other Lua APIs
Matthew Wild <mwild1@gmail.com>
parents:
331
diff
changeset
|
71 local function session_close(session, reason) |
|
330
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
72 local log = session.log or log; |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
73 if session.conn then |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
74 if reason then |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
75 if type(reason) == "string" then -- assume stream error |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
76 log("info", "Disconnecting %s[%s], <stream:error> is: %s", session.host or "(unknown host)", session.type, reason); |
| 331 | 77 session.sends2s(st.stanza("stream:error"):tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' })); |
|
330
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
78 elseif type(reason) == "table" then |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
79 if reason.condition then |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
80 local stanza = st.stanza("stream:error"):tag(reason.condition, stream_xmlns_attr):up(); |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
81 if reason.text then |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
82 stanza:tag("text", stream_xmlns_attr):text(reason.text):up(); |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
83 end |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
84 if reason.extra then |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
85 stanza:add_child(reason.extra); |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
86 end |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
87 log("info", "Disconnecting %s[%s], <stream:error> is: %s", session.host or "(unknown host)", session.type, tostring(stanza)); |
| 331 | 88 session.sends2s(stanza); |
|
330
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
89 elseif reason.name then -- a stanza |
| 331 | 90 log("info", "Disconnecting %s->%s[%s], <stream:error> is: %s", session.from_host or "(unknown host)", session.to_host or "(unknown host)", session.type, tostring(reason)); |
| 91 session.sends2s(reason); | |
|
330
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
92 end |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
93 end |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
94 end |
| 331 | 95 session.sends2s("</stream:stream>"); |
|
330
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
96 session.conn.close(); |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
97 xmppserver.disconnect(session.conn, "stream error"); |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
98 end |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
99 end |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
100 |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
101 |
| 148 | 102 -- End of session methods -- |
| 103 | |
| 104 function xmppserver.listener(conn, data) | |
| 105 local session = sessions[conn]; | |
| 106 if not session then | |
| 107 session = s2s_new_incoming(conn); | |
| 108 sessions[conn] = session; | |
| 109 | |
| 110 -- Logging functions -- | |
| 111 | |
|
585
033817e12ddb
Code tidying for xmpp{client,server}_listeners
Matthew Wild <mwild1@gmail.com>
parents:
557
diff
changeset
|
112 |
|
033817e12ddb
Code tidying for xmpp{client,server}_listeners
Matthew Wild <mwild1@gmail.com>
parents:
557
diff
changeset
|
113 local conn_name = "s2sin"..tostring(conn):match("[a-f0-9]+$"); |
|
033817e12ddb
Code tidying for xmpp{client,server}_listeners
Matthew Wild <mwild1@gmail.com>
parents:
557
diff
changeset
|
114 session.log = logger.init(conn_name); |
|
033817e12ddb
Code tidying for xmpp{client,server}_listeners
Matthew Wild <mwild1@gmail.com>
parents:
557
diff
changeset
|
115 |
|
033817e12ddb
Code tidying for xmpp{client,server}_listeners
Matthew Wild <mwild1@gmail.com>
parents:
557
diff
changeset
|
116 session.log("info", "Incoming s2s connection"); |
| 148 | 117 |
| 118 session.reset_stream = session_reset_stream; | |
|
333
8d15b073fdbe
session:disconnect() -> session:close() for consistency with other Lua APIs
Matthew Wild <mwild1@gmail.com>
parents:
331
diff
changeset
|
119 session.close = session_close; |
| 148 | 120 |
| 121 session_reset_stream(session); -- Initialise, ready for use | |
| 122 | |
|
604
b6a31e97d018
stanza_dispatch != dispatch_stanza
Matthew Wild <mwild1@gmail.com>
parents:
598
diff
changeset
|
123 session.dispatch_stanza = stream_callbacks.handlestanza; |
| 148 | 124 end |
| 125 if data then | |
| 126 session.data(conn, data); | |
| 127 end | |
| 128 end | |
| 129 | |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
431
diff
changeset
|
130 function xmppserver.disconnect(conn, err) |
|
163
3fec9b512d4e
Clean up session when s2s connections are disconnected
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
131 local session = sessions[conn]; |
|
3fec9b512d4e
Clean up session when s2s connections are disconnected
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
132 if session then |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
431
diff
changeset
|
133 if err and err ~= "closed" and session.srv_hosts then |
| 974 | 134 (session.log or log)("debug", "s2s connection closed unexpectedly"); |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
431
diff
changeset
|
135 if s2s_attempt_connect(session, err) then |
| 974 | 136 (session.log or log)("debug", "...so we're going to try again"); |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
431
diff
changeset
|
137 return; -- Session lives for now |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
431
diff
changeset
|
138 end |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
431
diff
changeset
|
139 end |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
431
diff
changeset
|
140 (session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err)); |
|
163
3fec9b512d4e
Clean up session when s2s connections are disconnected
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
141 s2s_destroy_session(session); |
|
3fec9b512d4e
Clean up session when s2s connections are disconnected
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
142 sessions[conn] = nil; |
|
3fec9b512d4e
Clean up session when s2s connections are disconnected
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
143 session = nil; |
|
3fec9b512d4e
Clean up session when s2s connections are disconnected
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
144 collectgarbage("collect"); |
|
3fec9b512d4e
Clean up session when s2s connections are disconnected
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
145 end |
| 148 | 146 end |
| 147 | |
| 148 function xmppserver.register_outgoing(conn, session) | |
| 149 session.direction = "outgoing"; | |
| 150 sessions[conn] = session; | |
| 151 | |
|
990
235abebc896e
xmppserver_listener: Add session:close() method to outgoing s2s connections too
Matthew Wild <mwild1@gmail.com>
parents:
974
diff
changeset
|
152 session.reset_stream = session_reset_stream; |
|
235abebc896e
xmppserver_listener: Add session:close() method to outgoing s2s connections too
Matthew Wild <mwild1@gmail.com>
parents:
974
diff
changeset
|
153 session.close = session_close; |
| 148 | 154 session_reset_stream(session); -- Initialise, ready for use |
| 155 | |
|
585
033817e12ddb
Code tidying for xmpp{client,server}_listeners
Matthew Wild <mwild1@gmail.com>
parents:
557
diff
changeset
|
156 --local function handleerr(err) print("Traceback:", err, debug.traceback()); end |
|
033817e12ddb
Code tidying for xmpp{client,server}_listeners
Matthew Wild <mwild1@gmail.com>
parents:
557
diff
changeset
|
157 --session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end |
| 148 | 158 end |
| 159 | |
| 160 connlisteners_register("xmppserver", xmppserver); | |
| 161 | |
| 162 | |
| 163 -- We need to perform some initialisation when a connection is created | |
| 164 -- We also need to perform that same initialisation at other points (SASL, TLS, ...) | |
| 165 | |
| 166 -- ...and we need to handle data | |
|
226
ba4711c4e8d2
Committing code to get nicer tracebacks for errors, also we no longer consider such errors fatal (probably a bad thing, I know...)
Matthew Wild <mwild1@gmail.com>
parents:
163
diff
changeset
|
167 -- ...and record all sessions associated with connections |
