projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge hoelzro->trunk
[prosody.git]
/
net
/
xmppcomponent_listener.lua
diff --git
a/net/xmppcomponent_listener.lua
b/net/xmppcomponent_listener.lua
index 2bf77fb6d412ae92f33f33ddad432327742ac94a..6f02b136954027a78a8ac03c01a95065a3c95dd2 100644
(file)
--- a/
net/xmppcomponent_listener.lua
+++ b/
net/xmppcomponent_listener.lua
@@
-18,6
+18,7
@@
local connlisteners = require "net.connlisteners";
local cm_register_component = require "core.componentmanager".register_component;
local cm_deregister_component = require "core.componentmanager".deregister_component;
local uuid_gen = require "util.uuid".generate;
local cm_register_component = require "core.componentmanager".register_component;
local cm_deregister_component = require "core.componentmanager".deregister_component;
local uuid_gen = require "util.uuid".generate;
+local jid_split = require "util.jid".split;
local sha1 = require "util.hashes".sha1;
local st = require "util.stanza";
local init_xmlhandlers = require "core.xmlhandlers";
local sha1 = require "util.hashes".sha1;
local st = require "util.stanza";
local init_xmlhandlers = require "core.xmlhandlers";
@@
-72,13
+73,10
@@
function stream_callbacks.streamopened(session, attr)
return;
end
return;
end
- -- Store the original host (this is used for config, etc.)
- session.user = attr.to;
- -- Set the host for future reference
- session.host = config.get(attr.to, "core", "component_address") or attr.to;
-- Note that we don't create the internal component
-- until after the external component auths successfully
-- Note that we don't create the internal component
-- until after the external component auths successfully
+ session.host = attr.to;
session.streamid = uuid_gen();
session.notopen = nil;
session.streamid = uuid_gen();
session.notopen = nil;
@@
-88,7
+86,7
@@
function stream_callbacks.streamopened(session, attr)
end
function stream_callbacks.streamclosed(session)
end
function stream_callbacks.streamclosed(session)
- session.log("Received </stream:stream>");
+ session.log("
debug", "
Received </stream:stream>");
session:close();
end
session:close();
end
@@
-106,6
+104,7
@@
function stream_callbacks.handlestanza(session, stanza)
local _, domain = jid_split(stanza.attr.from);
if domain ~= session.host then
-- Return error
local _, domain = jid_split(stanza.attr.from);
if domain ~= session.host then
-- Return error
+ session.log("warn", "Component sent stanza with missing or invalid 'from' address");
session:close{
condition = "invalid-from";
text = "Component tried to send from address <"..tostring(from)
session:close{
condition = "invalid-from";
text = "Component tried to send from address <"..tostring(from)
@@
-118,6
+117,7
@@
function stream_callbacks.handlestanza(session, stanza)
stanza.attr.from = session.host;
end
if not stanza.attr.to then
stanza.attr.from = session.host;
end
if not stanza.attr.to then
+ session.log("warn", "Rejecting stanza with no 'to' address");
session.send(st.error_reply(stanza, "modify", "bad-request", "Components MUST specify a 'to' address on stanzas"));
return;
end
session.send(st.error_reply(stanza, "modify", "bad-request", "Components MUST specify a 'to' address on stanzas"));
return;
end
@@
-203,7
+203,7
@@
function component_listener.ondisconnect(conn, err)
local session = sessions[conn];
if session then
(session.log or log)("info", "component disconnected: %s (%s)", tostring(session.host), tostring(err));
local session = sessions[conn];
if session then
(session.log or log)("info", "component disconnected: %s (%s)", tostring(session.host), tostring(err));
- if
session.host
then
+ if
hosts[session.host]
then
log("debug", "Deregistering component");
cm_deregister_component(session.host);
hosts[session.host].connected = nil;
log("debug", "Deregistering component");
cm_deregister_component(session.host);
hosts[session.host].connected = nil;