#170 Replace the MISP listing page, with an alert listing page

TheHive-Project · Apr 10, 2017 · b337888 · b337888
1 parent cb13057
commit b337888
Show file tree

Hide file tree

Showing 45 changed files with 740 additions and 187 deletions.
diff --git a/ui/app/index.html b/ui/app/index.html
@@ -130,6 +130,8 @@
     <script src="scripts/controllers/admin/AdminObservablesCtrl.js"></script>
     <script src="scripts/controllers/admin/AdminReportTemplatesCtrl.js"></script>
     <script src="scripts/controllers/admin/AdminUsersCtrl.js"></script>
+    <script src="scripts/controllers/alert/AlertListCtrl.js"></script>
+    <script src="scripts/controllers/alert/AlertStatsCtrl.js"></script>
     <script src="scripts/controllers/case/CaseCloseModalCtrl.js"></script>
     <script src="scripts/controllers/case/CaseCreationCtrl.js"></script>
     <script src="scripts/controllers/case/CaseDetailsCtrl.js"></script>
@@ -149,7 +151,6 @@
     <script src="scripts/controllers/cortex/CortexInstanceDialogCtrl.js"></script>
     <script src="scripts/controllers/misp/MispBulkImportCtrl.js"></script>
     <script src="scripts/controllers/misp/MispEventCtrl.js"></script>
-    <script src="scripts/controllers/misp/MispListCtrl.js"></script>
     <script src="scripts/controllers/misp/MispStatsCtrl.js"></script>
     <script src="scripts/directives/charts/c3Chart.js"></script>
     <script src="scripts/directives/charts/chart.js"></script>
@@ -195,6 +196,7 @@
     <script src="scripts/filters/showDate.js"></script>
     <script src="scripts/services/AfkSrv.js"></script>
     <script src="scripts/services/AlertSrv.js"></script>
+    <script src="scripts/services/AlertingSrv.js"></script>
     <script src="scripts/services/AnalyzerInfoSrv.js"></script>
     <script src="scripts/services/AnalyzerSrv.js"></script>
     <script src="scripts/services/AppLayoutSrv.js"></script>
@@ -215,6 +217,7 @@
     <script src="scripts/services/ListSrv.js"></script>
     <script src="scripts/services/MetricsCacheSrv.js"></script>
     <script src="scripts/services/MispSrv.js"></script>
+    <script src="scripts/services/NotificationSrv.js"></script>
     <script src="scripts/services/ObservablesUISrv.js"></script>
     <script src="scripts/services/PSearchSrv.js"></script>
     <script src="scripts/services/ReportTemplateSrv.js"></script>

diff --git a/ui/app/scripts/app.js b/ui/app/scripts/app.js
@@ -52,7 +52,7 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ui.bootstrap', 'ui.router
                         return VersionSrv.get();
                     },
                     appLayout: function($q, $rootScope, AppLayoutSrv) {
-                        AppLayoutSrv.init();                        
+                        AppLayoutSrv.init();
                         return $q.resolve();
                     }
                 }
@@ -143,7 +143,7 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ui.bootstrap', 'ui.router
                 controller: 'CaseMainCtrl',
                 title: 'Case',
                 resolve: {
-                    caze: function($q, $rootScope, $stateParams, CaseSrv, AlertSrv) {
+                    caze: function($q, $rootScope, $stateParams, CaseSrv, NotificationSrv) {
                         var deferred = $q.defer();
 
                         CaseSrv.get({
@@ -156,7 +156,7 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ui.bootstrap', 'ui.router
                         }, function(response) {
                             deferred.reject(response);
 
-                            AlertSrv.error('CaseMainCtrl', response.data, response.status);
+                            NotificationSrv.error('CaseMainCtrl', response.data, response.status);
                         });
 
                         return deferred.promise;
@@ -189,7 +189,7 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ui.bootstrap', 'ui.router
                 templateUrl: 'views/partials/case/case.tasks.item.html',
                 controller: 'CaseTasksItemCtrl',
                 resolve: {
-                    task: function($q, $stateParams, CaseTaskSrv, AlertSrv) {
+                    task: function($q, $stateParams, CaseTaskSrv, NotificationSrv) {
                         var deferred = $q.defer();
 
                         CaseTaskSrv.get({
@@ -198,7 +198,7 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ui.bootstrap', 'ui.router
                             deferred.resolve(data);
                         }, function(response) {
                             deferred.reject(response);
-                            AlertSrv.error('taskDetails', response.data, response.status);
+                            NotificationSrv.error('taskDetails', response.data, response.status);
                         });
 
                         return deferred.promise;
@@ -223,11 +223,11 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ui.bootstrap', 'ui.router
                     }
                 }
             })
-            .state('app.misp-list', {
-                url: 'misp/list',
-                templateUrl: 'views/partials/misp/list.html',
-                controller: 'MispListCtrl',
-                controllerAs: 'misp'
+            .state('app.alert-list', {
+                url: 'alert/list',
+                templateUrl: 'views/partials/alert/list.html',
+                controller: 'AlertListCtrl',
+                controllerAs: '$vm'
             });
     })
     .config(function($httpProvider) {

diff --git a/ui/app/scripts/controllers/AboutCtrl.js b/ui/app/scripts/controllers/AboutCtrl.js
@@ -5,11 +5,11 @@
     'use strict';
 
     angular.module('theHiveControllers').controller('AboutCtrl',
-        function($rootScope, $scope, $uibModalInstance, VersionSrv, AlertSrv) {
+        function($rootScope, $scope, $uibModalInstance, VersionSrv, NotificationSrv) {
             VersionSrv.get().then(function(response) {
                 $scope.version = response.versions;
             }, function(data, status) {
-                AlertSrv.error('AboutCtrl', data, status);
+                NotificationSrv.error('AboutCtrl', data, status);
             });
 
             $scope.close = function() {

diff --git a/ui/app/scripts/controllers/AuthenticationCtrl.js b/ui/app/scripts/controllers/AuthenticationCtrl.js
@@ -4,7 +4,7 @@
 (function() {
     'use strict';
     angular.module('theHiveControllers')
-        .controller('AuthenticationCtrl', function($scope, $state, $uibModalStack, AuthenticationSrv, AlertSrv) {
+        .controller('AuthenticationCtrl', function($scope, $state, $uibModalStack, AuthenticationSrv, NotificationSrv) {
             $scope.params = {};
 
             $uibModalStack.dismissAll();
@@ -15,9 +15,9 @@
                     $state.go('app.cases');
                 }, function(data, status) {
                     if (status === 520) {
-                        AlertSrv.error('AuthenticationCtrl', data, status);
+                        NotificationSrv.error('AuthenticationCtrl', data, status);
                     } else {
-                        AlertSrv.log(data.message, 'error');
+                        NotificationSrv.log(data.message, 'error');
                     }
                 });
             };

diff --git a/ui/app/scripts/controllers/MigrationCtrl.js b/ui/app/scripts/controllers/MigrationCtrl.js
@@ -1,7 +1,7 @@
 (function() {
     'use strict';
     angular.module('theHiveControllers').controller('MigrationCtrl',
-        function($rootScope, $scope, $http, $state, $timeout, $window, AlertSrv, StreamSrv, UserSrv) {
+        function($rootScope, $scope, $http, $state, $timeout, $window, NotificationSrv, StreamSrv, UserSrv) {
             $rootScope.title = 'Database migration';
             $scope.migrationStatus = {};
             $scope.showUserForm = false;
@@ -49,7 +49,7 @@
                     console.log('Migration started');
                 }).error(function(response) {
                     if (angular.isObject(response)) {
-                        AlertSrv.error('UserMgmtCtrl', response.data, response.status);
+                        NotificationSrv.error('UserMgmtCtrl', response.data, response.status);
                     } else {
                       console.log("Migration timeout");
                     }

diff --git a/ui/app/scripts/controllers/RootCtrl.js b/ui/app/scripts/controllers/RootCtrl.js
@@ -2,7 +2,7 @@
  * Controller for main page
  */
 angular.module('theHiveControllers').controller('RootCtrl',
-    function($scope, $rootScope, $uibModal, $location, $state, $base64, AuthenticationSrv, MispSrv, StreamSrv, StreamStatSrv, TemplateSrv, MetricsCacheSrv, AlertSrv, AppLayoutSrv, appConfig) {
+    function($scope, $rootScope, $uibModal, $location, $state, $base64, AuthenticationSrv, AlertingSrv, StreamSrv, StreamStatSrv, TemplateSrv, MetricsCacheSrv, NotificationSrv, AppLayoutSrv, appConfig) {
         'use strict';
 
         $rootScope.layoutSrv = AppLayoutSrv;
@@ -50,10 +50,10 @@ angular.module('theHiveControllers').controller('RootCtrl',
                 $scope.metricsCache = list;
             });
 
-            // Get MISP counts
-            $scope.mispEvents = MispSrv.stats($scope);
+            // Get Alert counts
+            $scope.alertEvents = AlertingSrv.stats($scope);
         }, function(data, status) {
-            AlertSrv.error('RootCtrl', data, status);
+            NotificationSrv.error('RootCtrl', data, status);
         });
 
         $scope.$on('templates:refresh', function(){
@@ -67,13 +67,14 @@ angular.module('theHiveControllers').controller('RootCtrl',
             });
         });
 
-        $scope.$on('misp:event-imported', function() {
-            $scope.mispEvents = MispSrv.stats($scope);
+        $scope.$on('alert:event-imported', function() {
+            $scope.alertEvents = AlertingSrv.stats($scope);
         });
 
-        $scope.$on('misp:status-updated', function(event, enabled) {
-            $scope.mispEnabled = enabled;
-        });
+        // FIXME
+        // $scope.$on('misp:status-updated', function(event, enabled) {
+        //     $scope.mispEnabled = enabled;
+        // });
 
         $scope.isAdmin = function(user) {
             var u = user;
@@ -92,7 +93,7 @@ angular.module('theHiveControllers').controller('RootCtrl',
             AuthenticationSrv.logout(function() {
                 $state.go('login');
             }, function(data, status) {
-                AlertSrv.error('RootCtrl', data, status);
+                NotificationSrv.error('RootCtrl', data, status);
             });
         };
 

diff --git a/ui/app/scripts/controllers/SearchCtrl.js b/ui/app/scripts/controllers/SearchCtrl.js
@@ -1,7 +1,7 @@
 (function() {
     'use strict';
     angular.module('theHiveControllers')
-        .controller('SearchCtrl', function($scope, $stateParams, $base64, PSearchSrv, CaseTaskSrv, AlertSrv, EntitySrv, UserInfoSrv) {
+        .controller('SearchCtrl', function($scope, $stateParams, $base64, PSearchSrv, CaseTaskSrv, NotificationSrv, EntitySrv, UserInfoSrv) {
             $scope.filter = {
                 type: {
                     values: [

diff --git a/ui/app/scripts/controllers/SettingsCtrl.js b/ui/app/scripts/controllers/SettingsCtrl.js
@@ -1,7 +1,7 @@
 (function() {
     'use strict';
     angular.module('theHiveControllers').controller('SettingsCtrl',
-        function($scope, $state, UserSrv, AlertSrv, resizeService, readLocalPicService, UserInfoSrv, appConfig) {
+        function($scope, $state, UserSrv, NotificationSrv, resizeService, readLocalPicService, UserInfoSrv, appConfig) {
             $scope.appConfig = appConfig;
 
             $scope.basicData = {
@@ -34,11 +34,11 @@
 
                     UserInfoSrv.update(data._id, data);
 
-                    AlertSrv.log('Your basic information have been successfully updated', 'success');
+                    NotificationSrv.log('Your basic information have been successfully updated', 'success');
 
                     $state.reload();
                 }, function(response) {
-                    AlertSrv.error('SettingsCtrl', response.data, response.status);
+                    NotificationSrv.error('SettingsCtrl', response.data, response.status);
                 });
             };
 
@@ -57,10 +57,10 @@
                     UserSrv.changePass({
                         userId: $scope.currentUser.id
                     }, updatedFields, function( /*data*/ ) {
-                        AlertSrv.log('Your password has been successfully updated', 'success');
+                        NotificationSrv.log('Your password has been successfully updated', 'success');
                         $state.reload();
                     }, function(response) {
-                        AlertSrv.error('SettingsCtrl', response.data, response.status);
+                        NotificationSrv.error('SettingsCtrl', response.data, response.status);
                     });
                 } else {
                     $state.go('app.cases');

diff --git a/ui/app/scripts/controllers/admin/AdminCaseTemplatesCtrl.js b/ui/app/scripts/controllers/admin/AdminCaseTemplatesCtrl.js
@@ -2,7 +2,7 @@
     'use strict';
 
     angular.module('theHiveControllers').controller('AdminCaseTemplatesCtrl',
-        function($scope, $uibModal, TemplateSrv, AlertSrv, UtilsSrv, ListSrv, MetricsCacheSrv) {
+        function($scope, $uibModal, TemplateSrv, NotificationSrv, UtilsSrv, ListSrv, MetricsCacheSrv) {
             $scope.task = '';
             $scope.tags = [];
             $scope.templates = [];
@@ -112,7 +112,7 @@
                     metrics.push(metric.name);
                     $scope.template.metricNames = metrics;
                 } else {
-                    AlertSrv.log('The metric [' + metric.title + '] has already been added to the template', 'warning');
+                    NotificationSrv.log('The metric [' + metric.title + '] has already been added to the template', 'warning');
                 }
             };
 
@@ -145,9 +145,9 @@
 
                     $scope.$emit('templates:refresh');
 
-                    AlertSrv.log('The template [' + $scope.template.name + '] has been successfuly created', 'success');
+                    NotificationSrv.log('The template [' + $scope.template.name + '] has been successfuly created', 'success');
                 }, function(response) {
-                    AlertSrv.error('TemplateCtrl', response.data, response.status);
+                    NotificationSrv.error('TemplateCtrl', response.data, response.status);
                 });
             };
 
@@ -160,9 +160,9 @@
 
                     $scope.$emit('templates:refresh');
 
-                    AlertSrv.log('The template [' + $scope.template.name + '] has been successfuly updated', 'success');
+                    NotificationSrv.log('The template [' + $scope.template.name + '] has been successfuly updated', 'success');
                 }, function(response) {
-                    AlertSrv.error('TemplateCtrl', response.data, response.status);
+                    NotificationSrv.error('TemplateCtrl', response.data, response.status);
                 });
             };
 

diff --git a/ui/app/scripts/controllers/admin/AdminMetricsCtrl.js b/ui/app/scripts/controllers/admin/AdminMetricsCtrl.js
@@ -2,7 +2,7 @@
     'use strict';
 
     angular.module('theHiveControllers').controller('AdminMetricsCtrl',
-        function($scope, ListSrv, MetricsCacheSrv, AlertSrv) {
+        function($scope, ListSrv, MetricsCacheSrv, NotificationSrv) {
             $scope.metrics = [];
 
             $scope.initMetrics = function() {
@@ -21,7 +21,7 @@
                     });
 
                 }, function(response) {
-                    AlertSrv.error('AdminMetricsCtrl', response.data, response.status);
+                    NotificationSrv.error('AdminMetricsCtrl', response.data, response.status);
                 });
             };
             $scope.initMetrics();
@@ -39,7 +39,7 @@
                         $scope.$emit('metrics:refresh');
                     },
                     function(response) {
-                        AlertSrv.error('AdminMetricsCtrl', response.data, response.status);
+                        NotificationSrv.error('AdminMetricsCtrl', response.data, response.status);
                     });
             };
         });

diff --git a/ui/app/scripts/controllers/admin/AdminObservablesCtrl.js b/ui/app/scripts/controllers/admin/AdminObservablesCtrl.js
@@ -2,7 +2,7 @@
     'use strict';
 
     angular.module('theHiveControllers').controller('AdminObservablesCtrl',
-        function($scope, ListSrv, AlertSrv) {
+        function($scope, ListSrv, NotificationSrv) {
             $scope.dataTypeList = [];
             $scope.params = {
                 newDataType: null
@@ -22,7 +22,7 @@
                         };
                     });
                 }, function(response) {
-                    AlertSrv.error('AdminObservablesCtrl', response.data, response.status);
+                    NotificationSrv.error('AdminObservablesCtrl', response.data, response.status);
                 });
             };
             $scope.load();
@@ -36,7 +36,7 @@
                         $scope.load();
                     },
                     function(response) {
-                        AlertSrv.error('ListSrv', response.data, response.status);
+                        NotificationSrv.error('ListSrv', response.data, response.status);
                     });
 
                 $scope.params.newDataType = '';
@@ -47,10 +47,10 @@
                     'listId': datatype.id
                 }, function(data) {
                     console.log(data);
-                    AlertSrv.log('The datatype ' + datatype.value + ' has been removed', 'success');
+                    NotificationSrv.log('The datatype ' + datatype.value + ' has been removed', 'success');
                     $scope.load();
                 }, function(response) {
-                    AlertSrv.error('ListSrv', response.data, response.status);
+                    NotificationSrv.error('ListSrv', response.data, response.status);
                 });
             };
         });