#80 Add raw attribute format

TheHive-Project · Mar 18, 2019 · 7cbff29 · 7cbff29
1 parent b1ad6c8
commit 7cbff29
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/app/org/elastic4play/models/Attributes.scala b/app/org/elastic4play/models/Attributes.scala
@@ -54,6 +54,7 @@ object AttributeFormat {
   val uuidFmt = UUIDAttributeFormat
   val hashFmt = HashAttributeFormat
   val binaryFmt = BinaryAttributeFormat
+  val rawFmt = RawAttributeFormat
 
   def enumFmt[T <: Enumeration](e: T)(implicit format: Format[T#Value]): EnumerationAttributeFormat[T] = EnumerationAttributeFormat[T](e)
 
@@ -95,8 +96,8 @@ case class Attribute[T](
   }
 
   def elasticMapping: FieldDefinition = format.elasticType(attributeName) match {
-    case a: BasicFieldDefinition if isSensitive ⇒ a.index("no")
-    case a                                      ⇒ a
+    case a: BasicFieldDefinition if isSensitive && a.`type` == "String" ⇒ a.index("no")
+    case a ⇒ a
   }
 
   def elasticTemplate(attributePath: Seq[String] = Nil): Seq[DynamicTemplateDefinition] =

diff --git a/app/org/elastic4play/models/RawAttributeFormat.scala b/app/org/elastic4play/models/RawAttributeFormat.scala
@@ -0,0 +1,25 @@
+package org.elastic4play.models
+
+import play.api.libs.json.{ JsString, JsValue }
+
+import com.sksamuel.elastic4s.ElasticDsl.binaryField
+import com.sksamuel.elastic4s.mappings.BasicFieldDefinition
+import org.scalactic._
+
+import org.elastic4play.controllers.{ InputValue, JsonInputValue }
+import org.elastic4play.{ AttributeError, InvalidFormatAttributeError }
+
+class RawAttributeFormat extends AttributeFormat[String]("raw") {
+  override def checkJson(subNames: Seq[String], value: JsValue): Or[JsValue, One[InvalidFormatAttributeError]] = value match {
+    case _: JsString if subNames.isEmpty ⇒ Good(value)
+    case _                               ⇒ formatError(JsonInputValue(value))
+  }
+  override def fromInputValue(subNames: Seq[String], value: InputValue): String Or Every[AttributeError] = TextAttributeFormat.fromInputValue(subNames, value) match {
+    case Bad(One(ifae: InvalidFormatAttributeError)) ⇒ Bad(One(ifae.copy(format = name)))
+    case other                                       ⇒ other
+  }
+
+  override def elasticType(attributeName: String): BasicFieldDefinition = binaryField(attributeName)
+}
+
+object RawAttributeFormat extends RawAttributeFormat