#974 Add the capability to hard delete an Alert

TheHive-Project · Jul 8, 2019 · 258299c · 258299c
1 parent d11afde
commit 258299c
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 2 deletions.
diff --git a/ui/app/scripts/controllers/alert/AlertEventCtrl.js b/ui/app/scripts/controllers/alert/AlertEventCtrl.js
@@ -1,10 +1,11 @@
 (function() {
     'use strict';
     angular.module('theHiveControllers')
-        .controller('AlertEventCtrl', function($scope, $rootScope, $state, $uibModal, $uibModalInstance, CustomFieldsCacheSrv, CaseResolutionStatus, AlertingSrv, NotificationSrv, UiSettingsSrv, clipboard, event, templates) {
+        .controller('AlertEventCtrl', function($scope, $rootScope, $state, $uibModal, $uibModalInstance, ModalUtilsSrv, CustomFieldsCacheSrv, CaseResolutionStatus, AlertingSrv, NotificationSrv, UiSettingsSrv, clipboard, event, templates, isAdmin) {
             var self = this;
             var eventId = event.id;
 
+            self.isAdmin = isAdmin;
             self.templates = _.pluck(templates, 'name');
             self.CaseResolutionStatus = CaseResolutionStatus;
             self.event = event;
@@ -189,6 +190,23 @@
                 });
             };
 
+            this.delete = function() {
+                ModalUtilsSrv.confirm('Remove Alert', 'Are you sure you want to delete this Alert?', {
+                    okText: 'Yes, remove it',
+                    flavor: 'danger'
+                }).then(function() {
+                    AlertingSrv.forceRemove(self.event.id)
+                    .then(function() {
+                        $uibModalInstance.close();
+                        NotificationSrv.log('Alert has been permanently deleted', 'success');
+                    })
+                    .catch(function(response) {
+                        NotificationSrv.error('AlertEventCtrl', response.data, response.status);
+                    });
+                });
+
+            };
+
             this.canMarkAsRead = AlertingSrv.canMarkAsRead;
             this.canMarkAsUnread = AlertingSrv.canMarkAsUnread;
 

diff --git a/ui/app/scripts/controllers/alert/AlertListCtrl.js b/ui/app/scripts/controllers/alert/AlertListCtrl.js
@@ -6,6 +6,8 @@
 
             self.urls = VersionSrv.mispUrls();
 
+            self.isAdmin = $scope.isAdmin($scope.currentUser);
+
             self.list = [];
             self.selection = [];
             self.menu = {
@@ -203,7 +205,8 @@
                         event: event,
                         templates: function() {
                             return CaseTemplateSrv.list();
-                        }
+                        },
+                        isAdmin: self.isAdmin
                     }
                 });
             };

diff --git a/ui/app/scripts/services/AlertingSrv.js b/ui/app/scripts/services/AlertingSrv.js
@@ -69,6 +69,14 @@
                     return $http.post(baseUrl + '/' + alertId + '/unfollow');
                 },
 
+                forceRemove: function(alertId) {
+                    return $http.delete(baseUrl + '/' + alertId, {
+                        params: {
+                            force: 1
+                        }
+                    });
+                },
+
                 stats: function(scope) {
                     var field = 'status',
                         result = {},

diff --git a/ui/app/views/partials/alert/event.dialog.html b/ui/app/views/partials/alert/event.dialog.html
@@ -163,6 +163,10 @@ <h4 class="vpad10 text-primary">
         <i class="fa fa-compress"></i> Merge into case
     </button>
 
+    <button ng-if="dialog.isAdmin" class="btn btn-danger" type="button" ng-disabled="dialog.loading" ng-click="dialog.delete()">
+        <i class="fa fa-trash"></i> Delete
+    </button>
+
     <form name="eventForm" class="form-horizontal pull-right mr-xs" style="width:450px;" ng-submit="dialog.import()">
         <div class="form-group">
             <label class="col-sm-4 control-label">Import alert as</label>

diff --git a/ui/app/views/partials/alert/list.html b/ui/app/views/partials/alert/list.html
@@ -5,6 +5,7 @@
                 <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{alertEvents.count}})</h3>
             </div>
             <div class="box-body">
+
                 <div ng-include="'views/partials/alert/list/toolbar.html'"></div>
 
                 <div class="mv-s filter-panel" ng-include="'views/partials/alert/list/mini-stats.html'" ng-show="$vm.filtering.context.showStats"></div>