Merge with 0.5

[prosody.git] / plugins / muc / muc.lib.lua

diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 05135c8f23e4633a81afc535f4de9d7cb53d8f4a..6d74c7ba9613ecddf4599918470081d0c23c4633 100644 (file)
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -16,6 +16,8 @@ local log = require "util.logger".init("mod_muc");
 local multitable_new = require "util.multitable".new;
 local t_insert, t_remove = table.insert, table.remove;
 local setmetatable = setmetatable;
+local base64 = require "util.encodings".base64;
+local md5 = require "util.hashes".md5;
 
 local muc_domain = nil; --module:get_host();
 local history_length = 20;
@@ -291,21 +293,44 @@ function room_mt: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 not current_nick and type ~= "error" and type ~= "result" then -- not in room
-               origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
+       elseif not current_nick then -- not in room
+               if type == "error" or type == "result" then
+                       local id = stanza.name == "iq" and stanza.attr.id and base64.decode(stanza.attr.id);
+                       local _nick, _id, _hash = (id or ""):match("^(.+)%z(.*)%z(.+)$");
+                       local occupant = self._occupants[stanza.attr.to];
+                       if occupant and _nick and self._jid_nick[_nick] and _id and _hash then
+                               local id, _to = stanza.attr.id;
+                               for jid in pairs(occupant.sessions) do
+                                       if md5(jid) == _hash then
+                                               _to = jid;
+                                               break;
+                                       end
+                               end
+                               if _to then
+                                       stanza.attr.to, stanza.attr.from, stanza.attr.id = _to, self._jid_nick[_nick], _id;
+                                       self:route_stanza(stanza);
+                                       stanza.attr.to, stanza.attr.from, stanza.attr.id = to, from, id;
+                               end
+                       end
+               else
+                       origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
+               end
        elseif stanza.name == "message" and type == "groupchat" then -- groupchat messages not allowed in PM
                origin.send(st.error_reply(stanza, "modify", "bad-request"));
-       elseif stanza.name == "message" and type == "error" and get_kickable_error(stanza) then
-               log("debug", "%s kicked from %s for sending an error message", current_nick, room);
-               self:handle_to_occupant(origin, st.presence({type='unavailable', from=from, to=to}):tag('status'):text('This participant is kicked from the room because he sent an error message to another occupant')); -- send unavailable
        else -- private stanza
                local o_data = self._occupants[to];
                if o_data then
                        log("debug", "%s sent private stanza to %s (%s)", from, to, o_data.jid);
                        local jid = o_data.jid;
-                       -- TODO if stanza.name=='iq' and type=='get' and stanza.tags[1].attr.xmlns == 'vcard-temp' then jid = jid_bare(jid); end
+                       local bare = jid_bare(jid);
                        stanza.attr.to, stanza.attr.from = jid, current_nick;
+                       local id = stanza.attr.id;
+                       if stanza.name=='iq' and type=='get' and stanza.tags[1].attr.xmlns == 'vcard-temp' and bare ~= jid then
+                               stanza.attr.to = bare;
+                               stanza.attr.id = base64.encode(jid.."\0"..id.."\0"..md5(from));
+                       end
                        self:route_stanza(stanza);
+                       stanza.attr.to, stanza.attr.from, stanza.attr.id = to, from, id;
                elseif type ~= "error" and type ~= "result" then -- recipient not in room
                        origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Recipient not in room"));
                end
@@ -446,6 +471,11 @@ function room_mt:handle_to_room(origin, stanza) -- presence changes and groupcha
                                self:broadcast_message(stanza, true);
                        end
                end
+       elseif stanza.name == "message" and type == "error" and get_kickable_error(stanza) then
+               local current_nick = self._jid_nick[stanza.attr.from];
+               log("debug", "%s kicked from %s for sending an error message", current_nick, self.jid);
+               self:handle_to_occupant(origin, st.presence({type='unavailable', from=stanza.attr.from, to=stanza.attr.to})
+                       :tag('status'):text('This participant is kicked from the room because he sent an error message to another occupant')); -- send unavailable
        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 = self._jid_nick[stanza.attr.from];