From a92077329fef3168c0565cb53ac8e044b14b4238 Mon Sep 17 00:00:00 2001 From: To-om Date: Tue, 8 Sep 2020 17:46:02 +0200 Subject: [PATCH] #1517 Don't split multiline observable --- dto/src/main/scala/org/thp/thehive/dto/v0/Observable.scala | 2 +- dto/src/main/scala/org/thp/thehive/dto/v1/Observable.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dto/src/main/scala/org/thp/thehive/dto/v0/Observable.scala b/dto/src/main/scala/org/thp/thehive/dto/v0/Observable.scala index bc23cc2687..c63f0b01de 100644 --- a/dto/src/main/scala/org/thp/thehive/dto/v0/Observable.scala +++ b/dto/src/main/scala/org/thp/thehive/dto/v0/Observable.scala @@ -24,7 +24,7 @@ object InputObservable { implicit val writes: Writes[InputObservable] = Json.writes[InputObservable] val fp: FieldsParser[Seq[String]] = FieldsParser[Seq[String]]("data") { - case (_, FString(s)) => Good(s.split("\\R+").toSeq) + case (_, FString(s)) => Good(Seq(s)) case (_, FAny(s)) => Good(s) case (_, FSeq(a)) => a.validatedBy(FieldsParser.string(_)) case (_, FUndefined) => Good(Nil) diff --git a/dto/src/main/scala/org/thp/thehive/dto/v1/Observable.scala b/dto/src/main/scala/org/thp/thehive/dto/v1/Observable.scala index cac1608986..e94bcf09c8 100644 --- a/dto/src/main/scala/org/thp/thehive/dto/v1/Observable.scala +++ b/dto/src/main/scala/org/thp/thehive/dto/v1/Observable.scala @@ -24,7 +24,7 @@ object InputObservable { implicit val writes: Writes[InputObservable] = Json.writes[InputObservable] val fp: FieldsParser[Seq[String]] = FieldsParser[Seq[String]]("data") { - case (_, FString(s)) => Good(s.split("\\R+").toSeq) + case (_, FString(s)) => Good(Seq(s)) case (_, FAny(s)) => Good(s) case (_, FSeq(a)) => a.validatedBy(FieldsParser.string(_)) case (_, FUndefined) => Good(Nil)