#1732 Add API for observable deletion from an alert

TheHive-Project · Jan 7, 2021 · 762ead3 · 762ead3
1 parent 458de0e
commit 762ead3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -285,7 +285,7 @@ class ObservableCtrl @Inject() (
           observable <-
             observableSrv
               .get(EntityIdOrName(observableId))
-              .can(Permissions.manageObservable)
+              .canManage
               .getOrFail("Observable")
           _ <- observableSrv.remove(observable)
         } yield Results.NoContent