#1743 Force close http client after use in webhook

TheHive-Project · Feb 3, 2021 · a90edda · a90edda
1 parent e2c0b7e
commit a90edda
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/thehive/app/org/thp/thehive/services/notification/notifiers/Webhook.scala b/thehive/app/org/thp/thehive/services/notification/notifiers/Webhook.scala
@@ -255,13 +255,14 @@ class Webhook(
       Future.failed(BadConfigurationError(s"The organisation ${organisation.name} is not authorised to use the webhook ${config.name}"))
     else if (user.isDefined)
       Future.failed(BadConfigurationError("The notification webhook must not be applied on user"))
-    else
-      for {
+    else {
+      val ws = new ProxyWS(config.wsConfig, mat)
+      val async = for {
         message <- Future.fromTry(buildMessage(config.version, audit))
         _ = logger.debug(s"Request webhook with message $message")
-        resp <- new ProxyWS(config.wsConfig, mat)
-          .url(config.url)
-          .post(message)
+        resp <- ws.url(config.url).post(message)
       } yield if (resp.status >= 400) logger.warn(s"Webhook call on ${config.url} returns ${resp.status} ${resp.statusText}") else ()
+      async.andThen { case _ => ws.close() }
+    }
 
 }