From 0f83fb38b77f8354d6501607f9ce808fba323fe0 Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Mon, 26 Jun 2017 11:11:13 +0200
Subject: [PATCH] #12 normalize audit operation

---
 thehive-backend/app/services/AuditSrv.scala  |  7 ++++++-
 thehive-backend/app/services/StreamSrv.scala | 14 ++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/thehive-backend/app/services/AuditSrv.scala b/thehive-backend/app/services/AuditSrv.scala
index beb6d61a00..ad3fb04555 100644
--- a/thehive-backend/app/services/AuditSrv.scala
+++ b/thehive-backend/app/services/AuditSrv.scala
@@ -23,7 +23,12 @@ trait AuditedModel { self: BaseModelDef ⇒
       .toMap
   def selectAuditedAttributes(attrs: JsObject) = JsObject {
     attrs.fields.flatMap {
-      case nv @ (attrName, _) ⇒ auditedAttributes.get(attrName).map(_ ⇒ nv)
+      case (attrName, value) ⇒
+        val attrNames = attrName.split("\\.").toSeq
+        auditedAttributes.get(attrNames.head).map { _ ⇒
+          val reverseNames = attrNames.reverse
+          reverseNames.drop(1).foldLeft(reverseNames.head → value)((jsTuple, name) ⇒ name → JsObject(Seq(jsTuple)))
+        }
     }
   }
 }
diff --git a/thehive-backend/app/services/StreamSrv.scala b/thehive-backend/app/services/StreamSrv.scala
index f8047c7430..61706ce738 100644
--- a/thehive-backend/app/services/StreamSrv.scala
+++ b/thehive-backend/app/services/StreamSrv.scala
@@ -126,6 +126,11 @@ class StreamActor(
     eventSrv.unsubscribe(self)
   }
 
+  private def normalizeOperation(operation: AuditOperation) = {
+    operation.entity.model match {
+      case am: AuditedModel ⇒ operation.copy(details = am.selectAuditedAttributes(operation.details))
+    }
+  }
   private def receiveWithState(waitingRequest: Option[WaitingRequest], currentMessages: Map[String, Option[StreamMessageGroup[_]]]): Receive = {
     /* End of HTTP request, mark received messages to ready*/
     case Commit(requestId) ⇒
@@ -149,17 +154,18 @@ class StreamActor(
     /* */
     case operation: AuditOperation if operation.entity.model.isInstanceOf[AuditedModel] ⇒
       val requestId = operation.authContext.requestId
-      logger.debug(s"Receiving audit operation : $operation")
+      val normalizedOperation = normalizeOperation(operation)
+      logger.debug(s"Receiving audit operation : $operation => $normalizedOperation")
       val updatedOperationGroup = currentMessages.get(requestId) match {
         case None ⇒
           logger.debug("Operation that comes after the end of request, make operation ready to send")
-          AuditOperationGroup(auxSrv, operation).makeReady // Operation that comes after the end of request
+          AuditOperationGroup(auxSrv, normalizedOperation).makeReady // Operation that comes after the end of request
         case Some(None) ⇒
           logger.debug("First operation of the request, creating operation group")
-          AuditOperationGroup(auxSrv, operation) // First operation related to the given request
+          AuditOperationGroup(auxSrv, normalizedOperation) // First operation related to the given request
         case Some(Some(aog: AuditOperationGroup)) ⇒
           logger.debug("Operation included in existing group")
-          aog :+ operation
+          aog :+ normalizedOperation
         case _ ⇒
           logger.debug("Impossible")
           sys.error("")