neoris/openvidu-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openvidu-server secuity exceptions prevention. New browserify scripts

Browse Source
This commit is contained in:
pabloFuente 2017-04-12 13:42:28 +02:00
parent 9f41599afd
commit a68652cdd4
4 changed files with 22257 additions and 4641 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openvidu-browser/src/main/resources/package.json
View File

@ -5,7 +5,8 @@
"main": "lib/index.js",
"types": "lib/index.d.ts",
"scripts": {
"browserify": "cd ts && watchify Main.ts -p [ tsify ] --exclude kurento-browser-extensions --debug -o ../static/js/OpenVidu.js -v",
"browserify1": "cd ts/OpenVidu && browserify Main.ts -p [ tsify ] --exclude kurento-browser-extensions --debug -o ../../static/js/OpenVidu.js -v",
"browserify2": "cd ts/OpenViduTokBox && browserify Main.ts -p [ tsify ] --exclude kurento-browser-extensions --debug -o ../../static/js/OpenViduTokBox.js -v",
"test": "echo \"Error: no test specified\" && exit 1",
"prepublish": "cd ts && tsc",
"developing": "cd ts && tsc -w"

9961
openvidu-browser/src/main/resources/static/js/OpenVidu.js
View File

File diff suppressed because one or more lines are too long

16906
openvidu-browser/src/main/resources/static/js/OpenViduTokBox.js Normal file
View File

File diff suppressed because one or more lines are too long

28
openvidu-server/src/main/java/org/openvidu/server/core/RoomManager.java
View File

@ -159,7 +159,9 @@ public class RoomManager {
}
room.leave(participantId);
this.sessionIdTokenRole.get(roomName).remove(participant.getName());
if (this.sessionIdTokenRole.get(roomName) != null){
this.sessionIdTokenRole.get(roomName).remove(participant.getName());
}
showMap();
@ -939,11 +941,31 @@ public class RoomManager {
}
public boolean isParticipantInRoom(String participantName, String roomName) {
return (this.sessionIdTokenRole.get(roomName).containsKey(participantName) || !SECURITY_ENABLED );
if (SECURITY_ENABLED) {
if (this.sessionIdTokenRole.get(roomName) != null) {
return this.sessionIdTokenRole.get(roomName).containsKey(participantName);
} else{
return false;
}
} else {
return true;
}
}
public boolean isPublisherInRoom(String participantName, String roomName) {
return (this.sessionIdTokenRole.get(roomName).get(participantName).equals(ParticipantRole.PUBLISHER) || !SECURITY_ENABLED );
if (SECURITY_ENABLED) {
if (this.sessionIdTokenRole.get(roomName) != null){
if (this.sessionIdTokenRole.get(roomName).get(participantName) != null){
return (this.sessionIdTokenRole.get(roomName).get(participantName).equals(ParticipantRole.PUBLISHER));
} else {
return false;
}
} else{
return false;
}
} else {
return true;
}
}
public String newSessionId(){