#86 Allow arbitrary parameters for a job

TheHive-Project · Apr 9, 2018 · 8c12015 · 8c12015
1 parent 446735e
commit 8c12015
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/org/thp/cortex/services/JobSrv.scala b/app/org/thp/cortex/services/JobSrv.scala
@@ -411,19 +411,19 @@ class JobSrv(
             "data" -> job.data().get)
       }
       .map { artifact ⇒
-        val configAndParam = analyzer.config.deepMerge(job.params)
         (BaseConfig.global.items ++ BaseConfig.tlp.items ++ analyzerDefinition.configurationItems)
-          .validatedBy(_.read(configAndParam))
+          .validatedBy(_.read(analyzer.config))
           .map(cfg ⇒ Json.obj("config" -> JsObject(cfg).deepMerge(analyzerDefinition.configuration)))
           .map { cfg ⇒
             val proxy_http = (cfg \ "config" \ "proxy_http").asOpt[String].fold(JsObject.empty) { proxy ⇒ Json.obj("proxy" -> Json.obj("http" -> proxy)) }
             val proxy_https = (cfg \ "config" \ "proxy_https").asOpt[String].fold(JsObject.empty) { proxy ⇒ Json.obj("proxy" -> Json.obj("https" -> proxy)) }
-            cfg.deepMerge(Json.obj("config" -> (proxy_http.deepMerge(proxy_https))))
+            cfg.deepMerge(Json.obj("config" -> proxy_http.deepMerge(proxy_https)))
           }
           .map(_ deepMerge artifact +
             ("dataType" -> JsString(job.dataType())) +
             ("tlp" -> JsNumber(job.tlp())) +
-            ("message" -> JsString(job.message().getOrElse(""))))
+            ("message" -> JsString(job.message().getOrElse(""))) +
+            ("parameters" -> job.params))
           .badMap(e ⇒ AttributeCheckingError("job", e.toSeq))
           .toTry
       }