From 56f9be77bc54ade08dab592712c59c8c337038d0 Mon Sep 17 00:00:00 2001 From: To-om Date: Wed, 22 Jul 2020 17:42:18 +0200 Subject: [PATCH] #1410 Add jobs query in observable --- .../connector/cortex/controllers/v0/JobCtrl.scala | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 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 ce689391cb..7ffc0748cb 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 @@ -9,12 +9,12 @@ import org.thp.scalligraph.steps.PagedResult import org.thp.scalligraph.steps.StepsOps._ import org.thp.scalligraph.{AuthorizationError, ErrorHandler} import org.thp.thehive.connector.cortex.controllers.v0.Conversion._ -import org.thp.thehive.connector.cortex.models.RichJob +import org.thp.thehive.connector.cortex.models.{ObservableJob, RichJob} import org.thp.thehive.connector.cortex.services.{JobSrv, JobSteps} import org.thp.thehive.controllers.v0.Conversion._ import org.thp.thehive.controllers.v0.{IdOrName, OutputParam, QueryableCtrl} import org.thp.thehive.models.{Permissions, RichCase, RichObservable} -import org.thp.thehive.services.ObservableSrv +import org.thp.thehive.services.{ObservableSrv, ObservableSteps} import play.api.Logger import play.api.mvc.{Action, AnyContent, Results} @@ -52,6 +52,13 @@ class JobCtrl @Inject() ( ) override val outputQuery: Query = Query.outputWithContext[RichJob, JobSteps]((jobSteps, authContext) => jobSteps.richJob(authContext)) + override val extraQueries: Seq[ParamQuery[_]] = Seq( + Query[ObservableSteps, JobSteps]( + "jobs", + (observableSteps, _) => new JobSteps(observableSteps.outTo[ObservableJob].raw)(db, observableSteps.graph) + ) + ) + def get(jobId: String): Action[AnyContent] = entrypoint("get job") .authRoTransaction(db) { implicit request => implicit graph =>