Merge branch 'release/4.1.3' into main

TheHive-Project · Apr 12, 2021 · df2b128 · df2b128
2 parents 0074446 + 044aa41
commit df2b128
Show file tree

Hide file tree

Showing 100 changed files with 2,674 additions and 1,878 deletions.
diff --git a/.github/ISSUE_TEMPLATE/thehive4_feature_request.md b/.github/ISSUE_TEMPLATE/thehive4_feature_request.md
@@ -1,7 +1,7 @@
 ---
 name: Feature Request for TheHive4
 about: Create a feature request for TheHive 4.
-title: "[Bug]"
+title: "[Feature Request]"
 labels: feature request, TheHive4
 assignees: ''
 ---

diff --git a/.gitignore b/.gitignore
@@ -43,3 +43,5 @@ tmp
 .bloop/
 .metals/
 metals.sbt
+
+.jvmopts
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Change Log
 
+## [4.1.3](https://github.com/TheHive-Project/TheHive/milestone/72) (2021-04-12)
+
+**Implemented enhancements:**
+
+- [Improvement] Cleanup deprecated filter usage [\#1922](https://github.com/TheHive-Project/TheHive/issues/1922)
+- [Improvement] Make the property "Imported" in alerts optimised for index [\#1923](https://github.com/TheHive-Project/TheHive/issues/1923)
+- [Feature Request] Display case templates in alphabetic order in "New case" menu [\#1925](https://github.com/TheHive-Project/TheHive/issues/1925)
+- [Enhancement] Prevent the application to start if database initialisation fails [\#1935](https://github.com/TheHive-Project/TheHive/issues/1935)
+- [Enhancement] Improve performance [\#1946](https://github.com/TheHive-Project/TheHive/issues/1946)
+- [Enhancement] Remove blocking queries in some UI pages [\#1948](https://github.com/TheHive-Project/TheHive/issues/1948)
+- [Enhancement] Use polluingDuration config from the UI [\#1951](https://github.com/TheHive-Project/TheHive/issues/1951)
+- [Enhancement] Disable confirm buttons in import dialogs [\#1953](https://github.com/TheHive-Project/TheHive/issues/1953)
+- [Enhancement] Add environment file in service [\#1954](https://github.com/TheHive-Project/TheHive/issues/1954)
+
+**Fixed bugs:**
+
+- [Bug] Add "Not assigned" to Assignee field on task page for tasks without an assigned user [\#1508](https://github.com/TheHive-Project/TheHive/issues/1508)
+- [Bug] (Still) slow loading of list-tags endpoint with 4.1.2 [\#1914](https://github.com/TheHive-Project/TheHive/issues/1914)
+- [Bug] Aggregation on custom fields provides incorect result [\#1921](https://github.com/TheHive-Project/TheHive/issues/1921)
+- [Bug] Very slow load of Case Task list in UI in 4.1.2 [\#1927](https://github.com/TheHive-Project/TheHive/issues/1927)
+- [Bug] Task "Take" Button not working [\#1931](https://github.com/TheHive-Project/TheHive/issues/1931)
+- [Bug] Cluster: new nodes fail to start when the oldest node has been restarted [\#1934](https://github.com/TheHive-Project/TheHive/issues/1934)
+- [Bug] Index status page is very slow [\#1936](https://github.com/TheHive-Project/TheHive/issues/1936)
+- [Bug] Update of color in tags [\#1950](https://github.com/TheHive-Project/TheHive/issues/1950)
+
 ## [4.1.2](https://github.com/TheHive-Project/TheHive/milestone/71) (2021-03-29)
 
 **Implemented enhancements:**

diff --git a/ScalliGraph b/ScalliGraph
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import Dependencies._
 import com.typesafe.sbt.packager.Keys.bashScriptDefines
 import org.thp.ghcl.Milestone
 
-val thehiveVersion         = "4.1.2-1"
+val thehiveVersion         = "4.1.3-1"
 val scala212               = "2.12.13"
 val scala213               = "2.13.1"
 val supportedScalaVersions = List(scala212, scala213)

diff --git a/conf/logback.xml b/conf/logback.xml
@@ -34,18 +34,13 @@
         <appender-ref ref="STDOUT"/>
     </appender>
 
-    <logger name="org.thp.scalligraph.models" level="TRACE"/>
-    <logger name="org.thp.scalligraph.traversal" level="TRACE"/>
-    <logger name="org.thp.thehive.services.StreamSrv" level="INFO"/>
-    <logger name="org.thp.thehive.services.StreamActor" level="INFO"/>
-    <!--
-    <logger name="org.janusgraph.graphdb" level="INFO" />
-    <logger name="org.thp.thehive.client" level="DEBUG" />
-    <logger name="org.thp.thehive.services.LocalAuthSrv" level="TRACE" />
-    <logger name="org.thp.scalligraph.graphql" level="TRACE" />
-    <logger name="org.janusgraph.graphdb.transaction.StandardJanusGraphTx" level="ERROR" />
-    -->
-    <logger name="org.thp.thehive" level="TRACE"/>
+    <!-- do not set the following logger to TRACE -->
+    <logger name="org.thp.scalligraph.traversal" level="INFO"/>
+    <logger name="org.reflections8.Reflections" level="ERROR" />
+    <logger name="org.janusgraph.graphdb.database.IndexSerializer" level="ERROR"/>
+
+    <logger name="org.thp.scalligraph.models" level="INFO"/>
+    <logger name="org.thp" level="INFO"/>
 
     <root level="INFO">
         <appender-ref ref="ASYNCFILE"/>

diff --git a/.../src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/CortexQueryExecutor.scala b/.../src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/CortexQueryExecutor.scala
@@ -5,6 +5,7 @@ import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.controllers.FieldsParser
 import org.thp.scalligraph.models._
 import org.thp.scalligraph.query._
+import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
 import org.thp.scalligraph.traversal.Traversal
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{BadRequestError, EntityIdOrName}
@@ -18,7 +19,8 @@ import javax.inject.{Inject, Singleton}
 import scala.reflect.runtime.{universe => ru}
 
 @Singleton
-class CortexQueryExecutor @Inject() (implicit
+class CortexQueryExecutor @Inject() (
+    appConfig: ApplicationConfig,
     override val db: Database,
     job: PublicJob,
     report: PublicAnalyzerTemplate,
@@ -27,6 +29,9 @@ class CortexQueryExecutor @Inject() (implicit
 ) extends QueryExecutor {
   lazy val controllers: List[PublicData] = action :: report :: job :: analyzerTemplate :: Nil
 
+  val limitedCountThresholdConfig: ConfigItem[Long, Long] = appConfig.item[Long]("query.limitedCountThreshold", "Maximum number returned by a count")
+  override val limitedCountThreshold: Long                = limitedCountThresholdConfig.get
+
   override lazy val publicProperties: PublicProperties = controllers.map(_.publicProperties).reduce(_ ++ _)
 
   override lazy val queries: Seq[ParamQuery[_]] =

diff --git a/frontend/app/index.html b/frontend/app/index.html
@@ -140,6 +140,7 @@
     <script src="scripts/components/charts/donut-chart.component.js"></script>
     <script src="scripts/components/common/custom-field-input.component.js"></script>
     <script src="scripts/components/common/custom-field-labels.component.js"></script>
+    <script src="scripts/components/common/datalist-header.component.js"></script>
     <script src="scripts/components/common/observable-flags.component.js"></script>
     <script src="scripts/components/common/tag.component.js"></script>
     <script src="scripts/components/common/task-flags.component.js"></script>
@@ -284,6 +285,7 @@
     <script src="scripts/filters/flattern-object.js"></script>
     <script src="scripts/filters/getField.js"></script>
     <script src="scripts/filters/hash-type.js"></script>
+    <script src="scripts/filters/limited-count.js"></script>
     <script src="scripts/filters/md5.js"></script>
     <script src="scripts/filters/offset.js"></script>
     <script src="scripts/filters/order-object-by.js"></script>
+3 −2		core-test/src/test/scala/org/thp/scalligraph/models/ModernQuery.scala
+8 −7		core/logback.xml
+24 −24		core/src/main/scala/org/thp/scalligraph/ContextPropagatingDisptacher.scala
+3 −0		core/src/main/scala/org/thp/scalligraph/EntityId.scala
+2 −1		core/src/main/scala/org/thp/scalligraph/ErrorHandler.scala
+13 −0		core/src/main/scala/org/thp/scalligraph/macro/TraversalMacro.scala
+6 −12		core/src/main/scala/org/thp/scalligraph/models/Database.scala
+44 −21		core/src/main/scala/org/thp/scalligraph/models/Operation.scala
+8 −0		core/src/main/scala/org/thp/scalligraph/query/Query.scala
+3 −1		core/src/main/scala/org/thp/scalligraph/query/QueryExecutor.scala
+1 −1		core/src/main/scala/org/thp/scalligraph/services/VertexSrv.scala
+40 −17		core/src/main/scala/org/thp/scalligraph/traversal/Graph.scala
+36 −10		core/src/main/scala/org/thp/scalligraph/traversal/TraversalOps.scala
+12 −12		core/src/main/scala/org/thp/scalligraph/traversal/TraversalPrinter.scala
+41 −13		core/src/main/scala/org/thp/scalligraph/utils/Retry.scala
+85 −1		database/janusgraph/src/main/java/org/thp/scalligraph/janus/strategies/JanusGraphAcceptNullStrategy.java
+1 −2		database/janusgraph/src/main/resources/play/reference-overrides.conf
+92 −78		database/janusgraph/src/main/scala/org/thp/scalligraph/janus/IndexOps.scala
+172 −26		database/janusgraph/src/main/scala/org/thp/scalligraph/janus/JanusClusterManagerActor.scala
+24 −12		database/janusgraph/src/main/scala/org/thp/scalligraph/janus/JanusClusterSerializer.scala
+34 −50		database/janusgraph/src/main/scala/org/thp/scalligraph/janus/JanusDatabase.scala
+36 −14		database/janusgraph/src/main/scala/org/thp/scalligraph/janus/JanusDatabaseProvider.scala