#2224 Fix ClassCastException in zip upload

TheHive-Project · Oct 26, 2021 · c7a446d · c7a446d
1 parent 5a946a7
commit c7a446d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
@@ -343,8 +343,8 @@ class ObservableCtrl @Inject() (
 
   private def getZipFiles(observable: InputObservable, zipPassword: Option[String]): Seq[InputObservable] =
     observable.attachment.flatMap(_.swap.toSeq).flatMap { attachment =>
-      val zipFile                = new ZipFile(attachment.filepath.toFile)
-      val files: Seq[FileHeader] = zipFile.getFileHeaders.asScala.asInstanceOf[Seq[FileHeader]]
+      val zipFile = new ZipFile(attachment.filepath.toFile)
+      val files   = zipFile.getFileHeaders.asScala
 
       if (zipFile.isEncrypted)
         zipFile.setPassword(zipPassword.getOrElse(configuration.get[String]("datastore.attachment.password")).toCharArray)

diff --git a/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala
@@ -372,8 +372,8 @@ class ObservableCtrl @Inject() (
 
   private def getZipFiles(observable: InputObservable, zipPassword: Option[String]): Seq[InputObservable] =
     observable.attachment.flatMap(_.swap.toSeq).flatMap { attachment =>
-      val zipFile                = new ZipFile(attachment.filepath.toFile)
-      val files: Seq[FileHeader] = zipFile.getFileHeaders.asScala.asInstanceOf[Seq[FileHeader]]
+      val zipFile = new ZipFile(attachment.filepath.toFile)
+      val files   = zipFile.getFileHeaders.asScala
 
       if (zipFile.isEncrypted)
         zipFile.setPassword(zipPassword.getOrElse(configuration.get[String]("datastore.attachment.password")).toCharArray)