Comparison

MUC: Strictly validate room JID on creation This should prevent any MUCs with invalid JID (according to current normalization routine)

comparison

equal deleted inserted replaced

-:744ca71a49f7
+:5611c939743a
 room_mt.set_presence_broadcast = presence_broadcast.set;
 room_mt.get_valid_broadcast_roles = presence_broadcast.get_valid_broadcast_roles;
 local jid_split = require "util.jid".split;
+local jid_prep = require "util.jid".prep;
 local jid_bare = require "util.jid".bare;
 local st = require "util.stanza";
 local cache = require "util.cache";
 local um_is_admin = require "core.usermanager".is_admin;
 	room:set_language(lang or module:get_option_string("muc_room_default_language"));
 	room:set_presence_broadcast(module:get_option("muc_room_default_presence_broadcast", room:get_presence_broadcast()));
 end
 function create_room(room_jid, config)
+	if jid_bare(room_jid) ~= room_jid or not jid_prep(room_jid, true) then
+		return nil, "invalid-jid";
+	end
 	local exists = get_room_from_jid(room_jid);
 	if exists then
 		return nil, "room-exists";
 	end
 	local room = muclib.new_room(room_jid, config);
 			end
 		end
 		if room == nil then
 			-- Watch presence to create rooms
+			if not jid_prep(room_jid, true) then
+				origin.send(st.error_reply(stanza, "modify", "jid-malformed"));
+				return true;
+			end
 			if stanza.attr.type == nil and stanza.name == "presence" and stanza:get_child("x", "http://jabber.org/protocol/muc") then
 				room = muclib.new_room(room_jid);
 				return room:handle_first_presence(origin, stanza);
 			elseif stanza.attr.type ~= "error" then
 				origin.send(st.error_reply(stanza, "cancel", "item-not-found"));