#1272 Don't use firstCompletedOf to find the right Cortex client

TheHive-Project · Jul 9, 2020 · 3d0dfcd · 3d0dfcd
1 parent 6867871
commit 3d0dfcd
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/ActionSrv.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/ActionSrv.scala
@@ -63,10 +63,13 @@ class ActionSrv @Inject() (
             .find(_.name == cortexId)
             .fold[Future[CortexClient]](Future.failed(NotFoundError(s"Cortex $cortexId not found")))(Future.successful)
         case None if cortexClients.nonEmpty =>
-          Future.firstCompletedOf {
-            cortexClients
-              .map(client => client.getResponder(workerId).map(_ => client))
-          }
+          Future
+            .traverse(cortexClients) { client =>
+              client.getResponder(workerId).map(_ => Some(client)).recover { case _ => None }
+            }
+            .flatMap(
+              _.flatten.headOption.fold[Future[CortexClient]](Future.failed(NotFoundError(s"Responder $workerId not found")))(Future.successful)
+            )
 
         case None => Future.failed(NotFoundError(s"Responder $workerId not found"))
       }