author | Matthew Wild <mwild1@gmail.com> |
Wed, 01 May 2013 13:54:31 +0100 | |
branch | sasl |
changeset 5555 | 70a7ef4b6aaa |
parent 1635 | 33d087466767 |
child 2077 | e33658f6052c |
permissions | -rw-r--r-- |
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1249
diff
changeset
|
1 |
-- Prosody IM |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
2 |
-- Copyright (C) 2008-2009 Matthew Wild |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
3 |
-- Copyright (C) 2008-2009 Waqas Hussain |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
4 |
-- |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
5 |
-- This project is MIT/X11 licensed. Please see the |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
6 |
-- COPYING file in the source package for more information. |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
7 |
-- |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
8 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
9 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
10 |
local hosts = _G.hosts; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
11 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
12 |
local t_concat = table.concat; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
13 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
14 |
local lxp = require "lxp"; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
15 |
local logger = require "util.logger"; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
16 |
local config = require "core.configmanager"; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
17 |
local connlisteners = require "net.connlisteners"; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
18 |
local cm_register_component = require "core.componentmanager".register_component; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
19 |
local cm_deregister_component = require "core.componentmanager".deregister_component; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
20 |
local uuid_gen = require "util.uuid".generate; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
21 |
local sha1 = require "util.hashes".sha1; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
22 |
local st = require "util.stanza"; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
23 |
local init_xmlhandlers = require "core.xmlhandlers"; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
24 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
25 |
local sessions = {}; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
26 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
27 |
local log = logger.init("componentlistener"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
28 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
29 |
local component_listener = { default_port = 5347; default_mode = "*a"; default_interface = config.get("*", "core", "component_interface") or "127.0.0.1" }; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
30 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
31 |
local xmlns_component = 'jabber:component:accept'; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
32 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
33 |
--- Callbacks/data for xmlhandlers to handle streams for us --- |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
34 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
35 |
local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams|stream", default_ns = xmlns_component }; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
36 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
37 |
function stream_callbacks.error(session, error, data, data2) |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
38 |
log("warn", "Error processing component stream: "..tostring(error)); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
39 |
if error == "no-stream" then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
40 |
session:close("invalid-namespace"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
41 |
elseif error == "xml-parse-error" and data == "unexpected-element-close" then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
42 |
session.log("warn", "Unexpected close of '%s' tag", data2); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
43 |
session:close("xml-not-well-formed"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
44 |
else |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
45 |
session.log("warn", "External component %s XML parse error: %s", tostring(session.host), tostring(error)); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
46 |
session:close("xml-not-well-formed"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
47 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
48 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
49 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
50 |
function stream_callbacks.streamopened(session, attr) |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
51 |
if config.get(attr.to, "core", "component_module") ~= "component" then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
52 |
-- Trying to act as a component domain which |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
53 |
-- hasn't been configured |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
54 |
session:close{ condition = "host-unknown", text = tostring(attr.to).." does not match any configured external components" }; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
55 |
return; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
56 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
57 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
58 |
-- Store the original host (this is used for config, etc.) |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
59 |
session.user = attr.to; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
60 |
-- Set the host for future reference |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
61 |
session.host = config.get(attr.to, "core", "component_address") or attr.to; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
62 |
-- Note that we don't create the internal component |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
63 |
-- until after the external component auths successfully |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
64 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
65 |
session.streamid = uuid_gen(); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
66 |
session.notopen = nil; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
67 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
68 |
session.send(st.stanza("stream:stream", { xmlns=xmlns_component, |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
69 |
["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.host }):top_tag()); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
70 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
71 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
72 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
73 |
function stream_callbacks.streamclosed(session) |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
74 |
session.send("</stream:stream>"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
75 |
session.notopen = true; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
76 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
77 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
78 |
local core_process_stanza = core_process_stanza; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
79 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
80 |
function stream_callbacks.handlestanza(session, stanza) |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
81 |
-- Namespaces are icky. |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
82 |
if not stanza.attr.xmlns and stanza.name == "handshake" then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
83 |
stanza.attr.xmlns = xmlns_component; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
84 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
85 |
return core_process_stanza(session, stanza); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
86 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
87 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
88 |
--- Closing a component connection |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
89 |
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'}; |
1617
c6e175a0d83b
xmpp{client,server,component]_listener: Open stream if sending an error and it isn't already open. Fixes #120
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
90 |
local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:gsub("%|[^|]+$", ""), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" }; |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
91 |
local function session_close(session, reason) |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
92 |
local log = session.log or log; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
93 |
if session.conn then |
1617
c6e175a0d83b
xmpp{client,server,component]_listener: Open stream if sending an error and it isn't already open. Fixes #120
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
94 |
if session.notopen then |
c6e175a0d83b
xmpp{client,server,component]_listener: Open stream if sending an error and it isn't already open. Fixes #120
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
95 |
session.send("<?xml version='1.0'?>"); |
c6e175a0d83b
xmpp{client,server,component]_listener: Open stream if sending an error and it isn't already open. Fixes #120
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
96 |
session.send(st.stanza("stream:stream", default_stream_attr):top_tag()); |
c6e175a0d83b
xmpp{client,server,component]_listener: Open stream if sending an error and it isn't already open. Fixes #120
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
97 |
end |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
98 |
if reason then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
99 |
if type(reason) == "string" then -- assume stream error |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
100 |
log("info", "Disconnecting component, <stream:error> is: %s", reason); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
101 |
session.send(st.stanza("stream:error"):tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' })); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
102 |
elseif type(reason) == "table" then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
103 |
if reason.condition then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
104 |
local stanza = st.stanza("stream:error"):tag(reason.condition, stream_xmlns_attr):up(); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
105 |
if reason.text then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
106 |
stanza:tag("text", stream_xmlns_attr):text(reason.text):up(); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
107 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
108 |
if reason.extra then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
109 |
stanza:add_child(reason.extra); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
110 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
111 |
log("info", "Disconnecting component, <stream:error> is: %s", tostring(stanza)); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
112 |
session.send(stanza); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
113 |
elseif reason.name then -- a stanza |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
114 |
log("info", "Disconnecting component, <stream:error> is: %s", tostring(reason)); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
115 |
session.send(reason); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
116 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
117 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
118 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
119 |
session.send("</stream:stream>"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
120 |
session.conn.close(); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
121 |
component_listener.disconnect(session.conn, "stream error"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
122 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
123 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
124 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
125 |
--- Component connlistener |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
126 |
function component_listener.listener(conn, data) |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
127 |
local session = sessions[conn]; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
128 |
if not session then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
129 |
local _send = conn.write; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
130 |
session = { type = "component", conn = conn, send = function (data) return _send(tostring(data)); end }; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
131 |
sessions[conn] = session; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
132 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
133 |
-- Logging functions -- |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
134 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
135 |
local conn_name = "jcp"..tostring(conn):match("[a-f0-9]+$"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
136 |
session.log = logger.init(conn_name); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
137 |
session.close = session_close; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
138 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
139 |
session.log("info", "Incoming Jabber component connection"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
140 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
141 |
local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "|"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
142 |
session.parser = parser; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
143 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
144 |
session.notopen = true; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
145 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
146 |
function session.data(conn, data) |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
147 |
local ok, err = parser:parse(data); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
148 |
if ok then return; end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
149 |
session:close("xml-not-well-formed"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
150 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
151 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
152 |
session.dispatch_stanza = stream_callbacks.handlestanza; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
153 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
154 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
155 |
if data then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
156 |
session.data(conn, data); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
157 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
158 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
159 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
160 |
function component_listener.disconnect(conn, err) |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
161 |
local session = sessions[conn]; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
162 |
if session then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
163 |
(session.log or log)("info", "component disconnected: %s (%s)", tostring(session.host), tostring(err)); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
164 |
if session.host then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
165 |
log("debug", "Deregistering component"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
166 |
cm_deregister_component(session.host); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
167 |
hosts[session.host].connected = nil; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
168 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
169 |
sessions[conn] = nil; |
1635
33d087466767
xmppcomponent_listener: Fix to collect component sessions on disconnect
Matthew Wild <mwild1@gmail.com>
parents:
1617
diff
changeset
|
170 |
for k in pairs(session) do session[k] = nil; end |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
171 |
session = nil; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
172 |
collectgarbage("collect"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
173 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
174 |
end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
175 |
|
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
176 |
connlisteners.register('xmppcomponent', component_listener); |