#1946 Fix observable count in case extraData

TheHive-Project · Apr 11, 2021 · 8bb5b7c · 8bb5b7c
1 parent 785a248
commit 8bb5b7c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/ScalliGraph b/ScalliGraph
diff --git a/conf/logback.xml b/conf/logback.xml
@@ -37,6 +37,7 @@
     <!-- do not set the following logger to TRACE -->
     <logger name="org.thp.scalligraph.traversal" level="INFO"/>
     <logger name="org.reflections8.Reflections" level="ERROR" />
+    <logger name="org.janusgraph.graphdb.database.IndexSerializer" level="ERROR"/>
 
     <logger name="org.thp.scalligraph.models" level="INFO"/>
     <logger name="org.thp" level="INFO"/>

diff --git a/thehive/app/org/thp/thehive/controllers/v1/CaseCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/CaseCtrl.scala
@@ -33,7 +33,7 @@ class CaseCtrl @Inject() (
     observableSrv: ObservableSrv,
     userSrv: UserSrv,
     taskSrv: TaskSrv,
-    organisationSrv: OrganisationSrv,
+    val organisationSrv: OrganisationSrv,
     alertSrv: AlertSrv,
     db: Database,
     appConfig: ApplicationConfig

diff --git a/thehive/app/org/thp/thehive/controllers/v1/CaseRenderer.scala b/thehive/app/org/thp/thehive/controllers/v1/CaseRenderer.scala
@@ -7,6 +7,7 @@ import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.models.{Alert, AlertCase, Case}
 import org.thp.thehive.services.CaseOps._
 import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.OrganisationSrv
 import org.thp.thehive.services.ShareOps._
 import org.thp.thehive.services.TaskOps._
 import play.api.libs.json._
@@ -16,11 +17,20 @@ import java.util.{Collection => JCollection, List => JList, Map => JMap}
 
 trait CaseRenderer extends BaseRenderer[Case] {
   val limitedCountThreshold: Long
+  val organisationSrv: OrganisationSrv
 
   def observableStats(implicit authContext: AuthContext): Traversal.V[Case] => Traversal[JsObject, AnyRef, Converter[JsObject, AnyRef]] =
     t =>
       t._id.domainMap { caseId =>
-        Json.obj("total" -> t.graph.indexCountQuery(s"""v."_label":Case AND v.relatedId:${caseId.value}"""))
+        Json.obj(
+          "total" -> t
+            .graph
+            .indexCountQuery(
+              s"""v."_label":Observable AND """ +
+                s"v.relatedId:${caseId.value} AND " +
+                s"v.organisationIds:${organisationSrv.currentId(t.graph, authContext).value}"
+            )
+        )
       }
 //    _.share
 //      .observables