author | Matthew Wild <mwild1@gmail.com> |
Thu, 04 Dec 2008 18:47:26 +0000 | |
changeset 545 | 60002993be04 |
parent 519 | cccd610a0ef9 |
child 557 | c9b3ffb08fe3 |
permissions | -rw-r--r-- |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
1 |
-- Prosody IM v0.1 |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
2 |
-- Copyright (C) 2008 Matthew Wild |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
3 |
-- Copyright (C) 2008 Waqas Hussain |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
4 |
-- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
5 |
-- This program is free software; you can redistribute it and/or |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
6 |
-- modify it under the terms of the GNU General Public License |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
7 |
-- as published by the Free Software Foundation; either version 2 |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
8 |
-- of the License, or (at your option) any later version. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
9 |
-- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
10 |
-- This program is distributed in the hope that it will be useful, |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
11 |
-- but WITHOUT ANY WARRANTY; without even the implied warranty of |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
12 |
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
13 |
-- GNU General Public License for more details. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
14 |
-- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
15 |
-- You should have received a copy of the GNU General Public License |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
16 |
-- along with this program; if not, write to the Free Software |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
17 |
-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
18 |
-- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
19 |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
20 |
|
148 | 21 |
|
22 |
local logger = require "logger"; |
|
23 |
local lxp = require "lxp" |
|
24 |
local init_xmlhandlers = require "core.xmlhandlers" |
|
25 |
local sm_new_session = require "core.sessionmanager".new_session; |
|
26 |
local s2s_new_incoming = require "core.s2smanager".new_incoming; |
|
27 |
local s2s_streamopened = require "core.s2smanager".streamopened; |
|
342
52f75260a22d
Incorrect function set as callback
Matthew Wild <mwild1@gmail.com>
parents:
333
diff
changeset
|
28 |
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
|
29 |
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
|
30 |
local s2s_attempt_connect = require "core.s2smanager".attempt_connection; |
545
60002993be04
Abstract xmlhandlers a bit more, also add error callbacks
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
31 |
local stream_callbacks = { streamopened = s2s_streamopened, streamclosed = s2s_streamclosed, handlestanza = core_process_stanza }; |
331 | 32 |
|
148 | 33 |
local connlisteners_register = require "net.connlisteners".register; |
34 |
||
35 |
local t_insert = table.insert; |
|
36 |
local t_concat = table.concat; |
|
37 |
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 |
|
38 |
local m_random = math.random; |
|
39 |
local format = string.format; |
|
40 |
local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session"); |
|
41 |
local st = stanza; |
|
42 |
||
43 |
local sessions = {}; |
|
451
e9f269e5204e
No more reading 1 byte at a time from sockets
Matthew Wild <mwild1@gmail.com>
parents:
434
diff
changeset
|
44 |
local xmppserver = { default_port = 5269, default_mode = "*a" }; |
148 | 45 |
|
46 |
-- These are session methods -- |
|
47 |
||
48 |
local function session_reset_stream(session) |
|
49 |
-- Reset stream |
|
331 | 50 |
local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "|"); |
148 | 51 |
session.parser = parser; |
52 |
||
53 |
session.notopen = true; |
|
54 |
||
55 |
function session.data(conn, data) |
|
56 |
parser:parse(data); |
|
57 |
end |
|
58 |
return true; |
|
59 |
end |
|
60 |
||
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
|
61 |
|
d9d4c1de16ce
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Matthew Wild <mwild1@gmail.com>
parents:
232
diff
changeset
|
62 |
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
|
63 |
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
|
64 |
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
|
65 |
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
|
66 |
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
|
67 |
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
|
68 |
log("info", "Disconnecting %s[%s], <stream:error> is: %s", session.host or "(unknown host)", session.type, reason); |
331 | 69 |
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
|
70 |
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
|
71 |
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
|
72 |
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
|
73 |
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
|
74 |
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
|
75 |
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
|
76 |
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
|
77 |
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
|
78 |
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
|
79 |
log("info", "Disconnecting %s[%s], <stream:error> is: %s", session.host or "(unknown host)", session.type, tostring(stanza)); |
331 | 80 |
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
|
81 |
elseif reason.name then -- a stanza |
331 | 82 |
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)); |
83 |
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
|
84 |
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
|
85 |
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
|
86 |
end |
331 | 87 |
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
|
88 |
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
|
89 |
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
|
90 |
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
|
91 |
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
|
92 |
|
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 |
|
148 | 94 |
-- End of session methods -- |
95 |
||
96 |
function xmppserver.listener(conn, data) |
|
97 |
local session = sessions[conn]; |
|
98 |
if not session then |
|
99 |
session = s2s_new_incoming(conn); |
|
100 |
sessions[conn] = session; |
|
101 |
||
102 |
-- Logging functions -- |
|
103 |
||
104 |
local mainlog, log = log; |
|
105 |
do |
|
106 |
local conn_name = "s2sin"..tostring(conn):match("[a-f0-9]+$"); |
|
107 |
log = logger.init(conn_name); |
|
108 |
end |
|
109 |
local print = function (...) log("info", t_concatall({...}, "\t")); end |
|
110 |
session.log = log; |
|
111 |
||
112 |
print("Incoming s2s connection"); |
|
113 |
||
114 |
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
|
115 |
session.close = session_close; |
148 | 116 |
|
117 |
session_reset_stream(session); -- Initialise, ready for use |
|
118 |
||
119 |
-- FIXME: Below function should be session,stanza - and xmlhandlers should use :method() notation to call, |
|
120 |
-- this will avoid the useless indirection we have atm |
|
121 |
-- (I'm on a mission, no time to fix now) |
|
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
|
122 |
|
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
|
123 |
-- Debug version -- |
545
60002993be04
Abstract xmlhandlers a bit more, also add error callbacks
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
124 |
-- local function handleerr(err) print("Traceback:", err, debug.traceback()); end |
60002993be04
Abstract xmlhandlers a bit more, also add error callbacks
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
125 |
-- session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end |
148 | 126 |
end |
127 |
if data then |
|
128 |
session.data(conn, data); |
|
129 |
end |
|
130 |
end |
|
131 |
||
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
431
diff
changeset
|
132 |
function xmppserver.disconnect(conn, err) |
163
3fec9b512d4e
Clean up session when s2s connections are disconnected
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
133 |
local session = sessions[conn]; |
3fec9b512d4e
Clean up session when s2s connections are disconnected
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
134 |
if session then |
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
431
diff
changeset
|
135 |
if err and err ~= "closed" and session.srv_hosts then |
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
431
diff
changeset
|
136 |
if s2s_attempt_connect(session, err) then |
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 |
||
152 |
session.reset_stream = session_reset_stream; |
|
153 |
session_reset_stream(session); -- Initialise, ready for use |
|
154 |
||
155 |
-- FIXME: Below function should be session,stanza - and xmlhandlers should use :method() notation to call, |
|
156 |
-- this will avoid the useless indirection we have atm |
|
157 |
-- (I'm on a mission, no time to fix now) |
|
431
3c89a073db53
Fix a waqas copy/paste error. It was my fault again apparently.
Matthew Wild <mwild1@gmail.com>
parents:
426
diff
changeset
|
158 |
local function handleerr(err) print("Traceback:", err, debug.traceback()); end |
426
3d8778059e90
Wrapped a core_process_stanza call in an xpcall call
Waqas Hussain <waqas20@gmail.com>
parents:
342
diff
changeset
|
159 |
session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end |
148 | 160 |
end |
161 |
||
162 |
connlisteners_register("xmppserver", xmppserver); |
|
163 |
||
164 |
||
165 |
-- We need to perform some initialisation when a connection is created |
|
166 |
-- We also need to perform that same initialisation at other points (SASL, TLS, ...) |
|
167 |
||
168 |
-- ...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
|
169 |
-- ...and record all sessions associated with connections |