Merge branch 'hotfix/3.0.1'

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.0"
+    val elastic4play = "org.cert-bdf" %% "elastic4play" % "1.4.1"
   }
 }

thehive-backend/app/models/Migration.scala

@@ -1,6 +1,6 @@
 package models
 
-import java.nio.file.{ Files, Path, Paths }
+import java.nio.file.{ Files, Path }
 import java.util.Date
 import javax.inject.{ Inject, Singleton }
 
@@ -11,7 +11,7 @@ import scala.util.Try
 
 import play.api.libs.json.JsValue.jsValueToJsLookup
 import play.api.libs.json._
-import play.api.{ Configuration, Logger }
+import play.api.{ Configuration, Environment, Logger }
 
 import akka.NotUsed
 import akka.stream.Materializer
@@ -35,6 +35,7 @@ class Migration(
     eventSrv: EventSrv,
     dashboardSrv: DashboardSrv,
     userSrv: UserSrv,
+    environment: Environment,
     implicit val ec: ExecutionContext,
     implicit val materializer: Materializer) extends MigrationOperations {
   @Inject() def this(
@@ -43,6 +44,7 @@ class Migration(
       eventSrv: EventSrv,
       dashboardSrv: DashboardSrv,
       userSrv: UserSrv,
+      environment: Environment,
       ec: ExecutionContext,
       materializer: Materializer) = {
     this(
@@ -54,6 +56,7 @@ class Migration(
       eventSrv,
       dashboardSrv,
       userSrv,
+      environment,
       ec, materializer)
   }
 
@@ -85,7 +88,7 @@ class Migration(
 
   private def addDashboards(version: Int): Future[Unit] = {
     userSrv.inInitAuthContext { implicit authContext ⇒
-      val dashboardsPath = Paths.get("migration").resolve(version.toString).resolve("dashboards")
+      val dashboardsPath = environment.rootPath.toPath.resolve("migration").resolve("12").resolve("dashboards")
       val dashboards = for {
         dashboardFile ← Try(Files.newDirectoryStream(dashboardsPath, "*.json").asScala).getOrElse(Nil)
         if Files.isReadable(dashboardFile)

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

@@ -8,7 +8,7 @@
 
             this.caze = caze;
             this.mode = '';
-            this.servers = config.servers; // TODO Nabil
+            this.servers = config.servers;
             this.failures = [];
 
             this.existingExports = {};
@@ -49,8 +49,8 @@
             this.export = function(server) {
                 self.loading = true;
                 self.failures = [];
-
-                MispSrv.export(self.caze.id, server)
+                
+                MispSrv.export(self.caze.id, server.name)
                 .then(function(response){
                     var success = 0,
                         failure = 0;

ui/bower.json

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

ui/package.json

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

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "3.0.0"
+version in ThisBuild := "3.0.1"