Merge branch 'hotfix/3.0.5'

TheHive-Project · Feb 8, 2018 · 11d72df · 11d72df
2 parents 1a347e4 + a501181
commit 11d72df
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## [3.0.5](https://github.com/TheHive-Project/TheHive/tree/3.0.5) (2018-02-08)
+[Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.0.4...3.0.5)
+
+**Fixed bugs:**
+
+ - Importing Template Button Non-Functional bug [\#404](https://github.com/TheHive-Project/TheHive/issues/404)
+ - No reports available for "domain" type bug [\#409](https://github.com/TheHive-Project/TheHive/issues/409)
+
 ## [3.0.4](https://github.com/TheHive-Project/TheHive/tree/3.0.4) (2018-02-05)
 [Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.0.3...3.0.4)
 
@@ -10,9 +18,7 @@
 - Make counts on Counter dashboard's widget clickable [\#455](https://github.com/TheHive-Project/TheHive/issues/455)
 - MISP feeds cause the growing of ES audit docs [\#450](https://github.com/TheHive-Project/TheHive/issues/450)
 - Case metrics sort  [\#418](https://github.com/TheHive-Project/TheHive/issues/418)
-- StreamSrv: Unexpected message : StreamNotFound [\#414](https://github.com/TheHive-Project/TheHive/issues/414)
 - Filter MISP Events Using MISP Tags & More Before Creating Alerts [\#370](https://github.com/TheHive-Project/TheHive/issues/370)
-- Single-Sign On support [\#354](https://github.com/TheHive-Project/TheHive/issues/354)
 - OAuth2 single sign-on implementation \(BE + FE\) [\#430](https://github.com/TheHive-Project/TheHive/pull/430) ([saibot94](https://github.com/saibot94))
 
 **Fixed bugs:**
@@ -28,7 +34,6 @@
 - Refresh custom fields on open cases by background changes [\#440](https://github.com/TheHive-Project/TheHive/issues/440)
 - Bug: Case metrics not shown when creating case from template [\#417](https://github.com/TheHive-Project/TheHive/issues/417)
 - Observable report taxonomies bug [\#409](https://github.com/TheHive-Project/TheHive/issues/409)
-- File upload when /tmp is full [\#321](https://github.com/TheHive-Project/TheHive/issues/321)
 
 **Closed issues:**
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -20,6 +20,6 @@ object Dependencies {
 
     val reflections = "org.reflections" % "reflections" % "0.9.11"
     val zip4j = "net.lingala.zip4j" % "zip4j" % "1.3.2"
-    val elastic4play = "org.cert-bdf" %% "elastic4play" % "1.4.3"
+    val elastic4play = "org.cert-bdf" %% "elastic4play" % "1.4.4"
   }
 }
diff --git a/ui/app/scripts/controllers/admin/AdminCaseTemplatesCtrl.js b/ui/app/scripts/controllers/admin/AdminCaseTemplatesCtrl.js
@@ -23,10 +23,22 @@
                 var result = [];
 
                 result = _.sortBy(_.map(customFields, function(definition, name){
+                    var fieldDef = self.fields[name];
+                    var type = fieldDef ? fieldDef.type : null;
+
+                    // The field doesn't exist, trying to find the field type from it's template value
+                    if(type === null) {
+                        var keys = _.without(_.keys(definition), 'order');
+                        if(keys.length > 0) {
+                            type = keys[0];
+                        }
+                    }
+
                     return {
                         name: name,
                         order: definition.order,
-                        value: definition[self.fields[name].type]
+                        value: fieldDef ? definition[type] : null,
+                        type: type
                     }
                 }), function(item){
                     return item.order;
@@ -248,10 +260,13 @@
                 self.template.customFields = {};
                 _.each(self.templateCustomFields, function(cf, index) {
                     var fieldDef = self.fields[cf.name];
-                    var value = (fieldDef.type === 'date' && cf.value) ? moment(cf.value).valueOf() : (cf.value || null)
+                    var value = null;
+                    if(fieldDef) {
+                        value = (fieldDef.type === 'date' && cf.value) ? moment(cf.value).valueOf() : (cf.value || null)
+                    }
 
                     self.template.customFields[cf.name] = {};
-                    self.template.customFields[cf.name][fieldDef.type] = value;
+                    self.template.customFields[cf.name][fieldDef ? fieldDef.type : cf.type] = value;
                     self.template.customFields[cf.name].order = index + 1;
                 });
 
@@ -320,11 +335,6 @@
                 modalInstance.result.then(function(template) {
                     return self.createTemplate(template);
                 })
-                .then(function(response) {
-                    self.getList(response.data.id);
-
-                    NotificationSrv.log('The template has been successfully imported', 'success');
-                })
                 .catch(function(err) {
                     if (err && err.status) {
                         NotificationSrv.error('TemplateCtrl', err.data, err.status);

diff --git a/ui/app/views/partials/observables/details/artifact-details-analysers.html b/ui/app/views/partials/observables/details/artifact-details-analysers.html
@@ -19,7 +19,7 @@ <h3 class="pv-xxs pr-xxs text-primary">
                         <a ng-if="jobs.length > 1" class="noline mr-xxs" href ng-click="analyzers[analyzerId].showRows = !analyzers[analyzerId].showRows">
                             <i class="fa" ng-class="{ true:'fa-minus-square-o', false:'fa-plus-square-o' }[analyzers[analyzerId].showRows]"></i>
                         </a>
-                        <span uib-tooltip="{{analyzer.description}}">{{analyzer.name}} {{analyzer.version}}</span>
+                        <span uib-tooltip="{{analyzer.description}}">{{analyzer.name ? (analyzer.name + ' ' + analyzer.version) : analyzerId}}</span>
                         <!-- <div class="text-muted">{{}}</div> -->
                     </td>
                     <!-- <td>

diff --git a/ui/bower.json b/ui/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "thehive",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "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": "3.0.4",
+    "version": "3.0.5",
     "license": "AGPL-3.0",
     "repository": {
         "type": "git",

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "3.0.4"
+version in ThisBuild := "3.0.5"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version in ThisBuild := "3.0.4"
		version in ThisBuild := "3.0.5"