#1376 Fix tag parsing (key:value)

TheHive-Project · Jun 15, 2020 · 92b1c98 · 92b1c98
1 parent 7dfcb18
commit 92b1c98
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/thehive/app/org/thp/thehive/models/Tag.scala b/thehive/app/org/thp/thehive/models/Tag.scala
@@ -35,7 +35,7 @@ object Tag {
   lazy val logger: Logger                  = Logger(getClass)
   val namespacePredicateValueColour: Regex = "([^\".:=]+)[.:]([\".=]+)=\"([^\"]+)\"#(\\p{XDigit}{6})".r
   val namespacePredicateValue: Regex       = "([^\".:=]+)[.:]([^\".=]+)=\"?([^\"]+)\"?".r
-  val namespacePredicate: Regex            = "([^\".:=]+)[.:]([^\".=]+)".r
+  val namespacePredicate: Regex            = "([^\".:=]+)[.]([^\".=]+)".r
   val PredicateValue: Regex                = "([^\".:=]+)[=:]\"?([^\"]+)\"?".r
   val predicate: Regex                     = "([^\".:=]+)".r
 

diff --git a/thehive/test/org/thp/thehive/models/TagTest.scala b/thehive/test/org/thp/thehive/models/TagTest.scala
@@ -9,6 +9,12 @@ class TagTest extends PlaySpecification {
   def parseTag(s: String): Tag = Tag.fromString(s, defaultNamespace, defaultColor)
   "tag" should {
     "be parsed from key:value" in {
+      val tag = parseTag("Module:atest_blah_blah")
+      tag must beEqualTo(Tag(defaultNamespace, "Module", Some("atest_blah_blah"), None, defaultColor))
+      tag.toString must beEqualTo("Module\"atest_blah_blah\"")
+    }
+
+    "be parsed from key:value=" in {
       val tag = parseTag("Id:7SeUoB3IBABD+tMh2PjVJYg==")
       tag must beEqualTo(Tag(defaultNamespace, "Id", Some("7SeUoB3IBABD+tMh2PjVJYg=="), None, defaultColor))
       tag.toString must beEqualTo("Id=\"7SeUoB3IBABD+tMh2PjVJYg==\"")