Merge remote-tracking branch 'upstream/develop' into mm-exporter

server/lib/Room.js

@@ -9,6 +9,27 @@ const config = require('../config/config');
 
 const logger = new Logger('Room');
 
+// In case they are not configured properly
+const accessFromRoles =
+{
+	BYPASS_ROOM_LOCK : [ userRoles.ADMIN ],
+	BYPASS_LOBBY     : [ userRoles.NORMAL ],
+	...config.accessFromRoles
+};
+
+const permissionsFromRoles =
+{
+	CHANGE_ROOM_LOCK : [ userRoles.NORMAL ],
+	PROMOTE_PEER     : [ userRoles.NORMAL ],
+	SEND_CHAT        : [ userRoles.NORMAL ],
+	MODERATE_CHAT    : [ userRoles.MODERATOR ],
+	SHARE_SCREEN     : [ userRoles.NORMAL ],
+	SHARE_FILE       : [ userRoles.NORMAL ],
+	MODERATE_FILES   : [ userRoles.MODERATOR ],
+	MODERATE_ROOM    : [ userRoles.MODERATOR ],
+	...config.permissionsFromRoles
+};
+
 class Room extends EventEmitter
 {
 	/**
@@ -152,7 +173,7 @@ class Room extends EventEmitter
 		if (returning)
 			this._peerJoining(peer, true);
 		else if ( // Has a role that is allowed to bypass room lock
-			peer.roles.some((role) => config.accessFromRoles.BYPASS_ROOM_LOCK.includes(role))
+			peer.roles.some((role) => accessFromRoles.BYPASS_ROOM_LOCK.includes(role))
 		)
 			this._peerJoining(peer);
 		else if (this._locked)
@@ -160,7 +181,7 @@ class Room extends EventEmitter
 		else
 		{
 			// Has a role that is allowed to bypass lobby
-			peer.roles.some((role) => config.accessFromRoles.BYPASS_LOBBY.includes(role)) ?
+			peer.roles.some((role) => accessFromRoles.BYPASS_LOBBY.includes(role)) ?
 				this._peerJoining(peer) :
 				this._handleGuest(peer);
 		}
@@ -187,7 +208,11 @@ class Room extends EventEmitter
 
 			this._peerJoining(promotedPeer);
 
-			for (const peer of this._getJoinedPeers())
+			for (
+				const peer of this._getPeersWithPermission({
+					permission : permissionsFromRoles.PROMOTE_PEER
+				})
+			)
 			{
 				this._notification(peer.socket, 'lobby:promotedPeer', { peerId: id });
 			}
@@ -196,7 +221,7 @@ class Room extends EventEmitter
 		this._lobby.on('peerRolesChanged', (peer) =>
 		{
 			if ( // Has a role that is allowed to bypass room lock
-				peer.roles.some((role) => config.accessFromRoles.BYPASS_ROOM_LOCK.includes(role))
+				peer.roles.some((role) => accessFromRoles.BYPASS_ROOM_LOCK.includes(role))
 			)
 			{
 				this._lobby.promotePeer(peer.id);
@@ -206,7 +231,7 @@ class Room extends EventEmitter
 
 			if ( // Has a role that is allowed to bypass lobby
 				!this._locked &&
-				peer.roles.some((role) => config.accessFromRoles.BYPASS_LOBBY.includes(role))
+				peer.roles.some((role) => accessFromRoles.BYPASS_LOBBY.includes(role))
 			)
 			{
 				this._lobby.promotePeer(peer.id);
@@ -219,7 +244,11 @@ class Room extends EventEmitter
 		{
 			const { id, displayName } = changedPeer;
 
-			for (const peer of this._getJoinedPeers())
+			for (
+				const peer of this._getPeersWithPermission({
+					permission : permissionsFromRoles.PROMOTE_PEER
+				})
+			)
 			{
 				this._notification(peer.socket, 'lobby:changeDisplayName', { peerId: id, displayName });
 			}
@@ -229,7 +258,11 @@ class Room extends EventEmitter
 		{
 			const { id, picture } = changedPeer;
 
-			for (const peer of this._getJoinedPeers())
+			for (
+				const peer of this._getPeersWithPermission({
+					permission : permissionsFromRoles.PROMOTE_PEER
+				})
+			)
 			{
 				this._notification(peer.socket, 'lobby:changePicture', { peerId: id, picture });
 			}
@@ -241,7 +274,11 @@ class Room extends EventEmitter
 
 			const { id } = closedPeer;
 
-			for (const peer of this._getJoinedPeers())
+			for (
+				const peer of this._getPeersWithPermission({
+					permission : permissionsFromRoles.PROMOTE_PEER
+				})
+			)
 			{
 				this._notification(peer.socket, 'lobby:peerClosed', { peerId: id });
 			}
@@ -344,7 +381,11 @@ class Room extends EventEmitter
 	{
 		this._lobby.parkPeer(parkPeer);
 
-		for (const peer of this._getJoinedPeers())
+		for (
+			const peer of this._getPeersWithPermission({
+				permission : permissionsFromRoles.PROMOTE_PEER
+			})
+		)
 		{
 			this._notification(peer.socket, 'parkedPeer', { peerId: parkPeer.id });
 		}
@@ -384,8 +425,8 @@ class Room extends EventEmitter
 						{
 							params : {
 								...config.turnAPIparams,
-								'api_key'     : config.turnAPIKey,
-								'ip'          : peer.socket.request.connection.remoteAddress
+								'api_key' : config.turnAPIKey,
+								'ip'      : peer.socket.request.connection.remoteAddress
 							}
 						});
 		
@@ -550,7 +591,7 @@ class Room extends EventEmitter
 					peers                : peerInfos,
 					tracker              : config.fileTracker,
 					authenticated        : peer.authenticated,
-					permissionsFromRoles : config.permissionsFromRoles,
+					permissionsFromRoles : permissionsFromRoles,
 					userRoles            : userRoles
 				});
 
@@ -682,9 +723,10 @@ class Room extends EventEmitter
 
 				if (
 					appData.source === 'screen' &&
-					!peer.roles.some((role) => config.permissionsFromRoles.SHARE_SCREEN.includes(role))
+					!peer.roles.some(
+						(role) => permissionsFromRoles.SHARE_SCREEN.includes(role))
 				)
-						throw new Error('peer not authorized');
+					throw new Error('peer not authorized');
 
 				// Ensure the Peer is joined.
 				if (!peer.joined)
@@ -985,7 +1027,7 @@ class Room extends EventEmitter
 			case 'chatMessage':
 			{
 				if (
-					!peer.roles.some((role) => config.permissionsFromRoles.SEND_CHAT.includes(role))
+					!peer.roles.some((role) => permissionsFromRoles.SEND_CHAT.includes(role))
 				)
 					throw new Error('peer not authorized');
 
@@ -1008,7 +1050,9 @@ class Room extends EventEmitter
 			case 'moderator:clearChat':
 			{
 				if (
-					!peer.roles.some((role) => config.permissionsFromRoles.MODERATE_CHAT.includes(role))
+					!peer.roles.some(
+						(role) => permissionsFromRoles.MODERATE_CHAT.includes(role)
+					)
 				)
 					throw new Error('peer not authorized');
 	
@@ -1046,7 +1090,9 @@ class Room extends EventEmitter
 			case 'lockRoom':
 			{
 				if (
-					!peer.roles.some((role) => config.permissionsFromRoles.CHANGE_ROOM_LOCK.includes(role))
+					!peer.roles.some(
+						(role) => permissionsFromRoles.CHANGE_ROOM_LOCK.includes(role)
+					)
 				)
 					throw new Error('peer not authorized');
 
@@ -1066,7 +1112,9 @@ class Room extends EventEmitter
 			case 'unlockRoom':
 			{
 				if (
-					!peer.roles.some((role) => config.permissionsFromRoles.CHANGE_ROOM_LOCK.includes(role))
+					!peer.roles.some(
+						(role) => permissionsFromRoles.CHANGE_ROOM_LOCK.includes(role)
+					)
 				)
 					throw new Error('peer not authorized');
 
@@ -1126,7 +1174,9 @@ class Room extends EventEmitter
 			case 'promotePeer':
 			{
 				if (
-					!peer.roles.some((role) => config.permissionsFromRoles.PROMOTE_PEER.includes(role))
+					!peer.roles.some(
+						(role) => permissionsFromRoles.PROMOTE_PEER.includes(role)
+					)
 				)
 					throw new Error('peer not authorized');
 
@@ -1143,7 +1193,9 @@ class Room extends EventEmitter
 			case 'promoteAllPeers':
 			{
 				if (
-					!peer.roles.some((role) => config.permissionsFromRoles.PROMOTE_PEER.includes(role))
+					!peer.roles.some(
+						(role) => permissionsFromRoles.PROMOTE_PEER.includes(role)
+					)
 				)
 					throw new Error('peer not authorized');
 
@@ -1158,7 +1210,9 @@ class Room extends EventEmitter
 			case 'sendFile':
 			{
 				if (
-					!peer.roles.some((role) => config.permissionsFromRoles.SHARE_FILE.includes(role))
+					!peer.roles.some(
+						(role) => permissionsFromRoles.SHARE_FILE.includes(role)
+					)
 				)
 					throw new Error('peer not authorized');
 
@@ -1181,7 +1235,9 @@ class Room extends EventEmitter
 			case 'moderator:clearFileSharing':
 			{
 				if (
-					!peer.roles.some((role) => config.permissionsFromRoles.MODERATE_FILES.includes(role))
+					!peer.roles.some(
+						(role) => permissionsFromRoles.MODERATE_FILES.includes(role)
+					)
 				)
 					throw new Error('peer not authorized');
 	
@@ -1217,7 +1273,9 @@ class Room extends EventEmitter
 			case 'moderator:muteAll':
 			{
 				if (
-					!peer.roles.some((role) => config.permissionsFromRoles.MODERATE_ROOM.includes(role))
+					!peer.roles.some(
+						(role) => permissionsFromRoles.MODERATE_ROOM.includes(role)
+					)
 				)
 					throw new Error('peer not authorized');
 
@@ -1232,7 +1290,9 @@ class Room extends EventEmitter
 			case 'moderator:stopAllVideo':
 			{
 				if (
-					!peer.roles.some((role) => config.permissionsFromRoles.MODERATE_ROOM.includes(role))
+					!peer.roles.some(
+						(role) => permissionsFromRoles.MODERATE_ROOM.includes(role)
+					)
 				)
 					throw new Error('peer not authorized');
 
@@ -1247,7 +1307,9 @@ class Room extends EventEmitter
 			case 'moderator:closeMeeting':
 			{
 				if (
-					!peer.roles.some((role) => config.permissionsFromRoles.MODERATE_ROOM.includes(role))
+					!peer.roles.some(
+						(role) => permissionsFromRoles.MODERATE_ROOM.includes(role)
+					)
 				)
 					throw new Error('peer not authorized');
 
@@ -1264,7 +1326,9 @@ class Room extends EventEmitter
 			case 'moderator:kickPeer':
 			{
 				if (
-					!peer.roles.some((role) => config.permissionsFromRoles.MODERATE_ROOM.includes(role))
+					!peer.roles.some(
+						(role) => permissionsFromRoles.MODERATE_ROOM.includes(role)
+					)
 				)
 					throw new Error('peer not authorized');
 
@@ -1452,6 +1516,19 @@ class Room extends EventEmitter
 			.filter((peer) => peer.joined && peer !== excludePeer);
 	}
 
+	_getPeersWithPermission({ permission = null, excludePeer = undefined, joined = true })
+	{
+		return Object.values(this._peers)
+			.filter(
+				(peer) =>
+					peer.joined === joined &&
+					peer !== excludePeer &&
+					peer.roles.some(
+						(role) => permission.includes(role)
+					)
+			);
+	}
+
 	_timeoutCallback(callback)
 	{
 		let called = false;