Merge branch 'release/3.5.0'

TheHive-Project · Oct 30, 2020 · 9f63ba6 · 9f63ba6
2 parents b2169e9 + 6e8c14c
commit 9f63ba6
Show file tree

Hide file tree

Showing 51 changed files with 736 additions and 554 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -20,7 +20,7 @@ includeCurlyBraceInSelectChains = true
 includeNoParensInSelectChains = true
 
 rewriteTokens {
-  "=>" : "⇒"
-  "<-" : "←"
-  "->": "→"
+  "⇒": "=>"
+  "←": "<-"
+  "→": "->"
 }
diff --git a/AUTHORS b/AUTHORS
@@ -11,7 +11,7 @@ Contributors
 
 * CERT Banque de France (CERT-BDF)
 
-Copyright (C) 2017-2019 Nabil Adouani
-Copyright (C) 2014-2019 Thomas Franco
-Copyright (C) 2014-2019 Saâd Kadhi
-Copyright (C) 2014-2019 Jérôme Leonard
+Copyright (C) 2017-2020 Nabil Adouani
+Copyright (C) 2014-2020 Thomas Franco
+Copyright (C) 2014-2020 Saâd Kadhi
+Copyright (C) 2014-2020 Jérôme Leonard
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Change Log
 
+## [3.5.0](https://github.com/TheHive-Project/TheHive/milestone/61) (2020-10-29)
+
+**Implemented enhancements:**
+
+- Not possible to import new alerts to cases when drilling down from dashboard [\#1218](https://github.com/TheHive-Project/TheHive/issues/1218)
+- Bug: Responder-list is unordered [\#1564](https://github.com/TheHive-Project/TheHive/issues/1564)
+
+**Closed issues:**
+
+- [Bug] Click on short report resolves outdated long report [\#1350](https://github.com/TheHive-Project/TheHive/issues/1350)
+
+**Fixed bugs:**
+
+- [Bug] Can't tag observable as IOC in Alert [\#1335](https://github.com/TheHive-Project/TheHive/issues/1335)
+- [Bug] Concurrent access fails [\#1570](https://github.com/TheHive-Project/TheHive/issues/1570)
+- [Bug] Pivoting from dashboard to search page is loosing the date filter [\#1581](https://github.com/TheHive-Project/TheHive/issues/1581)
+- [Bug] Report template admin page [\#1591](https://github.com/TheHive-Project/TheHive/issues/1591)
+- [Security] Update Playframework [\#1603](https://github.com/TheHive-Project/TheHive/issues/1603)
+
+## [3.4.3](https://github.com/TheHive-Project/TheHive/milestone/62) (2020-10-26)
+
+**Fixed bugs:**
+
+- [Bug] TheHive is stalled while importing Alerts with a large number of observables [\#1416](https://github.com/TheHive-Project/TheHive/issues/1416)
+
 ## [3.5.0-RC1](https://github.com/TheHive-Project/TheHive/milestone/44) (2020-08-12)
 
 **Implemented enhancements:**
@@ -16,7 +41,6 @@
 - [Bug] OAuth2/OpenIDC Authentication failure [\#1291](https://github.com/TheHive-Project/TheHive/issues/1291)
 - [Feature Request] OAuth support for Basic authentication to authorization server's tokenUrl [\#1294](https://github.com/TheHive-Project/TheHive/issues/1294)
 - [Bug] Can't auth with SSO/OAuth with FusionAuth [\#1342](https://github.com/TheHive-Project/TheHive/issues/1342)
-- [Bug] TheHive is stalled while importing Alerts with a large number of observables [\#1416](https://github.com/TheHive-Project/TheHive/issues/1416)
 
 ## [3.4.2](https://github.com/TheHive-Project/TheHive/milestone/57) (2020-04-25)
 

diff --git a/conf/application.sample b/conf/application.sample
@@ -27,16 +27,16 @@ search {
   #}
 
   ## Authentication configuration
-  #search.username = ""
-  #search.password = ""
+  #username = ""
+  #password = ""
 
   ## SSL configuration
-  #search.keyStore {
+  #keyStore {
   #  path = "/path/to/keystore"
   #  type = "JKS" # or PKCS12
   #  password = "keystore-password"
   #}
-  #search.trustStore {
+  #trustStore {
   #  path = "/path/to/trustStore"
   #  type = "JKS" # or PKCS12
   #  password = "trustStore-password"

diff --git a/project/Common.scala b/project/Common.scala
@@ -33,7 +33,8 @@ object Common {
     javaOptions += "-Xmx1G",
     // Redirect logs from ElasticSearch (which uses log4j2) to slf4j
     libraryDependencies += "org.apache.logging.log4j" % "log4j-to-slf4j" % "2.9.1",
-    excludeDependencies += "org.apache.logging.log4j" % "log4j-core"
+    excludeDependencies += "org.apache.logging.log4j" % "log4j-core",
+    dependencyOverrides += "com.typesafe.akka"        %% "akka-actor" % play.core.PlayVersion.akkaVersion
   )
 
   val stableVersion: Regex = "(\\d+\\.\\d+\\.\\d+)-(\\d+)".r

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -19,7 +19,7 @@ object Dependencies {
 
     val reflections      = "org.reflections"     % "reflections"         % "0.9.11"
     val zip4j            = "net.lingala.zip4j"   % "zip4j"               % "2.6.0"
-    val elastic4play     = "org.thehive-project" %% "elastic4play"       % "1.12.1"
+    val elastic4play     = "org.thehive-project" %% "elastic4play"       % "1.12.3"
     val akkaCluster      = "com.typesafe.akka"   %% "akka-cluster"       % play.core.PlayVersion.akkaVersion
     val akkaClusterTyped = "com.typesafe.akka"   %% "akka-cluster-typed" % play.core.PlayVersion.akkaVersion
     val akkaClusterTools = "com.typesafe.akka"   %% "akka-cluster-tools" % play.core.PlayVersion.akkaVersion

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.0
+sbt.version=1.3.8
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
 // Comment to get more information during initialization
 logLevel := Level.Info
 
-addSbtPlugin("com.typesafe.play"   % "sbt-plugin"           % "2.8.2")
+addSbtPlugin("com.typesafe.play"   % "sbt-plugin"           % "2.8.3")
 addSbtPlugin("org.foundweekends"   % "sbt-bintray"          % "0.5.1")
-addSbtPlugin("org.scalameta"       % "sbt-scalafmt"         % "2.4.0")
+addSbtPlugin("org.scalameta"       % "sbt-scalafmt"         % "2.3.0")
 addSbtPlugin("org.thehive-project" % "sbt-github-changelog" % "0.3.0")
diff --git a/thehive-backend/app/connectors/Connectors.scala b/thehive-backend/app/connectors/Connectors.scala
@@ -1,15 +1,16 @@
 package connectors
 
 import scala.collection.immutable
-import play.api.libs.json.{JsObject, Json}
+
+import play.api.libs.json.{ JsObject, Json }
 import play.api.mvc._
 import play.api.routing.sird.UrlContext
-import play.api.routing.{Router, SimpleRouter}
+import play.api.routing.{ Router, SimpleRouter }
+
 import com.google.inject.AbstractModule
-import scala.reflect.runtime.{universe => ru}
-import javax.inject.{Inject, Singleton}
+import javax.inject.{ Inject, Singleton }
 import models.HealthStatus
-import net.codingwell.scalaguice.{ScalaModule, ScalaMultibinder}
+import net.codingwell.scalaguice.{ ScalaModule, ScalaMultibinder }
 
 trait Connector {
   val name: String
@@ -34,7 +35,7 @@ class ConnectorRouter @Inject()(connectors: immutable.Set[Connector], actionBuil
 
 abstract class ConnectorModule extends AbstractModule with ScalaModule {
 
-  def registerController[C <: Connector: ru.TypeTag]: Unit = {
+  def registerController[C <: Connector: Manifest]: Unit = {
     val connectorBindings = ScalaMultibinder.newSetBinder[Connector](binder)
     connectorBindings.addBinding.to[C]
     ()