Merge branch 'feature/indexFix' into develop-th4

TheHive-Project · Apr 9, 2021 · 7140dde · 7140dde
2 parents 53c022d + b685b77
commit 7140dde
Show file tree

Hide file tree

Showing 46 changed files with 961 additions and 772 deletions.
diff --git a/ScalliGraph b/ScalliGraph
diff --git a/conf/logback.xml b/conf/logback.xml
@@ -34,19 +34,12 @@
         <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"/>
+    <!-- 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" 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"/>
+
+    <logger name="org.thp.scalligraph.models" level="DEBUG"/>
+    <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/scripts/components/organisation/OrgCustomTagsListCmp.js b/frontend/app/scripts/components/organisation/OrgCustomTagsListCmp.js
@@ -43,9 +43,6 @@
                         pageSize: self.filtering.context.pageSize,
                         filter: this.filtering.buildQuery(),
                         operations: [
-                            {
-                                '_name': 'listTag'
-                            },
                             {
                                 '_name': 'freetags'
                             }
+3 −2		core-test/src/test/scala/org/thp/scalligraph/models/ModernQuery.scala
+8 −7		core/logback.xml
+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
+3 −11		core/src/main/scala/org/thp/scalligraph/models/Database.scala
+29 −11		core/src/main/scala/org/thp/scalligraph/models/Operation.scala
+10 −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
+16 −13		core/src/main/scala/org/thp/scalligraph/traversal/Graph.scala
+27 −10		core/src/main/scala/org/thp/scalligraph/traversal/TraversalOps.scala
+10 −11		core/src/main/scala/org/thp/scalligraph/traversal/TraversalPrinter.scala
+10 −5		core/src/main/scala/org/thp/scalligraph/utils/Retry.scala
+85 −1		database/janusgraph/src/main/java/org/thp/scalligraph/janus/strategies/JanusGraphAcceptNullStrategy.java
+91 −78		database/janusgraph/src/main/scala/org/thp/scalligraph/janus/IndexOps.scala
+3 −21		database/janusgraph/src/main/scala/org/thp/scalligraph/janus/JanusDatabase.scala