From e5721e4840915e42d69bbc5ab70bcc0bcd6e52a4 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 4 Oct 2009 21:25:59 +0500 Subject: rostermanager: Added support for saving rosters of offline users to the save_roster function. --- core/rostermanager.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/rostermanager.lua b/core/rostermanager.lua index 0163e343..c3fd3b68 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -102,9 +102,16 @@ function load_roster(username, host) return roster; end -function save_roster(username, host) +function save_roster(username, host, roster) log("debug", "save_roster: saving roster for "..username.."@"..host); - if hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster then + if not roster then + roster = hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster; + --if not roster then + -- --roster = load_roster(username, host); + -- return true; -- roster unchanged, no reason to save + --end + end + if roster then local roster = hosts[host].sessions[username].roster; roster[false].version = (roster[false].version or 1) + 1; return datamanager.store(username, host, "roster", hosts[host].sessions[username].roster); -- cgit v1.2.3 From 53295e052d0b5fde8f2d94cb8f41427876c82935 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 4 Oct 2009 21:34:17 +0500 Subject: rostermanager: Fixed: Roster version was not being properly updated in some edge cases. --- core/rostermanager.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'core') diff --git a/core/rostermanager.lua b/core/rostermanager.lua index c3fd3b68..33fcf97a 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -130,7 +130,7 @@ function process_inbound_subscription_approval(username, host, jid) item.subscription = "both"; end item.ask = nil; - return datamanager.store(username, host, "roster", roster); + return save_roster(username, host, roster); end end @@ -152,7 +152,7 @@ function process_inbound_subscription_cancellation(username, host, jid) end end if changed then - return datamanager.store(username, host, "roster", roster); + return save_roster(username, host, roster); end end @@ -174,7 +174,7 @@ function process_inbound_unsubscribe(username, host, jid) end end if changed then - return datamanager.store(username, host, "roster", roster); + return save_roster(username, host, roster); end end @@ -196,7 +196,7 @@ function set_contact_pending_in(username, host, jid, pending) end if not roster.pending then roster.pending = {}; end roster.pending[jid] = true; - return datamanager.store(username, host, "roster", roster); + return save_roster(username, host, roster); end function is_contact_pending_out(username, host, jid) local roster = load_roster(username, host); @@ -215,7 +215,7 @@ function set_contact_pending_out(username, host, jid) -- subscribe end item.ask = "subscribe"; log("debug", "set_contact_pending_out: saving roster; set "..username.."@"..host..".roster["..jid.."].ask=subscribe"); - return datamanager.store(username, host, "roster", roster); + return save_roster(username, host, roster); end function unsubscribe(username, host, jid) local roster = load_roster(username, host); @@ -230,7 +230,7 @@ function unsubscribe(username, host, jid) elseif item.subscription == "to" then item.subscription = "none"; end - return datamanager.store(username, host, "roster", roster); + return save_roster(username, host, roster); end function subscribed(username, host, jid) if is_contact_pending_in(username, host, jid) then @@ -247,7 +247,7 @@ function subscribed(username, host, jid) end roster.pending[jid] = nil; -- TODO maybe remove roster.pending if empty - return datamanager.store(username, host, "roster", roster); + return save_roster(username, host, roster); end -- TODO else implement optional feature pre-approval (ask = subscribed) end function unsubscribed(username, host, jid) @@ -269,7 +269,7 @@ function unsubscribed(username, host, jid) end end if changed then - return datamanager.store(username, host, "roster", roster); + return save_roster(username, host, roster); end end @@ -278,7 +278,7 @@ function process_outbound_subscription_request(username, host, jid) local item = roster[jid]; if item and (item.subscription == "none" or item.subscription == "from") then item.ask = "subscribe"; - return datamanager.store(username, host, "roster", roster); + return save_roster(username, host, roster); end end @@ -287,7 +287,7 @@ end local item = roster[jid]; if item and (item.subscription == "none" or item.subscription == "from" then item.ask = "subscribe"; - return datamanager.store(username, host, "roster", roster); + return save_roster(username, host, roster); end end]] -- cgit v1.2.3 From 269a562f52e2d404c4d49122436029d07d17711c Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 4 Oct 2009 21:46:35 +0500 Subject: stanza_router: Reply to IQ requests with missing 'id' attribute with a bad-request error. --- core/stanza_router.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/stanza_router.lua b/core/stanza_router.lua index dac098bb..610498aa 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -26,9 +26,13 @@ function core_process_stanza(origin, stanza) -- TODO verify validity of stanza (as well as JID validity) if stanza.attr.type == "error" and #stanza.tags == 0 then return; end -- TODO invalid stanza, log if stanza.name == "iq" then - if (stanza.attr.type == "set" or stanza.attr.type == "get") and #stanza.tags ~= 1 then + local can_reply = stanza.attr.type == "set" or stanza.attr.type == "get" + local missing_id = not stanza.attr.id; + if can_reply and (#stanza.tags ~= 1 or missing_id) then origin.send(st.error_reply(stanza, "modify", "bad-request")); return; + elseif missing_id then + return; end end -- cgit v1.2.3