#280 Make number of maximum similar cases configurable under key "max…

…SimilarCases" (default=100)
TheHive-Project · Sep 5, 2017 · a5d9fed · a5d9fed
1 parent b7d2320
commit a5d9fed
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/thehive-backend/app/services/AlertSrv.scala b/thehive-backend/app/services/AlertSrv.scala
@@ -37,6 +37,7 @@ object AlertSrv {
 
 @Singleton
 class AlertSrv(
+    maxSimilarCases: Int,
     templates: Map[String, String],
     alertModel: AlertModel,
     createSrv: CreateSrv,
@@ -68,6 +69,7 @@ class AlertSrv(
     connectors: ConnectorRouter,
     ec: ExecutionContext,
     mat: Materializer) = this(
+    configuration.getOptional[Int]("maxSimilarCases").getOrElse(100),
     Map.empty[String, String],
     alertModel: AlertModel,
     createSrv,

diff --git a/thehive-backend/app/services/CaseSrv.scala b/thehive-backend/app/services/CaseSrv.scala
@@ -5,7 +5,7 @@ import javax.inject.{ Inject, Singleton }
 import scala.concurrent.{ ExecutionContext, Future }
 import scala.util.Try
 
-import play.api.Logger
+import play.api.{ Configuration, Logger }
 import play.api.libs.json.Json.toJsFieldJsValueWrapper
 import play.api.libs.json._
 
@@ -18,7 +18,8 @@ import org.elastic4play.controllers.Fields
 import org.elastic4play.services._
 
 @Singleton
-class CaseSrv @Inject() (
+class CaseSrv(
+    maxSimilarCases: Int,
     caseModel: CaseModel,
     artifactModel: ArtifactModel,
     taskModel: TaskModel,
@@ -30,6 +31,30 @@ class CaseSrv @Inject() (
     findSrv: FindSrv,
     implicit val ec: ExecutionContext) {
 
+  @Inject() def this(
+    configuration: Configuration,
+    caseModel: CaseModel,
+    artifactModel: ArtifactModel,
+    taskModel: TaskModel,
+    createSrv: CreateSrv,
+    artifactSrv: ArtifactSrv,
+    getSrv: GetSrv,
+    updateSrv: UpdateSrv,
+    deleteSrv: DeleteSrv,
+    findSrv: FindSrv,
+    ec: ExecutionContext) = this(
+    configuration.getOptional[Int]("maxSimilarCases").getOrElse(100),
+    caseModel,
+    artifactModel,
+    taskModel,
+    createSrv,
+    artifactSrv,
+    getSrv,
+    updateSrv,
+    deleteSrv,
+    findSrv,
+    ec)
+
   private[CaseSrv] lazy val logger = Logger(getClass)
 
   def applyTemplate(template: CaseTemplate, originalFields: Fields): Fields = {
@@ -120,7 +145,7 @@ class CaseSrv @Inject() (
         "status" ~= "Ok"), Some("all"), Nil)
       ._1
       .flatMapConcat { artifact ⇒ artifactSrv.findSimilar(artifact, Some("all"), Nil)._1 }
-      .groupBy(100, _.parentId)
+      .groupBy(maxSimilarCases, _.parentId)
       .map { a ⇒ (a.parentId, Seq(a)) }
       .reduce((l, r) ⇒ (l._1, r._2 ++ l._2))
       .mergeSubstreams