Skip to content

Commit

Permalink
#144 Add support of case template in back-end API
Browse files Browse the repository at this point in the history
  • Loading branch information
To-om committed Mar 13, 2017
1 parent 07d9df6 commit 1cd6210
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 10 deletions.
16 changes: 13 additions & 3 deletions thehive-backend/app/controllers/Case.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import org.elastic4play.services.{ QueryDSL, QueryDef, Role }
import org.elastic4play.services.JsonFormat.{ aggReads, queryReads }

import models.{ Case, CaseStatus }
import services.{ CaseSrv, TaskSrv }
import services.CaseMergeSrv
import services.{ CaseMergeSrv, CaseSrv, CaseTemplateSrv, TaskSrv }
import scala.util.Try

@Singleton
class CaseCtrl @Inject() (
caseSrv: CaseSrv,
caseTemplateSrv: CaseTemplateSrv,
caseMergeSrv: CaseMergeSrv,
taskSrv: TaskSrv,
auxSrv: AuxSrv,
Expand All @@ -43,7 +43,17 @@ class CaseCtrl @Inject() (

@Timed
def create() = authenticated(Role.write).async(fieldsBodyParser) { implicit request
caseSrv.create(request.body)
request.body
.getString("template")
.map { templateName
caseTemplateSrv.getByName(templateName)
.map(Some(_))
.recover { case _ None }
}
.getOrElse(Future.successful(None))
.flatMap { caseTemplate
caseSrv.create(request.body.unset("template"), caseTemplate)
}
.map(caze renderer.toOutput(CREATED, caze))
}

Expand Down
26 changes: 19 additions & 7 deletions thehive-backend/app/services/CaseSrv.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,14 @@ import akka.NotUsed
import akka.stream.scaladsl.Source

import play.api.Logger
import play.api.libs.json.{ JsObject, Json }
import play.api.libs.json.{ JsBoolean, JsNumber, JsObject, JsString, Json }
import play.api.libs.json.Json.toJsFieldJsValueWrapper

import org.elastic4play.InternalError
import org.elastic4play.controllers.Fields
import org.elastic4play.services.{ Agg, AuthContext, CreateSrv, DeleteSrv, FindSrv, GetSrv, QueryDSL, QueryDef, UpdateSrv }
import org.elastic4play.services.{ Agg, AuthContext, CreateSrv, DeleteSrv, FindSrv, GetSrv, QueryDef, UpdateSrv }

import models.{ Artifact, ArtifactModel, Case, CaseModel, Task, TaskModel }
import models.CaseStatus
import models.CaseResolutionStatus
import models.{ Artifact, ArtifactModel, Case, CaseModel, CaseResolutionStatus, CaseStatus, CaseTemplate, Task, TaskModel }

@Singleton
class CaseSrv @Inject() (
Expand All @@ -35,12 +33,26 @@ class CaseSrv @Inject() (

lazy val log = Logger(getClass)

def create(fields: Fields)(implicit authContext: AuthContext): Future[Case] = {
def applyTemplate(template: CaseTemplate, originalFields: Fields): Fields = {
originalFields.set("title", originalFields.getString("title").map(title JsString(template.titlePrefix().getOrElse("") + title)))
originalFields.set("description", originalFields.getString("description").orElse(template.description()).map(JsString(_)))
originalFields.set("severity", originalFields.getLong("severity").orElse(template.severity()).map(JsNumber(_)))
originalFields.set("tags", Json.arr((originalFields.getStrings("tags").getOrElse(Nil) ++ template.tags()).distinct))
originalFields.set("flag", originalFields.getBoolean("flag").orElse(template.flag()).map(JsBoolean(_)))
originalFields.set("tlp", originalFields.getLong("tlp").orElse(template.tlp()).map(JsNumber(_)))
originalFields.set("metricNames", Json.arr((originalFields.getStrings("metricNames").getOrElse(Nil) ++ template.metricNames()).distinct))
}

def create(fields: Fields, template: Option[CaseTemplate] = None)(implicit authContext: AuthContext): Future[Case] = {
val fieldsWithOwner = fields.get("owner") match {
case None fields.set("owner", authContext.userId)
case Some(_) fields
}
createSrv[CaseModel, Case](caseModel, fieldsWithOwner.unset("tasks"))
val templatedCaseFields = template match {
case None fieldsWithOwner
case Some(t) applyTemplate(t, fieldsWithOwner)
}
createSrv[CaseModel, Case](caseModel, templatedCaseFields.unset("tasks"))
.flatMap { caze
val taskFields = fields.getValues("tasks").collect {
case task: JsObject Fields(task)
Expand Down

0 comments on commit 1cd6210

Please sign in to comment.