Merge 0.9 -> trunk (like this?)
[prosody.git] / plugins / muc / mod_muc.lua
index b58f8bd02825d27d6ce6f3f6f18c0fedb3aa4c16..0f27519650577dbf598426b6fb38d0f298398d4d 100644 (file)
@@ -15,21 +15,26 @@ local muc_host = module:get_host();
 local muc_name = module:get_option("name");
 if type(muc_name) ~= "string" then muc_name = "Prosody Chatrooms"; end
 local restrict_room_creation = module:get_option("restrict_room_creation");
-if restrict_room_creation and restrict_room_creation ~= true then restrict_room_creation = nil; end
-
-local muc_new_room = module:require "muc".new_room;
-local register_component = require "core.componentmanager".register_component;
-local deregister_component = require "core.componentmanager".deregister_component;
+if restrict_room_creation then
+       if restrict_room_creation == true then 
+               restrict_room_creation = "admin";
+       elseif restrict_room_creation ~= "admin" and restrict_room_creation ~= "local" then
+               restrict_room_creation = nil;
+       end
+end
+local muclib = module:require "muc";
+local muc_new_room = muclib.new_room;
 local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
 local st = require "util.stanza";
 local uuid_gen = require "util.uuid".generate;
 local datamanager = require "util.datamanager";
 local um_is_admin = require "core.usermanager".is_admin;
+local hosts = hosts;
 
-local rooms = {};
+rooms = {};
+local rooms = rooms;
 local persistent_rooms = datamanager.load(nil, muc_host, "persistent") or {};
-local component;
 
 -- Configurable options
 local max_history_messages = module:get_option_number("max_history_messages");
@@ -38,7 +43,18 @@ local function is_admin(jid)
        return um_is_admin(jid, module.host);
 end
 
-local function room_route_stanza(room, stanza) core_post_stanza(component, stanza); end
+local _set_affiliation = muc_new_room.room_mt.set_affiliation;
+local _get_affiliation = muc_new_room.room_mt.get_affiliation;
+function muclib.room_mt:get_affiliation(jid)
+       if is_admin(jid) then return "owner"; end
+       return _get_affiliation(self, jid);
+end
+function muclib.room_mt:set_affiliation(actor, jid, affiliation, callback, reason)
+       if is_admin(jid) then return nil, "modify", "not-acceptable"; end
+       return _set_affiliation(self, actor, jid, affiliation, callback, reason);
+end
+
+local function room_route_stanza(room, stanza) module:send(stanza); end
 local function room_save(room, forced)
        local node = jid_split(room.jid);
        persistent_rooms[room.jid] = room._data.persistent;
@@ -54,26 +70,37 @@ local function room_save(room, forced)
                room._data.history = history;
        elseif forced then
                datamanager.store(node, muc_host, "config", nil);
+               if not next(room._occupants) then -- Room empty
+                       rooms[room.jid] = nil;
+               end
        end
        if forced then datamanager.store(nil, muc_host, "persistent", persistent_rooms); end
 end
 
+local persistent_errors = false;
 for jid in pairs(persistent_rooms) do
        local node = jid_split(jid);
-       local data = datamanager.load(node, muc_host, "config") or {};
-       local room = muc_new_room(jid, {
-               history_length = max_history_messages;
-       });
-       room._data = data._data;
-       room._data.history_length = max_history_messages; --TODO: Need to allow per-room with a global limit
-       room._affiliations = data._affiliations;
-       room.route_stanza = room_route_stanza;
-       room.save = room_save;
-       rooms[jid] = room;
+       local data = datamanager.load(node, muc_host, "config");
+       if data then
+               local room = muc_new_room(jid, {
+                       max_history_length = max_history_messages;
+               });
+               room._data = data._data;
+               room._data.max_history_length = max_history_messages; -- Overwrite old max_history_length in data with current settings
+               room._affiliations = data._affiliations;
+               room.route_stanza = room_route_stanza;
+               room.save = room_save;
+               rooms[jid] = room;
+       else -- missing room data
+               persistent_rooms[jid] = nil;
+               module:log("error", "Missing data for room '%s', removing from persistent room list", jid);
+               persistent_errors = true;
+       end
 end
+if persistent_errors then datamanager.store(nil, muc_host, "persistent", persistent_rooms); end
 
 local host_room = muc_new_room(muc_host, {
-       history_length = max_history_messages;
+       max_history_length = max_history_messages;
 });
 host_room.route_stanza = room_route_stanza;
 host_room.save = room_save;
@@ -93,7 +120,8 @@ local function get_disco_items(stanza)
        return reply; -- TODO cache disco reply
 end
 
-local function handle_to_domain(origin, stanza)
+local function handle_to_domain(event)
+       local origin, stanza = event.origin, event.stanza;
        local type = stanza.attr.type;
        if type == "error" or type == "result" then return; end
        if stanza.name == "iq" and type == "get" then
@@ -111,66 +139,63 @@ local function handle_to_domain(origin, stanza)
                host_room:handle_stanza(origin, stanza);
                --origin.send(st.error_reply(stanza, "cancel", "service-unavailable", "The muc server doesn't deal with messages and presence directed at it"));
        end
+       return true;
 end
 
 function stanza_handler(event)
        local origin, stanza = event.origin, event.stanza;
-       local to_node, to_host, to_resource = jid_split(stanza.attr.to);
-       if to_node then
-               local bare = to_node.."@"..to_host;
-               if to_host == muc_host or bare == muc_host then
-                       local room = rooms[bare];
-                       if not room then
-                               if not(restrict_room_creation) or is_admin(stanza.attr.from) then
-                                       room = muc_new_room(bare, {
-                                               history_length = max_history_messages;
-                                       });
-                                       room.route_stanza = room_route_stanza;
-                                       room.save = room_save;
-                                       rooms[bare] = room;
-                               end
-                       end
-                       if room then
-                               room:handle_stanza(origin, stanza);
-                               if not next(room._occupants) and not persistent_rooms[room.jid] then -- empty, non-persistent room
-                                       rooms[bare] = nil; -- discard room
-                               end
-                       else
-                               origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
-                       end
-               else --[[not for us?]] end
-               return;
+       local bare = jid_bare(stanza.attr.to);
+       local room = rooms[bare];
+       if not room then
+               if stanza.name ~= "presence" then
+                       origin.send(st.error_reply(stanza, "cancel", "item-not-found"));
+                       return true;
+               end
+               if not(restrict_room_creation) or
+                 (restrict_room_creation == "admin" and is_admin(stanza.attr.from)) or
+                 (restrict_room_creation == "local" and select(2, jid_split(stanza.attr.from)) == module.host:gsub("^[^%.]+%.", "")) then
+                       room = muc_new_room(bare, {
+                               max_history_length = max_history_messages;
+                       });
+                       room.route_stanza = room_route_stanza;
+                       room.save = room_save;
+                       rooms[bare] = room;
+               end
+       end
+       if room then
+               room:handle_stanza(origin, stanza);
+               if not next(room._occupants) and not persistent_rooms[room.jid] then -- empty, non-persistent room
+                       rooms[bare] = nil; -- discard room
+               end
+       else
+               origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
        end
-       -- to the main muc domain
-       handle_to_domain(origin, stanza);
-end
-module:hook("iq/bare", stanza_handler);
-module:hook("message/bare", stanza_handler);
-module:hook("presence/bare", stanza_handler);
-module:hook("iq/full", stanza_handler);
-module:hook("message/full", stanza_handler);
-module:hook("presence/full", stanza_handler);
-module:hook("iq/host", stanza_handler);
-module:hook("message/host", stanza_handler);
-module:hook("presence/host", stanza_handler);
-
-component = register_component(muc_host, function() end);
-function component.send(stanza) -- FIXME do a generic fix
+       return true;
+end
+module:hook("iq/bare", stanza_handler, -1);
+module:hook("message/bare", stanza_handler, -1);
+module:hook("presence/bare", stanza_handler, -1);
+module:hook("iq/full", stanza_handler, -1);
+module:hook("message/full", stanza_handler, -1);
+module:hook("presence/full", stanza_handler, -1);
+module:hook("iq/host", handle_to_domain, -1);
+module:hook("message/host", handle_to_domain, -1);
+module:hook("presence/host", handle_to_domain, -1);
+
+hosts[module.host].send = function(stanza) -- FIXME do a generic fix
        if stanza.attr.type == "result" or stanza.attr.type == "error" then
-               core_post_stanza(component, stanza);
+               module:send(stanza);
        else error("component.send only supports result and error stanzas at the moment"); end
 end
 
-prosody.hosts[module:get_host()].muc = { rooms = rooms };
+hosts[module:get_host()].muc = { rooms = rooms };
 
-module.unload = function()
-       deregister_component(muc_host);
-end
+local saved = false;
 module.save = function()
+       saved = true;
        return {rooms = rooms};
 end
 module.restore = function(data)
-       rooms = {};
        for jid, oldroom in pairs(data.rooms or {}) do
                local room = muc_new_room(jid);
                room._jid_nick = oldroom._jid_nick;
@@ -181,5 +206,30 @@ module.restore = function(data)
                room.save = room_save;
                rooms[jid] = room;
        end
-       prosody.hosts[module:get_host()].muc = { rooms = rooms };
+       hosts[module:get_host()].muc = { rooms = rooms };
+end
+
+function shutdown_room(room, stanza)
+       for nick, occupant in pairs(room._occupants) do
+               stanza.attr.from = nick;
+               for jid in pairs(occupant.sessions) do
+                       stanza.attr.to = jid;
+                       room:_route_stanza(stanza);
+                       room._jid_nick[jid] = nil;
+               end
+               room._occupants[nick] = nil;
+       end
+end
+function shutdown_component()
+       if not saved then
+               local stanza = st.presence({type = "unavailable"})
+                       :tag("x", {xmlns = "http://jabber.org/protocol/muc#user"})
+                               :tag("item", { affiliation='none', role='none' }):up();
+               for roomjid, room in pairs(rooms) do
+                       shutdown_room(room, stanza);
+               end
+               shutdown_room(host_room, stanza);
+       end
 end
+module.unload = shutdown_component;
+module:hook_global("server-stopping", shutdown_component);