MUC: Fixed: Presence for user joining the roomi was sent twice to the user
[prosody.git] / plugins / mod_muc.lua
index 79fcbdb6fcf78a0d59488a052d0f22ef99b7c004..a306c6997f0aa8e67fd8f76900da89839a6afb58 100644 (file)
@@ -7,14 +7,15 @@ local jid_bare = require "util.jid".bare;
 local st = require "util.stanza";
 local log = require "util.logger".init("mod_muc");
 local multitable_new = require "util.multitable".new;
+local t_insert, t_remove = table.insert, table.remove;
 
 if module:get_host_type() ~= "component" then
        error("MUC should be loaded as a component, please see http://prosody.im/doc/components", 0);
 end
 
 local muc_domain = module:get_host();
-
 local muc_name = "MUCMUCMUC!!!";
+local history_length = 20;
 
 -- room_name -> room
        -- occupant_room_nick -> data
@@ -30,6 +31,7 @@ local jid_nick = multitable_new(); -- real jid -> room's jid -> room nick
        -- subject - the room's subject
        -- non-anonymous = true|nil
        -- persistent = true|nil
+       -- history = {preserialized stanzas}
 local rooms_info = multitable_new();
 
 local persist_list = datamanager.load(nil, muc_domain, 'room_list') or {};
@@ -39,6 +41,29 @@ end
 
 local component;
 
+function filter_xmlns_from_array(array, filters)
+       local count = 0;
+       for i=#array,1,-1 do
+               local attr = array[i].attr;
+               if filters[attr and attr.xmlns] then
+                       t_remove(array, i);
+                       count = count + 1;
+               end
+       end
+       return count;
+end
+function filter_xmlns_from_stanza(stanza, filters)
+       if filters then
+               if filter_xmlns_from_array(stanza.tags, filters) ~= 0 then
+                       return stanza, filter_xmlns_from_array(stanza, filters);
+               end
+       end
+       return stanza, 0;
+end
+local presence_filters = {["http://jabber.org/protocol/muc"]=true;["http://jabber.org/protocol/muc#user"]=true};
+function get_filtered_presence(stanza)
+       return filter_xmlns_from_stanza(st.deserialize(st.preserialize(stanza)), presence_filters);
+end
 function getUsingPath(stanza, path, getText)
        local tag = stanza;
        for _, name in ipairs(path) do
@@ -91,7 +116,10 @@ function set_subject(current_nick, room, subject)
        if subject == "" then subject = nil; end
        rooms_info:set(room, 'subject', subject);
        save_room();
-       broadcast_message(current_nick, room, subject or "", nil);
+       local msg = st.message({type='groupchat', from=from})
+               :tag('subject'):text(subject):up();
+       broadcast_message_stanza(room, msg, false);
+       --broadcast_message(current_nick, room, subject or "", nil);
        return true;
 end
 
@@ -131,6 +159,65 @@ function broadcast_message(from, room, subject, body)
                        stanza.attr.to = o_data.jid;
                        core_route_stanza(component, stanza);
                end
+               if not subject and body then -- add to history
+                       local history = rooms_info:get(room, 'history');
+                       if not history then history = {}; rooms_info:set(room, 'history', history); end
+                       -- stanza = st.deserialize(st.preserialize(stanza));
+                       stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = muc_domain, stamp = datetime.datetime()}):up(); -- XEP-0203
+                       stanza:tag("x", {xmlns = "jabber:x:delay", from = muc_domain, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated)
+                       t_insert(history, st.preserialize(stanza));
+                       while #history > history_length do t_remove(history, 1) end
+               end
+       end
+end
+function broadcast_message_stanza(room, stanza, historic)
+       local r = rooms:get(room);
+       if r then
+               for occupant, o_data in pairs(r) do
+                       for jid in pairs(o_data.sessions) do
+                               stanza.attr.to = jid;
+                               core_route_stanza(component, stanza);
+                       end
+               end
+               if historic then -- add to history
+                       local history = rooms_info:get(room, 'history');
+                       if not history then history = {}; rooms_info:set(room, 'history', history); end
+                       -- stanza = st.deserialize(st.preserialize(stanza));
+                       stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = muc_domain, stamp = datetime.datetime()}):up(); -- XEP-0203
+                       stanza:tag("x", {xmlns = "jabber:x:delay", from = muc_domain, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated)
+                       t_insert(history, st.preserialize(stanza));
+                       while #history > history_length do t_remove(history, 1) end
+               end
+       end
+end
+function broadcast_presence_stanza(room, stanza, code, nick)
+       stanza = get_filtered_presence(stanza);
+       local data = rooms:get(room, stanza.attr.from);
+       stanza:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
+               :tag("item", {affiliation=data.affiliation, role=data.role, nick=nick}):up();
+       if code then
+               stanza:tag("status", {code=code}):up();
+       end
+       local me;
+       local r = rooms:get(room);
+       if r then
+               for occupant, o_data in pairs(r) do
+                       if occupant ~= stanza.attr.from then
+                               for jid in pairs(o_data.sessions) do
+                                       stanza.attr.to = jid;
+                                       core_route_stanza(component, stanza);
+                               end
+                       else
+                               me = o_data;
+                       end
+               end
+       end
+       if me then
+               stanza:tag("status", {code='110'});
+               for jid in pairs(me.sessions) do
+                       stanza.attr.to = jid;
+                       core_route_stanza(component, stanza);
+               end
        end
 end
 
@@ -140,24 +227,34 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc
        local current_nick = jid_nick:get(from, room);
        local type = stanza.attr.type;
        if stanza.name == "presence" then
+               local pr = get_filtered_presence(stanza);
+               pr.attr.from = to;
                if type == "error" then -- error, kick em out!
-                       local data = rooms:get(room, to);
-                       data.role = 'none';
-                       broadcast_presence('unavailable', to, room); -- TODO also add <status>This participant is kicked from the room because he sent an error presence: badformed error stanza</status>
-                       rooms:remove(room, to);
-                       jid_nick:remove(from, room);
+                       if current_nick then
+                               local data = rooms:get(room, to);
+                               data.role = 'none';
+                               local pr = st.presence({type='unavailable', from=current_nick}):tag('status'):text('This participant is kicked from the room because he sent an error presence'):up()
+                                       :tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
+                                       :tag("item", {affiliation=data.affiliation, role=data.role}):up();
+                               broadcast_presence_stanza(room, pr);
+                               --broadcast_presence('unavailable', to, room); -- TODO also add <status>This participant is kicked from the room because he sent an error presence: badformed error stanza</status>
+                               rooms:remove(room, to);
+                               jid_nick:remove(from, room);
+                       end
                elseif type == "unavailable" then -- unavailable
-                       if current_nick == to then
+                       if current_nick then
                                local data = rooms:get(room, to);
                                data.role = 'none';
-                               broadcast_presence('unavailable', to, room);
+                               broadcast_presence_stanza(room, pr);
+                               --broadcast_presence('unavailable', to, room);
                                rooms:remove(room, to);
                                jid_nick:remove(from, room);
-                       end -- TODO else do nothing?
+                       end
                elseif not type then -- available
                        if current_nick then
                                if current_nick == to then -- simple presence
-                                       -- TODO broadcast
+                                       broadcast_presence_stanza(room, pr);
+                                       -- FIXME check if something was filtered. if it was, then user may be rejoining
                                else -- change nick
                                        if rooms:get(room, to) then
                                                origin.send(st.error_reply(stanza, "cancel", "conflict"));
@@ -165,42 +262,63 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc
                                                local data = rooms:get(room, current_nick);
                                                local to_nick = select(3, jid_split(to));
                                                if to_nick then
-                                                       broadcast_presence('unavailable', current_nick, room, '303', to_nick);
+                                                       local p = st.presence({type='unavailable', from=current_nick});
+                                                               --[[:tag('x', {xmlns='http://jabber.org/protocol/muc#user'})
+                                                                       :tag('item', {affiliation=data.affiliation, role=data.role, nick=to_nick}):up()
+                                                                       :tag('status', {code='303'});]]
+                                                       broadcast_presence_stanza(room, p, '303', to_nick);
+                                                       --broadcast_presence('unavailable', current_nick, room, '303', to_nick);
                                                        rooms:remove(room, current_nick);
                                                        rooms:set(room, to, data);
                                                        jid_nick:set(from, room, to);
-                                                       broadcast_presence(nil, to, room, nil);
+                                                       broadcast_presence_stanza(room, pr);
+                                                       --broadcast_presence(nil, to, room, nil);
                                                else
-                                                       --TODO: malformed-jid
+                                                       --TODO malformed-jid
                                                end
                                        end
                                end
                        else -- enter room
+                               local new_nick = to;
                                if rooms:get(room, to) then
+                                       new_nick = nil;
+                               end
+                               if not new_nick then
                                        origin.send(st.error_reply(stanza, "cancel", "conflict"));
                                else
                                        local data;
                                        if not rooms:get(room) and not rooms_info:get(room) then -- new room
-                                               data = {affiliation='owner', role='moderator', jid=from};
+                                               data = {affiliation='owner', role='moderator', jid=from, sessions={[from]=get_filtered_presence(stanza)}};
                                        end
                                        if not data then -- new occupant
-                                               data = {affiliation='none', role='participant', jid=from};
+                                               data = {affiliation='none', role='participant', jid=from, sessions={[from]=get_filtered_presence(stanza)}};
                                        end
                                        rooms:set(room, to, data);
                                        jid_nick:set(from, room, to);
                                        local r = rooms:get(room);
                                        if r then
                                                for occupant, o_data in pairs(r) do
-                                                       if occupant ~= from then
-                                                               local pres = st.presence({to=from, from=occupant})
+                                                       if occupant ~= to then
+                                                               local pres = get_filtered_presence(o_data.sessions[o_data.jid]);
+                                                               pres.attr.to, pres.attr.from = from, occupant;
+                                                               pres
+                                                               --local pres = st.presence({to=from, from=occupant})
                                                                        :tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
                                                                        :tag("item", {affiliation=o_data.affiliation, role=o_data.role}):up();
                                                                core_route_stanza(component, pres);
                                                        end
                                                end
                                        end
-                                       broadcast_presence(nil, to, room);
-                                       -- TODO send discussion history
+                                       broadcast_presence_stanza(room, pr);
+                                       --broadcast_presence(nil, to, room);
+                                       local history = rooms_info:get(room, 'history'); -- send discussion history
+                                       if history then
+                                               for _, msg in ipairs(history) do
+                                                       msg = st.deserialize(msg);
+                                                       msg.attr.to=from;
+                                                       core_route_stanza(component, msg);
+                                               end
+                                       end
                                        if rooms_info:get(room, 'subject') then
                                                core_route_stanza(component, st.message({type='groupchat', from=room, to=from}):tag("subject"):text(rooms_info:get(room, 'subject')));
                                        end
@@ -209,11 +327,31 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc
                elseif type ~= 'result' then -- bad type
                        origin.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME correct error?
                end
-       elseif stanza.name == "message" and type == "groupchat" then
-               -- groupchat messages not allowed in PM
+       elseif not current_nick then -- not in room
+               origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
+       elseif stanza.name == "message" and type == "groupchat" then -- groupchat messages not allowed in PM
                origin.send(st.error_reply(stanza, "modify", "bad-request"));
-       else
-               origin.send(st.error_reply(stanza, "cancel", "not-implemented", "Private stanzas not implemented")); -- TODO route private stanza
+       elseif stanza.name == "message" and type == "error" then
+               if current_nick then
+                       local data = rooms:get(room, to);
+                       data.role = 'none';
+                       local pr = st.presence({type='unavailable', from=current_nick}):tag('status'):text('This participant is kicked from the room because he sent an error message to another occupant'):up()
+                               :tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
+                               :tag("item", {affiliation=data.affiliation, role=data.role}):up();
+                       broadcast_presence_stanza(room, pr);
+                       rooms:remove(room, to);
+                       jid_nick:remove(from, room);
+               end
+       else -- private stanza
+               local o_data = rooms:get(room, to);
+               if o_data then
+                       local jid = o_data.jid;
+                       if stanza.name=='iq' and type=='get' and stanza.tags[1].attr.xmlns == 'vcard-temp' then jid = jid_bare(jid); end
+                       stanza.attr.to, stanza.attr.from = jid, current_nick;
+                       core_route_stanza(component, stanza);
+               else -- recipient not in room
+                       origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Recipient not in room"));
+               end
        end
 end
 
@@ -235,14 +373,26 @@ function handle_to_room(origin, stanza) -- presence changes and groupchat messag
                if not current_nick then -- not in room
                        origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
                else
+                       local from = stanza.attr.from;
+                       stanza.attr.from = current_nick;
                        local subject = getText(stanza, {"subject"});
                        if subject then
-                               set_subject(current_nick, room, subject);
+                               set_subject(current_nick, room, subject); -- TODO use broadcast_message_stanza
                        else
-                               broadcast_message(current_nick, room, nil, getText(stanza, {"body"}));
-                               -- TODO add to discussion history
+                               --broadcast_message(current_nick, room, nil, getText(stanza, {"body"}));
+                               broadcast_message_stanza(room, stanza, true);
                        end
                end
+       elseif stanza.name == "presence" then -- hack - some buggy clients send presence updates to the room rather than their nick
+               local to = stanza.attr.to;
+               local current_nick = jid_nick:get(stanza.attr.from, to);
+               if current_nick then
+                       stanza.attr.to = current_nick;
+                       handle_to_occupant(origin, stanza);
+                       stanza.attr.to = to;
+               else
+                       origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+               end
        else
                if type == "error" or type == "result" then return; end
                origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
@@ -268,10 +418,7 @@ end
 
 register_component(muc_domain, function(origin, stanza)
        local to_node, to_host, to_resource = jid_split(stanza.attr.to);
-       if stanza.name == "presence" and stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
-               if type == "error" or type == "result" then return; end
-               origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME what's appropriate?
-       elseif to_resource and not to_node then
+       if to_resource and not to_node then
                if type == "error" or type == "result" then return; end
                origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- host/resource
        elseif to_resource then