From 762ead3f0ef11f9581e855919d8b34f6d6cd06e4 Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Thu, 7 Jan 2021 08:11:20 +0100
Subject: [PATCH] #1732 Add API for observable deletion from an alert

---
 thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala | 2 +-
 thehive/app/org/thp/thehive/controllers/v0/Router.scala         | 1 +
 thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
index bb8fb1d893..21af8c47e5 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
@@ -271,7 +271,7 @@ class ObservableCtrl @Inject() (
           observable <-
             observableSrv
               .get(EntityIdOrName(observableId))
-              .can(Permissions.manageObservable)
+              .canManage
               .getOrFail("Observable")
           _ <- observableSrv.remove(observable)
         } yield Results.NoContent
diff --git a/thehive/app/org/thp/thehive/controllers/v0/Router.scala b/thehive/app/org/thp/thehive/controllers/v0/Router.scala
index 80cd24e4eb..e29481df34 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/Router.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/Router.scala
@@ -87,6 +87,7 @@ class Router @Inject() (
     case POST(p"/alert/$alertId/artifact")            => observableCtrl.createInAlert(alertId) // Audit ok
     case PATCH(p"/alert/artifact/$observableId")      => observableCtrl.update(observableId)   // Audit ok
     case PATCH(p"/alert/artifact/_bulk")              => observableCtrl.bulkUpdate             // Audit ok
+    case DELETE(p"/alert/artifact/$observableId")     => observableCtrl.delete(observableId)   // Audit ok
 
     case GET(p"/case")                  => caseCtrl.search
     case POST(p"/case")                 => caseCtrl.create         // Audit ok
diff --git a/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala
index 8cf373d168..706c36481d 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala
@@ -285,7 +285,7 @@ class ObservableCtrl @Inject() (
           observable <-
             observableSrv
               .get(EntityIdOrName(observableId))
-              .can(Permissions.manageObservable)
+              .canManage
               .getOrFail("Observable")
           _ <- observableSrv.remove(observable)
         } yield Results.NoContent