diff --git a/CHANGELOG.md b/CHANGELOG.md index c08f4587c..305a27c03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,14 @@ # Change Log -## [2.1.1](https://github.com/TheHive-Project/Cortex/tree/2.1.1) (2018-10-09) +## [2.1.2](https://github.com/TheHive-Project/Cortex/tree/2.1.2) (2018-10-12) +[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.1.1...HEAD) + +**Fixed bugs:** +- GUI Search Function is broken [\#145](https://github.com/TheHive-Project/Cortex/issues/145) +- findSimilarJob function broken [\#144](https://github.com/TheHive-Project/Cortex/issues/144) + +## [2.1.1](https://github.com/TheHive-Project/Cortex/tree/2.1.1) (2018-10-09) [Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.1.0...2.1.1) **Implemented enhancements:** diff --git a/app/org/thp/cortex/services/JobSrv.scala b/app/org/thp/cortex/services/JobSrv.scala index 5e36466f8..829771955 100644 --- a/app/org/thp/cortex/services/JobSrv.scala +++ b/app/org/thp/cortex/services/JobSrv.scala @@ -118,7 +118,7 @@ class JobSrv( findForUser(userId, and( dataTypeFilter.map("dataType" like _).toList ::: dataFilter.map("data" like _).toList ::: - analyzerFilter.map(af ⇒ or("analyzerId" like af, "analyzerName" like af)).toList), range, Nil) + analyzerFilter.map(af ⇒ or("workerId" like af, "workerName" like af)).toList), range, Nil) } def findArtifacts(userId: String, jobId: String, queryDef: QueryDef, range: Option[String], sortBy: Seq[String]): (Source[Artifact, NotUsed], Future[Long]) = { @@ -310,7 +310,7 @@ class JobSrv( import org.elastic4play.services.QueryDSL._ val now = new Date().getTime logger.info(s"Checking rate limit on worker ${worker.name()} from ${new Date(now - rateUnit.id.toLong * 24 * 60 * 60 * 1000)}") - stats(and("createdAt" ~>= (now - rateUnit.id.toLong * 24 * 60 * 60 * 1000), "analyzerId" ~= worker.id), Seq(selectCount)).map { s ⇒ + stats(and("createdAt" ~>= (now - rateUnit.id.toLong * 24 * 60 * 60 * 1000), "workerId" ~= worker.id), Seq(selectCount)).map { s ⇒ val count = (s \ "count").as[Long] logger.info(s"$count analysis found (limit is $rate)") count < rate @@ -330,7 +330,7 @@ class JobSrv( logger.info(s"Looking for similar job (worker=${worker.id}, dataType=$dataType, data=$dataAttachment, tlp=$tlp, parameters=$parameters") val now = new Date().getTime find(and( - "analyzerId" ~= worker.id, + "workerId" ~= worker.id, "status" ~!= JobStatus.Failure, "status" ~!= JobStatus.Deleted, "startDate" ~>= (now - cache.toMillis), diff --git a/version.sbt b/version.sbt index 4a324e004..ee9594954 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "2.1.1" +version in ThisBuild := "2.1.2" diff --git a/www/package.json b/www/package.json index 5479e1972..d92084911 100755 --- a/www/package.json +++ b/www/package.json @@ -1,6 +1,6 @@ { "name": "cortex", - "version": "2.1.1", + "version": "2.1.2", "description": "A powerfull observable analysis engine", "license": "AGPL-v3", "homepage": "https://github.com/TheHive-Project/Cortex",