From 909e439525e41721abd91b227c7f9078aeda504b Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Mon, 11 Jan 2010 18:59:06 +0500 Subject: sessionmanager: Added resource prepping, and invalid resource checking to the bind_resource function. --- core/sessionmanager.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 9aafe0bf..df144f07 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -24,6 +24,7 @@ local uuid_generate = require "util.uuid".generate; local rm_load_roster = require "core.rostermanager".load_roster; local config_get = require "core.configmanager".get; local nameprep = require "util.encodings".stringprep.nameprep; +local resourceprep = require "util.encodings".stringprep.resourceprep; local fire_event = require "core.eventmanager".fire_event; local add_task = require "util.timer".add_task; @@ -105,7 +106,8 @@ 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 - resource = resource or uuid_generate(); + resource = resourceprep(resource); + resource = resource ~= "" and resource or uuid_generate(); --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing if not hosts[session.host].sessions[session.username] then -- cgit v1.2.3