Fix entity ID property type in describe

TheHive-Project · Dec 21, 2020 · 76a484b · 76a484b
1 parent 089e896
commit 76a484b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/thehive/app/org/thp/thehive/controllers/v0/DescribeCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/DescribeCtrl.scala
@@ -2,9 +2,8 @@ package org.thp.thehive.controllers.v0
 
 import java.lang.{Boolean => JBoolean}
 import java.util.Date
-
 import javax.inject.{Inject, Named, Singleton}
-import org.thp.scalligraph.NotFoundError
+import org.thp.scalligraph.{EntityId, NotFoundError}
 import org.thp.scalligraph.controllers.Entrypoint
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.PublicProperty
@@ -218,6 +217,7 @@ class DescribeCtrl @Inject() (
         case c if c == classOf[Hash]                              => Seq(PropertyDescription(prop.propertyName, "string"))
         case c if classOf[Number].isAssignableFrom(c)             => Seq(PropertyDescription(prop.propertyName, "number"))
         case c if c == classOf[String]                            => Seq(PropertyDescription(prop.propertyName, "string"))
+        case c if c == classOf[EntityId]                          => Seq(PropertyDescription(prop.propertyName, "string"))
         case _ =>
           logger.warn(s"Unrecognized property $prop. Add a custom description")
           Seq(PropertyDescription(prop.propertyName, "unknown"))

diff --git a/thehive/app/org/thp/thehive/controllers/v1/DescribeCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/DescribeCtrl.scala
@@ -2,9 +2,8 @@ package org.thp.thehive.controllers.v1
 
 import java.lang.{Boolean => JBoolean}
 import java.util.Date
-
 import javax.inject.{Inject, Named, Singleton}
-import org.thp.scalligraph.NotFoundError
+import org.thp.scalligraph.{EntityId, NotFoundError}
 import org.thp.scalligraph.controllers.Entrypoint
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.PublicProperty
@@ -212,6 +211,7 @@ class DescribeCtrl @Inject() (
         case c if c == classOf[Hash]                              => Seq(PropertyDescription(prop.propertyName, "string"))
         case c if classOf[Number].isAssignableFrom(c)             => Seq(PropertyDescription(prop.propertyName, "number"))
         case c if c == classOf[String]                            => Seq(PropertyDescription(prop.propertyName, "string"))
+        case c if c == classOf[EntityId]                          => Seq(PropertyDescription(prop.propertyName, "string"))
         case _ =>
           logger.warn(s"Unrecognized property $prop. Add a custom description")
           Seq(PropertyDescription(prop.propertyName, "unknown"))