aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-01-31 12:25:24 +0000
committerMatthew Wild <mwild1@gmail.com>2015-01-31 12:25:24 +0000
commit5a748d5a3ce2e861b6eccfa941971a0fcb0ec2c7 (patch)
treedc4f4861f9ff4c39fb0c037e14ec6db025ef0c39 /core
parenta5b88cba341e0f99461b12d6dd42f54352c4b76a (diff)
parentb51dfa3ecff22733dac5eb72b6d4bafa582e324e (diff)
downloadprosody-5a748d5a3ce2e861b6eccfa941971a0fcb0ec2c7.tar.gz
prosody-5a748d5a3ce2e861b6eccfa941971a0fcb0ec2c7.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
-rw-r--r--core/sessionmanager.lua10
1 files changed, 10 insertions, 0 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 09920b7d..476de931 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -117,6 +117,16 @@ function bind_resource(session, resource)
if session.resource then return nil, "cancel", "already-bound", "Cannot bind multiple resources on a single connection"; end
-- We don't support binding multiple resources
+ local event_payload = { session = session, resource = resource };
+ if hosts[session.host].events.fire_event("pre-resource-bind", event_payload) == false then
+ local err = event_payload.error;
+ if err then return nil, err.type, err.condition, err.text; end
+ return nil, "cancel", "not-allowed";
+ else
+ -- In case a plugin wants to poke at it
+ resource = event_payload.resource;
+ end
+
resource = resourceprep(resource);
resource = resource ~= "" and resource or uuid_generate();
--FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing