#175 Add worker definition config to build config provided to worker

TheHive-Project · Apr 4, 2019 · d16a2a8 · d16a2a8
1 parent 0224539
commit d16a2a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/org/thp/cortex/services/DockerJobRunnerSrv.scala b/app/org/thp/cortex/services/DockerJobRunnerSrv.scala
@@ -93,7 +93,6 @@ class DockerJobRunnerSrv(client: DockerClient, autoUpdate: Boolean, implicit val
               "errorMessage" -> message)
             Files.write(jobDirectory.resolve("output").resolve("output.json"), report.toString.getBytes(StandardCharsets.UTF_8))
           }
-          client.removeContainer(containerCreation.id())
       }
     timeout.fold(execution)(t ⇒ execution.withTimeout(t, client.stopContainer(containerCreation.id(), 3)))
       .andThen {

diff --git a/app/org/thp/cortex/services/JobRunnerSrv.scala b/app/org/thp/cortex/services/JobRunnerSrv.scala
@@ -112,7 +112,11 @@ class JobRunnerSrv @Inject() (
       .map { artifact ⇒
         val proxy_http = (worker.config \ "proxy_http").asOpt[String].fold(JsObject.empty) { proxy ⇒ Json.obj("proxy" → Json.obj("http" → proxy)) }
         val proxy_https = (worker.config \ "proxy_https").asOpt[String].fold(JsObject.empty) { proxy ⇒ Json.obj("proxy" → Json.obj("https" → proxy)) }
-        val config = worker.config.deepMerge(proxy_http).deepMerge(proxy_https)
+        val config = workerSrv.getDefinition(worker.workerDefinitionId())
+          .fold(_ ⇒ JsObject.empty, _.configuration)
+          .deepMerge(worker.config)
+          .deepMerge(proxy_http)
+          .deepMerge(proxy_https)
         (worker.config \ "cacerts").asOpt[String].foreach { cacerts ⇒
           val cacertsFile = jobFolder.resolve("input").resolve("cacerts")
           Files.write(cacertsFile, cacerts.getBytes)