Thu, 08 Jul 2010 23:56:53 +0100
prosodyctl: Force log output always to the console instead of using the config, which avoids creating log files as the wrong user
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1249
diff
changeset
|
1 | -- Prosody IM |
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2816
diff
changeset
|
2 | -- Copyright (C) 2008-2010 Matthew Wild |
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2816
diff
changeset
|
3 | -- Copyright (C) 2008-2010 Waqas Hussain |
1106
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; |
3320
517ae40a12a2
xmppcomponent_listener: Import jid_split to fix undefined global reference
Matthew Wild <mwild1@gmail.com>
parents:
3316
diff
changeset
|
21 | local jid_split = require "util.jid".split; |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
22 | 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
|
23 | local st = require "util.stanza"; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
24 | 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
|
25 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
26 | local sessions = {}; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
27 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
28 | local log = logger.init("componentlistener"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
29 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
30 | 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
|
31 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
32 | 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
|
33 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
34 | --- 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
|
35 | |
2466
0e44b6035210
net.xmpp{client,server,component}: Update for new xmlhandlers syntax
Matthew Wild <mwild1@gmail.com>
parents:
2162
diff
changeset
|
36 | local stream_callbacks = { default_ns = xmlns_component }; |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
37 | |
2754
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
38 | local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams"; |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
39 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
40 | function stream_callbacks.error(session, error, data, data2) |
2755
28f2416a3e4e
net.xmppcomponent_listener: Don't handle stream errors from component sessions that have already been destroyed
Matthew Wild <mwild1@gmail.com>
parents:
2754
diff
changeset
|
41 | if session.destroyed then return; end |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
42 | 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
|
43 | if error == "no-stream" then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
44 | session:close("invalid-namespace"); |
2754
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
45 | elseif error == "parse-error" then |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
46 | session.log("warn", "External component %s XML parse error: %s", tostring(session.host), tostring(data)); |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
47 | session:close("xml-not-well-formed"); |
2754
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
48 | elseif error == "stream-error" then |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
49 | local condition, text = "undefined-condition"; |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
50 | for child in data:children() do |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
51 | if child.attr.xmlns == xmlns_xmpp_streams then |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
52 | if child.name ~= "text" then |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
53 | condition = child.name; |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
54 | else |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
55 | text = child:get_text(); |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
56 | end |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
57 | if condition ~= "undefined-condition" and text then |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
58 | break; |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
59 | end |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
60 | end |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
61 | end |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
62 | text = condition .. (text and (" ("..text..")") or ""); |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
63 | session.log("info", "Session closed by remote with error: %s", text); |
b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild <mwild1@gmail.com>
parents:
2489
diff
changeset
|
64 | session:close(nil, text); |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
65 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
66 | end |
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 | 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
|
69 | 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
|
70 | -- 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
|
71 | -- hasn't been configured |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
72 | 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
|
73 | return; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
74 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
75 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
76 | -- 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
|
77 | session.user = attr.to; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
78 | -- 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
|
79 | 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
|
80 | -- 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
|
81 | -- 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
|
82 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
83 | session.streamid = uuid_gen(); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
84 | session.notopen = nil; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
85 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
86 | 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
|
87 | ["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
|
88 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
89 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
90 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
91 | function stream_callbacks.streamclosed(session) |
2756
d81af905ccce
net.xmppcomponent_listener: Close component sessions on receiving a </stream:stream>
Matthew Wild <mwild1@gmail.com>
parents:
2755
diff
changeset
|
92 | session.log("Received </stream:stream>"); |
d81af905ccce
net.xmppcomponent_listener: Close component sessions on receiving a </stream:stream>
Matthew Wild <mwild1@gmail.com>
parents:
2755
diff
changeset
|
93 | session:close(); |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
94 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
95 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
96 | 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
|
97 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
98 | 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
|
99 | -- Namespaces are icky. |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
100 | 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
|
101 | stanza.attr.xmlns = xmlns_component; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
102 | end |
3316
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
103 | if not stanza.attr.xmlns or stanza.attr.xmlns == "jabber:client" then |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
104 | local from = stanza.attr.from; |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
105 | if from then |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
106 | if session.component_validate_from then |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
107 | local _, domain = jid_split(stanza.attr.from); |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
108 | if domain ~= session.host then |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
109 | -- Return error |
3321
dcdfc04f9e3a
xmppcomponent_listener: Add log messages for when stanzas from components have invalid or missing to/from addresses
Matthew Wild <mwild1@gmail.com>
parents:
3320
diff
changeset
|
110 | session.log("warn", "Component sent stanza with missing or invalid 'from' address"); |
3316
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
111 | session:close{ |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
112 | condition = "invalid-from"; |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
113 | text = "Component tried to send from address <"..tostring(from) |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
114 | .."> which is not in domain <"..tostring(session.host)..">"; |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
115 | }; |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
116 | return; |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
117 | end |
3315
f4d2de6ac22e
xmppcomponent_listener: Validate to/from on components, fixes #104 and #162
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
118 | end |
3316
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
119 | else |
3315
f4d2de6ac22e
xmppcomponent_listener: Validate to/from on components, fixes #104 and #162
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
120 | stanza.attr.from = session.host; |
3316
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
121 | end |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
122 | if not stanza.attr.to then |
3321
dcdfc04f9e3a
xmppcomponent_listener: Add log messages for when stanzas from components have invalid or missing to/from addresses
Matthew Wild <mwild1@gmail.com>
parents:
3320
diff
changeset
|
123 | session.log("warn", "Rejecting stanza with no 'to' address"); |
3316
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
124 | session.send(st.error_reply(stanza, "modify", "bad-request", "Components MUST specify a 'to' address on stanzas")); |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
125 | return; |
6122a6270773
xmppcomponent_listener: Don't validate to/from on non-stanzas, fixes component auth.
Waqas Hussain <waqas20@gmail.com>
parents:
3315
diff
changeset
|
126 | end |
3315
f4d2de6ac22e
xmppcomponent_listener: Validate to/from on components, fixes #104 and #162
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
127 | end |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
128 | 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
|
129 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
130 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
131 | --- Closing a component connection |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
132 | local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'}; |
2466
0e44b6035210
net.xmpp{client,server,component}: Update for new xmlhandlers syntax
Matthew Wild <mwild1@gmail.com>
parents:
2162
diff
changeset
|
133 | local default_stream_attr = { ["xmlns:stream"] = "http://etherx.jabber.org/streams", 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
|
134 | local function session_close(session, reason) |
2757
c13816e0c546
net.xmppcomponent_listener: Don't allow closing a session that has already been destroyed
Matthew Wild <mwild1@gmail.com>
parents:
2756
diff
changeset
|
135 | if session.destroyed then return; end |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
136 | 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
|
137 | 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
|
138 | 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
|
139 | 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
|
140 | 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
|
141 | end |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
142 | if reason then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
143 | 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
|
144 | 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
|
145 | 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
|
146 | elseif type(reason) == "table" then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
147 | if reason.condition then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
148 | 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
|
149 | if reason.text then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
150 | 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
|
151 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
152 | if reason.extra then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
153 | stanza:add_child(reason.extra); |
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 | 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
|
156 | session.send(stanza); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
157 | 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
|
158 | 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
|
159 | session.send(reason); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
160 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
161 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
162 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
163 | session.send("</stream:stream>"); |
2489
d8296ab96f55
xmppcomponent_listener: Update for new connection API
Matthew Wild <mwild1@gmail.com>
parents:
2466
diff
changeset
|
164 | session.conn:close(); |
2126
fcdcdf00787c
*_listener: Update for new net.server API, specifically .listener -> .onincoming, .disconnect -> .ondisconnect
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
165 | component_listener.ondisconnect(session.conn, "stream error"); |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
166 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
167 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
168 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
169 | --- Component connlistener |
2126
fcdcdf00787c
*_listener: Update for new net.server API, specifically .listener -> .onincoming, .disconnect -> .ondisconnect
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
170 | function component_listener.onincoming(conn, data) |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
171 | local session = sessions[conn]; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
172 | if not session then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
173 | local _send = conn.write; |
2135
2119a5d603d8
xmppcomponent_listener: Use new API for writing to components, fixes traceback (thanks Tobias)
Matthew Wild <mwild1@gmail.com>
parents:
2126
diff
changeset
|
174 | session = { type = "component", conn = conn, send = function (data) return _send(conn, tostring(data)); end }; |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
175 | sessions[conn] = session; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
176 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
177 | -- Logging functions -- |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
178 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
179 | 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
|
180 | 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
|
181 | session.close = session_close; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
182 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
183 | 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
|
184 | |
2077
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1635
diff
changeset
|
185 | local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "\1"); |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
186 | session.parser = parser; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
187 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
188 | session.notopen = true; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
189 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
190 | function session.data(conn, data) |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
191 | 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
|
192 | if ok then return; end |
2758
0476a662dacc
net.xmppcomponent_listener: Log invalid XML received from components (as we already do for c2s/s2s)
Matthew Wild <mwild1@gmail.com>
parents:
2757
diff
changeset
|
193 | log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_")); |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
194 | 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
|
195 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
196 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
197 | 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
|
198 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
199 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
200 | if data then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
201 | session.data(conn, data); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
202 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
203 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
204 | |
2126
fcdcdf00787c
*_listener: Update for new net.server API, specifically .listener -> .onincoming, .disconnect -> .ondisconnect
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
205 | function component_listener.ondisconnect(conn, err) |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
206 | local session = sessions[conn]; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
207 | if session then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
208 | (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
|
209 | if session.host then |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
210 | log("debug", "Deregistering component"); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
211 | cm_deregister_component(session.host); |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
212 | hosts[session.host].connected = nil; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
213 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
214 | sessions[conn] = nil; |
2759
48e8832e5cab
net.xmppcomponent_listener: Don't remove 'log' and 'close' from sessions when destroying, and set destroyed = true
Matthew Wild <mwild1@gmail.com>
parents:
2758
diff
changeset
|
215 | for k in pairs(session) do |
48e8832e5cab
net.xmppcomponent_listener: Don't remove 'log' and 'close' from sessions when destroying, and set destroyed = true
Matthew Wild <mwild1@gmail.com>
parents:
2758
diff
changeset
|
216 | if k ~= "log" and k ~= "close" then |
48e8832e5cab
net.xmppcomponent_listener: Don't remove 'log' and 'close' from sessions when destroying, and set destroyed = true
Matthew Wild <mwild1@gmail.com>
parents:
2758
diff
changeset
|
217 | session[k] = nil; |
48e8832e5cab
net.xmppcomponent_listener: Don't remove 'log' and 'close' from sessions when destroying, and set destroyed = true
Matthew Wild <mwild1@gmail.com>
parents:
2758
diff
changeset
|
218 | end |
48e8832e5cab
net.xmppcomponent_listener: Don't remove 'log' and 'close' from sessions when destroying, and set destroyed = true
Matthew Wild <mwild1@gmail.com>
parents:
2758
diff
changeset
|
219 | end |
48e8832e5cab
net.xmppcomponent_listener: Don't remove 'log' and 'close' from sessions when destroying, and set destroyed = true
Matthew Wild <mwild1@gmail.com>
parents:
2758
diff
changeset
|
220 | session.destroyed = true; |
1106
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
221 | session = nil; |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
222 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
223 | end |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
224 | |
b51a65066595
prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
225 | connlisteners.register('xmppcomponent', component_listener); |