#303 Add owner attribute to log entities

TheHive-Project · Oct 19, 2017 · 6295a93 · 6295a93
1 parent cd2ec56
commit 6295a93
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/thehive-backend/app/models/Log.scala b/thehive-backend/app/models/Log.scala
@@ -27,6 +27,7 @@ trait LogAttributes { _: AttributeDef ⇒
   // - contentType (string): the mimetype of the file (send by client)
   val attachment = optionalAttribute("attachment", F.attachmentFmt, "Attached file", O.readonly)
   val status = attribute("status", F.enumFmt(LogStatus), "Status of the log", LogStatus.Ok)
+  val owner = attribute("owner", F.stringFmt, "User who owns the log")
 }
 
 @Singleton

diff --git a/thehive-backend/app/models/Migration.scala b/thehive-backend/app/models/Migration.scala
@@ -237,6 +237,12 @@ class Migration(
           val customFields = (caze \ "customFields").asOpt[JsObject].getOrElse(JsObject(Nil))
           caze + ("metrics" → metrics) + ("customFields" → customFields)
         })
+    case DatabaseState(10) ⇒
+      Seq(
+        mapEntity("case_task_log") { log ⇒
+          val owner = (log \ "createdBy").asOpt[JsString].getOrElse(JsString("init"))
+          log + ("owner" → owner)
+        })
   }
 
   private val requestCounter = new java.util.concurrent.atomic.AtomicInteger(0)

diff --git a/thehive-backend/app/services/LogSrv.scala b/thehive-backend/app/services/LogSrv.scala
@@ -28,8 +28,9 @@ class LogSrv @Inject() (
     getSrv[TaskModel, Task](taskModel, taskId)
       .flatMap { task ⇒ create(task, fields) }
 
-  def create(task: Task, fields: Fields)(implicit authContext: AuthContext): Future[Log] =
-    createSrv[LogModel, Log, Task](logModel, task, fields)
+  def create(task: Task, fields: Fields)(implicit authContext: AuthContext): Future[Log] = {
+    createSrv[LogModel, Log, Task](logModel, task, fields.addIfAbsent("owner", authContext.userId))
+  }
 
   def get(id: String): Future[Log] =
     getSrv[LogModel, Log](logModel, id)