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

openvidu-server: add trailing slash to all system path properties

pull/508/head
pabloFuente 2020-06-11 18:05:31 +02:00
parent 2d64569392
commit d0c1d5346b
4 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,10 +228,6 @@ public class OpenviduConfig {
return this.openviduRecordingPath; return this.openviduRecordingPath;
} }
public void setOpenViduRecordingPath(String recordingPath) {
this.openviduRecordingPath = recordingPath;
}
public boolean getOpenViduRecordingPublicAccess() { public boolean getOpenViduRecordingPublicAccess() {
return this.openviduRecordingPublicAccess; return this.openviduRecordingPublicAccess;
} }
@ -240,10 +236,6 @@ public class OpenviduConfig {
return this.openviduRecordingCustomLayout; return this.openviduRecordingCustomLayout;
} }
public void setOpenViduRecordingCustomLayout(String recordingCustomLayout) {
this.openviduRecordingCustomLayout = recordingCustomLayout;
}
public String getOpenViduRecordingVersion() { public String getOpenViduRecordingVersion() {
return this.openviduRecordingVersion; return this.openviduRecordingVersion;
} }
@ -804,6 +796,7 @@ public class OpenviduConfig {
File f = new File(stringPath); File f = new File(stringPath);
f.getCanonicalPath(); f.getCanonicalPath();
f.toURI().toString(); f.toURI().toString();
stringPath = stringPath.endsWith("/") ? stringPath : (stringPath + "/");
return stringPath; return stringPath;
} catch (Exception e) { } catch (Exception e) {
addError(property, "Is not a valid file system path. " + e.getMessage()); addError(property, "Is not a valid file system path. " + e.getMessage());
@ -828,6 +821,7 @@ public class OpenviduConfig {
throw new Exception( throw new Exception(
"OpenVidu Server does not have permissions to write on path " + f.getCanonicalPath()); "OpenVidu Server does not have permissions to write on path " + f.getCanonicalPath());
} }
stringPath = stringPath.endsWith("/") ? stringPath : (stringPath + "/");
return stringPath; return stringPath;
} catch (Exception e) { } catch (Exception e) {
addError(property, "Is not a valid writable file system path. " + e.getMessage()); addError(property, "Is not a valid writable file system path. " + e.getMessage());

3
openvidu-server/src/main/java/io/openvidu/server/cdr/CDRHttpHandler.java → openvidu-server/src/main/java/io/openvidu/server/resources/CDRHttpHandler.java
View File

@ -15,7 +15,7 @@
* *
*/ */
package io.openvidu.server.cdr; package io.openvidu.server.resources;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -33,7 +33,6 @@ public class CDRHttpHandler implements WebMvcConfigurer {
@Override @Override
public void addResourceHandlers(ResourceHandlerRegistry registry) { public void addResourceHandlers(ResourceHandlerRegistry registry) {
String cdrPath = openviduConfig.getOpenviduCdrPath(); String cdrPath = openviduConfig.getOpenviduCdrPath();
cdrPath = cdrPath.endsWith("/") ? cdrPath : cdrPath + "/";
registry.addResourceHandler("/cdr/**.log").addResourceLocations("file:" + cdrPath); registry.addResourceHandler("/cdr/**.log").addResourceLocations("file:" + cdrPath);
} }

3
openvidu-server/src/main/java/io/openvidu/server/resources/RecordingCustomLayoutsResourceHandler.java
View File

@ -41,9 +41,6 @@ public class RecordingCustomLayoutsResourceHandler implements WebMvcConfigurer {
@Override @Override
public void addResourceHandlers(ResourceHandlerRegistry registry) { public void addResourceHandlers(ResourceHandlerRegistry registry) {
String customLayoutsPath = openviduConfig.getOpenviduRecordingCustomLayout(); String customLayoutsPath = openviduConfig.getOpenviduRecordingCustomLayout();
customLayoutsPath = customLayoutsPath.endsWith("/") ? customLayoutsPath : customLayoutsPath + "/";
openviduConfig.setOpenViduRecordingCustomLayout(customLayoutsPath);
registry.addResourceHandler("/layouts/custom/**").addResourceLocations("file:" + customLayoutsPath); registry.addResourceHandler("/layouts/custom/**").addResourceLocations("file:" + customLayoutsPath);
} }

5
openvidu-server/src/main/java/io/openvidu/server/resources/RecordingsResourceHandler.java
View File

@ -38,12 +38,7 @@ public class RecordingsResourceHandler implements WebMvcConfigurer {
@Override @Override
public void addResourceHandlers(ResourceHandlerRegistry registry) { public void addResourceHandlers(ResourceHandlerRegistry registry) {
String recordingsPath = openviduConfig.getOpenViduRecordingPath(); String recordingsPath = openviduConfig.getOpenViduRecordingPath();
recordingsPath = recordingsPath.endsWith("/") ? recordingsPath : (recordingsPath + "/");
openviduConfig.setOpenViduRecordingPath(recordingsPath);
registry.addResourceHandler("/recordings/**").addResourceLocations("file:" + recordingsPath); registry.addResourceHandler("/recordings/**").addResourceLocations("file:" + recordingsPath);
} }