From d12bee964b15da931525b9814a8ceb7d3d11b471 Mon Sep 17 00:00:00 2001
From: To-om <thomas@strangebee.com>
Date: Wed, 5 Oct 2022 15:00:50 +0200
Subject: [PATCH] #432 Continue the parsing of the catalog if a invalid
 definition is found

---
 .../thp/cortex/models/WorkerDefinition.scala   | 18 +++++++++++++++++-
 app/org/thp/cortex/services/WorkerSrv.scala    |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/org/thp/cortex/models/WorkerDefinition.scala b/app/org/thp/cortex/models/WorkerDefinition.scala
index 7d0300f10..10406b447 100644
--- a/app/org/thp/cortex/models/WorkerDefinition.scala
+++ b/app/org/thp/cortex/models/WorkerDefinition.scala
@@ -110,7 +110,23 @@ object WorkerDefinition {
 
   def reads(workerType: WorkerType.Type): Reads[List[WorkerDefinition]] = {
     val reads = singleReads(workerType)
-    reads.map(List(_)) orElse Reads.list(reads)
+    implicitly[Reads[JsArray]]
+    reads.map(List(_)) orElse JsArrayReads.map(array =>
+      array
+        .value
+        .toList
+        .flatMap { js =>
+          reads
+            .reads(js)
+            .fold(
+              invalid => {
+                logger.warn(s"The catalog contains an invalid entry\n  entry:$js\n  $invalid")
+                Seq.empty
+              },
+              Seq(_)
+            )
+        }
+    )
   }
 
   implicit val writes: Writes[WorkerDefinition] = Writes[WorkerDefinition] { workerDefinition =>
diff --git a/app/org/thp/cortex/services/WorkerSrv.scala b/app/org/thp/cortex/services/WorkerSrv.scala
index c25d036f7..9de59b0bd 100644
--- a/app/org/thp/cortex/services/WorkerSrv.scala
+++ b/app/org/thp/cortex/services/WorkerSrv.scala
@@ -250,7 +250,7 @@ class WorkerSrv @Inject() (
               .set("command", workerDefinition.command.map(p => JsString(p.toString)))
               .set("url", workerDefinition.url)
               .set("license", workerDefinition.license)
-              .set("baseConfig", workerDefinition.baseConfiguration.map(JsString.apply))
+              .set("baseConfig", workerDefinition.baseConfiguration.fold(JsString(workerDefinition.name))(JsString.apply))
               .set("configuration", cfg.toString)
               .set("type", workerDefinition.tpe.toString)
               .addIfAbsent("dataTypeList", StringInputValue(workerDefinition.dataTypeList))