#169 Accept MISP attribute with null comment

TheHive-Project · Apr 10, 2017 · 6ac26b0 · 6ac26b0
1 parent 596fff9
commit 6ac26b0
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/thehive-misp/app/connectors/misp/JsonFormat.scala b/thehive-misp/app/connectors/misp/JsonFormat.scala
@@ -2,13 +2,10 @@ package connectors.misp
 
 import java.util.Date
 
-import play.api.libs.json.{ Json, Reads }
+import org.elastic4play.models.JsonFormat.enumFormat
 import play.api.libs.json.JsLookupResult.jsLookupResultToJsLookup
-import play.api.libs.json.JsValue
 import play.api.libs.json.JsValue.jsValueToJsLookup
-
-import org.elastic4play.models.JsonFormat.enumFormat
-import org.elastic4play.JsonFormat.dateFormat
+import play.api.libs.json.{JsSuccess, JsValue, Json, Reads}
 
 object JsonFormat {
   implicit val eventStatusFormat = enumFormat(EventStatus)
@@ -41,7 +38,7 @@ object JsonFormat {
       eventId ← (json \ "id").validate[String]
       timestamp ← (json \ "timestamp").validate[String]
       date = new Date(timestamp.toLong * 1000)
-      comment ← (json \ "comment").validate[String]
+      comment ← (json \ "comment").validate[String].orElse(JsSuccess(""))
       value ← (json \ "value").validate[String]
     } yield MispAttribute(id, tpe, category, uuid, eventId.toLong, date, comment, value))
 }