#2125 Be able to update the type of observable

TheHive-Project · Oct 1, 2021 · c88f3e9 · c88f3e9
1 parent 20911e7
commit c88f3e9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
@@ -358,6 +358,7 @@ class ObservableCtrl @Inject() (
 
 @Singleton
 class PublicObservable @Inject() (
+    observableTypeSrv: ObservableTypeSrv,
     observableSrv: ObservableSrv,
     organisationSrv: OrganisationSrv
 ) extends PublicData
@@ -424,7 +425,16 @@ class PublicObservable @Inject() (
     )
     .property("message", UMapping.string)(_.field.updatable)
     .property("tlp", UMapping.int)(_.field.updatable)
-    .property("dataType", UMapping.string)(_.field.readonly)
+    .property("dataType", UMapping.string)(_.field.custom { (_, value, vertex, graph, _) =>
+      val observable = observableSrv.model.converter(vertex)
+      for {
+        currentDataType <- observableTypeSrv.getByName(observable.dataType)(graph).getOrFail("ObservableType")
+        newDataType     <- observableTypeSrv.getByName(value)(graph).getOrFail("ObservableType")
+        isSameType = currentDataType.isAttachment == newDataType.isAttachment
+        _ <- if (isSameType) Success(()) else Failure(BadRequestError("Can not update dataType: isAttachment does not match"))
+        _ <- Try(observableSrv.get(vertex)(graph).update(_.dataType, value).iterate())
+      } yield Json.obj("dataType" -> value)
+    })
     .property("data", UMapping.string.optional)(_.field.readonly)
     .property("attachment.name", UMapping.string.optional)(_.select(_.attachments.value(_.name)).readonly)
     .property("attachment.hashes", UMapping.hash.sequence)(_.select(_.attachments.value(_.hashes)).readonly)

diff --git a/thehive/app/org/thp/thehive/controllers/v1/Properties.scala b/thehive/app/org/thp/thehive/controllers/v1/Properties.scala
@@ -28,7 +28,7 @@ import org.thp.thehive.services._
 import play.api.libs.json.{JsObject, JsValue, Json}
 
 import javax.inject.{Inject, Singleton}
-import scala.util.Failure
+import scala.util.{Failure, Success, Try}
 
 @Singleton
 class Properties @Inject() (
@@ -39,6 +39,7 @@ class Properties @Inject() (
     dashboardSrv: DashboardSrv,
     caseTemplateSrv: CaseTemplateSrv,
     observableSrv: ObservableSrv,
+    observableTypeSrv: ObservableTypeSrv,
     customFieldSrv: CustomFieldSrv,
     organisationSrv: OrganisationSrv,
     db: Database
@@ -440,7 +441,16 @@ class Properties @Inject() (
       )
       .property("message", UMapping.string)(_.field.updatable)
       .property("tlp", UMapping.int)(_.field.updatable)
-      .property("dataType", UMapping.string)(_.field.readonly)
+      .property("dataType", UMapping.string)(_.field.custom { (_, value, vertex, graph, _) =>
+        val observable = observableSrv.model.converter(vertex)
+        for {
+          currentDataType <- observableTypeSrv.getByName(observable.dataType)(graph).getOrFail("ObservableType")
+          newDataType     <- observableTypeSrv.getByName(value)(graph).getOrFail("ObservableType")
+          isSameType = currentDataType.isAttachment == newDataType.isAttachment
+          _ <- if (isSameType) Success(()) else Failure(BadRequestError("Can not update dataType: isAttachment does not match"))
+          _ <- Try(observableSrv.get(vertex)(graph).update(_.dataType, value).iterate())
+        } yield Json.obj("dataType" -> value)
+      })
       .property("data", UMapping.string.optional)(_.field.readonly)
       .property("attachment.name", UMapping.string.optional)(_.select(_.attachments.value(_.name)).readonly)
       .property("attachment.hashes", UMapping.hash.sequence)(_.select(_.attachments.value(_.hashes)).readonly)