From 8b0e157b1a43b887ba751c13abb0fd237246852d Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Tue, 12 Feb 2019 14:54:56 +0100 Subject: [PATCH 01/53] #863 Add more details to the alert and case audit logs in search page --- ui/app/views/directives/search/audit.html | 125 ++++++++++++++++------ ui/app/views/directives/search/task.html | 2 +- 2 files changed, 95 insertions(+), 32 deletions(-) diff --git a/ui/app/views/directives/search/audit.html b/ui/app/views/directives/search/audit.html index 0458e7ab5b..215427b40c 100644 --- a/ui/app/views/directives/search/audit.html +++ b/ui/app/views/directives/search/audit.html @@ -1,39 +1,102 @@ -
- - {{value.operation}} of {{value.objectType}}
- {{value.stats.name}} - - - {{value.operation}} of {{value.objectType}}
- {{value.stats.title || value.details.title}} - - - {{value.operation}} of task
- {{value.stats.title || value.details.title}} - - - {{value.operation}} of task log - - - {{value.operation}} of observable
- {{value.stats.data}} - - - {{value.operation}} of observable job
- {{value.stats.analyzerName}} - - - {{value.operation}} of alert
- {{value.stats.title}} - -
-
+
- {{getUserInfo.get(value.createdBy) | getField: 'name'}} + by {{getUserInfo.get(value.createdBy) | getField: 'name'}} Occurred on
+ +
+
+
+ + {{value.operation}} of {{value.objectType}}
+ {{value.stats.name}} + +
+
+
+
+ + {{value.operation}} of {{value.objectType}}
+ {{value.stats.title || value.details.title}} + +
+
+ + {{getUserInfo.get(value.stats.owner) | getField: 'name'}} + + + + + + ( + Closed + on + {{value.stats.endDate | showDate}} + as + {{value.stats.resolutionStatus}}) + +
+
+
+
+ + {{value.operation}} of task
+ {{value.stats.title || value.details.title}} + +
+
+
+
+ + {{value.operation}} of task log + +
+
+
+
+ + {{value.operation}} of observable
+ {{value.stats.data}} + +
+
+
+
+ + {{value.operation}} of observable job
+ {{value.stats.analyzerName}} + +
+
+
+
+ + {{value.operation}} of alert
+ {{value.stats.title}} + +
+
+ + Date: + {{value.stats.date | showDate}} + + + Type: + {{value.stats.type}} + + + Reference: + {{value.stats.sourceRef}} + + + Source: + {{value.stats.source}} + +
+
+
Details (ExpandCollapse) 
{{value.details | flattern | json}}
diff --git a/ui/app/views/directives/search/task.html b/ui/app/views/directives/search/task.html index fdf590e6ba..0eec85211a 100644 --- a/ui/app/views/directives/search/task.html +++ b/ui/app/views/directives/search/task.html @@ -7,7 +7,7 @@ {{getUserInfo.get(value.owner) | getField: 'name'}} - +
From e9ee614d58c427393bb16c61f53fee86e15ceabb Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Tue, 12 Feb 2019 16:27:37 +0100 Subject: [PATCH 02/53] #485 Disallow clicking on dashboard items in edit mode --- .../dashboard/DashboardViewCtrl.js | 20 +++++++++---------- .../scripts/directives/dashboard/counter.js | 18 +++++++---------- ui/app/scripts/directives/dashboard/donut.js | 7 +++++-- ui/app/scripts/directives/dashboard/item.js | 10 +++++----- ui/app/views/directives/dashboard/item.html | 6 +++--- ui/app/views/partials/dashboard/view.html | 2 +- 6 files changed, 31 insertions(+), 32 deletions(-) diff --git a/ui/app/scripts/controllers/dashboard/DashboardViewCtrl.js b/ui/app/scripts/controllers/dashboard/DashboardViewCtrl.js index 4c2c404e28..7e3805a96d 100644 --- a/ui/app/scripts/controllers/dashboard/DashboardViewCtrl.js +++ b/ui/app/scripts/controllers/dashboard/DashboardViewCtrl.js @@ -82,7 +82,7 @@ this.periodFilter = this.buildDashboardPeriodFilter(period); $scope.$broadcast('refresh-chart', this.periodFilter); - } + }; this.removeContainer = function(index) { var row = this.definition.items[index]; @@ -95,28 +95,28 @@ promise = ModalUtilsSrv.confirm('Remove widget', 'Are you sure you want to remove this item', { okText: 'Yes, remove it', flavor: 'danger' - }) + }); } promise.then(function() { - self.definition.items.splice(index, 1) + self.definition.items.splice(index, 1); }); - } + }; this.saveDashboard = function() { var copy = _.pick(this.dashboard, 'title', 'description', 'status'); copy.definition = angular.toJson(this.definition); DashboardSrv.update(this.dashboard.id, copy) - .then(function(response) { + .then(function(/*response*/) { self.options.editLayout = false; self.resizeCharts(); NotificationSrv.log('The dashboard has been successfully updated', 'success'); }) .catch(function(err) { NotificationSrv.error('DashboardEditCtrl', err.data, err.status); - }) - } + }); + }; this.removeItem = function(rowIndex, colIndex) { @@ -151,15 +151,15 @@ } return item; - } + }; this.itemDragStarted = function(colIndex, row) { row.items.splice(colIndex, 1); - } + }; this.exportDashboard = function() { DashboardSrv.exportDashboard(this.dashboard); - } + }; this.resizeCharts = function() { $timeout(function() { diff --git a/ui/app/scripts/directives/dashboard/counter.js b/ui/app/scripts/directives/dashboard/counter.js index 8d8825e0a6..6997297622 100644 --- a/ui/app/scripts/directives/dashboard/counter.js +++ b/ui/app/scripts/directives/dashboard/counter.js @@ -56,29 +56,25 @@ name: name, label: serie.label, value: data[name] || 0 - } + }; }); - }, function(err) { + }, function(/*err*/) { scope.error = true; NotificationSrv.log('Failed to fetch data, please edit the widget definition', 'error'); }); }; scope.openSearch = function(item) { - var criteria = [{ _type: scope.options.entity }, item.serie.query]; - - if (scope.globalQuery && scope.globalQuery !== '*') { - criteria.push(scope.globalQuery); + if(scope.mode === 'edit') { + return; } - var searchQuery = { - _and: _.without(criteria, null, undefined, '') - }; + var filters = (scope.options.filters || []).concat(item.serie.filters || []); GlobalSearchSrv.saveSection(scope.options.entity, { - search: null, - filters: scope.options.filters.concat(item.serie.filters) + search: filters.length === 0 ? '*' : null, + filters: filters }); $state.go('app.search'); }; diff --git a/ui/app/scripts/directives/dashboard/donut.js b/ui/app/scripts/directives/dashboard/donut.js index a0f4393bc3..078d657031 100644 --- a/ui/app/scripts/directives/dashboard/donut.js +++ b/ui/app/scripts/directives/dashboard/donut.js @@ -81,8 +81,11 @@ names: scope.options.names || {}, colors: scope.options.colors || {}, onclick: function(d) { + if(scope.mode === 'edit') { + return; + } + var fieldDef = scope.entity.attributes[scope.options.field]; - var fieldType = fieldDef.type; var data = { field: scope.options.field, @@ -107,7 +110,7 @@ } }; }, - function(err) { + function(/*err*/) { scope.error = true; NotificationSrv.log('Failed to fetch data, please edit the widget definition', 'error'); } diff --git a/ui/app/scripts/directives/dashboard/item.js b/ui/app/scripts/directives/dashboard/item.js index 5863d8188c..837ea15e26 100644 --- a/ui/app/scripts/directives/dashboard/item.js +++ b/ui/app/scripts/directives/dashboard/item.js @@ -1,6 +1,6 @@ (function() { 'use strict'; - angular.module('theHiveDirectives').directive('dashboardItem', function(DashboardSrv, UserSrv, $uibModal, $timeout, $q) { + angular.module('theHiveDirectives').directive('dashboardItem', function(DashboardSrv, UserSrv, $uibModal, $timeout) { return { restrict: 'E', replace: true, @@ -13,13 +13,13 @@ autoload: '=', refreshOn: '@', resizeOn: '@', - mode: '@', + mode: '=', showEdit: '=', showRemove: '=', onRemove: '&' }, templateUrl: 'views/directives/dashboard/item.html', - link: function(scope, element) { + link: function(scope/*, element*/) { scope.typeClasses = DashboardSrv.typeClasses; scope.timeIntervals = DashboardSrv.timeIntervals; scope.aggregations = DashboardSrv.aggregations; @@ -35,7 +35,7 @@ scope.query = null; if(scope.component.id) { - scope.$on('edit-chart-' + scope.component.id, function(data) { + scope.$on('edit-chart-' + scope.component.id, function(/*data*/) { scope.editItem(); }); } @@ -72,7 +72,7 @@ if(serie.filters) { serie.query = DashboardSrv.buildFiltersQuery(scope.metadata[entity || serie.entity].attributes, serie.filters); } - }) + }); scope.component.options = definition; diff --git a/ui/app/views/directives/dashboard/item.html b/ui/app/views/directives/dashboard/item.html index adb6435556..08bd60745c 100644 --- a/ui/app/views/directives/dashboard/item.html +++ b/ui/app/views/directives/dashboard/item.html @@ -1,7 +1,7 @@

- {{component.options.title || 'No title'}} + {{component.options.title || 'No title'}} {{mode}}

@@ -13,11 +13,11 @@

-
+
dnd-drop="$vm.itemInserted(item, $vm.definition.items, rowIndex, index)"> Date: Tue, 12 Feb 2019 17:09:57 +0100 Subject: [PATCH 03/53] #829 Fix error handling on observable dialog --- ui/app/scripts/controllers/case/ObservableCreationCtrl.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ui/app/scripts/controllers/case/ObservableCreationCtrl.js b/ui/app/scripts/controllers/case/ObservableCreationCtrl.js index e644dd38a3..1dc5f1adb6 100644 --- a/ui/app/scripts/controllers/case/ObservableCreationCtrl.js +++ b/ui/app/scripts/controllers/case/ObservableCreationCtrl.js @@ -142,16 +142,13 @@ $scope.handleSaveFailure = function(response) { $scope.pendingAsync = false; - if (response.status === 400) { + if (response.status === 400 && response.data.type === 'ConflictError') { $scope.failedObservables = $scope.getFailedObservables(response.data); $scope.step = 'error'; - } else { - if(response.data.type === "java.io.IOException") { + if(response.data.type) { NotificationSrv.error('ObservableCreationCtrl', response.data.message, response.status); - } else if(response.data.type === "InternalError") { - NotificationSrv.error('ObservableCreationCtrl', response.data.message, response.status); } else { NotificationSrv.error('ObservableCreationCtrl', 'An unexpected error occurred while creating the observables', response.status); } From 2279f6adff4656007db7040b1b0c0f664c302924 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Tue, 12 Feb 2019 17:39:33 +0100 Subject: [PATCH 04/53] #829 Don't close observable creation dialog if it fails --- ui/app/scripts/controllers/case/ObservableCreationCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/scripts/controllers/case/ObservableCreationCtrl.js b/ui/app/scripts/controllers/case/ObservableCreationCtrl.js index 1dc5f1adb6..0e9b05c56e 100644 --- a/ui/app/scripts/controllers/case/ObservableCreationCtrl.js +++ b/ui/app/scripts/controllers/case/ObservableCreationCtrl.js @@ -153,7 +153,7 @@ NotificationSrv.error('ObservableCreationCtrl', 'An unexpected error occurred while creating the observables', response.status); } - $uibModalInstance.close(response); + //$uibModalInstance.close(response); } }; From cd436ea294289d3dce2c73c3cecddd3a59b7ae78 Mon Sep 17 00:00:00 2001 From: To-om Date: Tue, 12 Feb 2019 18:15:26 +0100 Subject: [PATCH 05/53] #871 Fix MISP synchro log message --- thehive-misp/app/connectors/misp/MispSynchro.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/thehive-misp/app/connectors/misp/MispSynchro.scala b/thehive-misp/app/connectors/misp/MispSynchro.scala index 37fbd84fe1..eca5e3ba7d 100644 --- a/thehive-misp/app/connectors/misp/MispSynchro.scala +++ b/thehive-misp/app/connectors/misp/MispSynchro.scala @@ -134,9 +134,10 @@ class MispSynchro @Inject() ( } def synchronize(mispConnection: MispConnection, lastSyncDate: Option[Date])(implicit authContext: AuthContext): Source[Try[Alert], NotUsed] = { - logger.info(s"Synchronize MISP ${mispConnection.name} from $lastSyncDate") + val syncFrom = mispConnection.syncFrom(lastSyncDate.getOrElse(new Date(0))) + logger.info(s"Last synchronization of MISP ${mispConnection.name} is ${lastSyncDate.fold("Never")(_.toString)}, synchronize from $syncFrom") // get events that have been published after the last synchronization - mispSrv.getEventsFromDate(mispConnection, mispConnection.syncFrom(lastSyncDate.getOrElse(new Date(0)))) + mispSrv.getEventsFromDate(mispConnection, syncFrom) // get related alert .mapAsyncUnordered(1) { event ⇒ logger.trace(s"Looking for alert misp:${event.source}:${event.sourceRef}") From adbec9085c6337b72e5c5e85b07ee4e88a098e51 Mon Sep 17 00:00:00 2001 From: ZAch Priddy Date: Tue, 12 Feb 2019 20:39:55 -0800 Subject: [PATCH 06/53] Fix Update Label to Warning --- ui/app/views/directives/search/alert.html | 2 +- ui/app/views/partials/alert/list.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/app/views/directives/search/alert.html b/ui/app/views/directives/search/alert.html index 603ac007b1..180e6627ca 100644 --- a/ui/app/views/directives/search/alert.html +++ b/ui/app/views/directives/search/alert.html @@ -39,7 +39,7 @@
Status:
- {{value.status}} + {{value.status}}
diff --git a/ui/app/views/partials/alert/list.html b/ui/app/views/partials/alert/list.html index 8b3bfcbab5..34a018504f 100644 --- a/ui/app/views/partials/alert/list.html +++ b/ui/app/views/partials/alert/list.html @@ -114,7 +114,7 @@

List of alerts ({{$vm.list.total || 0}} of {{alertEvents.c {{::event.type}} - {{::event.status}} + {{::event.status}}
From 11831c5277d9edaa96e1f475f7fb93288e5fdcad Mon Sep 17 00:00:00 2001 From: Saad Kadhi Date: Wed, 13 Feb 2019 06:39:58 +0100 Subject: [PATCH 07/53] Add Crowdstrike2TH (WIP) and Synapse to the alert feeder list --- README.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 19f564f124..67d73e3dc2 100644 --- a/README.md +++ b/README.md @@ -77,12 +77,24 @@ TheHive can be configured to import events from one or multiple [MISP](http://ww [Cortex](https://github.com/TheHive-Project/Cortex/) is the perfect companion for TheHive. Use one or several to analyze observables at scale and respond to incidents. -### Integration with Digital Shadows -TheHive Project provides [DigitalShadows2TH](https://github.com/TheHive-Project/DigitalShadows2TH), a free, open source [Digital Shadows](https://www.digitalshadows.com/) alert feeder for TheHive. You can use it to import Digital Shadows *incidents* and *intel-incidents* as alerts in TheHive, where they can be previewed and transformed into new cases using pre-defined incident response templates or added into existing ones. +### Alert Feeders by TheHive Project -### Integration with Zerofox +#### DigitalShadows2TH +[DigitalShadows2TH](https://github.com/TheHive-Project/DigitalShadows2TH) is a free, open source [Digital Shadows](https://www.digitalshadows.com/) alert feeder for TheHive. You can use it to import Digital Shadows *incidents* and *intel-incidents* as alerts in TheHive, where they can be previewed and transformed into new cases using pre-defined incident response templates or added into existing ones. + +#### Synapse +[Synapse](https://github.com/TheHive-Project/Synapse) is a meta-alert feeder that allows you to centrally feed TheHive from multiple alert sources. It leverages TheHive's API to automate case and alert creation. Case creation from email or alert creation from SIEM event are typical use cases. Currently, Synapse allows you to integrate Exchange, O365 & QRadar. + +#### Zerofox2TH [Zerofox2TH](https://github.com/TheHive-Project/Zerofox2TH) is a free, open source [ZeroFOX](https://www.zerofox.com/) alert feeder for TheHive, written by TheHive Project. You can use it to feed ZeroFOX alerts into TheHive, where they can be previewed and transformed into new cases using pre-defined incident response templates or added into existing ones. +### Alert Feeders from the User Community + +### Integration with Crowdstrike Falcon (WIP) +[Crowdstrike2TH](https://github.com/xg5-simon/CrowdStrike2TH) is a [Crowdstrike Falcon](https://www.crowdstrike.com/endpoint-security-products/) alert feeder for TheHive, written by [Simon](https://github.com/xg5-simon). You can use it to feed Crowdstrike alerts into TheHive, where they can be previewed and transformed into new cases using pre-defined incident response templates or added into existing ones. + +**Note**: this is a work in progress. Currently, the code licensing is unclear. + ### Integration with FireEye iSIGHT [FireEye2TH](https://github.com/LDO-CERT/FireEye2TH) is a free, open source [FireEye iSIGHT](https://www.fireeye.com/) alert feeder for TheHive, written by LDO-CERT. You can use it to feed FireEye iSIGHT alerts into TheHive, where they can be previewed and transformed into new cases using pre-defined incident response templates or added into existing ones. From e179b6e4ad346336cb82de3e9117d9e416215df1 Mon Sep 17 00:00:00 2001 From: To-om Date: Wed, 13 Feb 2019 09:19:24 +0100 Subject: [PATCH 08/53] #869 Use observable TLP if possible when executing a responder --- .../connectors/cortex/services/ActionOperation.scala | 12 ++++++++++++ .../connectors/cortex/services/CortexActionSrv.scala | 12 ++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala b/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala index 061d5dc5dd..8a13182648 100644 --- a/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala +++ b/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala @@ -139,6 +139,18 @@ class ActionOperationSrv @Inject() ( } } + def findArtifactEntity(entity: BaseEntity): Future[Artifact] = { + import org.elastic4play.services.QueryDSL._ + + (entity, entity.model) match { + case (a: Artifact, _) ⇒ Future.successful(a) + case (_, model: ChildModelDef[_, _, _, _]) ⇒ + findSrv(model.parentModel, "_id" ~= entity.parentId.getOrElse(throw InternalError(s"Child entity $entity has no parent ID")), Some("0-1"), Nil) + ._1.runWith(Sink.head).flatMap(findArtifactEntity _) + case _ ⇒ Future.failed(BadRequestError("Artifact not found")) + } + } + def execute(entity: BaseEntity, operation: ActionOperation)(implicit authContext: AuthContext): Future[ActionOperation] = { if (operation.status == ActionOperationStatus.Waiting) { Retry()(classOf[VersionConflictEngineException]) { diff --git a/thehive-cortex/app/connectors/cortex/services/CortexActionSrv.scala b/thehive-cortex/app/connectors/cortex/services/CortexActionSrv.scala index 6b6f068c30..35819f25b1 100644 --- a/thehive-cortex/app/connectors/cortex/services/CortexActionSrv.scala +++ b/thehive-cortex/app/connectors/cortex/services/CortexActionSrv.scala @@ -72,10 +72,14 @@ class CortexActionSrv @Inject() ( def findResponderFor(entityType: String, entityId: String): Future[Seq[Responder]] = { for { - (tlp, pap) ← getEntity(entityType, entityId) - .flatMap(actionOperationSrv.findCaseEntity) - .map { caze ⇒ (caze.tlp(), caze.pap()) } - .recover { case _ ⇒ (0L, 0L) } + entity ← getEntity(entityType, entityId) + artifactTlp ← actionOperationSrv + .findArtifactEntity(entity) + .map(a ⇒ Some(a.tlp())) + .recover { case _ ⇒ None } + (tlp, pap) ← actionOperationSrv.findCaseEntity(entity) + .map { caze ⇒ (artifactTlp.getOrElse(caze.tlp()), caze.pap()) } + .recover { case _ ⇒ (artifactTlp.getOrElse(0L), 0L) } query = Json.obj( "dataTypeList" → s"thehive:$entityType") responders ← findResponders(query) From 639558ff08ec0b3100ce4d7fc1d0797994ffdd82 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Wed, 13 Feb 2019 11:55:17 +0100 Subject: [PATCH 09/53] #870 Add alert id copy link --- ui/app/scripts/controllers/alert/AlertEventCtrl.js | 6 +++++- ui/app/views/partials/alert/event.dialog.html | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ui/app/scripts/controllers/alert/AlertEventCtrl.js b/ui/app/scripts/controllers/alert/AlertEventCtrl.js index 692c86733e..1176842eee 100644 --- a/ui/app/scripts/controllers/alert/AlertEventCtrl.js +++ b/ui/app/scripts/controllers/alert/AlertEventCtrl.js @@ -1,7 +1,7 @@ (function() { 'use strict'; angular.module('theHiveControllers') - .controller('AlertEventCtrl', function($scope, $rootScope, $state, $uibModal, $uibModalInstance, CustomFieldsCacheSrv, CaseResolutionStatus, AlertingSrv, NotificationSrv, event, templates) { + .controller('AlertEventCtrl', function($scope, $rootScope, $state, $uibModal, $uibModalInstance, CustomFieldsCacheSrv, CaseResolutionStatus, AlertingSrv, NotificationSrv, clipboard, event, templates) { var self = this; var eventId = event.id; @@ -254,6 +254,10 @@ } }; + self.copyId = function(id) { + clipboard.copyText(id); + }; + self.load(); }); })(); diff --git a/ui/app/views/partials/alert/event.dialog.html b/ui/app/views/partials/alert/event.dialog.html index 50d1a948ad..84d5c44c2e 100644 --- a/ui/app/views/partials/alert/event.dialog.html +++ b/ui/app/views/partials/alert/event.dialog.html @@ -1,5 +1,7 @@
-

Alert Preview {{dialog.event.status}}

+

+ Alert Preview {{dialog.event.status}} +

@@ -17,6 +19,10 @@

+ ID: + {{dialog.event.id}} + + Date: {{dialog.event.date | showDate}} From de022a7781078c503d4d554385c65cdb89497d64 Mon Sep 17 00:00:00 2001 From: To-om Date: Wed, 13 Feb 2019 14:12:19 +0100 Subject: [PATCH 10/53] #856 Don't set alert status to "Update" if it is "New" --- thehive-backend/app/services/AlertSrv.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thehive-backend/app/services/AlertSrv.scala b/thehive-backend/app/services/AlertSrv.scala index dba52ca660..115236c1af 100644 --- a/thehive-backend/app/services/AlertSrv.scala +++ b/thehive-backend/app/services/AlertSrv.scala @@ -146,7 +146,7 @@ class AlertSrv( def update(alert: Alert, fields: Fields, modifyConfig: ModifyConfig)(implicit authContext: AuthContext): Future[Alert] = { val follow = fields.getBoolean("follow").getOrElse(alert.follow()) - val newStatus = if (follow) AlertStatus.Updated else alert.status() + val newStatus = if (follow && alert.status() != AlertStatus.New) AlertStatus.Updated else alert.status() val updatedAlert = updateSrv(alert, fields.set("status", Json.toJson(newStatus)), modifyConfig) alert.caze() match { case Some(caseId) if follow ⇒ From 3bc552a7943ed167cacca5af557444b9bdf5f694 Mon Sep 17 00:00:00 2001 From: To-om Date: Wed, 13 Feb 2019 14:47:55 +0100 Subject: [PATCH 11/53] #838 Add ioc information on similar observables in stats --- thehive-backend/app/models/Artifact.scala | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/thehive-backend/app/models/Artifact.scala b/thehive-backend/app/models/Artifact.scala index ea99e72524..dba97dcb5f 100644 --- a/thehive-backend/app/models/Artifact.scala +++ b/thehive-backend/app/models/Artifact.scala @@ -1,8 +1,8 @@ package models import java.util.Date -import javax.inject.{ Inject, Provider, Singleton } +import javax.inject.{ Inject, Provider, Singleton } import scala.concurrent.{ ExecutionContext, Future } import scala.util.Success @@ -12,6 +12,7 @@ import play.api.libs.json.JsValue.jsValueToJsLookup import play.api.libs.json.Json.toJsFieldJsValueWrapper import play.api.libs.json._ +import akka.stream.scaladsl.Sink import akka.stream.{ IOResult, Materializer } import akka.{ Done, NotUsed } import models.JsonFormat.artifactStatusFormat @@ -114,9 +115,11 @@ class ArtifactModel @Inject() ( override def getStats(entity: BaseEntity): Future[JsObject] = { entity match { case artifact: Artifact ⇒ - val (_, total) = artifactSrv.get.findSimilar(artifact, Some("0-0"), Nil) - total.failed.foreach(t ⇒ logger.error("Artifact.getStats error", t)) - total.map { t ⇒ Json.obj("seen" → t) } + val (similarArtifacts, total) = artifactSrv.get.findSimilar(artifact, Some("0-1"), Seq("-ioc")) + for { + ioc ← similarArtifacts.runWith(Sink.headOption).map(_.fold(false)(_.ioc())) + t ← total + } yield Json.obj("seen" → t, "ioc" → ioc) case _ ⇒ Future.successful(JsObject.empty) } } From 510d89e4c0a04434f02eff65272c76d45b142d23 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Wed, 13 Feb 2019 14:59:29 +0100 Subject: [PATCH 12/53] #838 Add a color indication for seen IOCs --- .../details/artifact-details-information.html | 9 ++++++++- .../partials/observables/list/artifacts-list-main.html | 9 +++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ui/app/views/partials/observables/details/artifact-details-information.html b/ui/app/views/partials/observables/details/artifact-details-information.html index 98227eb7dc..ef64d0265e 100644 --- a/ui/app/views/partials/observables/details/artifact-details-information.html +++ b/ui/app/views/partials/observables/details/artifact-details-information.html @@ -91,6 +91,7 @@

Links

+ @@ -98,10 +99,16 @@

Links

+ - diff --git a/ui/app/views/partials/observables/list/artifacts-list-main.html b/ui/app/views/partials/observables/list/artifacts-list-main.html index 6c0931883d..7ba681f28e 100644 --- a/ui/app/views/partials/observables/list/artifacts-list-main.html +++ b/ui/app/views/partials/observables/list/artifacts-list-main.html @@ -82,14 +82,19 @@

Observable List ({{artifacts.total || 0}} of {{artifactStats.count}})

- +
IOC TLP Case Date added
+ + [{{a.dataType}}]: {{a.data}}
#{{a.case.caseId}} - {{a.case.title}} + 		[{{a.dataType}}]: {{a.data || a.attachment.name}}
#{{a.case.caseId}} - {{a.case.title}} 		{{a.startDate | showDate}}
- +
- {{(artifact.data | fang) || (artifact.attachment.name | fang)}} + {{(artifact.data | fang) || (artifact.attachment.name | fang)}}
From 69c7473227a51ec942fb958e2f75be49825f9c3f Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Wed, 13 Feb 2019 20:06:14 +0100 Subject: [PATCH 13/53] #831 Add auto complete to case and observable tags in details page --- .../controllers/case/CaseDetailsCtrl.js | 12 ++++++++---- .../case/CaseObservablesItemCtrl.js | 19 ++++++++++++------- ui/app/scripts/directives/updatableTags.js | 3 ++- ui/app/views/directives/updatable-tags.html | 1 + ui/app/views/partials/case/case.details.html | 4 ++-- .../details/artifact-details-information.html | 6 +++--- 6 files changed, 28 insertions(+), 17 deletions(-) diff --git a/ui/app/scripts/controllers/case/CaseDetailsCtrl.js b/ui/app/scripts/controllers/case/CaseDetailsCtrl.js index a87c5a1517..8573a3a07a 100644 --- a/ui/app/scripts/controllers/case/CaseDetailsCtrl.js +++ b/ui/app/scripts/controllers/case/CaseDetailsCtrl.js @@ -1,7 +1,7 @@ (function() { 'use strict'; - angular.module('theHiveControllers').controller('CaseDetailsCtrl', function($scope, $state, $uibModal, CaseTabsSrv, UserInfoSrv, PSearchSrv) { + angular.module('theHiveControllers').controller('CaseDetailsCtrl', function($scope, $state, $uibModal, CaseTabsSrv, UserInfoSrv, TagSrv, PSearchSrv) { CaseTabsSrv.activateTab($state.current.data.tab); @@ -98,6 +98,10 @@ itemId: attachment.case_task.id }); }; + + $scope.getCaseTags = function(query) { + return TagSrv.fromCases(query); + }; }); angular.module('theHiveControllers').controller('CaseCustomFieldsCtrl', function($scope, $uibModal, CustomFieldsCacheSrv) { @@ -108,13 +112,13 @@ return { name: name, order: definition.order - } + }; }), function(item){ return item.order; }), 'name'); return result; - } + }; $scope.getCustomFieldName = function(fieldDef) { return 'customFields.' + fieldDef.reference + '.' + fieldDef.type; @@ -178,4 +182,4 @@ }; }); -})(); \ No newline at end of file +})(); diff --git a/ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js b/ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js index 11ef13bf02..8947c9aca6 100644 --- a/ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js +++ b/ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js @@ -1,7 +1,7 @@ (function () { 'use strict'; angular.module('theHiveControllers').controller('CaseObservablesItemCtrl', - function ($scope, $state, $stateParams, $q, $filter, $timeout, $document, CaseTabsSrv, CaseArtifactSrv, CortexSrv, PSearchSrv, AnalyzerSrv, NotificationSrv, VersionSrv, appConfig) { + function ($scope, $state, $stateParams, $q, $filter, $timeout, $document, CaseTabsSrv, CaseArtifactSrv, CortexSrv, PSearchSrv, AnalyzerSrv, NotificationSrv, VersionSrv, TagSrv, appConfig) { var observableId = $stateParams.itemId, observableName = 'observable-' + observableId; @@ -57,7 +57,7 @@ $scope.initScope(observable); }, function (response) { - NotificationSrv.error('artifactDetails', response.data, response.status); + NotificationSrv.error('ObservableDetails', response.data, response.status); CaseTabsSrv.activateTab('observables'); }); @@ -129,7 +129,7 @@ }, function (observable) { $scope.artifact = observable; }, function (response) { - NotificationSrv.error('artifactDetails', response.data, response.status); + NotificationSrv.error('ObservableDetails', response.data, response.status); CaseTabsSrv.activateTab('observables'); }); } @@ -195,8 +195,9 @@ artifactId: $scope.artifact.id }, field, function (response) { $scope.artifact = response.toJSON(); + NotificationSrv.log('Observable has been updated', 'success'); }, function (response) { - NotificationSrv.error('artifactDetails', response.data, response.status); + NotificationSrv.error('ObservableDetails', response.data, response.status); }); }; @@ -211,7 +212,7 @@ $scope.runAnalyzer = function (analyzerName, serverId) { var artifactName = $scope.artifact.data || $scope.artifact.attachment.name; - var promise = serverId ? $q.resolve(serverId) : CortexSrv.getServers([analyzerName]) + var promise = serverId ? $q.resolve(serverId) : CortexSrv.getServers([analyzerName]); promise.then(function (serverId) { return $scope._runAnalyzer(serverId, analyzerName, $scope.artifact.id); @@ -254,8 +255,8 @@ $scope.obsResponders = responders; }) .catch(function(err) { - NotificationSrv.error('observablesList', response.data, response.status); - }) + NotificationSrv.error('observablesList', err.data, err.status); + }); }; $scope.runResponder = function(responderId, responderName, artifact) { @@ -271,6 +272,10 @@ }); }; + $scope.getTags = function(query) { + return TagSrv.fromObservables(query); + }; + } ); diff --git a/ui/app/scripts/directives/updatableTags.js b/ui/app/scripts/directives/updatableTags.js index 4eb5acd03d..20341ef70d 100644 --- a/ui/app/scripts/directives/updatableTags.js +++ b/ui/app/scripts/directives/updatableTags.js @@ -9,7 +9,8 @@ 'scope': { 'value': '=?', 'onUpdate': '&', - 'active': '=?' + 'active': '=?', + 'source': '=' } }; }); diff --git a/ui/app/views/directives/updatable-tags.html b/ui/app/views/directives/updatable-tags.html index 096f1ce7ed..16e23ba3c2 100644 --- a/ui/app/views/directives/updatable-tags.html +++ b/ui/app/views/directives/updatable-tags.html @@ -16,6 +16,7 @@
+
diff --git a/ui/app/views/partials/case/case.details.html b/ui/app/views/partials/case/case.details.html index e1ad6e3091..b7a42429bd 100644 --- a/ui/app/views/partials/case/case.details.html +++ b/ui/app/views/partials/case/case.details.html @@ -50,10 +50,10 @@

Summary

-
+
Tags
- +
diff --git a/ui/app/views/partials/observables/details/artifact-details-information.html b/ui/app/views/partials/observables/details/artifact-details-information.html index ef64d0265e..cfe09c2830 100644 --- a/ui/app/views/partials/observables/details/artifact-details-information.html +++ b/ui/app/views/partials/observables/details/artifact-details-information.html @@ -70,10 +70,10 @@

-
-
Labels
+
+
Tags
- +
From fc84c784dd379db569ed6527c8f4840103980569 Mon Sep 17 00:00:00 2001 From: Zach Priddy Date: Thu, 14 Feb 2019 12:35:31 -0800 Subject: [PATCH 14/53] Update akka version Update akka version as detailed in #877 --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 27c1ecf10a..7040cba8cf 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -21,7 +21,7 @@ object Dependencies { val reflections = "org.reflections" % "reflections" % "0.9.11" val zip4j = "net.lingala.zip4j" % "zip4j" % "1.3.2" val elastic4play = "org.thehive-project" %% "elastic4play" % "1.8.0-1" - val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % "2.5.11" - val akkaClusterTools = "com.typesafe.akka" %% "akka-cluster-tools" % "2.5.11" + val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % "2.5.19" + val akkaClusterTools = "com.typesafe.akka" %% "akka-cluster-tools" % "2.5.19" } } From 5fdc6ce0dd8b3dd91eab009600272ed781568caf Mon Sep 17 00:00:00 2001 From: Zach Priddy Date: Thu, 14 Feb 2019 12:35:31 -0800 Subject: [PATCH 15/53] Revert "Update akka version" This reverts commit fc84c784dd379db569ed6527c8f4840103980569. --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 7040cba8cf..27c1ecf10a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -21,7 +21,7 @@ object Dependencies { val reflections = "org.reflections" % "reflections" % "0.9.11" val zip4j = "net.lingala.zip4j" % "zip4j" % "1.3.2" val elastic4play = "org.thehive-project" %% "elastic4play" % "1.8.0-1" - val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % "2.5.19" - val akkaClusterTools = "com.typesafe.akka" %% "akka-cluster-tools" % "2.5.19" + val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % "2.5.11" + val akkaClusterTools = "com.typesafe.akka" %% "akka-cluster-tools" % "2.5.11" } } From c9aafc51c47742ce76830c9e927561fc821d924d Mon Sep 17 00:00:00 2001 From: Zachary Priddy Date: Thu, 14 Feb 2019 12:36:52 -0800 Subject: [PATCH 16/53] Update akka version Update akka version as detailed in #877 --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 27c1ecf10a..7040cba8cf 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -21,7 +21,7 @@ object Dependencies { val reflections = "org.reflections" % "reflections" % "0.9.11" val zip4j = "net.lingala.zip4j" % "zip4j" % "1.3.2" val elastic4play = "org.thehive-project" %% "elastic4play" % "1.8.0-1" - val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % "2.5.11" - val akkaClusterTools = "com.typesafe.akka" %% "akka-cluster-tools" % "2.5.11" + val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % "2.5.19" + val akkaClusterTools = "com.typesafe.akka" %% "akka-cluster-tools" % "2.5.19" } } From 7a25bcf0ad71579dd84a711e4beb28837ac3c7a0 Mon Sep 17 00:00:00 2001 From: Saad Kadhi Date: Sat, 16 Feb 2019 22:20:28 +0100 Subject: [PATCH 17/53] Bump year --- AUTHORS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index 55201b220c..e81113c17d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -11,7 +11,7 @@ Contributors * CERT Banque de France (CERT-BDF) -Copyright (C) 2017-2018 Nabil Adouani -Copyright (C) 2014-2018 Thomas Franco -Copyright (C) 2014-2018 Saâd Kadhi -Copyright (C) 2014-2018 Jérôme Leonard \ No newline at end of file +Copyright (C) 2017-2019 Nabil Adouani +Copyright (C) 2014-2019 Thomas Franco +Copyright (C) 2014-2019 Saâd Kadhi +Copyright (C) 2014-2019 Jérôme Leonard \ No newline at end of file From cc65b5d04503c8d1eef9d9bada458a7e09730b6a Mon Sep 17 00:00:00 2001 From: To-om Date: Mon, 18 Feb 2019 11:04:13 +0100 Subject: [PATCH 18/53] #820 Add MISP url in status API --- thehive-misp/app/connectors/misp/MispConnection.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/thehive-misp/app/connectors/misp/MispConnection.scala b/thehive-misp/app/connectors/misp/MispConnection.scala index 0168e635ac..4931e9aafc 100644 --- a/thehive-misp/app/connectors/misp/MispConnection.scala +++ b/thehive-misp/app/connectors/misp/MispConnection.scala @@ -106,11 +106,13 @@ case class MispConnection( "name" → name, "version" → version, "status" → "OK", + "url" → baseUrl, "purpose" → purpose.toString) case None ⇒ Json.obj( "name" → name, "version" → "", "status" → "ERROR", + "url" → baseUrl, "purpose" → purpose.toString) } } From d62697cabbc99002613ee455179d62ac3e98bfd5 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Mon, 18 Feb 2019 11:16:48 +0100 Subject: [PATCH 19/53] #879 Update Copyright --- ui/app/views/components/app-container.component.html | 2 +- ui/app/views/partials/about.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/app/views/components/app-container.component.html b/ui/app/views/components/app-container.component.html index 77cd80c977..1832f7b0e7 100644 --- a/ui/app/views/components/app-container.component.html +++ b/ui/app/views/components/app-container.component.html @@ -26,7 +26,7 @@
- TheHive Project 2016-2018, AGPL-V3 + TheHive Project 2016-2019, AGPL-V3
diff --git a/ui/app/views/partials/about.html b/ui/app/views/partials/about.html index d6d11de312..df36bcc06b 100644 --- a/ui/app/views/partials/about.html +++ b/ui/app/views/partials/about.html @@ -19,8 +19,8 @@
- Copyright (C) 2016-2018 Thomas Franco, Saâd Kadhi, Jérôme Leonard
- Copyright (C) 2017-2018 Nabil Adouani + Copyright (C) 2016-2019 Thomas Franco, Saâd Kadhi, Jérôme Leonard
+ Copyright (C) 2017-2019 Nabil Adouani
From 1d76ab846eacf433ad9b182651de834b9b2b5029 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Mon, 18 Feb 2019 15:46:57 +0100 Subject: [PATCH 20/53] #884 Add a Related Alerts page in case details --- ui/app/index.html | 1 + ui/app/scripts/app.js | 16 ++- .../controllers/case/CaseAlertsCtrl.js | 77 ++++++++++ .../scripts/controllers/case/CaseMainCtrl.js | 9 ++ ui/app/scripts/services/CaseSrv.js | 5 + ui/app/views/partials/case/case.alerts.html | 135 ++++++++++++++++++ .../views/partials/case/case.panelinfo.html | 12 +- 7 files changed, 253 insertions(+), 2 deletions(-) create mode 100644 ui/app/scripts/controllers/case/CaseAlertsCtrl.js create mode 100644 ui/app/views/partials/case/case.alerts.html diff --git a/ui/app/index.html b/ui/app/index.html index cedc832a42..f0ebf9cd9e 100644 --- a/ui/app/index.html +++ b/ui/app/index.html @@ -149,6 +149,7 @@ + diff --git a/ui/app/scripts/app.js b/ui/app/scripts/app.js index d496cd8d65..df48f06ae6 100644 --- a/ui/app/scripts/app.js +++ b/ui/app/scripts/app.js @@ -263,6 +263,20 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ngSanitize', 'ui.bootstra templateUrl: 'views/partials/case/case.links.html', controller: 'CaseLinksCtrl' }) + .state('app.case.alerts', { + url: '/alerts', + templateUrl: 'views/partials/case/case.alerts.html', + controller: 'CaseAlertsCtrl', + resolve: { + alerts: function($stateParams, CaseSrv) { + return CaseSrv.alerts({range: 'all'}, { + query: { + case: $stateParams.caseId + } + }).$promise; + } + } + }) .state('app.case.tasks-item', { url: '/tasks/{itemId}', templateUrl: 'views/partials/case/case.tasks.item.html', @@ -433,7 +447,7 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ngSanitize', 'ui.bootstra var renderer = defaults.renderer; var linkRenderer = _.wrap(renderer.link, function(originalLink, href, title, text) { var html = originalLink.call(renderer, href, title, text); - return html.replace(/^ +
+
No records
+
+ + +
+
+ All ({{alerts.length || 0}}) + + + + Type: + {{statsItem.key}} ({{statsItem.value}}) + + Source: + {{statsItem.key}} ({{statsItem.value}}) +
+ +
+
+
No records
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + Reference + + + + + + + Type + + + + + + + Status + + + + + + + Title + + + + + + + Source + + + + + + + Severity + + + + + + Attributes + + + Date + + + + +
+ {{::event.sourceRef}} + + {{::event.type}} + + {{::event.status}} + +
+ {{::event.title}} +
+
+ + None + {{tag}} +
+ 		{{::event.source}} +
+ +
+ 		{{::event.artifacts.length || 0}}{{event.date | showDate}}
+
diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html index 991c3a98f8..f98344aaff 100644 --- a/ui/app/views/partials/case/case.panelinfo.html +++ b/ui/app/views/partials/case/case.panelinfo.html @@ -33,7 +33,17 @@

- + + + + + + + + + + + From a51f6d9d15184278dd30e3125682568dceab2119 Mon Sep 17 00:00:00 2001 From: To-om Date: Tue, 19 Feb 2019 09:21:29 +0100 Subject: [PATCH 21/53] #882 Disable deployment on pull-requests --- .drone.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.drone.yml b/.drone.yml index e39e9b7c46..c244399aa3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -159,6 +159,7 @@ steps: strip_components: 3 when: branch: [develop] + repo: TheHive-Project/TheHive - name: deploy binaries in integration environment image: appleboy/drone-ssh @@ -170,6 +171,7 @@ steps: - ./start thehive ${DRONE_BUILD_NUMBER} when: branch: [develop] + repo: TheHive-Project/TheHive # Deploy binaries in staging environment - name: copy binaries in staging environment @@ -183,6 +185,7 @@ steps: strip_components: 3 when: branch: [master] + repo: TheHive-Project/TheHive - name: deploy binaries in staging environment image: appleboy/drone-ssh @@ -194,6 +197,7 @@ steps: - ./start thehive ${DRONE_BUILD_NUMBER} when: branch: [master] + repo: TheHive-Project/TheHive volumes: - name: cache From 3dce91a5a146d289b147494c29064ac937f7e0ba Mon Sep 17 00:00:00 2001 From: To-om Date: Tue, 19 Feb 2019 10:34:25 +0100 Subject: [PATCH 22/53] #882 Disable deployment on pull-requests --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index c244399aa3..bec436627a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -159,7 +159,7 @@ steps: strip_components: 3 when: branch: [develop] - repo: TheHive-Project/TheHive + event: {exclude: [pull_request]} - name: deploy binaries in integration environment image: appleboy/drone-ssh @@ -171,7 +171,7 @@ steps: - ./start thehive ${DRONE_BUILD_NUMBER} when: branch: [develop] - repo: TheHive-Project/TheHive + event: {exclude: [pull_request]} # Deploy binaries in staging environment - name: copy binaries in staging environment @@ -185,7 +185,7 @@ steps: strip_components: 3 when: branch: [master] - repo: TheHive-Project/TheHive + event: {exclude: [pull_request]} - name: deploy binaries in staging environment image: appleboy/drone-ssh @@ -197,7 +197,7 @@ steps: - ./start thehive ${DRONE_BUILD_NUMBER} when: branch: [master] - repo: TheHive-Project/TheHive + event: {exclude: [pull_request]} volumes: - name: cache From 0644bc196a1a9fafb4c556106ac3948a94a52030 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Tue, 19 Feb 2019 11:21:57 +0100 Subject: [PATCH 23/53] #831 Fix the observable tags input --- ui/app/scripts/app.js | 14 +++++ .../case/CaseObservablesItemCtrl.js | 51 ++++++++----------- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/ui/app/scripts/app.js b/ui/app/scripts/app.js index df48f06ae6..294cd209bf 100644 --- a/ui/app/scripts/app.js +++ b/ui/app/scripts/app.js @@ -313,6 +313,20 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ngSanitize', 'ui.bootstra resolve: { appConfig: function(VersionSrv) { return VersionSrv.get(); + }, + artifact: function($q, $stateParams, CaseArtifactSrv, NotificationSrv) { + var deferred = $q.defer(); + + CaseArtifactSrv.api().get({ + 'artifactId': $stateParams.itemId + }).$promise.then(function(data) { + deferred.resolve(data); + }).catch(function(response) { + deferred.reject(response); + NotificationSrv.error('Observable Details', response.data, response.status); + }); + + return deferred.promise; } } }) diff --git a/ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js b/ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js index 8947c9aca6..f7690ffe60 100644 --- a/ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js +++ b/ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js @@ -1,7 +1,7 @@ (function () { 'use strict'; angular.module('theHiveControllers').controller('CaseObservablesItemCtrl', - function ($scope, $state, $stateParams, $q, $filter, $timeout, $document, CaseTabsSrv, CaseArtifactSrv, CortexSrv, PSearchSrv, AnalyzerSrv, NotificationSrv, VersionSrv, TagSrv, appConfig) { + function ($scope, $state, $stateParams, $q, $filter, $timeout, $document, CaseTabsSrv, CaseArtifactSrv, CortexSrv, PSearchSrv, AnalyzerSrv, NotificationSrv, VersionSrv, TagSrv, appConfig, artifact) { var observableId = $stateParams.itemId, observableName = 'observable-' + observableId; @@ -18,7 +18,7 @@ 'logMissing': '' }; - $scope.artifact = {}; + $scope.artifact = artifact; $scope.artifact.tlp = $scope.artifact.tlp || -1; $scope.analysisEnabled = VersionSrv.hasCortex(); $scope.cortexServers = $scope.analysisEnabled && appConfig.connectors.cortex.servers; @@ -32,37 +32,23 @@ mode: 'vb' }; - CaseArtifactSrv.api().get({ - 'artifactId': observableId - }, function (observable) { - - // Add tab - CaseTabsSrv.addTab(observableName, { - name: observableName, - label: observable.data || observable.attachment.name, - closable: true, - state: 'app.case.observables-item', - params: { - itemId: observable.id - } - }); - - // Select tab - $timeout(function() { - CaseTabsSrv.activateTab(observableName); - }, 0); - - - // Prepare the scope data - $scope.initScope(observable); - - }, function (response) { - NotificationSrv.error('ObservableDetails', response.data, response.status); - CaseTabsSrv.activateTab('observables'); + // Add tab + CaseTabsSrv.addTab(observableName, { + name: observableName, + label: artifact.data || artifact.attachment.name, + closable: true, + state: 'app.case.observables-item', + params: { + itemId: artifact.id + } }); - $scope.initScope = function (artifact) { - $scope.artifact = artifact; + // Select tab + $timeout(function() { + CaseTabsSrv.activateTab(observableName); + }, 0); + + $scope.initScope = function (artifact) { // Get analyzers available for the observable's datatype AnalyzerSrv.forDataType(artifact.dataType) @@ -101,6 +87,9 @@ }); }; + // Prepare the scope data + $scope.initScope(artifact); + $scope.onJobsChange = function (updates) { $scope.analyzerJobs = {}; From 4d827fa1ff923773337ec21fbfb6432864085615 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Tue, 19 Feb 2019 11:31:41 +0100 Subject: [PATCH 24/53] #876 Update case details title and case list title columns to be wrappable --- ui/app/views/partials/case/case.list.html | 6 +++--- ui/app/views/partials/case/case.panelinfo.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/app/views/partials/case/case.list.html b/ui/app/views/partials/case/case.list.html index 7fc06dfbb3..652263c438 100644 --- a/ui/app/views/partials/case/case.list.html +++ b/ui/app/views/partials/case/case.list.html @@ -68,7 +68,7 @@

List of cases ({{$vm.list.total || 0}} of {{$vm.caseStats.

-
+
#{{currentCase.caseId}} - {{currentCase.title}}
@@ -84,11 +84,11 @@

List of cases ({{$vm.list.total || 0}} of {{$vm.caseStats.

- + Merged from Case #{{currentCase.stats.mergeFrom[0].caseId}} and Case #{{currentCase.stats.mergeFrom[1].caseId}} -
+
diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html index f98344aaff..c7a15240bb 100644 --- a/ui/app/views/partials/case/case.panelinfo.html +++ b/ui/app/views/partials/case/case.panelinfo.html @@ -2,7 +2,7 @@

- Case # + Case # {{caze.caseId}} - {{caze.title}} From 321d2db42bf2b0c56f29d24b9604778ba2b349f3 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Tue, 19 Feb 2019 13:42:02 +0100 Subject: [PATCH 25/53] #820 Display link to MISP UI for every MISP alert --- ui/app/scripts/app.js | 4 ++-- .../scripts/controllers/alert/AlertListCtrl.js | 4 +++- .../scripts/controllers/case/CaseAlertsCtrl.js | 4 +++- ui/app/scripts/services/VersionSrv.js | 16 +++++++++++++++- ui/app/views/partials/alert/list.html | 14 +++++++++++++- ui/app/views/partials/case/case.alerts.html | 16 ++++++++-------- 6 files changed, 44 insertions(+), 14 deletions(-) diff --git a/ui/app/scripts/app.js b/ui/app/scripts/app.js index 294cd209bf..2b79943f4e 100644 --- a/ui/app/scripts/app.js +++ b/ui/app/scripts/app.js @@ -34,8 +34,8 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ngSanitize', 'ui.bootstra templateUrl: 'views/login.html', resolve: { appConfig: function(VersionSrv) { - return VersionSrv.get(); - } + return VersionSrv.get(); + } }, params: { autoLogin: false diff --git a/ui/app/scripts/controllers/alert/AlertListCtrl.js b/ui/app/scripts/controllers/alert/AlertListCtrl.js index bfe4803427..1b190023f8 100755 --- a/ui/app/scripts/controllers/alert/AlertListCtrl.js +++ b/ui/app/scripts/controllers/alert/AlertListCtrl.js @@ -1,9 +1,11 @@ (function() { 'use strict'; angular.module('theHiveControllers') - .controller('AlertListCtrl', function($rootScope, $scope, $q, $state, $uibModal, TagSrv, CaseTemplateSrv, AlertingSrv, NotificationSrv, FilteringSrv, CortexSrv, Severity) { + .controller('AlertListCtrl', function($rootScope, $scope, $q, $state, $uibModal, TagSrv, CaseTemplateSrv, AlertingSrv, NotificationSrv, FilteringSrv, CortexSrv, Severity, VersionSrv) { var self = this; + self.urls = VersionSrv.mispUrls(); + self.list = []; self.selection = []; self.menu = { diff --git a/ui/app/scripts/controllers/case/CaseAlertsCtrl.js b/ui/app/scripts/controllers/case/CaseAlertsCtrl.js index 46bc1a17dc..c379fbfc43 100644 --- a/ui/app/scripts/controllers/case/CaseAlertsCtrl.js +++ b/ui/app/scripts/controllers/case/CaseAlertsCtrl.js @@ -1,7 +1,7 @@ (function() { 'use strict'; angular.module('theHiveControllers').controller('CaseAlertsCtrl', - function($scope, $state, $stateParams, $uibModal, $timeout, CaseTabsSrv, alerts) { + function($scope, $state, $stateParams, $uibModal, $timeout, CaseTabsSrv, VersionSrv, alerts) { $scope.caseId = $stateParams.caseId; $scope.alerts = alerts; $scope.alertStats = []; @@ -12,6 +12,8 @@ }; var tabName = 'alerts-' + $scope.caseId; + $scope.mispUrls = VersionSrv.mispUrls(); + // Add tab CaseTabsSrv.addTab(tabName, { name: tabName, diff --git a/ui/app/scripts/services/VersionSrv.js b/ui/app/scripts/services/VersionSrv.js index bbd8d303c0..9750314fc0 100644 --- a/ui/app/scripts/services/VersionSrv.js +++ b/ui/app/scripts/services/VersionSrv.js @@ -13,7 +13,7 @@ callback(appConfig); } }); - }, 60000); + }, 60000); }, get: function(force) { var deferred = $q.defer(); @@ -40,6 +40,20 @@ } catch (err) { return false; } + }, + + mispUrls: function() { + var urls = {}; + var misp = cache.connectors.misp; + + if(!misp) { + return {}; + } + + (misp.servers || []).forEach(function(item) { + urls[item.name] = item.url; + }); + return urls; } }; diff --git a/ui/app/views/partials/alert/list.html b/ui/app/views/partials/alert/list.html index 34a018504f..735dd70717 100644 --- a/ui/app/views/partials/alert/list.html +++ b/ui/app/views/partials/alert/list.html @@ -108,7 +108,15 @@

List of alerts ({{$vm.list.total || 0}} of {{alertEvents.c

- {{::event.sourceRef}} + + {{::event.sourceRef}} + + + + + + + {{::event.type}} @@ -130,6 +138,10 @@

List of alerts ({{$vm.list.total || 0}} of {{alertEvents.c None {{tag}} +

{{event.source}} diff --git a/ui/app/views/partials/case/case.alerts.html b/ui/app/views/partials/case/case.alerts.html index c4b75d8a86..0c4c3b39d3 100644 --- a/ui/app/views/partials/case/case.alerts.html +++ b/ui/app/views/partials/case/case.alerts.html @@ -10,13 +10,6 @@ ng-click="filterBy('');" ng-class="{'label-primary': currentFilter===''}">All ({{alerts.length || 0}}) - - Type:
- {{::event.sourceRef}} + + {{::event.sourceRef}} + + + + + + {{::event.type}} From d265aa03f946b178f6d9bb0a0a9bebbd6fdefc3a Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Wed, 20 Feb 2019 15:19:33 +0100 Subject: [PATCH 26/53] #829 Fix observable bulk creation when all the list fail --- ui/app/scripts/controllers/case/ObservableCreationCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/scripts/controllers/case/ObservableCreationCtrl.js b/ui/app/scripts/controllers/case/ObservableCreationCtrl.js index 0e9b05c56e..8cfa86edd2 100644 --- a/ui/app/scripts/controllers/case/ObservableCreationCtrl.js +++ b/ui/app/scripts/controllers/case/ObservableCreationCtrl.js @@ -142,7 +142,7 @@ $scope.handleSaveFailure = function(response) { $scope.pendingAsync = false; - if (response.status === 400 && response.data.type === 'ConflictError') { + if (response.status === 400 && (response.data.type === 'ConflictError' || _.isArray(response.data))) { $scope.failedObservables = $scope.getFailedObservables(response.data); $scope.step = 'error'; From 4a0f551d1903065a4a3700c77e433cfd4dd159d5 Mon Sep 17 00:00:00 2001 From: To-om Date: Wed, 20 Feb 2019 15:52:35 +0100 Subject: [PATCH 27/53] #829 Ignore directories in zip file --- .../app/controllers/ArtifactCtrl.scala | 50 ++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/thehive-backend/app/controllers/ArtifactCtrl.scala b/thehive-backend/app/controllers/ArtifactCtrl.scala index 1071e59ae4..1655fe3a97 100644 --- a/thehive-backend/app/controllers/ArtifactCtrl.scala +++ b/thehive-backend/app/controllers/ArtifactCtrl.scala @@ -38,31 +38,35 @@ class ArtifactCtrl @Inject() ( private[ArtifactCtrl] lazy val logger = Logger(getClass) // extract a file from the archive and make sure its size matches the header (to protect against zip bombs) - private def extractAndCheckSize(zipFile: ZipFile, header: FileHeader)(implicit authContext: AuthContext): FileInputValue = { - val file = tempSrv.newTemporaryFile(header.getFileName, "-fromZipFile") - - val input = zipFile.getInputStream(header) - val size = header.getUncompressedSize - val sizedInput: FilterInputStream = new FilterInputStream(input) { - var totalRead = 0 - - override def read(): Int = { - if (totalRead < size) { - totalRead += 1 - super.read() + private def extractAndCheckSize(zipFile: ZipFile, header: FileHeader)(implicit authContext: AuthContext): Option[FileInputValue] = { + val fileName = header.getFileName + if (fileName.contains('/')) None + else { + val file = tempSrv.newTemporaryFile(fileName, "-fromZipFile") + + val input = zipFile.getInputStream(header) + val size = header.getUncompressedSize + val sizedInput: FilterInputStream = new FilterInputStream(input) { + var totalRead = 0 + + override def read(): Int = { + if (totalRead < size) { + totalRead += 1 + super.read() + } + else throw BadRequestError("Error extracting file: output size doesn't match header") } - else throw BadRequestError("Error extracting file: output size doesn't match header") } + Files.delete(file) + val fileSize = Files.copy(sizedInput, file) + if (fileSize != size) { + file.toFile.delete() + throw InternalError("Error extracting file: output size doesn't match header") + } + input.close() + val contentType = Option(Files.probeContentType(file)).getOrElse("application/octet-stream") + Some(FileInputValue(header.getFileName, file, contentType)) } - Files.delete(file) - val fileSize = Files.copy(sizedInput, file) - if (fileSize != size) { - file.toFile.delete() - throw InternalError("Error extracting file: output size doesn't match header") - } - input.close() - val contentType = Option(Files.probeContentType(file)).getOrElse("application/octet-stream") - FileInputValue(header.getFileName, file, contentType) } @Timed @@ -91,7 +95,7 @@ class ArtifactCtrl @Inject() ( } val multiFields = files.filterNot(_.isDirectory) - .map(extractAndCheckSize(zipFile, _)) + .flatMap(extractAndCheckSize(zipFile, _)) .map { fiv ⇒ fields .unset("isZip") From 7dd264d51341ff17ee1ebed63306dafc26697eae Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Wed, 20 Feb 2019 23:24:26 +0100 Subject: [PATCH 28/53] #888 WIP Add a UI Config section --- ui/app/index.html | 2 + ui/app/scripts/app.js | 16 +++++ .../admin/AdminCustomFieldDialogCtrl.js | 4 +- .../admin/AdminCustomFieldsCtrl.js | 4 +- .../controllers/admin/AdminUiSettingsCtrl.js | 32 +++++++++ ui/app/scripts/services/UiSettingsSrv.js | 65 +++++++++++++++++++ ui/app/views/components/header.component.html | 7 ++ ui/app/views/partials/admin/ui-settings.html | 29 +++++++++ 8 files changed, 155 insertions(+), 4 deletions(-) create mode 100644 ui/app/scripts/controllers/admin/AdminUiSettingsCtrl.js create mode 100644 ui/app/scripts/services/UiSettingsSrv.js create mode 100644 ui/app/views/partials/admin/ui-settings.html diff --git a/ui/app/index.html b/ui/app/index.html index f0ebf9cd9e..8946fc036c 100644 --- a/ui/app/index.html +++ b/ui/app/index.html @@ -144,6 +144,7 @@ + @@ -269,6 +270,7 @@ + diff --git a/ui/app/scripts/app.js b/ui/app/scripts/app.js index 2b79943f4e..8f4ddbc7a2 100644 --- a/ui/app/scripts/app.js +++ b/ui/app/scripts/app.js @@ -77,6 +77,10 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ngSanitize', 'ui.bootstra appLayout: function($q, $rootScope, AppLayoutSrv) { AppLayoutSrv.init(); return $q.resolve(); + }, + uiConfig: function($q, UiSettingsSrv) { + UiSettingsSrv.all(); + return $q.resolve(); } } }) @@ -215,6 +219,18 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ngSanitize', 'ui.bootstra controller: 'AdminObservablesCtrl', title: 'Observable administration' }) + .state('app.administration.ui-settings', { + url: '/ui-settings', + templateUrl: 'views/partials/admin/ui-settings.html', + controller: 'AdminUiSettingsCtrl', + controllerAs: '$vm', + title: 'UI settings', + resolve: { + uiConfig: function(UiSettingsSrv) { + return UiSettingsSrv.all(); + } + } + }) .state('app.case', { abstract: true, url: 'case/{caseId}', diff --git a/ui/app/scripts/controllers/admin/AdminCustomFieldDialogCtrl.js b/ui/app/scripts/controllers/admin/AdminCustomFieldDialogCtrl.js index 525d8222af..a44e0f9d92 100644 --- a/ui/app/scripts/controllers/admin/AdminCustomFieldDialogCtrl.js +++ b/ui/app/scripts/controllers/admin/AdminCustomFieldDialogCtrl.js @@ -78,11 +78,11 @@ self.clearUniqueReferenceError = function(form) { form.reference.$setValidity('unique', true); form.reference.$setPristine(); - } + }; self.cancel = function() { $uibModalInstance.dismiss(); - } + }; self.onNamechanged = function(form) { if (!self.customField.name) { diff --git a/ui/app/scripts/controllers/admin/AdminCustomFieldsCtrl.js b/ui/app/scripts/controllers/admin/AdminCustomFieldsCtrl.js index 9a82e94fe9..9b4a631bd3 100644 --- a/ui/app/scripts/controllers/admin/AdminCustomFieldsCtrl.js +++ b/ui/app/scripts/controllers/admin/AdminCustomFieldsCtrl.js @@ -59,12 +59,12 @@ } }); - modalInstance.result.then(function(data) { + modalInstance.result.then(function(/*data*/) { self.initCustomfields(); CustomFieldsCacheSrv.clearCache(); $scope.$emit('custom-fields:refresh'); }); - } + }; self.initCustomfields(); }); diff --git a/ui/app/scripts/controllers/admin/AdminUiSettingsCtrl.js b/ui/app/scripts/controllers/admin/AdminUiSettingsCtrl.js new file mode 100644 index 0000000000..4a3756601f --- /dev/null +++ b/ui/app/scripts/controllers/admin/AdminUiSettingsCtrl.js @@ -0,0 +1,32 @@ +(function() { + 'use strict'; + + angular.module('theHiveControllers').controller('AdminUiSettingsCtrl', function(UiSettingsSrv, uiConfig) { + var self = this; + + self.save = function(/*form*/) { + self.settingsKeys.forEach(function(key) { + //if(form[key].$dirty) { + if(!self.currentSettings[key]) { + UiSettingsSrv.create(key, self.configs[key]); + } else { + UiSettingsSrv.update(self.currentSettings[key].id, key, self.configs[key]); + } + //} + }); + }; + + self.loadSettings = function() { + self.settingsKeys = UiSettingsSrv.keys; + self.currentSettings = uiConfig; + + self.configs = {}; + self.settingsKeys.forEach(function(key) { + self.configs[key] = (uiConfig[key] || {}).value; + }); + }; + + self.loadSettings(); + + }); +})(); diff --git a/ui/app/scripts/services/UiSettingsSrv.js b/ui/app/scripts/services/UiSettingsSrv.js new file mode 100644 index 0000000000..6791f7c2a8 --- /dev/null +++ b/ui/app/scripts/services/UiSettingsSrv.js @@ -0,0 +1,65 @@ +(function() { + 'use strict'; + angular.module('theHiveServices').factory('UiSettingsSrv', function(ListSrv, $q) { + + var settings = null; + + return { + keys: [ + 'hideEmptyCaseButton' + ], + clearCache: function() { + settings = null; + }, + + get: function(name) { + return settings[name]; + }, + + create: function(name, value) { + return ListSrv.save({listId: 'ui_settings'}, { + value: { + name: name, + value: value + } + }).$promise; + }, + + update: function(id, name, value) { + return ListSrv.update({itemId: id}, { + value: { + name: name, + value: value + } + }).$promise; + }, + + all: function(force) { + var deferred = $q.defer(); + + if(settings === null || force) { + ListSrv.query({listId: 'ui_settings'}, {}, function(response) { + var json = response.toJSON(); + + settings = {}; + + _.each(_.keys(json), function(key) { + var setting = json[key]; + + settings[setting.name] = setting; + settings[setting.name].id = key; + }); + + deferred.resolve(settings); + }, function(response) { + deferred.reject(response); + }); + } else { + deferred.resolve(settings); + } + + return deferred.promise; + } + }; + }); +})(); diff --git a/ui/app/views/components/header.component.html b/ui/app/views/components/header.component.html index 6725f1f845..3533d777c9 100644 --- a/ui/app/views/components/header.component.html +++ b/ui/app/views/components/header.component.html @@ -157,6 +157,13 @@ Case custom fields +
  • +
  • + + + UI settings + +
  • diff --git a/ui/app/views/partials/admin/ui-settings.html b/ui/app/views/partials/admin/ui-settings.html new file mode 100644 index 0000000000..4e48545343 --- /dev/null +++ b/ui/app/views/partials/admin/ui-settings.html @@ -0,0 +1,29 @@ +
    +
    +
    +
    +
    +

    UI Settings

    +
    +
    + +
    + +
    +
    + +
    +
    +
    + +
    + +
    + +
    +
    +
    +
    +
    From 27db888c8c292cce7be5fd9d6b2e51bad0a05f77 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Thu, 21 Feb 2019 00:07:08 +0100 Subject: [PATCH 29/53] #888 Complete the UI settings admin section --- .../controllers/admin/AdminUiSettingsCtrl.js | 65 +++++++++++++++---- ui/app/scripts/services/UiSettingsSrv.js | 4 +- ui/app/views/partials/admin/ui-settings.html | 22 +++++++ 3 files changed, 76 insertions(+), 15 deletions(-) diff --git a/ui/app/scripts/controllers/admin/AdminUiSettingsCtrl.js b/ui/app/scripts/controllers/admin/AdminUiSettingsCtrl.js index 4a3756601f..518dde8676 100644 --- a/ui/app/scripts/controllers/admin/AdminUiSettingsCtrl.js +++ b/ui/app/scripts/controllers/admin/AdminUiSettingsCtrl.js @@ -1,32 +1,69 @@ (function() { 'use strict'; - angular.module('theHiveControllers').controller('AdminUiSettingsCtrl', function(UiSettingsSrv, uiConfig) { + angular.module('theHiveControllers').controller('AdminUiSettingsCtrl', function($scope, $q, NotificationSrv, UiSettingsSrv, uiConfig) { var self = this; + self.isDirtySetting = function(key, newValue) { + var currentValue = (self.currentSettings[key] || {}).value; + + return newValue !== currentValue; + }; + self.save = function(/*form*/) { + var promises = []; + self.settingsKeys.forEach(function(key) { - //if(form[key].$dirty) { - if(!self.currentSettings[key]) { - UiSettingsSrv.create(key, self.configs[key]); - } else { - UiSettingsSrv.update(self.currentSettings[key].id, key, self.configs[key]); + if(self.isDirtySetting(key, self.configs[key])) { + if(!self.currentSettings[key]) { + promises.push(UiSettingsSrv.create(key, self.configs[key])); + } else { + promises.push(UiSettingsSrv.update(self.currentSettings[key].id, key, self.configs[key])); + } } - //} }); + + if(promises.length === 0) { + return; + } + + $q.all(promises) + .then(function(/*responses*/) { + self.loadSettings(); + NotificationSrv.log('UI Settings updated successfully', 'success'); + }) + .catch(function(/*errors*/) { + NotificationSrv.error('An error occurred during UI Settings update'); + }); }; - self.loadSettings = function() { - self.settingsKeys = UiSettingsSrv.keys; - self.currentSettings = uiConfig; + self.loadSettings = function(configurations) { + var notifyRoot = false; + var promise; - self.configs = {}; - self.settingsKeys.forEach(function(key) { - self.configs[key] = (uiConfig[key] || {}).value; + if(configurations) { + promise = $q.resolve(configurations); + } else { + promise = UiSettingsSrv.all(true); + notifyRoot = true; + } + + promise.then(function(configs) { + self.settingsKeys = UiSettingsSrv.keys; + self.currentSettings = configs; + + self.configs = {}; + self.settingsKeys.forEach(function(key) { + self.configs[key] = (configs[key] || {}).value; + }); + + if(notifyRoot) { + $scope.$emit('ui-settings:refresh', configs); + } }); }; - self.loadSettings(); + self.loadSettings(uiConfig); }); })(); diff --git a/ui/app/scripts/services/UiSettingsSrv.js b/ui/app/scripts/services/UiSettingsSrv.js index 6791f7c2a8..ccadd40bd5 100644 --- a/ui/app/scripts/services/UiSettingsSrv.js +++ b/ui/app/scripts/services/UiSettingsSrv.js @@ -6,7 +6,9 @@ return { keys: [ - 'hideEmptyCaseButton' + 'hideEmptyCaseButton', + 'hideMyTasks', + 'hideWaitingTasks' ], clearCache: function() { settings = null; diff --git a/ui/app/views/partials/admin/ui-settings.html b/ui/app/views/partials/admin/ui-settings.html index 4e48545343..ef677430f3 100644 --- a/ui/app/views/partials/admin/ui-settings.html +++ b/ui/app/views/partials/admin/ui-settings.html @@ -18,6 +18,28 @@

    UI Settings

    +
    + +
    +
    + +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    From afab711c7e52ab5826b38ec1ac1ff99d47aba91f Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Thu, 21 Feb 2019 00:20:18 +0100 Subject: [PATCH 30/53] #449 Allow TheHive admin to disable creating an empty case from header or alert --- ui/app/scripts/controllers/RootCtrl.js | 5 ++++- .../controllers/alert/AlertListCtrl.js | 3 +++ .../case/CaseTemplatesDialogCtrl.js | 8 ++++--- ui/app/scripts/services/UiSettingsSrv.js | 20 ++++++++++++----- ui/app/views/partials/admin/ui-settings.html | 22 ------------------- .../case/case.templates.selector.html | 8 +++---- 6 files changed, 30 insertions(+), 36 deletions(-) diff --git a/ui/app/scripts/controllers/RootCtrl.js b/ui/app/scripts/controllers/RootCtrl.js index b6b0b35a67..882465e6b2 100644 --- a/ui/app/scripts/controllers/RootCtrl.js +++ b/ui/app/scripts/controllers/RootCtrl.js @@ -179,13 +179,16 @@ angular.module('theHiveControllers').controller('RootCtrl', resolve: { templates: function(){ return $scope.templates; + }, + uiSettings: function(UiSettingsSrv) { + return UiSettingsSrv.all(); } } }); modal.result.then(function(template) { $scope.createNewCase(template); - }) + }); }; $scope.aboutTheHive = function() { diff --git a/ui/app/scripts/controllers/alert/AlertListCtrl.js b/ui/app/scripts/controllers/alert/AlertListCtrl.js index 1b190023f8..05c2c9a57c 100755 --- a/ui/app/scripts/controllers/alert/AlertListCtrl.js +++ b/ui/app/scripts/controllers/alert/AlertListCtrl.js @@ -324,6 +324,9 @@ resolve: { templates: function(){ return templates; + }, + uiSettings: function(UiSettingsSrv) { + return UiSettingsSrv.all(); } } }); diff --git a/ui/app/scripts/controllers/case/CaseTemplatesDialogCtrl.js b/ui/app/scripts/controllers/case/CaseTemplatesDialogCtrl.js index b65aa6a574..770afac4e8 100644 --- a/ui/app/scripts/controllers/case/CaseTemplatesDialogCtrl.js +++ b/ui/app/scripts/controllers/case/CaseTemplatesDialogCtrl.js @@ -1,11 +1,13 @@ (function() { 'use strict'; angular.module('theHiveControllers').controller('CaseTemplatesDialogCtrl', - function($scope, $uibModalInstance, templates) { + function($scope, $uibModalInstance, UiSettingsSrv, templates, uiSettings) { this.templates = templates; + this.uiSettings = uiSettings; this.state = { filter: null, - selected: null + selected: null, + hideEmptyCaseButton: UiSettingsSrv.hideEmptyCaseButton() }; this.selectTemplate = function(template) { @@ -18,7 +20,7 @@ this.next = function(template) { $uibModalInstance.close(template); - } + }; this.cancel = function() { $uibModalInstance.dismiss(); diff --git a/ui/app/scripts/services/UiSettingsSrv.js b/ui/app/scripts/services/UiSettingsSrv.js index ccadd40bd5..27103e4e99 100644 --- a/ui/app/scripts/services/UiSettingsSrv.js +++ b/ui/app/scripts/services/UiSettingsSrv.js @@ -4,12 +4,12 @@ var settings = null; - return { - keys: [ - 'hideEmptyCaseButton', - 'hideMyTasks', - 'hideWaitingTasks' - ], + var keys = [ + 'hideEmptyCaseButton' + ]; + + var factory = { + keys: keys, clearCache: function() { settings = null; }, @@ -63,5 +63,13 @@ return deferred.promise; } }; + + keys.forEach(function(key) { + factory[key] = function() { + return (settings[key] || {}).value; + }; + }); + + return factory; }); })(); diff --git a/ui/app/views/partials/admin/ui-settings.html b/ui/app/views/partials/admin/ui-settings.html index ef677430f3..4e48545343 100644 --- a/ui/app/views/partials/admin/ui-settings.html +++ b/ui/app/views/partials/admin/ui-settings.html @@ -18,28 +18,6 @@

    UI Settings

    -
    - -
    -
    - -
    -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    diff --git a/ui/app/views/partials/case/case.templates.selector.html b/ui/app/views/partials/case/case.templates.selector.html index 4057a9ca4e..16ed0ddd63 100644 --- a/ui/app/views/partials/case/case.templates.selector.html +++ b/ui/app/views/partials/case/case.templates.selector.html @@ -2,15 +2,15 @@

    Create new Case

    -
    +
    -
    -

    OR

    +

    OR

    +
    -
    +

    Select a template

    From 40135202dfcc83230d2ec5b29512c0298abe4e33 Mon Sep 17 00:00:00 2001 From: To-om Date: Thu, 21 Feb 2019 15:04:49 +0100 Subject: [PATCH 31/53] update version and changelog --- CHANGELOG.md | 33 ++++++++++++++++++++++++++++++++- ui/bower.json | 2 +- ui/package.json | 2 +- version.sbt | 2 +- 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf414d99e1..ce9ab04631 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,38 @@ # Change Log -## [3.3.0-RC2](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC2) (2019-02-07) +## [3.3.0-RC3](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC3) (2019-02-21) + +[Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC2...3.3.0-RC3) + +**Implemented enhancements:** + +- Add a UI configuration admin section [\#888](https://github.com/TheHive-Project/TheHive/issues/888) +- Add a Related Alerts link to case details view [\#884](https://github.com/TheHive-Project/TheHive/issues/884) +- Update Copyright with year 2019 [\#879](https://github.com/TheHive-Project/TheHive/issues/879) +- Provide a quick link to copy alert id [\#870](https://github.com/TheHive-Project/TheHive/issues/870) +- \[BUG\] Audit trail for alert ignore [\#863](https://github.com/TheHive-Project/TheHive/issues/863) +- Related artifacts: IOC/not IOC [\#838](https://github.com/TheHive-Project/TheHive/issues/838) +- Feature: Add "auto-completion" to the UI [\#831](https://github.com/TheHive-Project/TheHive/issues/831) +- Improvement: Upload of observables seem to fail "silently" [\#829](https://github.com/TheHive-Project/TheHive/issues/829) +- Feature Request: link to and from Hive to MISP [\#820](https://github.com/TheHive-Project/TheHive/issues/820) +- Disable clickable widgets in dashboard edit mode [\#485](https://github.com/TheHive-Project/TheHive/issues/485) +- Ability to disable "New Case" -\> "Empty case" [\#449](https://github.com/TheHive-Project/TheHive/issues/449) + +**Fixed bugs:** + +- Drone build fails on pull-requests [\#882](https://github.com/TheHive-Project/TheHive/issues/882) +- AKKA version missmatch [\#877](https://github.com/TheHive-Project/TheHive/issues/877) +- Label Typo in Updated Alerts [\#874](https://github.com/TheHive-Project/TheHive/issues/874) +- Log message related to MISP synchronization is confusing [\#871](https://github.com/TheHive-Project/TheHive/issues/871) +- Cortex responders with DataType `thehive:case\_artifact` do not show up within thehive when attempting to run them for observables. [\#869](https://github.com/TheHive-Project/TheHive/issues/869) +- Alert updates and tracking \(follow\) [\#856](https://github.com/TheHive-Project/TheHive/issues/856) + +**Merged pull requests:** +- Update akka version [\#878](https://github.com/TheHive-Project/TheHive/pull/878) ([zpriddy](https://github.com/zpriddy)) +- Fix Update Label to Warning [\#873](https://github.com/TheHive-Project/TheHive/pull/873) ([zpriddy](https://github.com/zpriddy)) + +## [3.3.0-RC2](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC2) (2019-02-07) [Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC1...3.3.0-RC2) **Fixed bugs:** diff --git a/ui/bower.json b/ui/bower.json index 3b6695f030..f56c35e652 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "3.3.0-RC2", + "version": "3.3.0-RC3", "license": "AGPL-3.0", "dependencies": { "angular": "1.5.8", diff --git a/ui/package.json b/ui/package.json index d566ad6bad..fdcc56fab8 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "3.3.0-RC2", + "version": "3.3.0-RC3", "license": "AGPL-3.0", "repository": { "type": "git", diff --git a/version.sbt b/version.sbt index d7d3ca675d..84cc17b6f1 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "3.3.0-RC2" +version in ThisBuild := "3.3.0-RC3" From 79d0f4da8c77a222a202f928089aec3eb754d53f Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Fri, 22 Feb 2019 11:12:28 +0100 Subject: [PATCH 32/53] #893 Skip case template section when creating a case from alerts, if there are no case templates --- ui/app/scripts/controllers/alert/AlertListCtrl.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/app/scripts/controllers/alert/AlertListCtrl.js b/ui/app/scripts/controllers/alert/AlertListCtrl.js index 05c2c9a57c..ee29cdcb4a 100755 --- a/ui/app/scripts/controllers/alert/AlertListCtrl.js +++ b/ui/app/scripts/controllers/alert/AlertListCtrl.js @@ -315,6 +315,10 @@ CaseTemplateSrv.list() .then(function(templates) { + if(!templates || templates.length === 0) { + return $q.resolve(undefined); + } + // Open template selection dialog var modal = $uibModal.open({ templateUrl: 'views/partials/case/case.templates.selector.html', From 6b0163b3c794c59c11b7285c5ddba98f75491add Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Fri, 22 Feb 2019 11:13:31 +0100 Subject: [PATCH 33/53] #890 Fix UiSettingsSrv service injection --- ui/app/scripts/controllers/RootCtrl.js | 4 ++-- ui/app/scripts/controllers/alert/AlertEventCtrl.js | 4 +++- ui/app/scripts/controllers/alert/AlertListCtrl.js | 6 +++--- ui/app/views/partials/alert/event.dialog.html | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ui/app/scripts/controllers/RootCtrl.js b/ui/app/scripts/controllers/RootCtrl.js index 882465e6b2..acbd718b83 100644 --- a/ui/app/scripts/controllers/RootCtrl.js +++ b/ui/app/scripts/controllers/RootCtrl.js @@ -180,9 +180,9 @@ angular.module('theHiveControllers').controller('RootCtrl', templates: function(){ return $scope.templates; }, - uiSettings: function(UiSettingsSrv) { + uiSettings: ['UiSettingsSrv', function(UiSettingsSrv) { return UiSettingsSrv.all(); - } + }] } }); diff --git a/ui/app/scripts/controllers/alert/AlertEventCtrl.js b/ui/app/scripts/controllers/alert/AlertEventCtrl.js index 1176842eee..1f77b87a15 100644 --- a/ui/app/scripts/controllers/alert/AlertEventCtrl.js +++ b/ui/app/scripts/controllers/alert/AlertEventCtrl.js @@ -1,7 +1,7 @@ (function() { 'use strict'; angular.module('theHiveControllers') - .controller('AlertEventCtrl', function($scope, $rootScope, $state, $uibModal, $uibModalInstance, CustomFieldsCacheSrv, CaseResolutionStatus, AlertingSrv, NotificationSrv, clipboard, event, templates) { + .controller('AlertEventCtrl', function($scope, $rootScope, $state, $uibModal, $uibModalInstance, CustomFieldsCacheSrv, CaseResolutionStatus, AlertingSrv, NotificationSrv, UiSettingsSrv, clipboard, event, templates) { var self = this; var eventId = event.id; @@ -25,6 +25,8 @@ self.similarCasesStats = []; self.customFieldsCache = CustomFieldsCacheSrv; + self.hideEmptyCaseButton = UiSettingsSrv.hideEmptyCaseButton(); + var getTemplateCustomFields = function(customFields) { var result = []; diff --git a/ui/app/scripts/controllers/alert/AlertListCtrl.js b/ui/app/scripts/controllers/alert/AlertListCtrl.js index ee29cdcb4a..ba6c919b31 100755 --- a/ui/app/scripts/controllers/alert/AlertListCtrl.js +++ b/ui/app/scripts/controllers/alert/AlertListCtrl.js @@ -328,10 +328,10 @@ resolve: { templates: function(){ return templates; - }, - uiSettings: function(UiSettingsSrv) { + }, + uiSettings: ['UiSettingsSrv', function(UiSettingsSrv) { return UiSettingsSrv.all(); - } + }] } }); diff --git a/ui/app/views/partials/alert/event.dialog.html b/ui/app/views/partials/alert/event.dialog.html index 84d5c44c2e..c59d144ac4 100644 --- a/ui/app/views/partials/alert/event.dialog.html +++ b/ui/app/views/partials/alert/event.dialog.html @@ -166,7 +166,7 @@

    From db4d011a319c4cdfd27981c148c54573e1777339 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Fri, 22 Feb 2019 11:37:33 +0100 Subject: [PATCH 34/53] Bump version --- ui/bower.json | 2 +- ui/package.json | 2 +- version.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/bower.json b/ui/bower.json index f56c35e652..cb03f183b9 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "3.3.0-RC3", + "version": "3.3.0-RC4", "license": "AGPL-3.0", "dependencies": { "angular": "1.5.8", diff --git a/ui/package.json b/ui/package.json index fdcc56fab8..ae3a2388f0 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "3.3.0-RC3", + "version": "3.3.0-RC4", "license": "AGPL-3.0", "repository": { "type": "git", diff --git a/version.sbt b/version.sbt index 84cc17b6f1..48660d98a4 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "3.3.0-RC3" +version in ThisBuild := "3.3.0-RC4" From b252feb91dc63f3b011af8779d3a01bde6989855 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Fri, 22 Feb 2019 14:16:51 +0100 Subject: [PATCH 35/53] #894 Debounce the navigation to search page when coming from dashboard items --- .../scripts/directives/dashboard/counter.js | 22 ++++++++++--------- ui/app/scripts/directives/dashboard/donut.js | 11 ++++++---- ui/app/scripts/services/GlobalSearchSrv.js | 4 ++-- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ui/app/scripts/directives/dashboard/counter.js b/ui/app/scripts/directives/dashboard/counter.js index 6997297622..7c0714581b 100644 --- a/ui/app/scripts/directives/dashboard/counter.js +++ b/ui/app/scripts/directives/dashboard/counter.js @@ -1,6 +1,6 @@ (function() { 'use strict'; - angular.module('theHiveDirectives').directive('dashboardCounter', function($http, $state, DashboardSrv, NotificationSrv, GlobalSearchSrv) { + angular.module('theHiveDirectives').directive('dashboardCounter', function($q, $http, $state, DashboardSrv, NotificationSrv, GlobalSearchSrv) { return { restrict: 'E', scope: { @@ -66,17 +66,19 @@ }; scope.openSearch = function(item) { - if(scope.mode === 'edit') { - return; - } + if(scope.mode === 'edit') { + return; + } - var filters = (scope.options.filters || []).concat(item.serie.filters || []); + var filters = (scope.options.filters || []).concat(item.serie.filters || []); + + $q.resolve(GlobalSearchSrv.saveSection(scope.options.entity, { + search: filters.length === 0 ? '*' : null, + filters: filters + })).then(function() { + $state.go('app.search'); + }); - GlobalSearchSrv.saveSection(scope.options.entity, { - search: filters.length === 0 ? '*' : null, - filters: filters - }); - $state.go('app.search'); }; if (scope.autoload === true) { diff --git a/ui/app/scripts/directives/dashboard/donut.js b/ui/app/scripts/directives/dashboard/donut.js index 078d657031..6b0e2f0d52 100644 --- a/ui/app/scripts/directives/dashboard/donut.js +++ b/ui/app/scripts/directives/dashboard/donut.js @@ -1,6 +1,6 @@ (function() { 'use strict'; - angular.module('theHiveDirectives').directive('dashboardDonut', function(StatSrv, $state, DashboardSrv, NotificationSrv, GlobalSearchSrv) { + angular.module('theHiveDirectives').directive('dashboardDonut', function($q, StatSrv, $state, DashboardSrv, NotificationSrv, GlobalSearchSrv) { return { restrict: 'E', scope: { @@ -93,11 +93,14 @@ value: GlobalSearchSrv.buildDefaultFilterValue(fieldDef, d) }; - GlobalSearchSrv.saveSection(scope.options.entity, { + var filters = (scope.options.filters || []).concat([data]); + + $q.resolve(GlobalSearchSrv.saveSection(scope.options.entity, { search: null, - filters: scope.options.filters.concat([data]) + filters: filters + })).then(function() { + $state.go('app.search'); }); - $state.go('app.search'); } }, donut: { diff --git a/ui/app/scripts/services/GlobalSearchSrv.js b/ui/app/scripts/services/GlobalSearchSrv.js index 994a48c993..3c93648c6b 100644 --- a/ui/app/scripts/services/GlobalSearchSrv.js +++ b/ui/app/scripts/services/GlobalSearchSrv.js @@ -18,7 +18,7 @@ var cfg = this.restore(); return cfg[entity] || {}; - } + }; this.restore = function() { return localStorageService.get('search-section') || { @@ -55,7 +55,7 @@ return { operator: 'any', list: [{text: value.id, label:value.name}] - } + }; } else { switch(fieldDef.type) { case 'number': From b5ca2f01405b4553f8d5b3178eefea161e34247b Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Fri, 22 Feb 2019 14:48:40 +0100 Subject: [PATCH 36/53] Update Changelog --- CHANGELOG.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce9ab04631..f1f4ec8472 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,18 @@ # Change Log -## [3.3.0-RC3](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC3) (2019-02-21) +## [3.3.0-RC4](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC4) (2019-02-22) +[Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC3...3.3.0-RC4) + +**Implemented enhancements:** + +- Use empty case modal when merging alerts and no templates are defined [\#893](https://github.com/TheHive-Project/TheHive/issues/893) +**Fixed bugs:** + +- Issue with navigation from dashboard clickable donuts to search page [\#894](https://github.com/TheHive-Project/TheHive/issues/894) +- Hide Empty Case Button Broken [\#890](https://github.com/TheHive-Project/TheHive/issues/890) + +## [3.3.0-RC3](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC3) (2019-02-21) [Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC2...3.3.0-RC3) **Implemented enhancements:** @@ -809,4 +820,4 @@ -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file +\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* From b8fd37a71a46a8c3322666542d1333ad2f48f178 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Fri, 22 Feb 2019 11:12:28 +0100 Subject: [PATCH 37/53] #893 Skip case template section when creating a case from alerts, if there are no case templates --- ui/app/scripts/controllers/alert/AlertListCtrl.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/app/scripts/controllers/alert/AlertListCtrl.js b/ui/app/scripts/controllers/alert/AlertListCtrl.js index 05c2c9a57c..ee29cdcb4a 100755 --- a/ui/app/scripts/controllers/alert/AlertListCtrl.js +++ b/ui/app/scripts/controllers/alert/AlertListCtrl.js @@ -315,6 +315,10 @@ CaseTemplateSrv.list() .then(function(templates) { + if(!templates || templates.length === 0) { + return $q.resolve(undefined); + } + // Open template selection dialog var modal = $uibModal.open({ templateUrl: 'views/partials/case/case.templates.selector.html', From aab6ec2d9a6874e7272aec849ac987d5cede42af Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Fri, 22 Feb 2019 11:13:31 +0100 Subject: [PATCH 38/53] #890 Fix UiSettingsSrv service injection --- ui/app/scripts/controllers/RootCtrl.js | 4 ++-- ui/app/scripts/controllers/alert/AlertEventCtrl.js | 4 +++- ui/app/scripts/controllers/alert/AlertListCtrl.js | 6 +++--- ui/app/views/partials/alert/event.dialog.html | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ui/app/scripts/controllers/RootCtrl.js b/ui/app/scripts/controllers/RootCtrl.js index 882465e6b2..acbd718b83 100644 --- a/ui/app/scripts/controllers/RootCtrl.js +++ b/ui/app/scripts/controllers/RootCtrl.js @@ -180,9 +180,9 @@ angular.module('theHiveControllers').controller('RootCtrl', templates: function(){ return $scope.templates; }, - uiSettings: function(UiSettingsSrv) { + uiSettings: ['UiSettingsSrv', function(UiSettingsSrv) { return UiSettingsSrv.all(); - } + }] } }); diff --git a/ui/app/scripts/controllers/alert/AlertEventCtrl.js b/ui/app/scripts/controllers/alert/AlertEventCtrl.js index 1176842eee..1f77b87a15 100644 --- a/ui/app/scripts/controllers/alert/AlertEventCtrl.js +++ b/ui/app/scripts/controllers/alert/AlertEventCtrl.js @@ -1,7 +1,7 @@ (function() { 'use strict'; angular.module('theHiveControllers') - .controller('AlertEventCtrl', function($scope, $rootScope, $state, $uibModal, $uibModalInstance, CustomFieldsCacheSrv, CaseResolutionStatus, AlertingSrv, NotificationSrv, clipboard, event, templates) { + .controller('AlertEventCtrl', function($scope, $rootScope, $state, $uibModal, $uibModalInstance, CustomFieldsCacheSrv, CaseResolutionStatus, AlertingSrv, NotificationSrv, UiSettingsSrv, clipboard, event, templates) { var self = this; var eventId = event.id; @@ -25,6 +25,8 @@ self.similarCasesStats = []; self.customFieldsCache = CustomFieldsCacheSrv; + self.hideEmptyCaseButton = UiSettingsSrv.hideEmptyCaseButton(); + var getTemplateCustomFields = function(customFields) { var result = []; diff --git a/ui/app/scripts/controllers/alert/AlertListCtrl.js b/ui/app/scripts/controllers/alert/AlertListCtrl.js index ee29cdcb4a..ba6c919b31 100755 --- a/ui/app/scripts/controllers/alert/AlertListCtrl.js +++ b/ui/app/scripts/controllers/alert/AlertListCtrl.js @@ -328,10 +328,10 @@ resolve: { templates: function(){ return templates; - }, - uiSettings: function(UiSettingsSrv) { + }, + uiSettings: ['UiSettingsSrv', function(UiSettingsSrv) { return UiSettingsSrv.all(); - } + }] } }); diff --git a/ui/app/views/partials/alert/event.dialog.html b/ui/app/views/partials/alert/event.dialog.html index 84d5c44c2e..c59d144ac4 100644 --- a/ui/app/views/partials/alert/event.dialog.html +++ b/ui/app/views/partials/alert/event.dialog.html @@ -166,7 +166,7 @@

    From fe9336aa6e0ae7781c58f1dd37cb494e7e3d33b3 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Fri, 22 Feb 2019 11:37:33 +0100 Subject: [PATCH 39/53] Bump version --- ui/bower.json | 2 +- ui/package.json | 2 +- version.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/bower.json b/ui/bower.json index f56c35e652..cb03f183b9 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "3.3.0-RC3", + "version": "3.3.0-RC4", "license": "AGPL-3.0", "dependencies": { "angular": "1.5.8", diff --git a/ui/package.json b/ui/package.json index fdcc56fab8..ae3a2388f0 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "3.3.0-RC3", + "version": "3.3.0-RC4", "license": "AGPL-3.0", "repository": { "type": "git", diff --git a/version.sbt b/version.sbt index 84cc17b6f1..48660d98a4 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "3.3.0-RC3" +version in ThisBuild := "3.3.0-RC4" From 99b96d11755aaf36b7021dc7a976de15e9a0851a Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Fri, 22 Feb 2019 14:16:51 +0100 Subject: [PATCH 40/53] #894 Debounce the navigation to search page when coming from dashboard items --- .../scripts/directives/dashboard/counter.js | 22 ++++++++++--------- ui/app/scripts/directives/dashboard/donut.js | 11 ++++++---- ui/app/scripts/services/GlobalSearchSrv.js | 4 ++-- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ui/app/scripts/directives/dashboard/counter.js b/ui/app/scripts/directives/dashboard/counter.js index 6997297622..7c0714581b 100644 --- a/ui/app/scripts/directives/dashboard/counter.js +++ b/ui/app/scripts/directives/dashboard/counter.js @@ -1,6 +1,6 @@ (function() { 'use strict'; - angular.module('theHiveDirectives').directive('dashboardCounter', function($http, $state, DashboardSrv, NotificationSrv, GlobalSearchSrv) { + angular.module('theHiveDirectives').directive('dashboardCounter', function($q, $http, $state, DashboardSrv, NotificationSrv, GlobalSearchSrv) { return { restrict: 'E', scope: { @@ -66,17 +66,19 @@ }; scope.openSearch = function(item) { - if(scope.mode === 'edit') { - return; - } + if(scope.mode === 'edit') { + return; + } - var filters = (scope.options.filters || []).concat(item.serie.filters || []); + var filters = (scope.options.filters || []).concat(item.serie.filters || []); + + $q.resolve(GlobalSearchSrv.saveSection(scope.options.entity, { + search: filters.length === 0 ? '*' : null, + filters: filters + })).then(function() { + $state.go('app.search'); + }); - GlobalSearchSrv.saveSection(scope.options.entity, { - search: filters.length === 0 ? '*' : null, - filters: filters - }); - $state.go('app.search'); }; if (scope.autoload === true) { diff --git a/ui/app/scripts/directives/dashboard/donut.js b/ui/app/scripts/directives/dashboard/donut.js index 078d657031..6b0e2f0d52 100644 --- a/ui/app/scripts/directives/dashboard/donut.js +++ b/ui/app/scripts/directives/dashboard/donut.js @@ -1,6 +1,6 @@ (function() { 'use strict'; - angular.module('theHiveDirectives').directive('dashboardDonut', function(StatSrv, $state, DashboardSrv, NotificationSrv, GlobalSearchSrv) { + angular.module('theHiveDirectives').directive('dashboardDonut', function($q, StatSrv, $state, DashboardSrv, NotificationSrv, GlobalSearchSrv) { return { restrict: 'E', scope: { @@ -93,11 +93,14 @@ value: GlobalSearchSrv.buildDefaultFilterValue(fieldDef, d) }; - GlobalSearchSrv.saveSection(scope.options.entity, { + var filters = (scope.options.filters || []).concat([data]); + + $q.resolve(GlobalSearchSrv.saveSection(scope.options.entity, { search: null, - filters: scope.options.filters.concat([data]) + filters: filters + })).then(function() { + $state.go('app.search'); }); - $state.go('app.search'); } }, donut: { diff --git a/ui/app/scripts/services/GlobalSearchSrv.js b/ui/app/scripts/services/GlobalSearchSrv.js index 994a48c993..3c93648c6b 100644 --- a/ui/app/scripts/services/GlobalSearchSrv.js +++ b/ui/app/scripts/services/GlobalSearchSrv.js @@ -18,7 +18,7 @@ var cfg = this.restore(); return cfg[entity] || {}; - } + }; this.restore = function() { return localStorageService.get('search-section') || { @@ -55,7 +55,7 @@ return { operator: 'any', list: [{text: value.id, label:value.name}] - } + }; } else { switch(fieldDef.type) { case 'number': From c9ca6b228133b91d4a459671afd107ed71b0f574 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Fri, 22 Feb 2019 14:48:40 +0100 Subject: [PATCH 41/53] Update Changelog --- CHANGELOG.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce9ab04631..f1f4ec8472 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,18 @@ # Change Log -## [3.3.0-RC3](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC3) (2019-02-21) +## [3.3.0-RC4](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC4) (2019-02-22) +[Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC3...3.3.0-RC4) + +**Implemented enhancements:** + +- Use empty case modal when merging alerts and no templates are defined [\#893](https://github.com/TheHive-Project/TheHive/issues/893) +**Fixed bugs:** + +- Issue with navigation from dashboard clickable donuts to search page [\#894](https://github.com/TheHive-Project/TheHive/issues/894) +- Hide Empty Case Button Broken [\#890](https://github.com/TheHive-Project/TheHive/issues/890) + +## [3.3.0-RC3](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC3) (2019-02-21) [Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC2...3.3.0-RC3) **Implemented enhancements:** @@ -809,4 +820,4 @@ -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file +\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* From 70666ee614399c099b9e82b3ecff69b5df2532ef Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Sat, 23 Feb 2019 23:31:36 +0100 Subject: [PATCH 42/53] #896 Fix the tags filter pre setting from dashboard clickable items --- ui/app/scripts/services/GlobalSearchSrv.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/scripts/services/GlobalSearchSrv.js b/ui/app/scripts/services/GlobalSearchSrv.js index 3c93648c6b..380f44b4ca 100644 --- a/ui/app/scripts/services/GlobalSearchSrv.js +++ b/ui/app/scripts/services/GlobalSearchSrv.js @@ -51,7 +51,7 @@ }; this.buildDefaultFilterValue = function(fieldDef, value) { - if(fieldDef.type === 'user' || fieldDef.values.length > 0) { + if(fieldDef.name === 'tags' || fieldDef.type === 'user' || fieldDef.values.length > 0) { return { operator: 'any', list: [{text: value.id, label:value.name}] From f6c504c05f14f0f4ed1acddc55b4e2929ee5fa40 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Sat, 23 Feb 2019 23:45:13 +0100 Subject: [PATCH 43/53] #897 Add artifact description on mouse over in alert preview dialog --- ui/app/views/partials/alert/event.dialog.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/app/views/partials/alert/event.dialog.html b/ui/app/views/partials/alert/event.dialog.html index c59d144ac4..fb6ef5305f 100644 --- a/ui/app/views/partials/alert/event.dialog.html +++ b/ui/app/views/partials/alert/event.dialog.html @@ -87,19 +87,19 @@

    • {{attribute.dataType}} -
    +
    {{attribute.data | fang | ellipsis:250}}
    -
    +
    {{attribute.attachment.name}} ({{attribute.attachment.size}} bytes)
    -
    +
    {{attribute.remoteAttachment.filename}}
    From 1b0a71f7583cf5d2d049fd834931c8cdd1595b69 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Sat, 23 Feb 2019 23:55:27 +0100 Subject: [PATCH 44/53] #895 Exclude responder jobs from search page --- ui/app/scripts/controllers/SearchCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/scripts/controllers/SearchCtrl.js b/ui/app/scripts/controllers/SearchCtrl.js index 5d910d9970..76bd24bf58 100644 --- a/ui/app/scripts/controllers/SearchCtrl.js +++ b/ui/app/scripts/controllers/SearchCtrl.js @@ -25,7 +25,7 @@ _not: { '_in': { '_field': '_type', - '_values': ['dashboard', 'data', 'user', 'analyzer', 'caseTemplate'] + '_values': ['dashboard', 'data', 'user', 'analyzer', 'caseTemplate', 'reportTemplate', 'action'] } } } From 752cdbc2e57d4e7607976866a4b2bea185c987a3 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Sat, 23 Feb 2019 23:59:55 +0100 Subject: [PATCH 45/53] Prepare 3.3.0-RC5 release --- CHANGELOG.md | 12 ++++++++++++ ui/bower.json | 2 +- ui/package.json | 2 +- version.sbt | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1f4ec8472..840666dfb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Change Log +## [3.3.0-RC5](https://github.com/TheHive-Project/TheHive/tree/HEAD) (2019-02-24) +[Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC4...3.3.0-RC5) + +**Implemented enhancements:** + +- Mouseover text for alert preview [\#897](https://github.com/TheHive-Project/TheHive/issues/897) + +**Fixed bugs:** + +- dashboard clicks are not correctly translated to tag filters [\#896](https://github.com/TheHive-Project/TheHive/issues/896) +- Search results not visible [\#895](https://github.com/TheHive-Project/TheHive/issues/895) + ## [3.3.0-RC4](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC4) (2019-02-22) [Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC3...3.3.0-RC4) diff --git a/ui/bower.json b/ui/bower.json index cb03f183b9..6812f70221 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "3.3.0-RC4", + "version": "3.3.0-RC5", "license": "AGPL-3.0", "dependencies": { "angular": "1.5.8", diff --git a/ui/package.json b/ui/package.json index ae3a2388f0..f76f7ac094 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "3.3.0-RC4", + "version": "3.3.0-RC5", "license": "AGPL-3.0", "repository": { "type": "git", diff --git a/version.sbt b/version.sbt index 48660d98a4..ff5dcf32d6 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "3.3.0-RC4" +version in ThisBuild := "3.3.0-RC5" From 8206aa7fbbcf141a8ce8f068492654951e318664 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Mon, 4 Mar 2019 16:46:36 +0100 Subject: [PATCH 46/53] #908 Add a text dashboard widget --- ui/app/index.html | 1 + .../dashboard/DashboardViewCtrl.js | 9 +- .../scripts/directives/dashboard/multiline.js | 4 +- ui/app/scripts/directives/dashboard/text.js | 99 +++++++++++++++++++ ui/app/scripts/services/DashboardSrv.js | 12 ++- ui/app/views/directives/dashboard/item.html | 10 +- .../directives/dashboard/text/basic.html | 17 ++++ .../views/directives/dashboard/text/edit.html | 14 +++ .../dashboard/text/serie.filters.html | 25 +++++ .../directives/dashboard/text/series.html | 42 ++++++++ .../views/directives/dashboard/text/view.html | 19 ++++ 11 files changed, 244 insertions(+), 8 deletions(-) create mode 100644 ui/app/scripts/directives/dashboard/text.js create mode 100644 ui/app/views/directives/dashboard/text/basic.html create mode 100644 ui/app/views/directives/dashboard/text/edit.html create mode 100644 ui/app/views/directives/dashboard/text/serie.filters.html create mode 100644 ui/app/views/directives/dashboard/text/series.html create mode 100644 ui/app/views/directives/dashboard/text/view.html diff --git a/ui/app/index.html b/ui/app/index.html index 8946fc036c..c5e868cf1e 100644 --- a/ui/app/index.html +++ b/ui/app/index.html @@ -186,6 +186,7 @@ + diff --git a/ui/app/scripts/controllers/dashboard/DashboardViewCtrl.js b/ui/app/scripts/controllers/dashboard/DashboardViewCtrl.js index 7e3805a96d..d254d4c939 100644 --- a/ui/app/scripts/controllers/dashboard/DashboardViewCtrl.js +++ b/ui/app/scripts/controllers/dashboard/DashboardViewCtrl.js @@ -57,11 +57,11 @@ this.canEditDashboard = function() { return (this.createdBy === this.currentUser.id) || (this.dashboardStatus = 'Shared' && AuthenticationSrv.isAdmin(this.currentUser)); - } + }; this.options = { dashboardAllowedTypes: ['container'], - containerAllowedTypes: ['bar', 'line', 'donut', 'counter', 'multiline'], + containerAllowedTypes: ['bar', 'line', 'donut', 'counter', 'text', 'multiline'], maxColumns: 3, cls: DashboardSrv.typeClasses, labels: { @@ -70,6 +70,7 @@ donut: 'Donut', line: 'Line', counter: 'Counter', + text: 'Text', multiline: 'Multi Lines' }, editLayout: !_.find(this.definition.items, function(row) { @@ -132,9 +133,9 @@ }, 0); }); - } + }; - this.itemInserted = function(item, rows, rowIndex, index) { + this.itemInserted = function(item, rows/*, rowIndex, index*/) { if(!item.id){ item.id = UtilsSrv.guid(); } diff --git a/ui/app/scripts/directives/dashboard/multiline.js b/ui/app/scripts/directives/dashboard/multiline.js index 4c86d6d871..6849c4992a 100644 --- a/ui/app/scripts/directives/dashboard/multiline.js +++ b/ui/app/scripts/directives/dashboard/multiline.js @@ -33,7 +33,7 @@ } return s; - } + }; scope.buildSerie = function(serie, q, index) { return { @@ -166,7 +166,7 @@ }; scope.chart = chart; - }, function(err) { + }, function(/*err*/) { scope.error = true; NotificationSrv.log('Failed to fetch data, please edit the widget definition', 'error'); }); diff --git a/ui/app/scripts/directives/dashboard/text.js b/ui/app/scripts/directives/dashboard/text.js new file mode 100644 index 0000000000..9fdf77c810 --- /dev/null +++ b/ui/app/scripts/directives/dashboard/text.js @@ -0,0 +1,99 @@ +(function() { + 'use strict'; + angular.module('theHiveDirectives').directive('dashboardText', function($q, $http, $state, DashboardSrv, GlobalSearchSrv, NotificationSrv) { + return { + restrict: 'E', + scope: { + filter: '=?', + options: '=', + entity: '=', + autoload: '=', + mode: '=', + refreshOn: '@', + resizeOn: '@', + metadata: '=' + }, + templateUrl: 'views/directives/dashboard/text/view.html', + link: function(scope, elem) { + + scope.error = false; + scope.data = null; + scope.globalQuery = null; + + scope.load = function() { + if(!scope.options.series || scope.options.series.length === 0) { + scope.error = true; + return; + } + + var query = DashboardSrv.buildChartQuery(scope.filter, scope.options.query); + scope.globalQuery = query; + + var stats = { + stats: _.map(scope.options.series || [], function(serie, index) { + var s = { + _agg: serie.agg, + _name: serie.name || 'agg_' + (index + 1), + _query: serie.query || {} + }; + + if(serie.agg !== 'count') { + s._field = serie.field; + } + + return { + model: serie.entity, + query: query, + stats: [s] + }; + }) + }; + + var statsPromise = $http.post('./api/_stats', stats); + + statsPromise.then(function(response) { + scope.error = false; + scope.data = response.data; + + var template = scope.options.template; + Object.keys(scope.data).forEach(function(key){ + var regex = new RegExp('{{' + key + '}}', 'gi'); + + template = template.replace(regex, scope.data[key]); + }); + + scope.content = template; + + }, function(/*err*/) { + scope.error = true; + + NotificationSrv.log('Failed to fetch data, please edit the widget definition', 'error'); + }); + }; + + scope.copyHTML = function() { + var html = elem[0].querySelector('.widget-content').innerHTML; + function listener(e) { + e.clipboardData.setData('text/html', html); + e.clipboardData.setData('text/plain', html); + e.preventDefault(); + } + document.addEventListener('copy', listener); + document.execCommand('copy'); + document.removeEventListener('copy', listener); + } + + if (scope.autoload === true) { + scope.load(); + } + + if (!_.isEmpty(scope.refreshOn)) { + scope.$on(scope.refreshOn, function(event, filter) { + scope.filter = filter; + scope.load(); + }); + } + } + }; + }); +})(); diff --git a/ui/app/scripts/services/DashboardSrv.js b/ui/app/scripts/services/DashboardSrv.js index 6a2bcda5d1..7e0475bbce 100644 --- a/ui/app/scripts/services/DashboardSrv.js +++ b/ui/app/scripts/services/DashboardSrv.js @@ -74,7 +74,8 @@ donut: 'fa-pie-chart', line: 'fa-line-chart', multiline: 'fa-area-chart', - counter: 'fa-calculator' + counter: 'fa-calculator', + text: 'fa-file' }; this.sortOptions = [{ @@ -113,6 +114,14 @@ entity: null } }, + { + type: 'text', + options: { + title: null, + template: null, + entity: null + } + }, { type: 'donut', options: { @@ -234,6 +243,7 @@ this.hasMinimalConfiguration = function(component) { switch (component.type) { case 'multiline': + case 'text': return component.options.series.length === _.without(_.pluck(component.options.series, 'entity'), undefined).length; default: return !!component.options.entity; diff --git a/ui/app/views/directives/dashboard/item.html b/ui/app/views/directives/dashboard/item.html index 08bd60745c..e6f6094b69 100644 --- a/ui/app/views/directives/dashboard/item.html +++ b/ui/app/views/directives/dashboard/item.html @@ -1,7 +1,7 @@

    - {{component.options.title || 'No title'}} {{mode}} + {{component.options.title || 'No title'}}

    @@ -56,6 +56,14 @@

    resize-on="{{resizeOn}}" mode="mode"> + + + + +

    +
    +
    +
    + + +
    +
    +
    diff --git a/ui/app/views/directives/dashboard/text/edit.html b/ui/app/views/directives/dashboard/text/edit.html new file mode 100644 index 0000000000..89ad303eae --- /dev/null +++ b/ui/app/views/directives/dashboard/text/edit.html @@ -0,0 +1,14 @@ + + + + Basic + + + + + + Series + + + + diff --git a/ui/app/views/directives/dashboard/text/serie.filters.html b/ui/app/views/directives/dashboard/text/serie.filters.html new file mode 100644 index 0000000000..ff38f8c3b6 --- /dev/null +++ b/ui/app/views/directives/dashboard/text/serie.filters.html @@ -0,0 +1,25 @@ +
    + Serie's filter +
    +
    +
    +
    + + + + +
    +
    +
    + +
    +
    +
    + + Add a filter + +
    diff --git a/ui/app/views/directives/dashboard/text/series.html b/ui/app/views/directives/dashboard/text/series.html new file mode 100644 index 0000000000..04c4a36e0c --- /dev/null +++ b/ui/app/views/directives/dashboard/text/series.html @@ -0,0 +1,42 @@ +
    + No series defined. Add a serie +
    +
    +
    +
    + + + +
    + +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + +
    +
    +
    + + Add a serie + +
    diff --git a/ui/app/views/directives/dashboard/text/view.html b/ui/app/views/directives/dashboard/text/view.html new file mode 100644 index 0000000000..c5f6d82b01 --- /dev/null +++ b/ui/app/views/directives/dashboard/text/view.html @@ -0,0 +1,19 @@ +
    +
    +
    +

    +
    +
    Failed to fetch data, please edit the widget definition
    +

    +
    +
    +
    +
    +
    + HTML + Copy +
    +
    +
    +
    +
    From 42e318a1582f0a8c00b527d0191cdbd55813b6a3 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Mon, 4 Mar 2019 23:47:54 +0100 Subject: [PATCH 47/53] #901 Disable alert import button if no template is set and empty cases are not allowed --- ui/app/views/partials/alert/event.dialog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/views/partials/alert/event.dialog.html b/ui/app/views/partials/alert/event.dialog.html index fb6ef5305f..aab0ea0a91 100644 --- a/ui/app/views/partials/alert/event.dialog.html +++ b/ui/app/views/partials/alert/event.dialog.html @@ -169,7 +169,7 @@

    - +

    From c7b23a5c70753f408b58b954f13f8e9c4bcd0321 Mon Sep 17 00:00:00 2001 From: To-om Date: Thu, 7 Mar 2019 11:36:05 +0100 Subject: [PATCH 48/53] #666 Update elastic4play to unable wildcard search --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 7040cba8cf..31aac9bee6 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -20,7 +20,7 @@ object Dependencies { val reflections = "org.reflections" % "reflections" % "0.9.11" val zip4j = "net.lingala.zip4j" % "zip4j" % "1.3.2" - val elastic4play = "org.thehive-project" %% "elastic4play" % "1.8.0-1" + val elastic4play = "org.thehive-project" %% "elastic4play" % "1.9.0" val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % "2.5.19" val akkaClusterTools = "com.typesafe.akka" %% "akka-cluster-tools" % "2.5.19" } From 2ce42625f245abbb06ce9ec1f348c9f250440b51 Mon Sep 17 00:00:00 2001 From: To-om Date: Thu, 7 Mar 2019 13:21:35 +0100 Subject: [PATCH 49/53] #912 Add "AddTagToAlert" operation, for responders --- .../cortex/services/ActionOperation.scala | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala b/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala index 8a13182648..dad270cbbd 100644 --- a/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala +++ b/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala @@ -61,6 +61,10 @@ case class AddLogToTask(content: String, owner: Option[String], status: ActionOp override def updateStatus(newStatus: Type, newMessage: String): ActionOperation = copy(status = newStatus, message = newMessage) } +case class AddTagToAlert(tag: String, status: ActionOperationStatus.Type = ActionOperationStatus.Waiting, message: String = "") extends ActionOperation { + override def updateStatus(newStatus: ActionOperationStatus.Type, newMessage: String): AddTagToAlert = copy(status = newStatus, message = newMessage) +} + object ActionOperation { val addTagToCaseWrites = Json.writes[AddTagToCase] val addTagToArtifactWrites = Json.writes[AddTagToArtifact] @@ -69,6 +73,7 @@ object ActionOperation { val closeTaskWrites = Json.writes[CloseTask] val markAlertAsReadWrites = Json.writes[MarkAlertAsRead] val addLogToTaskWrites = Json.writes[AddLogToTask] + val addTagToAlertWrites = Json.writes[AddTagToAlert] implicit val actionOperationReads: Reads[ActionOperation] = Reads[ActionOperation](json ⇒ (json \ "type").asOpt[String].fold[JsResult[ActionOperation]](JsError("type is missing in action operation")) { case "AddTagToCase" ⇒ (json \ "tag").validate[String].map(tag ⇒ AddTagToCase(tag)) @@ -85,6 +90,7 @@ object ActionOperation { content ← (json \ "content").validate[String] owner ← (json \ "owner").validateOpt[String] } yield AddLogToTask(content, owner) + case "AddTagToAlert" => (json \ "tag").validate[String].map(tag ⇒ AddTagToAlert(tag)) case other ⇒ JsError(s"Unknown operation $other") }) implicit val actionOperationWrites: Writes[ActionOperation] = Writes[ActionOperation] { @@ -95,6 +101,7 @@ object ActionOperation { case a: CloseTask ⇒ closeTaskWrites.writes(a) case a: MarkAlertAsRead ⇒ markAlertAsReadWrites.writes(a) case a: AddLogToTask ⇒ addLogToTaskWrites.writes(a) + case a: AddTagToAlert ⇒ addTagToAlertWrites.writes(a) case a ⇒ Json.obj("unsupported operation" → a.toString) } } @@ -198,6 +205,15 @@ class ActionOperationSrv @Inject() ( task ← findTaskEntity(entity) _ ← logSrv.create(task, Fields.empty.set("message", content).set("owner", owner.map(JsString))) } yield operation.updateStatus(ActionOperationStatus.Success, "") + case AddTagToAlert(tag, _, _) => + entity match { + case initialAlert: Alert ⇒ + for { + alert ← alertSrv.get(initialAlert.id) + _ ← alertSrv.update(alert.id, Fields.empty.set("tags", Json.toJson((alert.tags() :+ tag).distinct)), ModifyConfig(retryOnConflict = 0, version = Some(alert.version))) + } yield operation.updateStatus(ActionOperationStatus.Success, "") + case _ ⇒ Future.failed(BadRequestError("Alert not found")) + } case o ⇒ Future.successful(operation.updateStatus(ActionOperationStatus.Failure, s"Operation $o not supported")) } } From 55adc90964199a0866cca68166c7a87c6c33c69e Mon Sep 17 00:00:00 2001 From: To-om Date: Thu, 7 Mar 2019 15:42:34 +0100 Subject: [PATCH 50/53] Update changelog --- CHANGELOG.md | 19 ++++++++++++++++++- ui/bower.json | 2 +- ui/package.json | 2 +- version.sbt | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 840666dfb1..8a2f869586 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,23 @@ # Change Log -## [3.3.0-RC5](https://github.com/TheHive-Project/TheHive/tree/HEAD) (2019-02-24) +## [3.3.0-RC6](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC6) (2019-02-07) + +[Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC5...3.3.0-RC6) + +**Implemented enhancements:** + +- Add Tags to an Alert with Responder [\#912](https://github.com/TheHive-Project/TheHive/issues/912) +- Dashboards - Add text widget [\#908](https://github.com/TheHive-Project/TheHive/issues/908) +- Empty case still available when disabled [\#901](https://github.com/TheHive-Project/TheHive/issues/901) +- Support for filtering Tags by prefix \(using asterisk, % or something\) in search dialog [\#666](https://github.com/TheHive-Project/TheHive/issues/666) + +**Closed issues:** + +- Dynamic \(auto-refresh\) of cases is break in 3.3.0-RC5 [\#907](https://github.com/TheHive-Project/TheHive/issues/907) +- Hostname Artifact [\#900](https://github.com/TheHive-Project/TheHive/issues/900) +- DOS issue: Firefox crashing TheHive [\#899](https://github.com/TheHive-Project/TheHive/issues/899) + +## [3.3.0-RC5](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC5) (2019-02-23) [Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC4...3.3.0-RC5) **Implemented enhancements:** diff --git a/ui/bower.json b/ui/bower.json index 6812f70221..038e96e3dd 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "3.3.0-RC5", + "version": "3.3.0-RC6", "license": "AGPL-3.0", "dependencies": { "angular": "1.5.8", diff --git a/ui/package.json b/ui/package.json index f76f7ac094..8fd047fe20 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "3.3.0-RC5", + "version": "3.3.0-RC6", "license": "AGPL-3.0", "repository": { "type": "git", diff --git a/version.sbt b/version.sbt index ff5dcf32d6..ccfbebfa1b 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "3.3.0-RC5" +version in ThisBuild := "3.3.0-RC6" From d69e999e7fab2a60f77fe591cd17e708022f251e Mon Sep 17 00:00:00 2001 From: To-om Date: Tue, 19 Mar 2019 10:35:35 +0100 Subject: [PATCH 51/53] #930 update elastic4play --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 31aac9bee6..bb22b979d0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -20,7 +20,7 @@ object Dependencies { val reflections = "org.reflections" % "reflections" % "0.9.11" val zip4j = "net.lingala.zip4j" % "zip4j" % "1.3.2" - val elastic4play = "org.thehive-project" %% "elastic4play" % "1.9.0" + val elastic4play = "org.thehive-project" %% "elastic4play" % "1.10.0" val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % "2.5.19" val akkaClusterTools = "com.typesafe.akka" %% "akka-cluster-tools" % "2.5.19" } From 591f597877825c2287df30e8bea9a1295b8b9488 Mon Sep 17 00:00:00 2001 From: To-om Date: Tue, 19 Mar 2019 10:35:48 +0100 Subject: [PATCH 52/53] Reformat code --- .../app/connectors/cortex/services/ActionOperation.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala b/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala index dad270cbbd..dff91957d8 100644 --- a/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala +++ b/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala @@ -90,8 +90,8 @@ object ActionOperation { content ← (json \ "content").validate[String] owner ← (json \ "owner").validateOpt[String] } yield AddLogToTask(content, owner) - case "AddTagToAlert" => (json \ "tag").validate[String].map(tag ⇒ AddTagToAlert(tag)) - case other ⇒ JsError(s"Unknown operation $other") + case "AddTagToAlert" ⇒ (json \ "tag").validate[String].map(tag ⇒ AddTagToAlert(tag)) + case other ⇒ JsError(s"Unknown operation $other") }) implicit val actionOperationWrites: Writes[ActionOperation] = Writes[ActionOperation] { case a: AddTagToCase ⇒ addTagToCaseWrites.writes(a) @@ -205,7 +205,7 @@ class ActionOperationSrv @Inject() ( task ← findTaskEntity(entity) _ ← logSrv.create(task, Fields.empty.set("message", content).set("owner", owner.map(JsString))) } yield operation.updateStatus(ActionOperationStatus.Success, "") - case AddTagToAlert(tag, _, _) => + case AddTagToAlert(tag, _, _) ⇒ entity match { case initialAlert: Alert ⇒ for { From efaae053e572108af347de6120aff78802df657e Mon Sep 17 00:00:00 2001 From: To-om Date: Tue, 19 Mar 2019 10:41:41 +0100 Subject: [PATCH 53/53] Update version and changelog --- CHANGELOG.md | 11 +++++++++-- ui/bower.json | 2 +- ui/package.json | 2 +- version.sbt | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a2f869586..bc0dce8ae9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,14 @@ # Change Log -## [3.3.0-RC6](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC6) (2019-02-07) +## [3.3.0](https://github.com/TheHive-Project/TheHive/tree/3.3.0) (2019-03-19) +[Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC6...3.3.0) + +**Fixed bugs:** + +- Merge case by CaseID Broken [\#930](https://github.com/TheHive-Project/TheHive/issues/930) + +## [3.3.0-RC6](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC6) (2019-03-07) [Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC5...3.3.0-RC6) **Implemented enhancements:** @@ -849,4 +856,4 @@ -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* +\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file diff --git a/ui/bower.json b/ui/bower.json index 038e96e3dd..bc7d1b9bb3 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "3.3.0-RC6", + "version": "3.3.0", "license": "AGPL-3.0", "dependencies": { "angular": "1.5.8", diff --git a/ui/package.json b/ui/package.json index 8fd047fe20..ba8f5b8e8e 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "3.3.0-RC6", + "version": "3.3.0", "license": "AGPL-3.0", "repository": { "type": "git", diff --git a/version.sbt b/version.sbt index ccfbebfa1b..9e1a15392a 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "3.3.0-RC6" +version in ThisBuild := "3.3.0-1"