Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CloseTask responder operation #728

Merged
merged 2 commits into from
Sep 20, 2018
Merged

CloseTask responder operation #728

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c10cc6b
Add CloseTask responder operation
srilumpa Sep 19, 2018
3fb1bb9
Merge branch 'develop' into closetask_operation
srilumpa Sep 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions thehive-cortex/app/connectors/cortex/services/ActionOperation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import akka.actor.ActorSystem
import akka.stream.Materializer
import akka.stream.scaladsl.Sink
import javax.inject.{ Inject, Singleton }
import models.{ Alert, Case, Artifact }
import models.{ Alert, Case, Artifact, Task, TaskStatus }
import services.{ CaseSrv, TaskSrv, ArtifactSrv }

import org.elastic4play.controllers.Fields
Expand Down Expand Up @@ -46,11 +46,16 @@ case class AddCustomFields(name: String, tpe: String, value: JsValue, status: Ac
override def updateStatus(newStatus: ActionOperationStatus.Type, newMessage: String): AddCustomFields = copy(status = newStatus, message = newMessage)
}

case class CloseTask(status: ActionOperationStatus.Type = ActionOperationStatus.Waiting, message: String = "") extends ActionOperation {
def updateStatus(newStatus: ActionOperationStatus.Type, newMessage: String): CloseTask = copy(status = newStatus, message = newMessage)
}

object ActionOperation {
val addTagToCaseWrites = Json.writes[AddTagToCase]
val addTagToArtifactWrites = Json.writes[AddTagToArtifact]
val createTaskWrites = Json.writes[CreateTask]
val addCustomFieldsWrites = Json.writes[AddCustomFields]
val closeTaskWrites = Json.writes[CloseTask]
implicit val actionOperationReads: Reads[ActionOperation] = Reads[ActionOperation](json ⇒
(json \ "type").asOpt[String].fold[JsResult[ActionOperation]](JsError("type is missing in action operation")) {
case "AddTagToCase" ⇒ (json \ "tag").validate[String].map(tag ⇒ AddTagToCase(tag))
Expand All @@ -61,14 +66,16 @@ object ActionOperation {
tpe ← (json \ "tpe").validate[String]
value ← (json \ "value").validate[JsValue]
} yield AddCustomFields(name, tpe, value)
case other ⇒ JsError(s"Unknown operation $other")
case "CloseTask" ⇒ JsSuccess(CloseTask())
case other ⇒ JsError(s"Unknown operation $other")
})
implicit val actionOperationWrites: Writes[ActionOperation] = Writes[ActionOperation] {
case a: AddTagToCase ⇒ addTagToCaseWrites.writes(a)
case a: AddTagToCase ⇒ addTagToCaseWrites.writes(a)
case a: AddTagToArtifact ⇒ addTagToArtifactWrites.writes(a)
case a:CreateTask ⇒ createTaskWrites.writes(a)
case a: AddCustomFields ⇒ addCustomFieldsWrites.writes(a)
case a ⇒ Json.obj("unsupported operation" → a.toString)
case a: CreateTask ⇒ createTaskWrites.writes(a)
case a: AddCustomFields ⇒ addCustomFieldsWrites.writes(a)
case a: CloseTask ⇒ closeTaskWrites.writes(a)
case a ⇒ Json.obj("unsupported operation" → a.toString)
}
}

Expand Down Expand Up @@ -102,6 +109,13 @@ class ActionOperationSrv @Inject() (
}
}

def findTaskEntity(entity: BaseEntity): Future[Task] = {
(entity, entity.model) match {
case (a: Task, _) ⇒ Future.successful(a)
case _ ⇒ Future.failed(BadRequestError("Task not found"))
}
}

def execute(entity: BaseEntity, operation: ActionOperation)(implicit authContext: AuthContext): Future[ActionOperation] = {
if (operation.status == ActionOperationStatus.Waiting) {
val updatedOperation = operation match {
Expand Down Expand Up @@ -135,6 +149,12 @@ class ActionOperationSrv @Inject() (
_ ← caseSrv.update(caze, Fields.empty.set("customFields", customFields), ModifyConfig(retryOnConflict = 0, version = Some(caze.version)))
} yield operation.updateStatus(ActionOperationStatus.Success, "")
}
case CloseTask(_, _) ⇒
for {
initialTask ← findTaskEntity(entity)
task ← taskSrv.get(initialTask.id)
_ ← taskSrv.update(task, Fields.empty.set("status", TaskStatus.Completed.toString).set("flag", JsFalse), ModifyConfig(retryOnConflict = 0, version = Some(task.version)))
} yield operation.updateStatus(ActionOperationStatus.Success, "")
case o ⇒ Future.successful(operation.updateStatus(ActionOperationStatus.Failure, s"Operation $o not supported"))
}
updatedOperation.recover { case error ⇒ operation.updateStatus(ActionOperationStatus.Failure, error.getMessage) }
Expand Down