Skip to content

Commit b6649bb

Browse files
committed
Merge branch 'hotfix/4.1.24'
2 parents 099bc74 + 9840655 commit b6649bb

File tree

5 files changed

+28
-24
lines changed

5 files changed

+28
-24
lines changed

CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
# Change Log
22

3-
## [4.1.23](https://github.com/TheHive-Project/TheHive/milestone/94) (2022-07-22)
3+
## [4.1.24](https://github.com/TheHive-Project/TheHive/milestone/95) (2022-09-12)
44

55
**Fixed bugs:**
66

7-
- [Bug] system user can be deleted by integrity checks [\#2406](https://github.com/TheHive-Project/TheHive/issues/2406)
7+
- [Bug] All analyzers become unavailable when an analyzer is updated [\#2420](https://github.com/TheHive-Project/TheHive/issues/2420)
8+
9+
## [4.1.23](https://github.com/TheHive-Project/TheHive/milestone/94) (2022-08-30)
810

11+
**Fixed bugs:**
12+
13+
- [Bug] system user can be deleted by integrity checks [\#2406](https://github.com/TheHive-Project/TheHive/issues/2406)
914

1015
## [4.1.22](https://github.com/TheHive-Project/TheHive/milestone/93) (2022-07-01)
1116

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Dependencies._
22
import com.typesafe.sbt.packager.Keys.bashScriptDefines
33
import org.thp.ghcl.Milestone
44

5-
val thehiveVersion = "4.1.23-1"
5+
val thehiveVersion = "4.1.24-1"
66
val scala212 = "2.12.13"
77
val scala213 = "2.13.1"
88
val supportedScalaVersions = List(scala212, scala213)

cortex/dto/src/main/scala/org/thp/cortex/dto/v0/Worker.scala

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,24 @@ case class OutputWorker(
1414

1515
object OutputWorker {
1616
implicit val writes: Writes[OutputWorker] = Json.writes[OutputWorker]
17-
implicit val reads: Reads[OutputWorker] = Reads[OutputWorker](
18-
json =>
19-
for {
20-
id <- (json \ "id").validate[String]
21-
name <- (json \ "name").validate[String]
22-
version <- (json \ "version").validate[String]
23-
description <- (json \ "description").validate[String]
24-
dataTypeList <- (json \ "dataTypeList").validate[Seq[String]]
25-
maxTlp = (json \ "maxTlp").asOpt[Long].getOrElse(3L)
26-
maxPap = (json \ "maxPap").asOpt[Long].getOrElse(3L)
27-
} yield OutputWorker(
28-
id,
29-
name,
30-
version,
31-
description,
32-
dataTypeList,
33-
maxTlp,
34-
maxPap
35-
)
17+
implicit val reads: Reads[OutputWorker] = Reads[OutputWorker](json =>
18+
for {
19+
id <- (json \ "id").validate[String]
20+
name <- (json \ "name").validate[String]
21+
version <- (json \ "version").validate[String]
22+
description <- (json \ "description").validate[String]
23+
dataTypeList <- (json \ "dataTypeList").validateOpt[Seq[String]]
24+
maxTlp = (json \ "maxTlp").asOpt[Long].getOrElse(3L)
25+
maxPap = (json \ "maxPap").asOpt[Long].getOrElse(3L)
26+
} yield OutputWorker(
27+
id,
28+
name,
29+
version,
30+
description,
31+
dataTypeList.getOrElse(Nil),
32+
maxTlp,
33+
maxPap
34+
)
3635
)
3736
}
3837

frontend/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "thehive",
3-
"version": "4.1.23-1",
3+
"version": "4.1.24-1",
44
"license": "AGPL-3.0",
55
"dependencies": {
66
"jquery": "^3.4.1",

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "thehive",
3-
"version": "4.1.23-1",
3+
"version": "4.1.24-1",
44
"license": "AGPL-3.0",
55
"repository": {
66
"type": "git",

0 commit comments

Comments
 (0)