Merge branch 'hotfix/3.0.8'

CHANGELOG.md

@@ -1,9 +1,25 @@
 # Change Log
 
+## [3.0.8](https://github.com/TheHive-Project/TheHive/tree/3.0.8) (2018-04-03)
+[Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.0.7...3.0.8)
+
+**Fixed bugs:**
+
+- Mini reports is not shown when Cortex 2 is used [\#526](https://github.com/TheHive-Project/TheHive/issues/526)
+- Session collision when TheHive & Cortex 2 share the same URL [\#525](https://github.com/TheHive-Project/TheHive/issues/525)
+- "Run all" in single observable context does not work [\#524](https://github.com/TheHive-Project/TheHive/issues/524)
+- Error on displaying analyzers name in report template admin page [\#523](https://github.com/TheHive-Project/TheHive/issues/523)
+- Job Analyzer is no longer named in 3.0.7 with Cortex2 [\#521](https://github.com/TheHive-Project/TheHive/issues/521)
+
+**Merged pull requests:**
+
+- Add ElasticSearch file descriptor limit to docker-compose.yml [\#505](https://github.com/TheHive-Project/TheHive/pull/505) ([flmsc](https://github.com/flmsc))
+
 ## [3.0.7](https://github.com/TheHive-Project/TheHive/tree/3.0.7) (2018-03-29)
 [Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.0.6...3.0.7)
 
 **Implemented enhancements:**
+
 - Delete Case [\#100](https://github.com/TheHive-Project/TheHive/issues/100)
 
 **Fixed bugs:**

docker/thehive/docker-compose.yml

@@ -11,6 +11,10 @@ services:
       - thread_pool.index.queue_size=100000
       - thread_pool.search.queue_size=100000
       - thread_pool.bulk.queue_size=100000
+    ulimits:
+      nofile:
+      soft: 65536
+      hard: 65536
   cortex:
     image: certbdf/cortex:latest
     depends_on:

thehive-backend/conf/reference.conf

@@ -5,9 +5,9 @@
 # HTTP filters
 play.filters {
   # name of cookie in which the CSRF token is transmitted to client
-  csrf.cookie.name = XSRF-TOKEN
+  csrf.cookie.name = THE-HIVE-XSRF-TOKEN
   # name of header in which the client should send CSRD token
-  csrf.header.name = X-XSRF-TOKEN
+  csrf.header.name = X-THe-HIVE-XSRF-TOKEN
 
   enabled = [
     services.StreamFilter,
@@ -22,7 +22,7 @@ play.http.errorHandler = org.elastic4play.ErrorHandler
 # Register module for dependency injection
 play.modules.enabled += global.TheHive
 
-
+play.http.session.cookieName = THE_HIVE_SESSION
 
 # ElasticSearch
 search {

thehive-cortex/app/connectors/cortex/services/CortexSrv.scala

@@ -251,7 +251,7 @@ class CortexSrv @Inject() (
                       for {
                         artifact ← artifactSrv.get(job.artifactId())
                         reports = Try(Json.parse(artifact.reports()).asOpt[JsObject]).toOption.flatten.getOrElse(JsObject.empty)
-                        newReports = reports + (job.analyzerId() → jobSummary)
+                        newReports = reports + (job.analyzerDefinition().getOrElse(job.analyzerId()) → jobSummary)
                       } yield artifactSrv.update(job.artifactId(), Fields.empty.set("reports", newReports.toString), ModifyConfig(retryOnConflict = 0, version = Some(artifact.version)))
                     }
                       .recover {

ui/app/scripts/app.js

@@ -332,6 +332,8 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ngSanitize', 'ui.bootstra
     .config(function($httpProvider) {
         'use strict';
 
+        $httpProvider.defaults.xsrfCookieName = 'THE-HIVE-XSRF-TOKEN';
+        $httpProvider.defaults.xsrfHeaderName = 'X-THE-HIVE-XSRF-TOKEN';
         $httpProvider.interceptors.push(function($rootScope, $q) {
             var isApiCall = function(url) {
                 return url && url.startsWith('./api') && !url.startsWith('./api/stream');

ui/app/scripts/controllers/admin/AdminReportTemplatesCtrl.js

@@ -120,9 +120,9 @@
         this.reportTypes = ['short', 'long'];
         this.editorOptions = {
             useWrapMode: true,
-            showGutter: true,
-            theme: 'default',
-            mode: 'xml'
+            showGutter: true
+            //theme: 'chrome',
+            //mode: 'xml'
         };
 
         this.formData = _.pick(reportTemplate, 'id', 'reportType', 'content');

ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js

@@ -203,7 +203,7 @@
                 var artifactName = $scope.artifact.data || $scope.artifact.attachment.name;
                 var analyzerIds = _.pluck(_.filter($scope.analyzers, function (a) {
                     return a.active === true;
-                }), 'id');
+                }), 'name');
 
                 CortexSrv.getServers(analyzerIds)
                     .then(function (serverId) {

ui/app/views/directives/flow/observable-job.html

@@ -1,16 +1,16 @@
 <div class="flow-observable-job">
-    <div class="flow-item-title wrap">        
+    <div class="flow-item-title wrap">
         <i class="glyphicon glyphicon-cog"></i>
         <span ng-if="!base.object.endDate">
-            Job: <em>{{base.object.analyzerId}}</em> started
+            Job: <em>{{base.object.analyzerName || base.object.analyzerId}}</em> started
         </span>
         <span ng-if="base.object.endDate">
-            Job <em>{{base.object.analyzerId}}</em> terminated
+            Job <em>{{base.object.analyzerName || base.object.analyzerId}}</em> terminated
         </span>
     </div>
     <div class="flow-item-updates wrap">
         <div>status: <em>{{base.object.status}}</em></div>
         <div>startDate: <em>{{base.object.startDate | showDate}}</em></div>
-        <div ng-if="base.object.endDate">endDate: <em>{{base.object.endDate | showDate}}</em></div>        
+        <div ng-if="base.object.endDate">endDate: <em>{{base.object.endDate | showDate}}</em></div>
     </div>
 </div>

ui/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "thehive",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "license": "AGPL-3.0",
   "dependencies": {
     "angular": "1.5.8",

ui/package.json

@@ -1,6 +1,6 @@
 {
     "name": "thehive",
-    "version": "3.0.7",
+    "version": "3.0.8",
     "license": "AGPL-3.0",
     "repository": {
         "type": "git",

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "3.0.7"
+version in ThisBuild := "3.0.8"