sessionmanager, mod_tls: Mark a session as secure when TLS is active

[prosody.git] / plugins / mod_roster.lua

diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 554ef2e59044a85cf2a37918880792c331356498..bdc9a23318d7d50dd831b95aeddb160968f2c8a5 100644 (file)
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -35,12 +35,12 @@ module:add_iq_handler("c2s", "jabber:iq:roster",
                function (session, stanza)
                        if stanza.tags[1].name == "query" then
                                if stanza.attr.type == "get" then
-                                       local roster = st.reply(stanza)
-                                                               :query("jabber:iq:roster");
+                                       local roster = st.reply(stanza);
                                        
                                        local ver = stanza.tags[1].attr.ver
                                        
                                        if (not ver) or tonumber(ver) ~= (session.roster[false].version or 1) then
+                                               roster:query("jabber:iq:roster");
                                                -- Client does not support versioning, or has stale roster
                                                for jid in pairs(session.roster) do
                                                        if jid ~= "pending" and jid then
@@ -114,19 +114,25 @@ module:add_iq_handler("c2s", "jabber:iq:roster",
                                                                        end
                                                                        local success, err_type, err_cond, err_msg = rm_add_to_roster(session, jid, r_item);
                                                                        if success then
+                                                                               -- Ok, send success
                                                                                session.send(st.reply(stanza));
+                                                                               -- and push change to all resources
                                                                                rm_roster_push(from_node, from_host, jid);
                                                                        else
+                                                                               -- Adding to roster failed
                                                                                session.send(st.error_reply(stanza, err_type, err_cond, err_msg));
                                                                        end
                                                                end
                                                        else
+                                                               -- Trying to add self to roster
                                                                session.send(st.error_reply(stanza, "cancel", "not-allowed"));
                                                        end
                                                else
+                                                       -- Invalid JID added to roster
                                                        session.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME what's the correct error?
                                                end
                                        else
+                                               -- Roster set didn't include a single item, or its name wasn't  'item'
                                                session.send(st.error_reply(stanza, "modify", "bad-request"));
                                        end
                                        return true;