-
Notifications
You must be signed in to change notification settings - Fork 236
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#426 Make obsolete worker still available and notify user to update them
- Loading branch information
Showing
13 changed files
with
214 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,57 +1,71 @@ | ||
| package org.thp.cortex.controllers | ||
|
|
||
| import scala.concurrent.ExecutionContext | ||
|
|
||
| import scala.concurrent.{ExecutionContext, Future} | ||
| import play.api.Configuration | ||
| import play.api.http.Status | ||
| import play.api.libs.json.Json.toJsFieldJsValueWrapper | ||
| import play.api.libs.json.{JsBoolean, JsString, Json} | ||
| import play.api.libs.json.{JsBoolean, JsNull, JsString, Json} | ||
| import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents} | ||
|
|
||
| import com.sksamuel.elastic4s.ElasticDsl | ||
| import org.elastic4play.controllers.Authenticated | ||
|
|
||
| import javax.inject.{Inject, Singleton} | ||
| import org.elasticsearch.client.Node | ||
| import org.thp.cortex.models.Worker | ||
|
|
||
| import org.thp.cortex.models.{Roles, Worker, WorkerType} | ||
| import org.elastic4play.services.AuthSrv | ||
| import org.elastic4play.services.auth.MultiAuthSrv | ||
| import org.thp.cortex.services.WorkerSrv | ||
|
|
||
| @Singleton | ||
| class StatusCtrl @Inject() ( | ||
| configuration: Configuration, | ||
| authSrv: AuthSrv, | ||
| workerSrv: WorkerSrv, | ||
| components: ControllerComponents, | ||
| authenticated: Authenticated, | ||
| implicit val ec: ExecutionContext | ||
| ) extends AbstractController(components) | ||
| with Status { | ||
|
|
||
| private[controllers] def getVersion(c: Class[_]) = Option(c.getPackage.getImplementationVersion).getOrElse("SNAPSHOT") | ||
|
|
||
| def get: Action[AnyContent] = Action { | ||
| Ok( | ||
| Json.obj( | ||
| "versions" -> Json.obj( | ||
| "Cortex" -> getVersion(classOf[Worker]), | ||
| "Elastic4Play" -> getVersion(classOf[AuthSrv]), | ||
| "Play" -> getVersion(classOf[AbstractController]), | ||
| "Elastic4s" -> getVersion(classOf[ElasticDsl]), | ||
| "ElasticSearch client" -> getVersion(classOf[Node]) | ||
| ), | ||
| "config" -> Json.obj( | ||
| "protectDownloadsWith" -> configuration.get[String]("datastore.attachment.password"), | ||
| "authType" -> (authSrv match { | ||
| case multiAuthSrv: MultiAuthSrv => | ||
| multiAuthSrv.authProviders.map { a => | ||
| JsString(a.name) | ||
| } | ||
| case _ => JsString(authSrv.name) | ||
| }), | ||
| "capabilities" -> authSrv.capabilities.map(c => JsString(c.toString)), | ||
| "ssoAutoLogin" -> JsBoolean(configuration.getOptional[Boolean]("auth.sso.autologin").getOrElse(false)) | ||
| def get: Action[AnyContent] = | ||
| Action { | ||
| Ok( | ||
| Json.obj( | ||
| "versions" -> Json.obj( | ||
| "Cortex" -> getVersion(classOf[Worker]), | ||
| "Elastic4Play" -> getVersion(classOf[AuthSrv]), | ||
| "Play" -> getVersion(classOf[AbstractController]), | ||
| "Elastic4s" -> getVersion(classOf[ElasticDsl]), | ||
| "ElasticSearch client" -> getVersion(classOf[Node]) | ||
| ), | ||
| "config" -> Json.obj( | ||
| "protectDownloadsWith" -> configuration.get[String]("datastore.attachment.password"), | ||
| "authType" -> (authSrv match { | ||
| case multiAuthSrv: MultiAuthSrv => | ||
| multiAuthSrv.authProviders.map { a => | ||
| JsString(a.name) | ||
| } | ||
| case _ => JsString(authSrv.name) | ||
| }), | ||
| "capabilities" -> authSrv.capabilities.map(c => JsString(c.toString)), | ||
| "ssoAutoLogin" -> JsBoolean(configuration.getOptional[Boolean]("auth.sso.autologin").getOrElse(false)) | ||
| ) | ||
| ) | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| def getAlerts: Action[AnyContent] = | ||
| authenticated(Roles.read).async { implicit request => | ||
| workerSrv.obsoleteWorkersForUser(request.userId).map { obsoleteWorkers => | ||
| val (obsoleteAnalyzers, obsoleteResponders) = obsoleteWorkers.partition(_.tpe() == WorkerType.analyzer) | ||
| val alerts = | ||
| (if (obsoleteAnalyzers.nonEmpty) List("ObsoleteAnalyzers") else Nil) ::: | ||
| (if (obsoleteResponders.nonEmpty) List("ObsoleteResponders") else Nil) | ||
| Ok(Json.toJson(alerts)) | ||
| } | ||
| } | ||
|
|
||
| def health: Action[AnyContent] = TODO | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| 'user strict'; | ||
|
|
||
| import _ from "lodash"; | ||
|
|
||
| export default class AlertService { | ||
| constructor($http, $interval) { | ||
| 'ngInject'; | ||
|
|
||
| this.$http = $http; | ||
| this.$interval = $interval; | ||
| this.update = 0; | ||
| this.alerts = []; | ||
| } | ||
|
|
||
| startUpdate() { | ||
| this.update += 1; | ||
| if (!this.timer) { | ||
| this.timer = this.$interval(this.updateAlerts, 1000, 0, true, this); | ||
| } | ||
| } | ||
|
|
||
| stopUpdate() { | ||
| this.update -= 1; | ||
| if (this.update <= 0 && this.$interval) { | ||
| this.$interval.cancel(this.timer); | ||
| delete this.$interval; | ||
| } | ||
| } | ||
|
|
||
| updateAlerts(self) { | ||
| self.$http.get('./api/alert').then( | ||
| response => { | ||
| self.alerts = response.data; | ||
| }, | ||
| rejection => { | ||
| self.alerts = []; | ||
| } | ||
| ); | ||
| } | ||
|
|
||
| contains(alertType) { | ||
| return _.find(this.alerts, { type: alertType }); | ||
| } | ||
|
|
||
| nonEmpty() { | ||
| return this.alerts.length > 0; | ||
| } | ||
|
|
||
| isEmpty() { | ||
| return this.alerts.length == 0; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 5 additions & 4 deletions
9
www/src/app/pages/admin/organizations/components/analyzers/analyzers-list.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.