Merge branch 'release/3.5.1'

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## [3.5.1](https://github.com/TheHive-Project/TheHive/milestone/65) (2021-03-01)
+
+**Fixed bugs:**
+
+- [Bug] Init Script Syntax Error in Bash Switch-Case [\#1646](https://github.com/TheHive-Project/TheHive/issues/1646)
+- [Bug] Issues with case attachments section [\#1651](https://github.com/TheHive-Project/TheHive/issues/1651)
+- [Bug] Fix the severity component [\#1654](https://github.com/TheHive-Project/TheHive/issues/1654)
+- [Bug] Display problem TH [\#1688](https://github.com/TheHive-Project/TheHive/issues/1688)
+- [Bug] Update doesn't work on Elasticsearch 7.11 [\#1799](https://github.com/TheHive-Project/TheHive/issues/1799)
+
+## [3.4.4](https://github.com/TheHive-Project/TheHive/milestone/63) (2020-10-30)
+
+**Fixed bugs:**
+
+- [Security] Update Playframework [\#1604](https://github.com/TheHive-Project/TheHive/issues/1604)
+
 ## [3.5.0](https://github.com/TheHive-Project/TheHive/milestone/61) (2020-10-29)
 
 **Implemented enhancements:**

build.sbt

@@ -56,7 +56,6 @@ lazy val thehiveCortex = (project in file("thehive-cortex"))
 
 lazy val thehive = (project in file("."))
   .enablePlugins(PlayScala /*, PlayAkkaHttp2Support*/ )
-  .enablePlugins(Bintray)
   .dependsOn(thehiveBackend, thehiveMisp, thehiveCortex)
   .aggregate(thehiveBackend, thehiveMisp, thehiveCortex)
   .settings(projectSettings)
@@ -85,31 +84,14 @@ lazy val rpmPackageRelease = (project in file("package/rpm-release"))
         |GPG key as well as configuration for yum.""".stripMargin,
     linuxPackageMappings in Rpm := Seq(
       packageMapping(
-        file("PGP-PUBLIC-KEY")                       → "etc/pki/rpm-gpg/GPG-TheHive-Project",
-        file("package/rpm-release/thehive-rpm.repo") → "/etc/yum.repos.d/thehive-rpm.repo",
-        file("LICENSE")                              → "/usr/share/doc/thehive-project-release/LICENSE"
+        file("PGP-PUBLIC-KEY")                       -> "etc/pki/rpm-gpg/GPG-TheHive-Project",
+        file("package/rpm-release/thehive-rpm.repo") -> "/etc/yum.repos.d/thehive-rpm.repo",
+        file("LICENSE")                              -> "/usr/share/doc/thehive-project-release/LICENSE"
       )
     )
   )
 
-rpmReleaseFile := {
-  import scala.sys.process._
-  val rpmFile = (packageBin in Rpm in rpmPackageRelease).value
-  Process(
-    "rpm" ::
-      "--define" :: "_gpg_name TheHive Project" ::
-      "--define" :: "_signature gpg" ::
-      "--define" :: "__gpg_check_password_cmd /bin/true" ::
-      "--define" :: "__gpg_sign_cmd %{__gpg} gpg --batch --no-verbose --no-armor --use-agent --no-secmem-warning -u \"%{_gpg_name}\" -sbo %{__signature_filename} %{__plaintext_filename}" ::
-      "--addsign" :: rpmFile.toString ::
-      Nil
-  ).!!
-  rpmFile
-}
-
-milestoneFilter := ((milestone: Milestone) ⇒ milestone.title.head < '4')
-
-bintrayOrganization := Some("thehive-project")
+milestoneFilter := ((milestone: Milestone) => milestone.title.head < '4')
 
 // Front-end //
 run := {
@@ -123,11 +105,3 @@ packageBin := {
   (packageBin in Debian).value
   (packageBin in Rpm).value
 }
-
-publish := {
-  (publish in Docker).value
-  publishRelease.value
-  publishLatest.value
-  publishRpm.value
-  publishDebian.value
-}

conf/application.sample

@@ -245,3 +245,14 @@ misp {
   #  purpose = ImportAndExport
   #} ## <-- Uncomment to complete the configuration
 }
+
+misp-thread-pool {
+  fork-join-executor {
+    # Min number of threads available for MISP synchronization
+    parallelism-min = 2
+    # Parallelism (threads) ... ceil(available processors * factor)
+    parallelism-factor = 2.0
+    # Max number of threads available for MISP synchronization
+    parallelism-max = 4
+  }
+}

package/debian/postinst

@@ -82,8 +82,8 @@ case "$1" in
     addUser thehive "" thehive "thehive daemon-user" "/bin/false"
 
     # Chown definitions created by SBT Native Packager
-
-    chown thehive:thehive /var/log/thehive
+    touch /var/log/thehive/application.log
+    chown -R thehive:thehive /var/log/thehive
     chown root:thehive /etc/thehive/application.conf /etc/thehive/logback.xml
     chmod 0640 /etc/thehive/application.conf /etc/thehive/logback.xml
     mkdir -p /opt/thehive/conf

package/docker/Dockerfile

@@ -55,6 +55,7 @@ RUN apt update && \
   mkdir /etc/thehive && \
   cp /opt/thehive/conf/logback.xml /etc/thehive/logback.xml && \
   chown -R root:root /opt/thehive && \
+  touch /var/log/thehive/application.log && \
   chown -R thehive:thehive /var/log/thehive /etc/thehive && \
   chmod +x /opt/thehive/entrypoint
 

package/thehive

@@ -42,10 +42,13 @@ check_requirements() {
   INIT=$(readlink /proc/1/exe 2> /dev/null)
   case ${INIT} in
     *systemd*)
-      echo echo "Your are using systemd. This script should not be used"
+      echo  "Your are using systemd. This script should not be used"
+      return 1
+      ;;
     *upstart*)
-      echo echo "Your are using upstart. This script should not be used"
-      return 1;;
+      echo  "Your are using upstart. This script should not be used"
+      return 1
+      ;;
   esac
   return 0
 }

project/Dependencies.scala

@@ -19,7 +19,7 @@ object Dependencies {
 
     val reflections      = "org.reflections"     % "reflections"         % "0.9.11"
     val zip4j            = "net.lingala.zip4j"   % "zip4j"               % "2.6.0"
-    val elastic4play     = "org.thehive-project" %% "elastic4play"       % "1.12.3"
+    val elastic4play     = "org.thehive-project" %% "elastic4play"       % "1.13.1"
     val akkaCluster      = "com.typesafe.akka"   %% "akka-cluster"       % play.core.PlayVersion.akkaVersion
     val akkaClusterTyped = "com.typesafe.akka"   %% "akka-cluster-typed" % play.core.PlayVersion.akkaVersion
     val akkaClusterTools = "com.typesafe.akka"   %% "akka-cluster-tools" % play.core.PlayVersion.akkaVersion

project/plugins.sbt

@@ -2,6 +2,5 @@
 logLevel := Level.Info
 
 addSbtPlugin("com.typesafe.play"   % "sbt-plugin"           % "2.8.3")
-addSbtPlugin("org.foundweekends"   % "sbt-bintray"          % "0.5.1")
 addSbtPlugin("org.scalameta"       % "sbt-scalafmt"         % "2.3.0")
 addSbtPlugin("org.thehive-project" % "sbt-github-changelog" % "0.3.0")