#110 Include type in worker id computation in order to prevent collis…

…ion between responders and analyzers
TheHive-Project · Jul 26, 2018 · fc938f7 · fc938f7
1 parent 14732e1
commit fc938f7
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/app/org/thp/cortex/models/Migration.scala b/app/org/thp/cortex/models/Migration.scala
@@ -11,6 +11,7 @@ import org.thp.cortex.services.{ OrganizationSrv, UserSrv }
 import org.elastic4play.controllers.Fields
 import org.elastic4play.services.Operation._
 import org.elastic4play.services.{ DatabaseState, MigrationOperations, Operation }
+import org.elastic4play.utils.Hasher
 
 @Singleton
 class Migration @Inject() (
@@ -31,20 +32,31 @@ class Migration @Inject() (
   }
 
   val operations: PartialFunction[DatabaseState, Seq[Operation]] = {
-    case DatabaseState(1) ⇒ Seq(
-      // add type to analyzer
-      addAttribute("analyzer", "type" → JsString("analyzer")),
-
-      renameAttribute("job", "workerDefinitionId", "analyzerDefinitionId"),
-      renameAttribute("job", "workerId", "analyzerId"),
-      renameAttribute("job", "workerName", "analyzerName"),
-
-      renameEntity("analyzer", "worker"),
-      renameAttribute("worker", "workerDefinitionId", "analyzerDefinitionId"),
-      addAttribute("worker", "type" → JsString(WorkerType.analyzer.toString)),
-
-      renameEntity("analyzerConfig", "workerConfig"),
-      addAttribute("workerConfig", "type" → JsString(WorkerType.analyzer.toString)))
+    case DatabaseState(1) ⇒
+      val hasher = Hasher("MD5")
+      Seq(
+
+        // add type to analyzer
+        addAttribute("analyzer", "type" → JsString("analyzer")),
+
+        renameAttribute("job", "workerDefinitionId", "analyzerDefinitionId"),
+        renameAttribute("job", "workerId", "analyzerId"),
+        renameAttribute("job", "workerName", "analyzerName"),
+
+        renameEntity("analyzer", "worker"),
+        renameAttribute("worker", "workerDefinitionId", "analyzerDefinitionId"),
+        addAttribute("worker", "type" → JsString(WorkerType.analyzer.toString)),
+        mapEntity("worker") { worker ⇒
+          val id = for {
+            organizationId ← (worker \ "_parent").asOpt[String]
+            name ← (worker \ "name").asOpt[String]
+            tpe ← (worker \ "type").asOpt[String]
+          } yield hasher.fromString(s"${organizationId}_${name}_$tpe").head.toString
+          worker + ("_id" → JsString(id.getOrElse("<null>")))
+        },
+
+        renameEntity("analyzerConfig", "workerConfig"),
+        addAttribute("workerConfig", "type" → JsString(WorkerType.analyzer.toString)))
 
     case _ ⇒ Nil
   }

diff --git a/app/org/thp/cortex/models/Worker.scala b/app/org/thp/cortex/models/Worker.scala
@@ -45,7 +45,8 @@ class WorkerModel @Inject() (organizationModel: OrganizationModel) extends Child
     val id = for {
       organizationId ← parent.map(_.id)
       name ← (attrs \ "name").asOpt[String]
-    } yield hasher.fromString(s"${organizationId}_$name").head.toString
+      tpe ← (attrs \ "type").asOpt[String]
+    } yield hasher.fromString(s"${organizationId}_${name}_$tpe").head.toString
     Future.successful(attrs + ("_id" → JsString(id.getOrElse("<null>"))))
   }
 }