#59 Remove ":" of temporary file names

TheHive-Project · Jul 2, 2018 · 1bc7c21 · 1bc7c21
1 parent 8974448
commit 1bc7c21
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/app/org/elastic4play/services/TempSrv.scala b/app/org/elastic4play/services/TempSrv.scala
@@ -45,25 +45,25 @@ class TempSrv @Inject() (
     case t: Throwable ⇒ logger.warn(s"Fail to remove temporary files ($directory) : $t")
   }
 
+  private def requestTempDir(requestId: String): Path = {
+    tempDir.resolve(requestId.replaceAllLiterally(":", "_"))
+  }
+
   def newTemporaryFile(prefix: String, suffix: String)(implicit authContext: AuthContext): Path = {
-    val td = tempDir.resolve(authContext.requestId)
+    val td = requestTempDir(authContext.requestId)
     if (!Files.exists(td))
       Files.createDirectories(td)
-    Files.createTempFile(tempDir.resolve(authContext.requestId), prefix, suffix)
-  }
-
-  def releaseTemporaryFiles()(implicit authContext: AuthContext): Unit = {
-    releaseTemporaryFiles(authContext.requestId)
+    Files.createTempFile(td, prefix, suffix)
   }
 
   def releaseTemporaryFiles(request: RequestHeader): Unit = {
     releaseTemporaryFiles(Instance.getRequestId(request))
   }
 
   def releaseTemporaryFiles(requestId: String): Unit = {
-    val d = tempDir.resolve(requestId)
-    if (Files.exists(d))
-      delete(d)
+    val td = requestTempDir(requestId)
+    if (Files.exists(td))
+      delete(td)
   }
 }