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

openvidu-server: kms.uris validation to its own public method

pull/331/head
pabloFuente 2019-10-03 10:14:16 +02:00
parent c44c3cdd76
commit 8624927a33
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
View File

@ -172,7 +172,7 @@ public class OpenviduConfig {
} }
try { try {
this.initiateKmsUris(this.kmsUris); this.kmsUrisList = this.kmsUrisStringToList(this.kmsUris);
} catch (Exception e) { } catch (Exception e) {
log.error("Error in 'kms.uris' system property: " + e.getMessage()); log.error("Error in 'kms.uris' system property: " + e.getMessage());
log.error("Shutting down OpenVidu Server"); log.error("Shutting down OpenVidu Server");
@ -380,7 +380,7 @@ public class OpenviduConfig {
return this.externalizedProperties; return this.externalizedProperties;
} }
private void initiateKmsUris(String kmsUris) throws Exception { public List<String> kmsUrisStringToList(String kmsUris) throws Exception {
kmsUris = kmsUris.replaceAll("\\s", ""); // Remove all white spaces kmsUris = kmsUris.replaceAll("\\s", ""); // Remove all white spaces
kmsUris = kmsUris.replaceAll("\\\\", ""); // Remove previous escapes kmsUris = kmsUris.replaceAll("\\\\", ""); // Remove previous escapes
kmsUris = kmsUris.replaceAll("\"", ""); // Remove previous double quotes kmsUris = kmsUris.replaceAll("\"", ""); // Remove previous double quotes
@ -389,15 +389,17 @@ public class OpenviduConfig {
kmsUris = kmsUris.replaceAll(",", "\\\",\\\""); // Escape middle uris kmsUris = kmsUris.replaceAll(",", "\\\",\\\""); // Escape middle uris
Gson gson = new Gson(); Gson gson = new Gson();
JsonArray kmsUrisArray = gson.fromJson(kmsUris, JsonArray.class); JsonArray kmsUrisArray = gson.fromJson(kmsUris, JsonArray.class);
this.kmsUrisList = JsonUtils.toStringList(kmsUrisArray);
if (kmsUrisList.size() == 1 && kmsUrisList.get(0).isEmpty()) { List<String> list = JsonUtils.toStringList(kmsUrisArray);
if (list.size() == 1 && list.get(0).isEmpty()) {
log.warn("Array kms.uris is empty"); log.warn("Array kms.uris is empty");
this.kmsUrisList = new ArrayList<>(); list = new ArrayList<>();
} else { } else {
for (String uri : kmsUrisList) { for (String uri : kmsUrisList) {
this.checkWebsocketUri(uri); this.checkWebsocketUri(uri);
} }
} }
return list;
} }
public void initiateOpenViduWebhookEndpoint(String endpoint) throws Exception { public void initiateOpenViduWebhookEndpoint(String endpoint) throws Exception {