From a06f0565e3f9f03718482065945a26ecab412ddc Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Tue, 15 Dec 2020 17:24:42 +0100
Subject: [PATCH] #1694 Add user to link observables and jobs

---
 .../thehive/connector/cortex/controllers/v0/JobCtrl.scala | 6 +++++-
 .../org/thp/thehive/connector/cortex/models/Job.scala     | 4 ++--
 .../thp/thehive/controllers/v0/TheHiveQueryExecutor.scala | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/JobCtrl.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/JobCtrl.scala
index cabe1bccc0..e844845d15 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/JobCtrl.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/JobCtrl.scala
@@ -1,6 +1,7 @@
 package org.thp.thehive.connector.cortex.controllers.v0
 
 import com.google.inject.name.Named
+
 import javax.inject.{Inject, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.{Database, UMapping}
@@ -14,7 +15,7 @@ import org.thp.thehive.connector.cortex.services.JobOps._
 import org.thp.thehive.connector.cortex.services.JobSrv
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.controllers.v0.{OutputParam, PublicData, QueryCtrl}
-import org.thp.thehive.models.{Permissions, RichCase, RichObservable}
+import org.thp.thehive.models.{Observable, Permissions, RichCase, RichObservable}
 import org.thp.thehive.services.ObservableOps._
 import org.thp.thehive.services.ObservableSrv
 import play.api.mvc.{Action, AnyContent, Results}
@@ -93,6 +94,9 @@ class PublicJob @Inject() (jobSrv: JobSrv) extends PublicData with JobRenderer {
       }
     )
   override val outputQuery: Query = Query.outputWithContext[RichJob, Traversal.V[Job]]((jobSteps, authContext) => jobSteps.richJob(authContext))
+  override val extraQueries: Seq[ParamQuery[_]] = Seq(
+    Query[Traversal.V[Observable], Traversal.V[Job]]("jobs", (jobTraversal, _) => jobTraversal.jobs)
+  )
   override val publicProperties: PublicProperties = PublicPropertyListBuilder[Job]
     .property("analyzerId", UMapping.string)(_.rename("workerId").readonly)
     .property("cortexId", UMapping.string.optional)(_.field.readonly)
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/Job.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/Job.scala
index e376e97cab..60ca038fa7 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/Job.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/Job.scala
@@ -1,12 +1,12 @@
 package org.thp.thehive.connector.cortex.models
 
-import java.util.Date
-
 import org.thp.scalligraph.models.Entity
 import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity, EntityId}
 import org.thp.thehive.models.{Observable, RichObservable}
 import play.api.libs.json.{Format, JsObject, Json}
 
+import java.util.Date
+
 object JobStatus extends Enumeration {
   val InProgress, Success, Failure, Waiting, Deleted = Value
 
diff --git a/thehive/app/org/thp/thehive/controllers/v0/TheHiveQueryExecutor.scala b/thehive/app/org/thp/thehive/controllers/v0/TheHiveQueryExecutor.scala
index 9e7192d940..efd82dcf72 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/TheHiveQueryExecutor.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/TheHiveQueryExecutor.scala
@@ -83,11 +83,11 @@ class TheHiveQueryExecutor @Inject() (
     case (tpe, _) if SubType(tpe, ru.typeOf[Traversal.V[Log]])               => ru.typeOf[Traversal.V[Task]]
   }
   override val customFilterQuery: FilterQuery = FilterQuery(db, publicProperties) { (tpe, globalParser) =>
-    FieldsParser.debug("parentChildFilter") {
-      case (_, FObjOne("_parent", ParentIdFilter(parentType, parentId))) if parentTypes.isDefinedAt(tpe, parentType) =>
+    FieldsParser("parentChildFilter") {
+      case (_, FObjOne("_parent", ParentIdFilter(parentType, parentId))) if parentTypes.isDefinedAt((tpe, parentType)) =>
         Good(new ParentIdInputFilter(parentType, parentId))
-      case (path, FObjOne("_parent", ParentQueryFilter(parentType, parentFilterField))) if parentTypes.isDefinedAt(tpe, parentType) =>
-        globalParser(parentTypes(tpe, parentType)).apply(path, parentFilterField).map(query => new ParentQueryInputFilter(parentType, query))
+      case (path, FObjOne("_parent", ParentQueryFilter(parentType, parentFilterField))) if parentTypes.isDefinedAt((tpe, parentType)) =>
+        globalParser(parentTypes((tpe, parentType))).apply(path, parentFilterField).map(query => new ParentQueryInputFilter(parentType, query))
       case (path, FObjOne("_child", ChildQueryFilter(childType, childQueryField))) if childTypes.isDefinedAt((tpe, childType)) =>
         globalParser(childTypes((tpe, childType))).apply(path, childQueryField).map(query => new ChildQueryInputFilter(childType, query))
     }