Skip to content

Commit

Permalink
#110 Fix variable names (analyzer/worker)
Browse files Browse the repository at this point in the history
  • Loading branch information
@To-om
To-om committed Jul 26, 2018
1 parent 9ce8983 commit 6281b9c
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 80 deletions.
32 changes: 16 additions & 16 deletions app/org/thp/cortex/services/WorkerConfigSrv.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,50 +55,50 @@ trait WorkerConfigSrv {
def getForOrganization(organizationId: String, configName: String): Future[BaseConfig] = {
import org.elastic4play.services.QueryDSL._
for {
analyzerConfig ← findForOrganization(organizationId, "name" ~= configName, Some("0-1"), Nil)
workerConfig ← findForOrganization(organizationId, "name" ~= configName, Some("0-1"), Nil)
._1
.runWith(Sink.headOption)
d ← definitions
baseConfig ← d.get(configName).fold[Future[BaseConfig]](Future.failed(NotFoundError(s"config $configName not found")))(Future.successful)
} yield baseConfig.copy(config = analyzerConfig)
} yield baseConfig.copy(config = workerConfig)
}

def create(organization: Organization, fields: Fields)(implicit authContext: AuthContext): Future[WorkerConfig] = {
createSrv[WorkerConfigModel, WorkerConfig, Organization](workerConfigModel, organization, fields.set("type", workerType.toString))
}

def update(analyzerConfig: WorkerConfig, fields: Fields)(implicit authContext: AuthContext): Future[WorkerConfig] = {
updateSrv(analyzerConfig, fields, ModifyConfig.default)
def update(workerConfig: WorkerConfig, fields: Fields)(implicit authContext: AuthContext): Future[WorkerConfig] = {
updateSrv(workerConfig, fields, ModifyConfig.default)
}

def updateOrCreate(userId: String, analyzerConfigName: String, config: JsObject)(implicit authContext: AuthContext): Future[BaseConfig] = {
def updateOrCreate(userId: String, workerConfigName: String, config: JsObject)(implicit authContext: AuthContext): Future[BaseConfig] = {
for {
organizationId ← userSrv.getOrganizationId(userId)
organization ← organizationSrv.get(organizationId)
baseConfig ← getForOrganization(organizationId, analyzerConfigName)
baseConfig ← getForOrganization(organizationId, workerConfigName)
validatedConfig ← baseConfig.items.validatedBy(_.read(config))
.map(_.filterNot(_._2 == JsNull))
.fold(c ⇒ Future.successful(Fields.empty.set("config", JsObject(c).toString).set("name", analyzerConfigName)), errors ⇒ Future.failed(AttributeCheckingError("analyzerConfig", errors.toSeq)))
newAnalyzerConfig ← baseConfig.config.fold(create(organization, validatedConfig))(analyzerConfig ⇒ update(analyzerConfig, validatedConfig))
} yield baseConfig.copy(config = Some(newAnalyzerConfig))
.fold(c ⇒ Future.successful(Fields.empty.set("config", JsObject(c).toString).set("name", workerConfigName)), errors ⇒ Future.failed(AttributeCheckingError("workerConfig", errors.toSeq)))
newWorkerConfig ← baseConfig.config.fold(create(organization, validatedConfig))(workerConfig ⇒ update(workerConfig, validatedConfig))
} yield baseConfig.copy(config = Some(newWorkerConfig))
}

private def updateDefinitionConfig(definitionConfig: Map[String, BaseConfig], analyzerConfig: WorkerConfig): Map[String, BaseConfig] = {
definitionConfig.get(analyzerConfig.name())
private def updateDefinitionConfig(definitionConfig: Map[String, BaseConfig], workerConfig: WorkerConfig): Map[String, BaseConfig] = {
definitionConfig.get(workerConfig.name())
.fold(definitionConfig) { baseConfig ⇒
definitionConfig + (analyzerConfig.name() → baseConfig.copy(config = Some(analyzerConfig)))
definitionConfig + (workerConfig.name() → baseConfig.copy(config = Some(workerConfig)))
}
}

def listConfigForUser(userId: String): Future[Seq[BaseConfig]] = {
import org.elastic4play.services.QueryDSL._
for {
configItems ← definitions
analyzerConfigItems = configItems
analyzerConfigs ← findForUser(userId, any, Some("all"), Nil)
workerConfigItems = configItems
workerConfigs ← findForUser(userId, any, Some("all"), Nil)
._1
.runFold(analyzerConfigItems) { (definitionConfig, analyzerConfig) ⇒ updateDefinitionConfig(definitionConfig, analyzerConfig) }
} yield analyzerConfigs.values.toSeq
.runFold(workerConfigItems) { (definitionConfig, workerConfig) ⇒ updateDefinitionConfig(definitionConfig, workerConfig) }
} yield workerConfigs.values.toSeq
}

def findForUser(userId: String, queryDef: QueryDef, range: Option[String], sortBy: Seq[String]): (Source[WorkerConfig, NotUsed], Future[Long]) = {
Expand Down
96 changes: 33 additions & 63 deletions app/org/thp/cortex/services/WorkerSrv.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import org.elastic4play.database.ModifyConfig
@Singleton
class WorkerSrv(
analyzersPaths: Seq[Path],
workersPaths: Seq[Path],
respondersPaths: Seq[Path],
workerModel: WorkerModel,
organizationSrv: OrganizationSrv,
userSrv: UserSrv,
Expand All @@ -40,7 +40,7 @@ class WorkerSrv(

@Inject() def this(
config: Configuration,
analyzerModel: WorkerModel,
workerModel: WorkerModel,
organizationSrv: OrganizationSrv,
userSrv: UserSrv,
createSrv: CreateSrv,
Expand All @@ -52,7 +52,7 @@ class WorkerSrv(
mat: Materializer) = this(
config.get[Seq[String]]("analyzer.path").map(p ⇒ Paths.get(p)),
config.get[Seq[String]]("responder.path").map(p ⇒ Paths.get(p)),
analyzerModel,
workerModel,
organizationSrv,
userSrv,
createSrv,
Expand Down Expand Up @@ -83,8 +83,8 @@ class WorkerSrv(
}

def listResponderDefinitions: (Source[WorkerDefinition, NotUsed], Future[Long]) = {
val analyzerDefinitions = workerMap.values.filter(_.tpe == WorkerType.responder)
Source(analyzerDefinitions.toList) → Future.successful(analyzerDefinitions.size.toLong)
val responderDefinitions = workerMap.values.filter(_.tpe == WorkerType.responder)
Source(responderDefinitions.toList) → Future.successful(responderDefinitions.size.toLong)
}

def get(workerId: String): Future[Worker] = getSrv[WorkerModel, Worker](workerModel, workerId)
Expand All @@ -103,36 +103,6 @@ class WorkerSrv(
.map(_.getOrElse(throw NotFoundError(s"worker $workerId not found")))
}

// private def listForOrganization(organizationId: String): (Source[Worker, NotUsed], Future[Long]) = {
// import org.elastic4play.services.QueryDSL._
// findForOrganization(organizationId, any, Some("all"), Nil)
// }
//
// def listAnalyzerForOrganization(organizationId: String): (Source[Worker, NotUsed], Future[Long]) = {
// import org.elastic4play.services.QueryDSL._
// findForOrganization(organizationId, "type" ~= WorkerType.analyzer, Some("all"), Nil)
// }
//
// private def listForUser(userId: String): (Source[Worker, NotUsed], Future[Long]) = {
// import org.elastic4play.services.QueryDSL._
// findForUser(userId, any, Some("all"), Nil)
// }
//
// def listAnalyzerForUser(userId: String): (Source[Worker, NotUsed], Future[Long]) = {
// import org.elastic4play.services.QueryDSL._
// findForUser(userId, "type" ~= WorkerType.analyzer, Some("all"), Nil)
// }
//
// def findForUser(userId: String, queryDef: QueryDef, range: Option[String], sortBy: Seq[String]): (Source[Worker, NotUsed], Future[Long]) = {
// val workers = for {
// user ← userSrv.get(userId)
// organizationId = user.organization()
// } yield findForOrganization(organizationId, queryDef, range, sortBy)
// val analyserSource = Source.fromFutureSource(workers.map(_._1)).mapMaterializedValue(_ ⇒ NotUsed)
// val analyserTotal = workers.flatMap(_._2)
// analyserSource → analyserTotal
// }

def findAnalyzersForUser(userId: String, queryDef: QueryDef, range: Option[String], sortBy: Seq[String]): (Source[Worker, NotUsed], Future[Long]) = {
import org.elastic4play.services.QueryDSL._
val analyzers = for {
Expand All @@ -146,12 +116,12 @@ class WorkerSrv(

def findRespondersForUser(userId: String, queryDef: QueryDef, range: Option[String], sortBy: Seq[String]): (Source[Worker, NotUsed], Future[Long]) = {
import org.elastic4play.services.QueryDSL._
val analyzers = for {
val responders = for {
user ← userSrv.get(userId)
organizationId = user.organization()
} yield findForOrganization(organizationId, and(queryDef, "type" ~= WorkerType.responder), range, sortBy)
val analyserSource = Source.fromFutureSource(analyzers.map(_._1)).mapMaterializedValue(_ ⇒ NotUsed)
val analyserTotal = analyzers.flatMap(_._2)
val analyserSource = Source.fromFutureSource(responders.map(_._1)).mapMaterializedValue(_ ⇒ NotUsed)
val analyserTotal = responders.flatMap(_._2)
analyserSource → analyserTotal
}

Expand All @@ -166,31 +136,31 @@ class WorkerSrv(

def rescan(): Unit = {
scan(analyzersPaths.map(_ → WorkerType.analyzer) ++
workersPaths.map(_ → WorkerType.responder))
respondersPaths.map(_ → WorkerType.responder))
}

def scan(analyzerPaths: Seq[(Path, WorkerType.Type)]): Unit = {
val analyzers = (for {
(analyzerPath, analyzerType) ← analyzerPaths
analyzerDir ← Try(Files.newDirectoryStream(analyzerPath).asScala).getOrElse {
logger.warn(s"Analyzer directory ($analyzerPath) is not found")
def scan(workerPaths: Seq[(Path, WorkerType.Type)]): Unit = {
val workers = (for {
(workerPath, workerType) ← workerPaths
workerDir ← Try(Files.newDirectoryStream(workerPath).asScala).getOrElse {
logger.warn(s"Worker directory ($workerPath) is not found")
Nil
}
if Files.isDirectory(analyzerDir)
infoFile ← Files.newDirectoryStream(analyzerDir, "*.json").asScala
analyzerDefinition ← WorkerDefinition.fromPath(infoFile, analyzerType).fold(
if Files.isDirectory(workerDir)
infoFile ← Files.newDirectoryStream(workerDir, "*.json").asScala
workerDefinition ← WorkerDefinition.fromPath(infoFile, workerType).fold(
error ⇒ {
logger.warn("Analyzer definition file read error", error)
logger.warn("Worker definition file read error", error)
Nil
},
ad ⇒ Seq(ad))
} yield analyzerDefinition.id → analyzerDefinition)
} yield workerDefinition.id → workerDefinition)
.toMap

workerMapLock.synchronized {
workerMap = analyzers
workerMap = workers
}
logger.info(s"New analyzer list:\n\n\t${workerMap.values.map(a ⇒ s"${a.name} ${a.version}").mkString("\n\t")}\n")
logger.info(s"New worker list:\n\n\t${workerMap.values.map(a ⇒ s"${a.name} ${a.version}").mkString("\n\t")}\n")
}

def create(organization: Organization, workerDefinition: WorkerDefinition, workerFields: Fields)(implicit authContext: AuthContext): Future[Worker] = {
Expand All @@ -217,7 +187,7 @@ class WorkerSrv(

}, {
case One(e) ⇒ Future.failed(e)
case Every(es @ _*) ⇒ Future.failed(AttributeCheckingError(s"analyzer(${workerDefinition.name}).configuration", es))
case Every(es @ _*) ⇒ Future.failed(AttributeCheckingError(s"worker(${workerDefinition.name}).configuration", es))
})
}

Expand All @@ -228,22 +198,22 @@ class WorkerSrv(
} yield worker
}

def delete(analyzer: Worker)(implicit authContext: AuthContext): Future[Unit] =
deleteSrv.realDelete(analyzer)
def delete(worker: Worker)(implicit authContext: AuthContext): Future[Unit] =
deleteSrv.realDelete(worker)

def delete(analyzerId: String)(implicit authContext: AuthContext): Future[Unit] =
deleteSrv.realDelete[WorkerModel, Worker](workerModel, analyzerId)
def delete(workerId: String)(implicit authContext: AuthContext): Future[Unit] =
deleteSrv.realDelete[WorkerModel, Worker](workerModel, workerId)

def update(analyzer: Worker, fields: Fields)(implicit authContext: AuthContext): Future[Worker] = update(analyzer, fields, ModifyConfig.default)
def update(worker: Worker, fields: Fields)(implicit authContext: AuthContext): Future[Worker] = update(worker, fields, ModifyConfig.default)

def update(analyzer: Worker, fields: Fields, modifyConfig: ModifyConfig)(implicit authContext: AuthContext): Future[Worker] = {
val analyzerFields = fields.getValue("configuration").fold(fields)(cfg ⇒ fields.set("configuration", cfg.toString))
updateSrv(analyzer, analyzerFields, modifyConfig)
def update(worker: Worker, fields: Fields, modifyConfig: ModifyConfig)(implicit authContext: AuthContext): Future[Worker] = {
val workerFields = fields.getValue("configuration").fold(fields)(cfg ⇒ fields.set("configuration", cfg.toString))
updateSrv(worker, workerFields, modifyConfig)
}

def update(analyzerId: String, fields: Fields)(implicit authContext: AuthContext): Future[Worker] = update(analyzerId, fields, ModifyConfig.default)
def update(workerId: String, fields: Fields)(implicit authContext: AuthContext): Future[Worker] = update(workerId, fields, ModifyConfig.default)

def update(analyzerId: String, fields: Fields, modifyConfig: ModifyConfig)(implicit authContext: AuthContext): Future[Worker] = {
get(analyzerId).flatMap(analyzer ⇒ update(analyzer, fields, modifyConfig))
def update(workerId: String, fields: Fields, modifyConfig: ModifyConfig)(implicit authContext: AuthContext): Future[Worker] = {
get(workerId).flatMap(worker ⇒ update(worker, fields, modifyConfig))
}
}
2 changes: 1 addition & 1 deletion test/resources/analyzers/echoAnalyzer/echoAnalyzer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "TheHive-Project",
"url": "https://github.com/thehive-project/thehive",
"license": "AGPL-V3",
"baseconfig": "echoAnalyzer",
"baseConfig": "echoAnalyzer",
"config": {

},
Expand Down

0 comments on commit 6281b9c

Please sign in to comment.