From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Thu, 11 Aug 2016 14:13:20 +0000 (+0300)
Subject: Add a requirement for full JID in subscribe_room command
X-Git-Tag: 16.09~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffba664f2cfa0965c05d572e14c3524550bd6742;p=ejabberd

Add a requirement for full JID in subscribe_room command
---

diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl
index 692dedf5f..e1d48cdab 100644
--- a/src/mod_muc_admin.erl
+++ b/src/mod_muc_admin.erl
@@ -908,8 +908,9 @@ subscribe_room(User, Nick, Room, Nodes) ->
 	    case jid:from_string(User) of
 		error ->
 		    throw({error, "Malformed user JID"});
-		JID ->
-		    UserJID = jid:replace_resource(JID, Nick),
+		#jid{lresource = <<"">>} ->
+		    throw({error, "User's JID should have a resource"});
+		UserJID ->
 		    case get_room_pid(Name, Host) of
 			Pid when is_pid(Pid) ->
 			    case gen_fsm:sync_send_all_state_event(