Merge branch 'hotfix/4.1.24'

TheHive-Project · Sep 13, 2022 · b6649bb · b6649bb
2 parents 099bc74 + 9840655
commit b6649bb
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,16 @@
 # Change Log
 
-## [4.1.23](https://github.com/TheHive-Project/TheHive/milestone/94) (2022-07-22)
+## [4.1.24](https://github.com/TheHive-Project/TheHive/milestone/95) (2022-09-12)
 
 **Fixed bugs:**
 
-- [Bug] system user can be deleted by integrity checks [\#2406](https://github.com/TheHive-Project/TheHive/issues/2406)
+- [Bug] All analyzers become unavailable when an analyzer is updated [\#2420](https://github.com/TheHive-Project/TheHive/issues/2420)
+
+## [4.1.23](https://github.com/TheHive-Project/TheHive/milestone/94) (2022-08-30)
 
+**Fixed bugs:**
+
+- [Bug] system user can be deleted by integrity checks [\#2406](https://github.com/TheHive-Project/TheHive/issues/2406)
 
 ## [4.1.22](https://github.com/TheHive-Project/TheHive/milestone/93) (2022-07-01)
 

diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import Dependencies._
 import com.typesafe.sbt.packager.Keys.bashScriptDefines
 import org.thp.ghcl.Milestone
 
-val thehiveVersion         = "4.1.23-1"
+val thehiveVersion         = "4.1.24-1"
 val scala212               = "2.12.13"
 val scala213               = "2.13.1"
 val supportedScalaVersions = List(scala212, scala213)

diff --git a/cortex/dto/src/main/scala/org/thp/cortex/dto/v0/Worker.scala b/cortex/dto/src/main/scala/org/thp/cortex/dto/v0/Worker.scala
@@ -14,25 +14,24 @@ case class OutputWorker(
 
 object OutputWorker {
   implicit val writes: Writes[OutputWorker] = Json.writes[OutputWorker]
-  implicit val reads: Reads[OutputWorker] = Reads[OutputWorker](
-    json =>
-      for {
-        id           <- (json \ "id").validate[String]
-        name         <- (json \ "name").validate[String]
-        version      <- (json \ "version").validate[String]
-        description  <- (json \ "description").validate[String]
-        dataTypeList <- (json \ "dataTypeList").validate[Seq[String]]
-        maxTlp = (json \ "maxTlp").asOpt[Long].getOrElse(3L)
-        maxPap = (json \ "maxPap").asOpt[Long].getOrElse(3L)
-      } yield OutputWorker(
-        id,
-        name,
-        version,
-        description,
-        dataTypeList,
-        maxTlp,
-        maxPap
-      )
+  implicit val reads: Reads[OutputWorker] = Reads[OutputWorker](json =>
+    for {
+      id           <- (json \ "id").validate[String]
+      name         <- (json \ "name").validate[String]
+      version      <- (json \ "version").validate[String]
+      description  <- (json \ "description").validate[String]
+      dataTypeList <- (json \ "dataTypeList").validateOpt[Seq[String]]
+      maxTlp = (json \ "maxTlp").asOpt[Long].getOrElse(3L)
+      maxPap = (json \ "maxPap").asOpt[Long].getOrElse(3L)
+    } yield OutputWorker(
+      id,
+      name,
+      version,
+      description,
+      dataTypeList.getOrElse(Nil),
+      maxTlp,
+      maxPap
+    )
   )
 }
 

diff --git a/frontend/bower.json b/frontend/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "thehive",
-  "version": "4.1.23-1",
+  "version": "4.1.24-1",
   "license": "AGPL-3.0",
   "dependencies": {
     "jquery": "^3.4.1",

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
     "name": "thehive",
-    "version": "4.1.23-1",
+    "version": "4.1.24-1",
     "license": "AGPL-3.0",
     "repository": {
         "type": "git",