Merge branch 'release/4.0.0-RC3' into master-th4

CHANGELOG.md

@@ -38,6 +38,8 @@
 - [Bug] Search link to observable does not work [\#1365](https://github.com/TheHive-Project/TheHive/issues/1365)
 - [Bug] Unable to vienw analysis report from observable list [\#1366](https://github.com/TheHive-Project/TheHive/issues/1366)
 - [Bug] MISP export succeeds but show an error message [\#1367](https://github.com/TheHive-Project/TheHive/issues/1367)
+- [Bug] rc3 migration script failure [\#1369](https://github.com/TheHive-Project/TheHive/issues/1369)
+- [Bug] set HTTP redirect correctly when behind a reverse proxy  [\#1370](https://github.com/TheHive-Project/TheHive/issues/1370)
 
 ## [4.0.0-RC2](https://github.com/TheHive-Project/TheHive/milestone/54) (2020-05-07)
 

build.sbt

@@ -2,7 +2,7 @@ import Dependencies._
 import com.typesafe.sbt.packager.Keys.bashScriptDefines
 import org.thp.ghcl.Milestone
 
-val thehiveVersion         = "4.0.0-RC3-2"
+val thehiveVersion         = "4.0.0-RC3-3"
 val scala212               = "2.12.11"
 val scala213               = "2.13.1"
 val supportedScalaVersions = List(scala212, scala213)
@@ -60,6 +60,10 @@ libraryDependencies in ThisBuild ++= {
     case _                       => compilerPlugin(macroParadise) :: Nil
   }
 }
+dependencyOverrides in ThisBuild ++= Seq(
+  "org.locationtech.spatial4j" % "spatial4j"                 % "0.6",
+  "org.elasticsearch.client"   % "elasticsearch-rest-client" % "6.7.2"
+)
 PlayKeys.includeDocumentationInBinary := false
 milestoneFilter := ((milestone: Milestone) => milestone.title.startsWith("4"))
 
@@ -311,10 +315,6 @@ lazy val thehiveMigration = (project in file("migration"))
       scopt,
       specs % Test
     ),
-    dependencyOverrides ++= Seq(
-      "org.locationtech.spatial4j" % "spatial4j"                 % "0.6",
-      "org.elasticsearch.client"   % "elasticsearch-rest-client" % "6.7.2"
-    ),
     fork := true,
     normalizedName := "migrate",
     mainClass := None

thehive/app/org/thp/thehive/TheHiveRouter.scala

@@ -3,8 +3,7 @@ package org.thp.thehive
 import play.api.mvc._
 import play.api.routing.sird._
 import play.api.routing.{Router, SimpleRouter}
-import play.api.{Environment, Logger, Mode}
-
+import play.api.{Configuration, Environment, Logger, Mode}
 import _root_.controllers.{Assets, ExternalAssets}
 import com.google.inject.ProvidedBy
 import javax.inject.{Inject, Provider, Singleton}
@@ -16,7 +15,8 @@ class TheHiveRouter @Inject() (
     routerV1: v1.Router,
     davRouter: dav.Router,
     assets: AssetGetter,
-    actionBuilder: DefaultActionBuilder
+    actionBuilder: DefaultActionBuilder,
+    configuration: Configuration
 ) extends Provider[Router] {
 
   lazy val logger: Logger = Logger(getClass)
@@ -25,7 +25,7 @@ class TheHiveRouter @Inject() (
     routerV0.withPrefix("/api/") orElse // default version
     davRouter.withPrefix("/fs") orElse
     SimpleRouter {
-      case GET(p"/")                                   => actionBuilder(Results.PermanentRedirect("/index.html"))
+      case GET(p"/")                                   => actionBuilder(Results.PermanentRedirect(configuration.get[String]("play.http.context").stripSuffix("/") + "/index.html"))
       case GET(p"/$file*") if !file.startsWith("api/") => assets.at(file)
     }
 }