#1946 Use limited count in case extraData

TheHive-Project · Apr 9, 2021 · abcccbd · abcccbd
1 parent 25d1dbc
commit abcccbd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/ScalliGraph b/ScalliGraph
diff --git a/thehive/app/org/thp/thehive/controllers/v1/CaseCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/CaseCtrl.scala
@@ -4,6 +4,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.P
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperties, Query}
+import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.scalligraph.{EntityIdOrName, RichOptionTry, RichSeq}
@@ -33,10 +34,14 @@ class CaseCtrl @Inject() (
     userSrv: UserSrv,
     taskSrv: TaskSrv,
     organisationSrv: OrganisationSrv,
-    db: Database
+    db: Database,
+    appConfig: ApplicationConfig
 ) extends QueryableCtrl
     with CaseRenderer {
 
+  val limitedCountThresholdConfig: ConfigItem[Long, Long] = appConfig.item[Long]("query.limitedCountThreshold", "Maximum number returned by a count")
+  val limitedCountThreshold: Long                         = limitedCountThresholdConfig.get
+
   override val entityName: String                 = "case"
   override val publicProperties: PublicProperties = properties.`case`
   override val initialQuery: Query =

diff --git a/thehive/app/org/thp/thehive/controllers/v1/CaseRenderer.scala b/thehive/app/org/thp/thehive/controllers/v1/CaseRenderer.scala
@@ -15,11 +15,12 @@ import java.lang.{Long => JLong}
 import java.util.{Collection => JCollection, List => JList, Map => JMap}
 
 trait CaseRenderer extends BaseRenderer[Case] {
+  val limitedCountThreshold: Long
 
   def observableStats(implicit authContext: AuthContext): Traversal.V[Case] => Traversal[JsValue, JLong, Converter[JsValue, JLong]] =
     _.share
       .observables
-      .count
+      .limitedCount(limitedCountThreshold)
       .domainMap(count => Json.obj("total" -> count))
 
   def taskStats(implicit
+3 −5		core/src/main/scala/org/thp/scalligraph/query/Query.scala
+9 −0		core/src/main/scala/org/thp/scalligraph/traversal/TraversalOps.scala