From 2bf0d50232994a42e4a250b124fbbba01dfef57a Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 22 May 2010 05:50:47 +0500 Subject: rostermanager: When loading the roster, also return a datamanager error if available. --- core/rostermanager.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/rostermanager.lua b/core/rostermanager.lua index e2a92696..a8eb806c 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -93,7 +93,8 @@ function load_roster(username, host) else -- Attempt to load roster for non-loaded user log("debug", "load_roster: loading for offline user: "..username.."@"..host); end - roster = datamanager.load(username, host, "roster") or {}; + local data, err = datamanager.load(username, host, "roster"); + roster = data or {}; if user then user.roster = roster; end if not roster[false] then roster[false] = { }; end if roster[jid] then @@ -101,7 +102,7 @@ function load_roster(username, host) log("warn", "roster for "..jid.." has a self-contact"); end hosts[host].events.fire_event("roster-load", username, host, roster); - return roster; + return roster, err; end function save_roster(username, host, roster) -- cgit v1.2.3 From f77c1fc2d0378297e4d31ff2f7420515291d9988 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 22 May 2010 05:52:24 +0500 Subject: sessionmanager: If roster loading fails during resource bind, kick the user with an internal-server-error. --- core/sessionmanager.lua | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 6e771a84..3537d2d2 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -174,7 +174,19 @@ function bind_resource(session, resource) hosts[session.host].sessions[session.username].sessions[resource] = session; full_sessions[session.full_jid] = session; - session.roster = rm_load_roster(session.username, session.host); + local err; + session.roster, err = rm_load_roster(session.username, session.host); + if err then + full_sessions[session.full_jid] = nil; + hosts[session.host].sessions[session.username].sessions[resource] = nil; + session.full_jid = nil; + session.resource = nil; + if next(bare_sessions[session.username..'@'..session.host]) == nil then + bare_sessions[session.username..'@'..session.host] = nil; + hosts[session.host].sessions[session.username] = nil; + end + return nil, "cancel", "internal-server-error", "Error loading roster"; + end hosts[session.host].events.fire_event("resource-bind", {session=session}); -- cgit v1.2.3 From c1257c7435697f4ed47c823ac0ebc8f676f1c773 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 22 May 2010 05:53:27 +0500 Subject: sessionmanager: Change error for reaching resource limit from 'conflict' to 'resource-constraint' during session bind. --- core/sessionmanager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core') diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 3537d2d2..48990de3 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -136,7 +136,7 @@ function bind_resource(session, resource) local sessions = hosts[session.host].sessions[session.username].sessions; local limit = config_get(session.host, "core", "max_resources") or 10; if #sessions >= limit then - return nil, "cancel", "conflict", "Resource limit reached; only "..limit.." resources allowed"; + return nil, "cancel", "resource-constraint", "Resource limit reached; only "..limit.." resources allowed"; end if sessions[resource] then -- Resource conflict -- cgit v1.2.3 From 41d45e0c64b94de227f048d5f376699dd6041735 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sat, 22 May 2010 12:20:22 +0100 Subject: rostermanager: Don't fire roster-load event if there was an error loading the roster --- core/rostermanager.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/rostermanager.lua b/core/rostermanager.lua index a8eb806c..a3315245 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -101,7 +101,9 @@ function load_roster(username, host) roster[jid] = nil; log("warn", "roster for "..jid.." has a self-contact"); end - hosts[host].events.fire_event("roster-load", username, host, roster); + if not err then + hosts[host].events.fire_event("roster-load", username, host, roster); + end return roster, err; end -- cgit v1.2.3 From 8abd2f2c24bd83acb36e9c8ace40ac3751f09663 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 23 May 2010 05:46:52 +0500 Subject: rostermanager: Correctly clear the bare_sessions table on roster load errors during bind. --- core/sessionmanager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core') diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 48990de3..fd6ed96e 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -181,7 +181,7 @@ function bind_resource(session, resource) hosts[session.host].sessions[session.username].sessions[resource] = nil; session.full_jid = nil; session.resource = nil; - if next(bare_sessions[session.username..'@'..session.host]) == nil then + if next(bare_sessions[session.username..'@'..session.host].sessions) == nil then bare_sessions[session.username..'@'..session.host] = nil; hosts[session.host].sessions[session.username] = nil; end -- cgit v1.2.3 From 054a2d38c1ab12bf6bda2c22b775a91b9fb4dd4a Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Mon, 24 May 2010 00:29:45 +0500 Subject: rostermanager: Mark rosters which fail to load as broken, and never save them. --- core/rostermanager.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/rostermanager.lua b/core/rostermanager.lua index a3315245..285cf4f6 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -96,7 +96,7 @@ function load_roster(username, host) local data, err = datamanager.load(username, host, "roster"); roster = data or {}; if user then user.roster = roster; end - if not roster[false] then roster[false] = { }; end + if not roster[false] then roster[false] = { broken = err or nil }; end if roster[jid] then roster[jid] = nil; log("warn", "roster for "..jid.." has a self-contact"); @@ -125,6 +125,7 @@ function save_roster(username, host, roster) if metadata.version ~= true then metadata.version = (metadata.version or 0) + 1; end + if roster[false].broken then return nil, "Not saving broken roster" end return datamanager.store(username, host, "roster", roster); end log("warn", "save_roster: user had no roster to save"); -- cgit v1.2.3 From e1b4298fde007769a41c0a97fbfcc2f44bb383f9 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Mon, 24 May 2010 00:35:08 +0500 Subject: rostermanager: Return an error string when subscription test fails due to an error. --- core/rostermanager.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/rostermanager.lua b/core/rostermanager.lua index 285cf4f6..506cf205 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -191,9 +191,9 @@ function process_inbound_unsubscribe(username, host, jid) end function is_contact_subscribed(username, host, jid) - local roster = load_roster(username, host); + local roster, err = load_roster(username, host); local item = roster[jid]; - return item and (item.subscription == "from" or item.subscription == "both"); + return item and (item.subscription == "from" or item.subscription == "both"), err; end function is_contact_pending_in(username, host, jid) -- cgit v1.2.3 From 4353f95a958a306dfb990d84abe7a922ece80126 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Mon, 24 May 2010 00:49:12 +0500 Subject: usermanager: Take datamanager errors into account when determining account existance. --- core/usermanager.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/usermanager.lua b/core/usermanager.lua index 42e49d38..698d2f10 100644 --- a/core/usermanager.lua +++ b/core/usermanager.lua @@ -69,7 +69,8 @@ end function user_exists(username, host) if not(require_provisioning) and is_cyrus(host) then return true; end - return datamanager.load(username, host, "accounts") ~= nil; -- FIXME also check for empty credentials + local account, err = datamanager.load(username, host, "accounts"); + return (account or err) ~= nil; -- FIXME also check for empty credentials end function create_user(username, password, host) -- cgit v1.2.3