Merge branch 'hotfix/2.13.2'

TheHive-Project · Oct 24, 2017 · 68e99fd · 68e99fd
2 parents 01ef4c0 + 254f5ce
commit 68e99fd
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log
 
+## [2.13.2](https://github.com/CERT-BDF/TheHive/tree/2.13.2) (2017-10-24)
+
+[Full Changelog](https://github.com/CERT-BDF/TheHive/compare/2.13.1...2.13.2)
+
+**Fixed bugs:**
+
+- Security issue on Play 2.6.5 [\#356](https://github.com/CERT-BDF/TheHive/issues/356)
+- Incorrect stats: non-IOC observables counted as IOC and IOC word displayed twice [\#347](https://github.com/CERT-BDF/TheHive/issues/347)
+- Deleted Observables, Show up on the statistics tab under Observables by Type [\#343](https://github.com/CERT-BDF/TheHive/issues/343)
+- Statistics on metrics doesn't work [\#342](https://github.com/CERT-BDF/TheHive/issues/342)
+- Error on custom fields format when merging cases [\#331](https://github.com/CERT-BDF/TheHive/issues/331)
+
 ## [2.13.1](https://github.com/CERT-BDF/TheHive/tree/2.13.1) (2017-09-18)
 [Full Changelog](https://github.com/CERT-BDF/TheHive/compare/2.13.0...2.13.1)
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -32,6 +32,6 @@ object Dependencies {
     val reflections = "org.reflections" % "reflections" % "0.9.11"
     val zip4j = "net.lingala.zip4j" % "zip4j" % "1.3.2"
     val akkaTest = "com.typesafe.akka" %% "akka-stream-testkit" % "2.5.4"
-    val elastic4play = "org.cert-bdf" %% "elastic4play" % "1.3.1"
+    val elastic4play = "org.cert-bdf" %% "elastic4play" % "1.3.2"
   }
 }
diff --git a/thehive-backend/app/models/Migration.scala b/thehive-backend/app/models/Migration.scala
@@ -237,6 +237,7 @@ class Migration(
           val customFields = (caze \ "customFields").asOpt[JsObject].getOrElse(JsObject(Nil))
           caze + ("metrics" → metrics) + ("customFields" → customFields)
         })
+    case DatabaseState(10) ⇒ Nil
   }
 
   private val requestCounter = new java.util.concurrent.atomic.AtomicInteger(0)

diff --git a/thehive-backend/app/models/package.scala b/thehive-backend/app/models/package.scala
@@ -1,5 +1,5 @@
 
 
 package object models {
-  val modelVersion = 10
+  val modelVersion = 11
 }
diff --git a/thehive-backend/app/services/CaseMergeSrv.scala b/thehive-backend/app/services/CaseMergeSrv.scala
@@ -123,12 +123,12 @@ class CaseMergeSrv @Inject() (
       customFieldsObject ← caze.customFields().asOpt[JsObject]
     } yield customFieldsObject
 
-    val mergedCustomFieldsObject: Seq[(String, JsValue)] = customFields.flatMap(_.keys).distinct.map { key ⇒
+    val mergedCustomFieldsObject: Seq[(String, JsValue)] = customFields.flatMap(_.keys).distinct.flatMap { key ⇒
       val customFieldsValues = customFields.flatMap(cf ⇒ (cf \ key).asOpt[JsObject]).distinct
       if (customFieldsValues.size != 1)
-        key → JsNull
+        None
       else
-        key → customFieldsValues.head
+        Some(key → customFieldsValues.head)
     }
 
     JsObject(mergedCustomFieldsObject)

diff --git a/ui/app/scripts/controllers/StatisticsCtrl.js b/ui/app/scripts/controllers/StatisticsCtrl.js
@@ -128,7 +128,8 @@
             type: 'case_artifact',
             field: 'dataType',
             dateField: 'startDate',
-            tagsField: 'tags'
+            tagsField: 'tags',
+            filter: {status: 'Ok'}
         };
 
         $scope.observableByIoc = {
@@ -138,9 +139,10 @@
             dateField: 'startDate',
             tagsField: 'tags',
             names: {
-                '0': 'NOT IOC',
-                '1': 'IOC'
-            }
+                'false': 'NOT IOC',
+                'true': 'IOC'
+            },
+            filter: {status: 'Ok'}
         };
 
         $scope.observableOverTime = {
@@ -154,7 +156,8 @@
             },
             types: {
                 startDate: 'bar'
-            }
+            },
+            filter: {status: 'Ok'}
         };
 
         $scope.setTagsAggregator = function(aggregator) {

diff --git a/ui/app/views/partials/observables/list/mini-stats.html b/ui/app/views/partials/observables/list/mini-stats.html
@@ -24,9 +24,9 @@ <h4>Statistics</h4>
             <div class="panel-body">
                 <table class="table table-condensed">
                     <tr ng-repeat="item in statsCtrl.byIoc.details">
-                        <td class="active">{{(item.key === '0') ? 'Not IOC' : 'IOC' }}</td>
+                        <td class="active">{{(item.key === 'false') ? 'Not IOC' : 'IOC' }}</td>
                         <td>
-                            <a href ng-click="addFilterValue('ioc', item.key === '0' ? false : true)">{{item.count}}</a>
+                            <a href ng-click="addFilterValue('ioc', item.key === 'false' ? false : true)">{{item.count}}</a>
                         </td>
                     </tr>
                 </table>

diff --git a/ui/bower.json b/ui/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "thehive",
-  "version": "2.13.1",
+  "version": "2.13.2",
   "license": "AGPL-3.0",
   "dependencies": {
     "angular": "1.5.8",

diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "thehive",
-    "version": "2.13.1",
+    "version": "2.13.2",
     "license": "AGPL-3.0",
     "repository": {
         "type": "git",

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "2.13.1"
+version in ThisBuild := "2.13.2"