#21 Make baseConfig optional

TheHive-Project · May 7, 2017 · 5653c19 · 5653c19
1 parent d5fd06a
commit 5653c19
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/services/ExternalAnalyzerSrv.scala b/app/services/ExternalAnalyzerSrv.scala
@@ -128,8 +128,10 @@ class ExternalAnalyzerSrv(
       command ← (__ \ "command").read[String]
       absoluteCommand = analyzerPath.resolve(Paths.get(command.replaceAll("[\\/]", File.separator)))
       config ← (__ \ "config").read[JsObject]
-      baseConfigKey ← (__ \ "baseConfig").read[String]
-      baseConfig = (analyzerConfig \ baseConfigKey).asOpt[JsObject].getOrElse(JsObject(Nil))
+      baseConfigKey ← (__ \ "baseConfig").readNullable[String]
+      baseConfig = baseConfigKey
+        .flatMap(bc ⇒ (analyzerConfig \ bc).asOpt[JsObject])
+        .getOrElse(Json.obj())
     } yield ExternalAnalyzer(
       name,
       version,