ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

'kms.uris' property added to openvidu-server 'application.properties'

pull/20/head
pabloFuente 2017-05-18 14:17:19 +02:00
parent 1efd07208b
commit 2bf258e728
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openvidu-server/src/main/java/org/openvidu/server/OpenViduServer.java
View File

@ -33,6 +33,7 @@ import org.openvidu.server.rpc.JsonRpcNotificationService;
import org.openvidu.server.rpc.JsonRpcUserControl; import org.openvidu.server.rpc.JsonRpcUserControl;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@ -41,6 +42,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean; import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean;
import com.google.gson.Gson;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
/** /**
@ -57,6 +59,9 @@ public class OpenViduServer implements JsonRpcConfigurer {
public static final String KMSS_URIS_PROPERTY = "kms.uris"; public static final String KMSS_URIS_PROPERTY = "kms.uris";
public static final String KMSS_URIS_DEFAULT = "[ \"ws://localhost:8888/kurento\" ]"; public static final String KMSS_URIS_DEFAULT = "[ \"ws://localhost:8888/kurento\" ]";
@Value("${kms.uris}")
private String KMSS_CUSTOM_URIS;
private static final Logger log = LoggerFactory.getLogger(OpenViduServer.class); private static final Logger log = LoggerFactory.getLogger(OpenViduServer.class);
@ -66,6 +71,11 @@ public class OpenViduServer implements JsonRpcConfigurer {
JsonArray kmsUris = getPropertyJson(KMSS_URIS_PROPERTY, KMSS_URIS_DEFAULT, JsonArray.class); JsonArray kmsUris = getPropertyJson(KMSS_URIS_PROPERTY, KMSS_URIS_DEFAULT, JsonArray.class);
List<String> kmsWsUris = JsonUtils.toStringList(kmsUris); List<String> kmsWsUris = JsonUtils.toStringList(kmsUris);
if ((KMSS_CUSTOM_URIS != null) && (!KMSS_CUSTOM_URIS.isEmpty())) {
List<String> uris = new Gson().fromJson( KMSS_CUSTOM_URIS, List.class );
kmsWsUris.addAll(0, uris);
}
if (kmsWsUris.isEmpty()) { if (kmsWsUris.isEmpty()) {
throw new IllegalArgumentException(KMSS_URIS_PROPERTY throw new IllegalArgumentException(KMSS_URIS_PROPERTY

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

@ -1034,7 +1034,9 @@ public class RoomManager {
if (this.sessionIdToken.get(roomId) != null) { if (this.sessionIdToken.get(roomId) != null) {
if(metadataFormatCorrect(metadata)){ if(metadataFormatCorrect(metadata)){
String token = new BigInteger(130, new SecureRandom()).toString(32); String token = new BigInteger(130, new SecureRandom()).toString(32);
this.sessionIdToken.get(roomId).put(token, new Token(token, role, metadata)); if (SECURITY_ENABLED) { // Store the token only if security is enabled
this.sessionIdToken.get(roomId).put(token, new Token(token, role, metadata));
}
showMap(); showMap();
return token; return token;
} }

2
openvidu-server/src/main/resources/application.properties
View File

@ -5,5 +5,7 @@ server.ssl.key-store-password: kurento
server.ssl.keyStoreType: JKS server.ssl.keyStoreType: JKS
server.ssl.keyAlias: kurento-selfsigned server.ssl.keyAlias: kurento-selfsigned
kms.uris=[\"ws://localhost:8888/kurento\"]
openvidu.secret: MY_SECRET openvidu.secret: MY_SECRET
openvidu.security: true openvidu.security: true