From d0c1d5346bf9bd460753d295a1f5bb584e552edd Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Thu, 11 Jun 2020 18:05:31 +0200 Subject: [PATCH] openvidu-server: add trailing slash to all system path properties --- .../java/io/openvidu/server/config/OpenviduConfig.java | 10 ++-------- .../server/{cdr => resources}/CDRHttpHandler.java | 3 +-- .../RecordingCustomLayoutsResourceHandler.java | 3 --- .../server/resources/RecordingsResourceHandler.java | 5 ----- 4 files changed, 3 insertions(+), 18 deletions(-) rename openvidu-server/src/main/java/io/openvidu/server/{cdr => resources}/CDRHttpHandler.java (93%) diff --git a/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java b/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java index 16bf77ac..018c4e71 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java +++ b/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java @@ -228,10 +228,6 @@ public class OpenviduConfig { return this.openviduRecordingPath; } - public void setOpenViduRecordingPath(String recordingPath) { - this.openviduRecordingPath = recordingPath; - } - public boolean getOpenViduRecordingPublicAccess() { return this.openviduRecordingPublicAccess; } @@ -240,10 +236,6 @@ public class OpenviduConfig { return this.openviduRecordingCustomLayout; } - public void setOpenViduRecordingCustomLayout(String recordingCustomLayout) { - this.openviduRecordingCustomLayout = recordingCustomLayout; - } - public String getOpenViduRecordingVersion() { return this.openviduRecordingVersion; } @@ -804,6 +796,7 @@ public class OpenviduConfig { File f = new File(stringPath); f.getCanonicalPath(); f.toURI().toString(); + stringPath = stringPath.endsWith("/") ? stringPath : (stringPath + "/"); return stringPath; } catch (Exception e) { addError(property, "Is not a valid file system path. " + e.getMessage()); @@ -828,6 +821,7 @@ public class OpenviduConfig { throw new Exception( "OpenVidu Server does not have permissions to write on path " + f.getCanonicalPath()); } + stringPath = stringPath.endsWith("/") ? stringPath : (stringPath + "/"); return stringPath; } catch (Exception e) { addError(property, "Is not a valid writable file system path. " + e.getMessage()); diff --git a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDRHttpHandler.java b/openvidu-server/src/main/java/io/openvidu/server/resources/CDRHttpHandler.java similarity index 93% rename from openvidu-server/src/main/java/io/openvidu/server/cdr/CDRHttpHandler.java rename to openvidu-server/src/main/java/io/openvidu/server/resources/CDRHttpHandler.java index 8cf32e11..151e24ee 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDRHttpHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/resources/CDRHttpHandler.java @@ -15,7 +15,7 @@ * */ -package io.openvidu.server.cdr; +package io.openvidu.server.resources; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; @@ -33,7 +33,6 @@ public class CDRHttpHandler implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { String cdrPath = openviduConfig.getOpenviduCdrPath(); - cdrPath = cdrPath.endsWith("/") ? cdrPath : cdrPath + "/"; registry.addResourceHandler("/cdr/**.log").addResourceLocations("file:" + cdrPath); } diff --git a/openvidu-server/src/main/java/io/openvidu/server/resources/RecordingCustomLayoutsResourceHandler.java b/openvidu-server/src/main/java/io/openvidu/server/resources/RecordingCustomLayoutsResourceHandler.java index 432f8451..dab3e05f 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/resources/RecordingCustomLayoutsResourceHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/resources/RecordingCustomLayoutsResourceHandler.java @@ -41,9 +41,6 @@ public class RecordingCustomLayoutsResourceHandler implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { String customLayoutsPath = openviduConfig.getOpenviduRecordingCustomLayout(); - customLayoutsPath = customLayoutsPath.endsWith("/") ? customLayoutsPath : customLayoutsPath + "/"; - openviduConfig.setOpenViduRecordingCustomLayout(customLayoutsPath); - registry.addResourceHandler("/layouts/custom/**").addResourceLocations("file:" + customLayoutsPath); } diff --git a/openvidu-server/src/main/java/io/openvidu/server/resources/RecordingsResourceHandler.java b/openvidu-server/src/main/java/io/openvidu/server/resources/RecordingsResourceHandler.java index b037a602..f1433fa6 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/resources/RecordingsResourceHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/resources/RecordingsResourceHandler.java @@ -38,12 +38,7 @@ public class RecordingsResourceHandler implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - String recordingsPath = openviduConfig.getOpenViduRecordingPath(); - recordingsPath = recordingsPath.endsWith("/") ? recordingsPath : (recordingsPath + "/"); - - openviduConfig.setOpenViduRecordingPath(recordingsPath); - registry.addResourceHandler("/recordings/**").addResourceLocations("file:" + recordingsPath); }