Merge pull request #6644 from ant-media/supportMp3VoD

Support mp3 file upload

src/main/java/io/antmedia/rest/RestServiceBase.java

@@ -28,6 +28,7 @@
 import jakarta.servlet.ServletContext;
 
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
@@ -1226,10 +1227,10 @@ protected Result uploadVoDFile(String fileName, InputStream inputStream) {
 		String appScopeName = getScope().getName();
 		String fileExtension = FilenameUtils.getExtension(fileName);
 		try {
-
-			if ("mp4".equalsIgnoreCase(fileExtension) || "webm".equalsIgnoreCase(fileExtension) 
-					||  "mov".equalsIgnoreCase(fileExtension) ||  "avi".equalsIgnoreCase(fileExtension)
-					||  "wmv".equalsIgnoreCase(fileExtension)) {
+			
+		   String[] supportedFormats = new String[] {"mp4", "webm", "mov", "avi", "mp3", "wmv"};
+		   
+		   if (ArrayUtils.contains(supportedFormats, fileExtension)) {
 
 
 				IStatsCollector statsCollector = (IStatsCollector) getAppContext().getBean(IStatsCollector.BEAN_NAME);
@@ -1251,9 +1252,12 @@ protected Result uploadVoDFile(String fileName, InputStream inputStream) {
 					}
 					String vodId = RandomStringUtils.randomNumeric(24);
 
-					File savedFile = new File(String.format("%s/webapps/%s/%s", System.getProperty("red5.root"), appScopeName,
-							"streams/" + vodId + "." + fileExtension));
+
+					File savedFile = new File(streamsDirectory, vodId + "." + fileExtension);
 
+					if (!savedFile.toPath().normalize().startsWith(streamsDirectory.toPath().normalize())) {
+			            throw new IOException("Entry is outside of the target directory");
+					} 
 
 					int read = 0;
 					byte[] bytes = new byte[2048];

src/main/java/io/antmedia/whip/WhipEndpoint.java

@@ -81,11 +81,11 @@ public CompletableFuture<Response> startWhipPublish(@Context UriInfo uriInfo, @P
 
 		PublishParameters publishParameters = new PublishParameters(streamId);
 
-		String prefix = "Bearer ";
+		String prefix = "Bearer "; //there is a space after the word Bearer on purpose
 
 	    if (token != null && token.toLowerCase().startsWith(prefix.toLowerCase())) {
 	        // Extract the token by removing the prefix
-	        token = token.substring(prefix.length());
+	        token = token.substring(prefix.length()).trim();
 	    }
 
 

src/test/java/io/antmedia/test/rest/VoDRestServiceV2UnitTest.java

@@ -287,7 +287,7 @@ public void testDeleteVoDs() {
 
 
 	}
-
+	
 
 	@Test
 	public void testUploadVodFile() throws FileNotFoundException, IOException {
@@ -338,7 +338,9 @@ public void testUploadVodFile() throws FileNotFoundException, IOException {
 
 			try (FileInputStream inputStream2 = new FileInputStream("src/test/resources/big-buck-bunny_trailer.webm")) {
 
-				restServiceReal.uploadVoDFile(fileName, inputStream2);
+				result = restServiceReal.uploadVoDFile(fileName, inputStream2);
+				assertTrue(result.isSuccess());
+
 			}
 
 
@@ -350,7 +352,23 @@ public void testUploadVodFile() throws FileNotFoundException, IOException {
 
 			assertEquals(2, restServiceReal.getTotalVodNumber().getNumber());
 
-		} 
+			try (FileInputStream inputStream2 = new FileInputStream("src/test/resources/test.mp3")) {
+
+				result = restServiceReal.uploadVoDFile(fileName, inputStream2);
+				assertTrue(result.isSuccess());
+			}
+
+
+			assertTrue(f.isDirectory());
+
+			assertEquals(3, f.list().length);
+
+			assertEquals(3, store.getTotalVodNumber());
+
+			assertEquals(3, restServiceReal.getTotalVodNumber().getNumber());
+		}
+
+
 
 	}