#1411 Add fromObservable tag query

TheHive-Project · Jul 7, 2020 · a4daae0 · a4daae0
1 parent 5498e6d
commit a4daae0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala
@@ -40,6 +40,7 @@ class TagCtrl @Inject() (
   implicit val stringRenderer: Renderer.Aux[String, String] = Renderer.json[String, String](identity)
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
     Query[TagSteps, TagSteps]("fromCase", (tagSteps, _) => tagSteps.fromCase),
+    Query[TagSteps, TagSteps]("fromObservable", (tagSteps, _) => tagSteps.fromObservable),
     Query[TagSteps, Traversal[String, String]]("text", (tagSteps, _) => tagSteps.displayName),
     Query.output[String, Traversal[String, String]]
   )

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.{CaseTag, Tag}
+import org.thp.thehive.models.{CaseTag, ObservableTag, Tag}
 
 import scala.util.{Success, Try}
 
@@ -83,6 +83,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])
+
+  def fromObservable: TagSteps = this.filter(_.inTo[ObservableTag])
 }
 
 class TagIntegrityCheckOps @Inject() (@Named("with-thehive-schema") val db: Database, val service: TagSrv) extends IntegrityCheckOps[Tag] {