From 2946d8e2367a07717864eee300ebc63e55c53d1c Mon Sep 17 00:00:00 2001 From: To-om Date: Tue, 22 Dec 2020 15:32:40 +0100 Subject: [PATCH] #1685 Remove redundant MISP filters --- .../scala/org/thp/misp/client/MispClient.scala | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/misp/client/src/main/scala/org/thp/misp/client/MispClient.scala b/misp/client/src/main/scala/org/thp/misp/client/MispClient.scala index 8917e681f1..e5d03cd2d6 100644 --- a/misp/client/src/main/scala/org/thp/misp/client/MispClient.scala +++ b/misp/client/src/main/scala/org/thp/misp/client/MispClient.scala @@ -183,27 +183,9 @@ class MispClient( val maybeEvent = Try(Json.parse(data.toArray[Byte]).as[Event]) maybeEvent.fold(error => { logger.warn(s"Event has invalid format: ${data.decodeString("UTF-8")}", error); Nil }, List(_)) } - .filterNot(isExcluded) .mapMaterializedValue(_ => NotUsed) } - def isExcluded(event: Event): Boolean = { - val eventTags = event.tags.map(_.name).toSet - if (whitelistTags.nonEmpty && (whitelistTags & eventTags).isEmpty) { - logger.debug(s"event ${event.id} is ignored because it doesn't contain any of whitelist tags (${whitelistTags.mkString(",")})") - true - } else if (excludedOrganisations.contains(event.orgc)) { - logger.debug(s"event ${event.id} is ignored because its organisation (${event.orgc}) is excluded") - true - } else { - val t = excludedTags.intersect(eventTags) - if ((excludedTags & eventTags).nonEmpty) { - logger.debug(s"event ${event.id} is ignored because one of its tags (${t.mkString(",")}) is excluded") - true - } else false - } - } - def searchAttributes(eventId: String, publishDate: Option[Date])(implicit ec: ExecutionContext): Source[Attribute, NotUsed] = { logger.debug(s"Search MISP attributes for event #$eventId ${publishDate.fold("")("from " + _)}") Source