From cbbbdb714cf86735306206645ab3e2d763d92cee Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Thu, 12 Apr 2018 15:58:44 +0200 Subject: [PATCH 01/12] #91 Sort analyzers list by name in the analyzers page --- .../pages/analyzers/analyzers.controller.js | 3 +- .../app/pages/analyzers/analyzers.service.js | 30 +++++++++++-------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/www/src/app/pages/analyzers/analyzers.controller.js b/www/src/app/pages/analyzers/analyzers.controller.js index 4d461eb12..73855108b 100644 --- a/www/src/app/pages/analyzers/analyzers.controller.js +++ b/www/src/app/pages/analyzers/analyzers.controller.js @@ -100,7 +100,8 @@ export default class AnalyzersController extends PageController { this.SearchService.configure({ objectType: 'analyzer', filter: this.buildQuery(), - range: this.buildRange() + range: this.buildRange(), + sort: '+name' }) .search() .then(response => { diff --git a/www/src/app/pages/analyzers/analyzers.service.js b/www/src/app/pages/analyzers/analyzers.service.js index ad7278d8f..e31fe69ec 100644 --- a/www/src/app/pages/analyzers/analyzers.service.js +++ b/www/src/app/pages/analyzers/analyzers.service.js @@ -58,19 +58,23 @@ export default class AnalyzerService { list() { let defered = this.$q.defer(); - this.$http.get('./api/analyzer', { params: { range: 'all' } }).then( - response => { - this.analyzers = response.data; - this.dataTypes = _.sortBy( - _.uniq(_.flatten(_.map(response.data, 'dataTypeList'))) - ); - - defered.resolve(response.data); - }, - response => { - defered.reject(response); - } - ); + this.$http + .get('./api/analyzer', { + params: { range: 'all', sort: '+name' } + }) + .then( + response => { + this.analyzers = response.data; + this.dataTypes = _.sortBy( + _.uniq(_.flatten(_.map(response.data, 'dataTypeList'))) + ); + + defered.resolve(response.data); + }, + response => { + defered.reject(response); + } + ); return defered.promise; } From dc3f698072512a3c8cc788be58e11ccb6b2467e6 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Thu, 12 Apr 2018 16:26:09 +0200 Subject: [PATCH 02/12] #92 Fix link of the header's logo --- www/src/app/components/header/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/src/app/components/header/header.html b/www/src/app/components/header/header.html index 9e20213e2..e6601af2c 100644 --- a/www/src/app/components/header/header.html +++ b/www/src/app/components/header/header.html @@ -13,7 +13,7 @@
- + Cortex From 5a2b91195fe632e9c7262d1765f73ce85983d7c7 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Thu, 12 Apr 2018 17:42:45 +0200 Subject: [PATCH 06/12] #95 Add strict filter flag on analyzer list of run analyzer dialog --- www/src/app/pages/analyzers/analyzer.run.modal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/src/app/pages/analyzers/analyzer.run.modal.html b/www/src/app/pages/analyzers/analyzer.run.modal.html index 0627600df..0008ae193 100644 --- a/www/src/app/pages/analyzers/analyzer.run.modal.html +++ b/www/src/app/pages/analyzers/analyzer.run.modal.html @@ -49,7 +49,7 @@

Run analysis

    -
  • +
  • {{a.name}} From 40a62063af23a42ab3e4e3012f7c826bee726bb0 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Fri, 13 Apr 2018 11:20:30 +0200 Subject: [PATCH 07/12] Bump version to 2.0.4 --- version.sbt | 2 +- www/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/version.sbt b/version.sbt index 3e00daab6..740abf8d0 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "2.0.3" +version in ThisBuild := "2.0.4" diff --git a/www/package.json b/www/package.json index 66fee3a1b..88c4e376f 100755 --- a/www/package.json +++ b/www/package.json @@ -1,6 +1,6 @@ { "name": "cortex", - "version": "2.0.3", + "version": "2.0.4", "description": "A powerfull observable analysis engine", "license": "AGPL-v3", "homepage": "https://github.com/TheHive-Project/Cortex", From a88cac018b3907d71c537a31677231cc2276b982 Mon Sep 17 00:00:00 2001 From: To-om Date: Fri, 13 Apr 2018 10:02:57 +0200 Subject: [PATCH 08/12] Disable basic authentication by default --- conf/reference.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/reference.conf b/conf/reference.conf index 3d3aa6375..9f91ef006 100644 --- a/conf/reference.conf +++ b/conf/reference.conf @@ -50,6 +50,7 @@ search { } auth.provider = ["local"] +auth.method.basic = false # Datastore datastore { From 4ec123f1096ec9fbfee2313e0ab628a400348ec8 Mon Sep 17 00:00:00 2001 From: To-om Date: Fri, 13 Apr 2018 08:57:46 +0200 Subject: [PATCH 09/12] #90 Fix python dependencies installation in docker --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 94be3abc0..481c9145e 100644 --- a/build.sbt +++ b/build.sbt @@ -145,8 +145,8 @@ dockerCommands ~= { dc => "pip3 install -U pip setuptools && " + "cd /opt && " + "git clone https://github.com/CERT-BDF/Cortex-Analyzers.git && " + - "pip install $(sort -u Cortex-Analyzers/analyzers/*/requirements.txt) && " + - "sort -u Cortex-Analyzers/analyzers/*/requirements.txt | grep -v ';python_version' | xargs -n 1 pip3 install || true"), + "for I in Cortex-Analyzers/analyzers/*/requirements.txt; do pip2 install -r $I; done && " + + "for I in Cortex-Analyzers/analyzers/*/requirements.txt; do pip3 install -r $I || true; done"), Cmd("ADD", "var", "/var"), Cmd("ADD", "etc", "/etc"), ExecCmd("RUN", "chown", "-R", "daemon:root", "/var/log/cortex"), From 39197698a6e684f0e141b09a3ed20e355048c504 Mon Sep 17 00:00:00 2001 From: To-om Date: Fri, 13 Apr 2018 08:47:36 +0200 Subject: [PATCH 10/12] #89 Let an user display and change their API key --- app/org/thp/cortex/controllers/AnalyzerCtrl.scala | 2 +- app/org/thp/cortex/controllers/MispCtrl.scala | 3 +-- app/org/thp/cortex/controllers/UserCtrl.scala | 8 ++++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/org/thp/cortex/controllers/AnalyzerCtrl.scala b/app/org/thp/cortex/controllers/AnalyzerCtrl.scala index adf802682..795dfdd23 100644 --- a/app/org/thp/cortex/controllers/AnalyzerCtrl.scala +++ b/app/org/thp/cortex/controllers/AnalyzerCtrl.scala @@ -4,7 +4,7 @@ import javax.inject.{ Inject, Singleton } import scala.concurrent.{ ExecutionContext, Future } -import play.api.libs.json.{ JsNull, JsObject, Json } +import play.api.libs.json.{ JsObject, Json } import play.api.mvc.{ AbstractController, Action, AnyContent, ControllerComponents } import akka.stream.Materializer diff --git a/app/org/thp/cortex/controllers/MispCtrl.scala b/app/org/thp/cortex/controllers/MispCtrl.scala index dac5e034a..783493b92 100644 --- a/app/org/thp/cortex/controllers/MispCtrl.scala +++ b/app/org/thp/cortex/controllers/MispCtrl.scala @@ -2,11 +2,10 @@ package org.thp.cortex.controllers import javax.inject.Inject import org.elastic4play.controllers.{ Authenticated, Fields, FieldsBodyParser, Renderer } -import org.elastic4play.services.QueryDSL import org.thp.cortex.models.Roles import org.thp.cortex.services.{ AnalyzerSrv, MispSrv } import play.api.Logger -import play.api.libs.json.{ JsObject, JsValue, Json } +import play.api.libs.json.{ JsObject, JsValue } import play.api.mvc._ import scala.concurrent.{ ExecutionContext, Future } diff --git a/app/org/thp/cortex/controllers/UserCtrl.scala b/app/org/thp/cortex/controllers/UserCtrl.scala index f6aceec8e..8277fdff0 100644 --- a/app/org/thp/cortex/controllers/UserCtrl.scala +++ b/app/org/thp/cortex/controllers/UserCtrl.scala @@ -210,9 +210,11 @@ class UserCtrl @Inject() ( } @Timed - def getKey(userId: String): Action[AnyContent] = authenticated(Roles.orgAdmin, Roles.superAdmin).async { implicit request ⇒ + def getKey(userId: String): Action[AnyContent] = authenticated().async { implicit request ⇒ for { _ ← checkUserOrganization(userId) + _ ← if (userId == request.userId || request.roles.contains(Roles.orgAdmin) || request.roles.contains(Roles.superAdmin)) Future.successful(()) + else Future.failed(AuthorizationError("You are not authorized to perform this operation")) key ← authSrv.getKey(userId) } yield Ok(key) } @@ -226,9 +228,11 @@ class UserCtrl @Inject() ( } @Timed - def renewKey(userId: String): Action[AnyContent] = authenticated(Roles.orgAdmin, Roles.superAdmin).async { implicit request ⇒ + def renewKey(userId: String): Action[AnyContent] = authenticated().async { implicit request ⇒ for { _ ← checkUserOrganization(userId) + _ ← if (userId == request.userId || request.roles.contains(Roles.orgAdmin) || request.roles.contains(Roles.superAdmin)) Future.successful(()) + else Future.failed(AuthorizationError("You are not authorized to perform this operation")) key ← authSrv.renewKey(userId) } yield Ok(key) } From 25a306665978c36216d77ed7c4d2167c01c1dc05 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Fri, 13 Apr 2018 15:01:05 +0200 Subject: [PATCH 11/12] #89 Add API key section to user settings page --- .../settings/settings.page.controller.js | 55 ++++++++++++++++++- www/src/app/pages/settings/settings.page.html | 30 ++++++++++ 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/www/src/app/pages/settings/settings.page.controller.js b/www/src/app/pages/settings/settings.page.controller.js index 9fd1a60e1..6afe4cb67 100644 --- a/www/src/app/pages/settings/settings.page.controller.js +++ b/www/src/app/pages/settings/settings.page.controller.js @@ -6,8 +6,10 @@ export default class SettingsPageController { $scope, $state, UserService, + ModalService, NotificationService, - resizeService + resizeService, + clipboard ) { 'ngInject'; @@ -16,8 +18,10 @@ export default class SettingsPageController { this.$state = $state; this.UserService = UserService; + this.ModalService = ModalService; this.NotificationService = NotificationService; this.resizeService = resizeService; + this.clipboard = clipboard; this.basicData = {}; this.passData = { @@ -26,6 +30,7 @@ export default class SettingsPageController { password: '', passwordConfirm: '' }; + this.keyData = {}; } $onInit() { @@ -41,6 +46,9 @@ export default class SettingsPageController { this.canChangePass = this.config.config.capabilities.indexOf('changePassword') !== -1; + this.canChangeKey = + this.config.config.capabilities.indexOf('authByKey') !== -1; + this.$scope.$watch('$ctrl.avatar', value => { if (!value) { return; @@ -93,7 +101,11 @@ export default class SettingsPageController { this.passData.password !== '' && this.passData.password === this.passData.passwordConfirm ) { - this.UserService.changePass(this.currentUser.id, this.passData.currentPassword, this.passData.password) + this.UserService.changePass( + this.currentUser.id, + this.passData.currentPassword, + this.passData.password + ) .then(() => { this.NotificationService.log( 'Your password has been successfully updated', @@ -134,4 +146,43 @@ export default class SettingsPageController { form.avatar.$setValidity('maxsize', true); form.avatar.$setPristine(true); } + + getKey() { + this.UserService.getKey(this.currentUser.id).then(key => { + this.keyData.key = key; + }); + } + + createKey() { + let modalInstance = this.ModalService.confirm( + 'Renew API Key', + 'Are you sure you want to renew your API Key?', + { + flavor: 'danger', + okText: 'Yes, renew it' + } + ); + + modalInstance.result + .then(() => this.UserService.setKey(this.currentUser.id)) + .then(() => { + delete this.keyData.key; + this.NotificationService.success( + 'API key has been successfully renewed.' + ); + }) + .catch(err => { + if (!_.isString(err)) { + this.NotificationService.error('Unable to lock the user.'); + } + }); + } + + copyKey() { + this.clipboard.copyText(this.keyData.key); + delete this.keyData.key; + this.NotificationService.success( + 'API key has been successfully copied to clipboard.' + ); + } } diff --git a/www/src/app/pages/settings/settings.page.html b/www/src/app/pages/settings/settings.page.html index 3cf8fa8f7..5d51b3c0d 100644 --- a/www/src/app/pages/settings/settings.page.html +++ b/www/src/app/pages/settings/settings.page.html @@ -127,6 +127,36 @@

+ +
+
+
+

API Key

+
+
+
+

You don't have any API key.

+

Please contact your organization's administrator.

+
+
+

You have an API key defined. You can renew it if needed.

+
+ + Renew + Reveal + + + + + +
+
+
+
+
+
From 4fd981fda21cce7657a0c4588ecd6115a44069ac Mon Sep 17 00:00:00 2001 From: To-om Date: Fri, 13 Apr 2018 15:08:41 +0200 Subject: [PATCH 12/12] Update changelog --- CHANGELOG.md | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43969d449..ba5c00fdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,27 @@ # Change Log -## [2.0.3](https://github.com/TheHive-Project/Cortex/tree/2.0.3) (2018-04-09) +## [2.0.4](https://github.com/TheHive-Project/Cortex/tree/2.0.4) (2018-04-13) +[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.0.3...2.0.4) + +**Implemented enhancements:** + +- Let a Read/Analyze User Display/Change their API Key [\#89](https://github.com/TheHive-Project/Cortex/issues/89) + +**Fixed bugs:** +- Strictly filter the list of analyzers in the run dialog [\#95](https://github.com/TheHive-Project/Cortex/issues/95) +- Updating users by orgAdmin users fails silently [\#94](https://github.com/TheHive-Project/Cortex/issues/94) +- Fix analyzer configurations icons [\#93](https://github.com/TheHive-Project/Cortex/issues/93) +- Wrong page redirection [\#92](https://github.com/TheHive-Project/Cortex/issues/92) +- Sort analyzers list by name [\#91](https://github.com/TheHive-Project/Cortex/issues/91) +- Cortex 2.0.3 docker container having cortex analyzer errors [\#90](https://github.com/TheHive-Project/Cortex/issues/90) +- Install python3 requirements for analyzers in public docker image [\#58](https://github.com/TheHive-Project/Cortex/issues/58) + +**Closed issues:** + +- Insufficient Rights To Perform This Action [\#87](https://github.com/TheHive-Project/Cortex/issues/87) + +## [2.0.3](https://github.com/TheHive-Project/Cortex/tree/2.0.3) (2018-04-09) [Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.0.2...2.0.3) **Implemented enhancements:**