#1861 Remove whole text index on potential large text field

TheHive-Project · Mar 22, 2021 · dfc13e5 · dfc13e5
1 parent a9242e4
commit dfc13e5
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 9 deletions.
diff --git a/ScalliGraph b/ScalliGraph
diff --git a/thehive/app/org/thp/thehive/models/Alert.scala b/thehive/app/org/thp/thehive/models/Alert.scala
@@ -43,7 +43,7 @@ case class AlertTag()
 @DefineIndex(IndexType.standard, "source")
 @DefineIndex(IndexType.standard, "sourceRef")
 @DefineIndex(IndexType.fulltext, "title")
-@DefineIndex(IndexType.fulltext, "description")
+@DefineIndex(IndexType.fulltextOnly, "description")
 @DefineIndex(IndexType.standard, "severity")
 @DefineIndex(IndexType.standard, "date")
 @DefineIndex(IndexType.standard, "lastSyncDate")

diff --git a/thehive/app/org/thp/thehive/models/Case.scala b/thehive/app/org/thp/thehive/models/Case.scala
@@ -83,15 +83,15 @@ case class CaseProcedure()
 @BuildVertexEntity
 @DefineIndex(IndexType.unique, "number")
 @DefineIndex(IndexType.fulltext, "title")
-@DefineIndex(IndexType.fulltext, "description")
+@DefineIndex(IndexType.fulltextOnly, "description")
 @DefineIndex(IndexType.standard, "severity")
 @DefineIndex(IndexType.standard, "startDate")
 @DefineIndex(IndexType.standard, "endDate")
 @DefineIndex(IndexType.standard, "flag")
 @DefineIndex(IndexType.standard, "tlp")
 @DefineIndex(IndexType.standard, "pap")
 @DefineIndex(IndexType.standard, "status")
-@DefineIndex(IndexType.fulltext, "summary")
+@DefineIndex(IndexType.fulltextOnly, "summary")
 @DefineIndex(IndexType.standard, "tags")
 @DefineIndex(IndexType.standard, "assignee")
 @DefineIndex(IndexType.standard, "organisationIds")

diff --git a/thehive/app/org/thp/thehive/models/Log.scala b/thehive/app/org/thp/thehive/models/Log.scala
@@ -8,7 +8,7 @@ import java.util.Date
 @BuildEdgeEntity[Log, Attachment]
 case class LogAttachment()
 
-@DefineIndex(IndexType.fulltext, "message")
+@DefineIndex(IndexType.fulltextOnly, "message")
 @DefineIndex(IndexType.standard, "date")
 @DefineIndex(IndexType.standard, "taskId")
 @DefineIndex(IndexType.standard, "organisationIds")

diff --git a/thehive/app/org/thp/thehive/models/Observable.scala b/thehive/app/org/thp/thehive/models/Observable.scala
@@ -17,7 +17,7 @@ case class ObservableData()
 @BuildEdgeEntity[Observable, Tag]
 case class ObservableTag()
 
-@DefineIndex(IndexType.fulltext, "message")
+@DefineIndex(IndexType.fulltextOnly, "message")
 @DefineIndex(IndexType.standard, "tlp")
 @DefineIndex(IndexType.standard, "ioc")
 @DefineIndex(IndexType.standard, "sighted")

diff --git a/thehive/app/org/thp/thehive/models/Tag.scala b/thehive/app/org/thp/thehive/models/Tag.scala
@@ -4,7 +4,8 @@ import org.thp.scalligraph.BuildVertexEntity
 import org.thp.scalligraph.models.{DefineIndex, IndexType}
 
 @DefineIndex(IndexType.unique, "namespace", "predicate", "value")
-@DefineIndex(IndexType.fulltext, "namespace", "predicate", "value", "description")
+@DefineIndex(IndexType.fulltext, "namespace", "predicate", "value")
+@DefineIndex(IndexType.fulltextOnly, "description")
 @BuildVertexEntity
 case class Tag(
     namespace: String,

diff --git a/thehive/app/org/thp/thehive/models/Task.scala b/thehive/app/org/thp/thehive/models/Task.scala
@@ -21,7 +21,7 @@ case class TaskLog()
 @BuildVertexEntity
 @DefineIndex(IndexType.fulltext, "title")
 @DefineIndex(IndexType.standard, "group")
-@DefineIndex(IndexType.fulltext, "description")
+@DefineIndex(IndexType.fulltextOnly, "description")
 @DefineIndex(IndexType.standard, "status")
 @DefineIndex(IndexType.standard, "flag")
 @DefineIndex(IndexType.standard, "startDate")

diff --git a/thehive/app/org/thp/thehive/models/TheHiveSchemaDefinition.scala b/thehive/app/org/thp/thehive/models/TheHiveSchemaDefinition.scala
@@ -391,6 +391,14 @@ class TheHiveSchemaDefinition @Inject() extends Schema with UpdatableSchema {
       traversal.outE("OrganisationDashboard").raw.property("writable", true).iterate()
       Success(())
     }
+    //=====[release 4.1.0]=====
+    .removeIndex("Alert", IndexType.fulltext, "description")
+    .removeIndex("Case", IndexType.fulltext, "description", "summary")
+    .removeIndex("Log", IndexType.fulltext, "message")
+    .removeIndex("Observable", IndexType.fulltext, "message")
+    .removeIndex("Log", IndexType.fulltext, "message")
+    .removeIndex("Tag", IndexType.fulltext, "description")
+    .removeIndex("Task", IndexType.fulltext, "description")
 
   val reflectionClasses = new Reflections(
     new ConfigurationBuilder()

diff --git a/thehive/test/org/thp/thehive/controllers/v0/StatusCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/StatusCtrlTest.scala
@@ -70,7 +70,7 @@ class StatusCtrlTest extends PlaySpecification with TestAppBuilder {
           "pollingDuration"      -> 1000
         ),
         "schemaStatus" -> Json.arr(
-          Json.obj("name" -> "thehive", "currentVersion" -> 59, "expectedVersion" -> 59, "error" -> JsNull)
+          Json.obj("name" -> "thehive", "currentVersion" -> 66, "expectedVersion" -> 66, "error" -> JsNull)
         )
       )