Merge branch 'release/3.1.1'

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [3.1.1](https://github.com/TheHive-Project/Cortex/milestone/28) (2021-03-01)
+
+**Implemented enhancements:**
+
+- [Improvement] Create logfile after installation [\#341](https://github.com/TheHive-Project/Cortex/issues/341)
+
+**Fixed bugs:**
+
+- [BUG] Certificate not taken into account when running neurons with process [\#317](https://github.com/TheHive-Project/Cortex/issues/317)
+- [Bug] Update doesn't work on Elasticsearch 7.11 [\#346](https://github.com/TheHive-Project/Cortex/issues/346)
+
 ## [3.1.0](https://github.com/TheHive-Project/Cortex/milestone/27) (2020-10-30)
 
 **Implemented enhancements:**

app/org/thp/cortex/models/Migration.scala

@@ -85,5 +85,6 @@ class Migration @Inject() (userSrv: UserSrv, organizationSrv: OrganizationSrv, w
         }
       )
     case DatabaseState(4) => Nil
+    case DatabaseState(5) => Nil
   }
 }

app/org/thp/cortex/models/package.scala

@@ -1,5 +1,5 @@
 package org.thp.cortex
 
 package object models {
-  val modelVersion = 5
+  val modelVersion = 6
 }

app/org/thp/cortex/services/ProcessJobRunnerSrv.scala

@@ -35,7 +35,9 @@ class ProcessJobRunnerSrv @Inject() (implicit val system: ActorSystem) {
     val baseDirectory = Paths.get(command).getParent.getParent
     val output        = StringBuilder.newBuilder
     logger.info(s"Execute $command in $baseDirectory, timeout is ${timeout.fold("none")(_.toString)}")
-    val process = Process(Seq(command, jobDirectory.toString), baseDirectory.toFile)
+    val cacertsFile = jobDirectory.resolve("input").resolve("cacerts")
+    val env         = if (Files.exists(cacertsFile)) Seq("REQUESTS_CA_BUNDLE" -> cacertsFile.toString) else Nil
+    val process = Process(Seq(command, jobDirectory.toString), baseDirectory.toFile, env: _*)
       .run(ProcessLogger { s =>
         logger.info(s"  Job ${job.id}: $s")
         output ++= s

package/debian/postinst

@@ -83,7 +83,8 @@ case "$1" in
 
     # Chown definitions created by SBT Native Packager
 
-    chown cortex:cortex /var/log/cortex
+    touch /var/log/cortex/application.log
+    chown -R cortex:cortex /var/log/cortex
     chown root:cortex /etc/cortex/application.conf /etc/cortex/logback.xml
     chmod 0640 /etc/cortex/application.conf /etc/cortex/logback.xml
 

package/docker/entrypoint

@@ -137,6 +137,7 @@ fi
 
 echo config file is:
 cat "$CONFIG_FILE"
+touch /var/log/cortex/application.log
 chown -R "$DAEMON_USER" /var/log/cortex
 chown -R "$DAEMON_USER" /etc/cortex
 chown -R "$DAEMON_USER" "$CONFIG_FILE"

package/rpm/post

@@ -0,0 +1,3 @@
+mkdir -p /var/log/cortex
+touch /var/log/cortex/application.log
+chown -R cortex:cortex /var/log/cortex

project/Dependencies.scala

@@ -18,7 +18,7 @@ object Dependencies {
 
   val reflections      = "org.reflections"     % "reflections"         % "0.9.11"
   val zip4j            = "net.lingala.zip4j"   % "zip4j"               % "1.3.2"
-  val elastic4play     = "org.thehive-project" %% "elastic4play"       % "1.12.3"
+  val elastic4play     = "org.thehive-project" %% "elastic4play"       % "1.13.1"
   val dockerClient     = "com.spotify"         % "docker-client"       % "8.14.4"
   val akkaCluster      = "com.typesafe.akka"   %% "akka-cluster"       % play.core.PlayVersion.akkaVersion
   val akkaClusterTyped = "com.typesafe.akka"   %% "akka-cluster-typed" % play.core.PlayVersion.akkaVersion

rpm.sbt

@@ -26,7 +26,7 @@ rpmRequirements += "java-1.8.0-openjdk-headless"
 
 maintainerScripts in Rpm := maintainerScriptsFromDirectory(
   baseDirectory.value / "package" / "rpm",
-  Seq(RpmConstants.Pre, RpmConstants.Preun, RpmConstants.Postun)
+  Seq(RpmConstants.Pre, RpmConstants.Preun, RpmConstants.Post, RpmConstants.Postun)
 )
 
 linuxPackageSymlinks in Rpm := Nil

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "3.1.0-1"
+version in ThisBuild := "3.1.1-1"

www/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cortex",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "A powerfull observable analysis engine",
   "license": "AGPL-3.0-or-later",
   "homepage": "https://github.com/TheHive-Project/Cortex",

www/src/app/components/about/about.html

@@ -1,7 +1,7 @@
 <div class="modal-header bg-primary">
   <h3 class="modal-title">About</h3>
 </div>
-<div class="modal-body">  
+<div class="modal-body">
   <div class="pv-s text-center">
     <img alt="Cortex" height="50" src="../../../assets/images/logo-dark.svg" />
   </div>
@@ -20,8 +20,10 @@ <h3 class="modal-title">About</h3>
   </div>
   <div class="row mt-s">
     <div class="col-md-12 text-center">
-      <div>Copyright (C) 2014-2020 Thomas Franco, Saâd Kadhi, Jérôme Leonard</div>
-      <div>Copyright (C) 2017-2020 Nabil Adouani</div>
+        <strong>
+          <a href="https://thehive-project.org" target="_blank">TheHive Project</a> 2016-2021,
+          <a href="https://www.gnu.org/licenses/agpl-3.0.en.html" target="_blank">AGPL-V3</a>
+        </strong>
     </div>
   </div>
 
@@ -32,4 +34,4 @@ <h3 class="modal-title">About</h3>
       Close
     </div>
   </div>
-</div>
+</div>

www/src/app/components/footer/footer.html

@@ -4,8 +4,8 @@
   </div>
   <div>
     <strong>
-      <a href="http://www.thehive-project.org" target="_blank">TheHive Project</a> 2016-2020,
+      <a href="http://www.thehive-project.org" target="_blank">TheHive Project</a> 2016-2021,
       <a href="https://www.gnu.org/licenses/agpl-3.0.en.html" target="_blank">AGPL-V3</a>
     </strong>
   </div>
-</div>
+</div>

www/src/app/core/services/common/StreamService.js

@@ -130,12 +130,11 @@ export default function (app) {
           // Initialize the stream;
           this.isPolling = false;
 
+          if (err.status === 401) {
+            return;
+          }
           if (err.status !== 404) {
             NotificationService.error('StreamSrv', err.data, err.status);
-
-            if (err.status === 401) {
-              return;
-            }
           }
 
           this.init();
@@ -181,4 +180,4 @@ export default function (app) {
   }
 
   app.service('StreamSrv', StreamSrv);
-}
+}