From 4e83c7ddd66031d6a67d7c8cfda36f7b514ac1b6 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 29 Mar 2011 14:10:00 +0100 Subject: sessionmanager: Fire pre-resource-unbind to allow plugins (such as mod_smacks) to hook and prevent/override session destruction --- core/sessionmanager.lua | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index d36591bf..426763f5 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -108,16 +108,23 @@ function destroy_session(session, err) -- Remove session/resource from user's session list if session.full_jid then - hosts[session.host].sessions[session.username].sessions[session.resource] = nil; + local host_session = hosts[session.host]; + + -- Allow plugins to prevent session destruction + if host_session.events.fire_event("pre-resource-unbind", {session=session, error=err}) then + return; + end + + host_session.sessions[session.username].sessions[session.resource] = nil; full_sessions[session.full_jid] = nil; - if not next(hosts[session.host].sessions[session.username].sessions) then + if not next(host_session.sessions[session.username].sessions) then log("debug", "All resources of %s are now offline", session.username); - hosts[session.host].sessions[session.username] = nil; + host_session.sessions[session.username] = nil; bare_sessions[session.username..'@'..session.host] = nil; end - hosts[session.host].events.fire_event("resource-unbind", {session=session, error=err}); + host_session.events.fire_event("resource-unbind", {session=session, error=err}); end retire_session(session); -- cgit v1.2.3 From ca74173a8221e9cd93db30c7bb89c8b181f8b60b Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 5 Apr 2011 13:26:19 +0100 Subject: usermanager: Check host exists before trying to look up admins for it --- core/usermanager.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core') diff --git a/core/usermanager.lua b/core/usermanager.lua index 5e2e41fc..0152afd7 100644 --- a/core/usermanager.lua +++ b/core/usermanager.lua @@ -96,6 +96,8 @@ function get_provider(host) end function is_admin(jid, host) + if host and not hosts[host] then return false; end + local is_admin; jid = jid_bare(jid); host = host or "*"; -- cgit v1.2.3