From 2bf258e72877a64b6458d577b7e32f5ab8a4024c Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Thu, 18 May 2017 14:17:19 +0200
Subject: [PATCH] 'kms.uris' property added to openvidu-server
 'application.properties'

---
 .../main/java/org/openvidu/server/OpenViduServer.java  | 10 ++++++++++
 .../java/org/openvidu/server/core/RoomManager.java     |  4 +++-
 .../src/main/resources/application.properties          |  2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/openvidu-server/src/main/java/org/openvidu/server/OpenViduServer.java b/openvidu-server/src/main/java/org/openvidu/server/OpenViduServer.java
index 4d32376e..1818758d 100644
--- a/openvidu-server/src/main/java/org/openvidu/server/OpenViduServer.java
+++ b/openvidu-server/src/main/java/org/openvidu/server/OpenViduServer.java
@@ -33,6 +33,7 @@ import org.openvidu.server.rpc.JsonRpcNotificationService;
 import org.openvidu.server.rpc.JsonRpcUserControl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 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.web.socket.server.standard.ServletServerContainerFactoryBean;
 
+import com.google.gson.Gson;
 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_DEFAULT = "[ \"ws://localhost:8888/kurento\" ]";
+  
+  @Value("${kms.uris}")
+  private String KMSS_CUSTOM_URIS;
 
   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);
     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()) {
       throw new IllegalArgumentException(KMSS_URIS_PROPERTY
diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/RoomManager.java b/openvidu-server/src/main/java/org/openvidu/server/core/RoomManager.java
index 576e3304..988dd76e 100644
--- a/openvidu-server/src/main/java/org/openvidu/server/core/RoomManager.java
+++ b/openvidu-server/src/main/java/org/openvidu/server/core/RoomManager.java
@@ -1034,7 +1034,9 @@ public class RoomManager {
 	  if (this.sessionIdToken.get(roomId) != null) {
 		  if(metadataFormatCorrect(metadata)){
 			  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();
 			  return token;
 		  }
diff --git a/openvidu-server/src/main/resources/application.properties b/openvidu-server/src/main/resources/application.properties
index 05eff0cd..cf353c80 100644
--- a/openvidu-server/src/main/resources/application.properties
+++ b/openvidu-server/src/main/resources/application.properties
@@ -5,5 +5,7 @@ server.ssl.key-store-password: kurento
 server.ssl.keyStoreType: JKS
 server.ssl.keyAlias: kurento-selfsigned
 
+kms.uris=[\"ws://localhost:8888/kurento\"]
+
 openvidu.secret: MY_SECRET
 openvidu.security: true
\ No newline at end of file