From d4bd9b29be041dc5256a94687e926470a101f611 Mon Sep 17 00:00:00 2001 From: To-om Date: Mon, 12 Dec 2016 17:05:15 +0100 Subject: [PATCH] #53 remove html extension in report template zip package --- .../app/connectors/cortex/services/CortexClient.scala | 2 +- thehive-cortex/app/controllers/ReportTemplate.scala | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/thehive-cortex/app/connectors/cortex/services/CortexClient.scala b/thehive-cortex/app/connectors/cortex/services/CortexClient.scala index 0747695f8f..7321a8dba4 100644 --- a/thehive-cortex/app/connectors/cortex/services/CortexClient.scala +++ b/thehive-cortex/app/connectors/cortex/services/CortexClient.scala @@ -20,7 +20,7 @@ class CortexClient(val name: String, baseUrl: String, key: String) { lazy val logger = Logger(getClass) logger.info(s"new Cortex($name, $baseUrl, $key)") - def request[A](uri: String, f: WSRequest ⇒ Future[WSResponse], t: WSResponse ⇒ A)(implicit ws: WSClient, ec: ExecutionContext) = { + def request[A](uri: String, f: WSRequest ⇒ Future[WSResponse], t: WSResponse ⇒ A)(implicit ws: WSClient, ec: ExecutionContext): Future[A] = { val url = (baseUrl + uri) logger.info(s"Requesting Cortex $url") f(ws.url(url).withHeaders("auth" → key)).map { diff --git a/thehive-cortex/app/controllers/ReportTemplate.scala b/thehive-cortex/app/controllers/ReportTemplate.scala index 8f668bbd80..6a16e8207d 100644 --- a/thehive-cortex/app/controllers/ReportTemplate.scala +++ b/thehive-cortex/app/controllers/ReportTemplate.scala @@ -98,11 +98,13 @@ class ReportTemplateCtrl @Inject() ( } val importedReportTemplates: Seq[Future[(String, JsBoolean)]] = zipFile.getFileHeaders.toSeq.filter(_ != null).collect { case fileHeader: FileHeader if !fileHeader.isDirectory ⇒ - val Array(analyzerId, flavor, _*) = (fileHeader.getFileName + "/").split("/", 3) + val Array(analyzerId, flavorHtml, _*) = (fileHeader.getFileName + "/").split("/", 3) val inputStream = zipFile.getInputStream(fileHeader) val content = Source.fromInputStream(inputStream).mkString inputStream.close() + val flavor = if (flavorHtml.endsWith(".html")) flavorHtml.dropRight(5) else flavorHtml + val reportTemplateFields = Fields.empty .set("flavor", flavor) .set("analyzers", analyzerId)