#1611 Fix text containing predicate (don't tokenize)

TheHive-Project · Nov 5, 2020 · 53a8bb4 · 53a8bb4
1 parent 58fb2d3
commit 53a8bb4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/ScalliGraph b/ScalliGraph
diff --git a/thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala
@@ -132,6 +132,22 @@ class PublicTag @Inject() (tagSrv: TagSrv) extends PublicData {
     .property("predicate", UMapping.string)(_.field.readonly)
     .property("value", UMapping.string.optional)(_.field.readonly)
     .property("description", UMapping.string.optional)(_.field.readonly)
-    .property("text", UMapping.string)(_.select(_.displayName).readonly)
+    .property("text", UMapping.string)(
+      _.select(_.displayName)
+        .filter((_, tags) =>
+          tags
+            .graphMap[String, String, Converter.Identity[String]](
+              { v =>
+                val namespace = UMapping.string.getProperty(v, "namespace")
+                val predicate = UMapping.string.getProperty(v, "predicate")
+                val value     = UMapping.string.optional.getProperty(v, "value")
+                Tag(namespace, predicate, value, None, 0).toString
+              },
+              Converter.identity[String]
+            )
+        )
+        .converter(_ => Converter.identity[String])
+        .readonly
+    )
     .build
 }