#1652 Clone traversal to fix updates

TheHive-Project · Nov 19, 2020 · 8d0dd41 · 8d0dd41
1 parent 9506fe3
commit 8d0dd41
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/thehive/app/org/thp/thehive/services/LogSrv.scala b/thehive/app/org/thp/thehive/services/LogSrv.scala
@@ -68,11 +68,9 @@ class LogSrv @Inject() (attachmentSrv: AttachmentSrv, auditSrv: AuditSrv, taskSr
   )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[Log], JsObject)] =
     auditSrv.mergeAudits(super.update(traversal, propertyUpdaters)) {
       case (logSteps, updatedFields) =>
-        for {
-          task <- logSteps.clone().task.getOrFail("Task")
-          log  <- logSteps.getOrFail("Log")
-          _    <- auditSrv.log.update(log, task, updatedFields)
-        } yield ()
+        logSteps.clone().project(_.by.by(_.task)).getOrFail("Log").flatMap {
+          case (log, task) => auditSrv.log.update(log, task, updatedFields)
+        }
     }
 }
 

diff --git a/thehive/app/org/thp/thehive/services/ObservableSrv.scala b/thehive/app/org/thp/thehive/services/ObservableSrv.scala
@@ -183,10 +183,10 @@ class ObservableSrv @Inject() (
   )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[Observable], JsObject)] =
     auditSrv.mergeAudits(super.update(traversal, propertyUpdaters)) {
       case (observableSteps, updatedFields) =>
-        for {
-          observable <- observableSteps.getOrFail("Observable")
-          _          <- auditSrv.observable.update(observable, updatedFields)
-        } yield ()
+        observableSteps
+          .clone()
+          .getOrFail("Observable")
+          .flatMap(observable => auditSrv.observable.update(observable, updatedFields))
     }
 }