#1946 Filter tag usage by organisation

TheHive-Project · Apr 11, 2021 · 785a248 · 785a248
1 parent 6d88194
commit 785a248
Showing 1 changed file with 20 additions and 3 deletions.
diff --git a/thehive/app/org/thp/thehive/controllers/v1/TagRenderer.scala b/thehive/app/org/thp/thehive/controllers/v1/TagRenderer.scala
@@ -4,13 +4,15 @@ import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.models.Tag
+import org.thp.thehive.services.OrganisationSrv
 import org.thp.thehive.services.TagOps._
 import play.api.libs.json._
 
 import java.util.{Map => JMap}
 
 trait TagRenderer extends BaseRenderer[Tag] {
   val limitedCountThreshold: Long
+  val organisationSrv: OrganisationSrv
 
   def usageStats(implicit
       authContext: AuthContext
@@ -22,9 +24,24 @@ trait TagRenderer extends BaseRenderer[Tag] {
       ).domainMap {
         case (tag, caseTemplateCount) =>
           Json.obj(
-            "case"         -> t.graph.indexCountQuery(s"""v."_label":Case AND v.tags:"${tag.replaceAllLiterally("\"", "\\\"")}""""),
-            "alert"        -> t.graph.indexCountQuery(s"""v."_label":Alert AND v.tags:"${tag.replaceAllLiterally("\"", "\\\"")}""""),
-            "observable"   -> t.graph.indexCountQuery(s"""v."_label":Observable AND v.tags:"${tag.replaceAllLiterally("\"", "\\\"")}""""),
+            "case" -> t
+              .graph
+              .indexCountQuery(
+                s"""v."_label":Case AND v.tags:"${tag.replaceAllLiterally("\"", "\\\"")}" AND """ +
+                  s"v.organisationIds:${organisationSrv.currentId(t.graph, authContext).value}"
+              ),
+            "alert" -> t
+              .graph
+              .indexCountQuery(
+                s"""v."_label":Alert AND v.tags:"${tag.replaceAllLiterally("\"", "\\\"")}" AND """ +
+                  s"v.organisationId:${organisationSrv.currentId(t.graph, authContext).value}"
+              ),
+            "observable" -> t
+              .graph
+              .indexCountQuery(
+                s"""v."_label":Observable AND v.tags:"${tag.replaceAllLiterally("\"", "\\\"")}" AND """ +
+                  s"v.organisationIds:${organisationSrv.currentId(t.graph, authContext).value}"
+              ),
             "caseTemplate" -> caseTemplateCount
           )
       }