#1411 Add queries for tags

TheHive-Project · Jul 7, 2020 · 9952165 · 9952165
1 parent 6937494
commit 9952165
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/thehive/app/org/thp/thehive/controllers/v0/Properties.scala b/thehive/app/org/thp/thehive/controllers/v0/Properties.scala
@@ -372,6 +372,7 @@ class Properties @Inject() (
     .property("predicate", UniMapping.string)(_.field.readonly)
     .property("value", UniMapping.string.optional)(_.field.readonly)
     .property("description", UniMapping.string.optional)(_.field.readonly)
+    .property("text", UniMapping.string)(_.select(_.displayName).readonly)
     .build
 
   lazy val task: List[PublicProperty[_, _]] =

diff --git a/thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala
@@ -38,6 +38,11 @@ class TagCtrl @Inject() (
     (param, graph, _) => tagSrv.get(param.idOrName)(graph)
   )
 
+  override val extraQueries: Seq[ParamQuery[_]] = Seq(
+    Query[TagSteps, TagSteps]("fromCase", (tagSteps, _) => tagSteps.fromCase),
+    Query.output[String, TagSteps](_.displayName)
+  )
+
   def importTaxonomy: Action[AnyContent] =
     entrypoint("import taxonomy")
       .extract("file", FieldsParser.file.optional.on("file"))

diff --git a/thehive/app/org/thp/thehive/services/TagSrv.scala b/thehive/app/org/thp/thehive/services/TagSrv.scala
@@ -9,7 +9,7 @@ import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
 import org.thp.scalligraph.services.{IntegrityCheckOps, VertexSrv}
 import org.thp.scalligraph.steps.StepsOps._
 import org.thp.scalligraph.steps.{Traversal, VertexSteps}
-import org.thp.thehive.models.Tag
+import org.thp.thehive.models.{CaseTag, Tag}
 
 import scala.util.{Success, Try}
 
@@ -81,6 +81,8 @@ class TagSteps(raw: GremlinScala[Vertex])(implicit db: Database, graph: Graph) e
   }
 
   def displayName: Traversal[String, String] = this.map(_.toString)
+
+  def fromCase: TagSteps = this.filter(_.inTo[CaseTag])
 }
 
 class TagIntegrityCheckOps @Inject() (@Named("with-thehive-schema") val db: Database, val service: TagSrv) extends IntegrityCheckOps[Tag] {