Skip to content

Commit 8647850

Browse files
To-omTo-om
committed
Reformat code
1 parent b1836de commit 8647850

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1098
-1101
lines changed

‎.scalafmt.conf

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
version = "2.0.0-RC7"
1+
version = 2.3.2
2+
project.git = true
23
align = more # For pretty alignment.
34
assumeStandardLibraryStripMargin = true
45
style = defaultWithAlign
56
maxColumn = 150
67

78
align.openParenCallSite = false
89
align.openParenDefnSite = false
9-
newlines.alwaysBeforeTopLevelStatements = true
10+
newlines.alwaysBeforeTopLevelStatements = false
1011
rewrite.rules = [
11-
# ExpandImportSelectors
1212
RedundantBraces
1313
RedundantParens
1414
SortModifiers
@@ -20,7 +20,7 @@ includeCurlyBraceInSelectChains = true
2020
includeNoParensInSelectChains = true
2121

2222
rewriteTokens {
23-
"=>" : "⇒"
24-
"<-" : "←"
25-
"->": "→"
23+
"⇒" : "=>"
24+
"←" : "<-"
25+
"→" : "->"
2626
}

‎app/org/thp/cortex/Module.scala

+9-9
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import org.thp.cortex.services._
1717

1818
import org.elastic4play.models.BaseModelDef
1919
import org.elastic4play.services.auth.MultiAuthSrv
20-
import org.elastic4play.services.{UserSrv ⇒ EUserSrv, AuthSrv, MigrationOperations}
20+
import org.elastic4play.services.{UserSrv => EUserSrv, AuthSrv, MigrationOperations}
2121
import org.thp.cortex.controllers.{AssetCtrl, AssetCtrlDev, AssetCtrlProd}
2222
import services.mappers.{MultiUserMapperSrv, UserMapper}
2323

@@ -41,8 +41,8 @@ class Module(environment: Environment, configuration: Configuration) extends Abs
4141
reflectionClasses
4242
.getSubTypesOf(classOf[BaseModelDef])
4343
.asScala
44-
.filterNot(c ⇒ Modifier.isAbstract(c.getModifiers))
45-
.foreach { modelClass ⇒
44+
.filterNot(c => Modifier.isAbstract(c.getModifiers))
45+
.foreach { modelClass =>
4646
logger.info(s"Loading model $modelClass")
4747
modelBindings.addBinding.to(modelClass)
4848
if (classOf[AuditedModel].isAssignableFrom(modelClass)) {
@@ -54,9 +54,9 @@ class Module(environment: Environment, configuration: Configuration) extends Abs
5454
reflectionClasses
5555
.getSubTypesOf(classOf[AuthSrv])
5656
.asScala
57-
.filterNot(c ⇒ Modifier.isAbstract(c.getModifiers) || c.isMemberClass)
58-
.filterNot(c ⇒ c == classOf[MultiAuthSrv] || c == classOf[CortexAuthSrv])
59-
.foreach { authSrvClass ⇒
57+
.filterNot(c => Modifier.isAbstract(c.getModifiers) || c.isMemberClass)
58+
.filterNot(c => c == classOf[MultiAuthSrv] || c == classOf[CortexAuthSrv])
59+
.foreach { authSrvClass =>
6060
logger.info(s"Loading authentication module $authSrvClass")
6161
authBindings.addBinding.to(authSrvClass)
6262
}
@@ -65,9 +65,9 @@ class Module(environment: Environment, configuration: Configuration) extends Abs
6565
reflectionClasses
6666
.getSubTypesOf(classOf[UserMapper])
6767
.asScala
68-
.filterNot(c ⇒ Modifier.isAbstract(c.getModifiers) || c.isMemberClass)
69-
.filterNot(c ⇒ c == classOf[MultiUserMapperSrv])
70-
.foreach(mapperCls ⇒ ssoMapperBindings.addBinding.to(mapperCls))
68+
.filterNot(c => Modifier.isAbstract(c.getModifiers) || c.isMemberClass)
69+
.filterNot(c => c == classOf[MultiUserMapperSrv])
70+
.foreach(mapperCls => ssoMapperBindings.addBinding.to(mapperCls))
7171

7272
if (environment.mode == Mode.Prod)
7373
bind[AssetCtrl].to[AssetCtrlProd]

‎app/org/thp/cortex/controllers/AnalyzerConfigCtrl.scala

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import org.elastic4play.BadRequestError
1313
import org.elastic4play.controllers.{Authenticated, Fields, FieldsBodyParser, Renderer}
1414

1515
@Singleton
16-
class AnalyzerConfigCtrl @Inject()(
16+
class AnalyzerConfigCtrl @Inject() (
1717
analyzerConfigSrv: AnalyzerConfigSrv,
1818
userSrv: UserSrv,
1919
authenticated: Authenticated,
@@ -23,34 +23,34 @@ class AnalyzerConfigCtrl @Inject()(
2323
implicit val ec: ExecutionContext
2424
) extends AbstractController(components) {
2525

26-
def get(analyzerConfigName: String): Action[AnyContent] = authenticated(Roles.orgAdmin).async { request ⇒
26+
def get(analyzerConfigName: String): Action[AnyContent] = authenticated(Roles.orgAdmin).async { request =>
2727
analyzerConfigSrv
2828
.getForUser(request.userId, analyzerConfigName)
2929
.map(renderer.toOutput(OK, _))
3030
}
3131

32-
def list(): Action[AnyContent] = authenticated(Roles.orgAdmin).async { request ⇒
32+
def list(): Action[AnyContent] = authenticated(Roles.orgAdmin).async { request =>
3333
analyzerConfigSrv
3434
.listConfigForUser(request.userId)
35-
.map { bc ⇒
35+
.map { bc =>
3636
renderer.toOutput(
3737
OK,
3838
bc.sortWith {
39-
case (BaseConfig("global", _, _, _), _) ⇒ true
40-
case (_, BaseConfig("global", _, _, _)) ⇒ false
41-
case (BaseConfig(a, _, _, _), BaseConfig(b, _, _, _)) ⇒ a.compareTo(b) < 0
39+
case (BaseConfig("global", _, _, _), _) => true
40+
case (_, BaseConfig("global", _, _, _)) => false
41+
case (BaseConfig(a, _, _, _), BaseConfig(b, _, _, _)) => a.compareTo(b) < 0
4242
}
4343
)
4444
}
4545
}
4646

47-
def update(analyzerConfigName: String): Action[Fields] = authenticated(Roles.orgAdmin).async(fieldsBodyParser) { implicit request ⇒
47+
def update(analyzerConfigName: String): Action[Fields] = authenticated(Roles.orgAdmin).async(fieldsBodyParser) { implicit request =>
4848
request.body.getValue("config").flatMap(_.asOpt[JsObject]) match {
49-
case Some(config) ⇒
49+
case Some(config) =>
5050
analyzerConfigSrv
5151
.updateOrCreate(request.userId, analyzerConfigName, config)
5252
.map(renderer.toOutput(OK, _))
53-
case None ⇒ Future.failed(BadRequestError("attribute config has invalid format"))
53+
case None => Future.failed(BadRequestError("attribute config has invalid format"))
5454
}
5555
}
5656
}

‎app/org/thp/cortex/controllers/AnalyzerCtrl.scala

+19-19
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import org.elastic4play.services.JsonFormat.queryReads
1515
import org.elastic4play.services.{QueryDSL, QueryDef}
1616

1717
@Singleton
18-
class AnalyzerCtrl @Inject()(
18+
class AnalyzerCtrl @Inject() (
1919
workerSrv: WorkerSrv,
2020
userSrv: UserSrv,
2121
authenticated: Authenticated,
@@ -26,7 +26,7 @@ class AnalyzerCtrl @Inject()(
2626
implicit val mat: Materializer
2727
) extends AbstractController(components) {
2828

29-
def find: Action[Fields] = authenticated(Roles.read).async(fieldsBodyParser) { request ⇒
29+
def find: Action[Fields] = authenticated(Roles.read).async(fieldsBodyParser) { request =>
3030
val query = request.body.getValue("query").fold[QueryDef](QueryDSL.any)(_.as[QueryDef])
3131
val range = request.body.getString("range")
3232
val sort = request.body.getStrings("sort").getOrElse(Nil)
@@ -35,54 +35,54 @@ class AnalyzerCtrl @Inject()(
3535
renderer.toOutput(OK, analyzers.map(analyzerJson(isAdmin)), analyzerTotal)
3636
}
3737

38-
def get(analyzerId: String): Action[AnyContent] = authenticated(Roles.read).async { request ⇒
38+
def get(analyzerId: String): Action[AnyContent] = authenticated(Roles.read).async { request =>
3939
val isAdmin = request.roles.contains(Roles.orgAdmin)
4040
workerSrv
4141
.getForUser(request.userId, analyzerId)
42-
.map(a ⇒ renderer.toOutput(OK, analyzerJson(isAdmin)(a)))
42+
.map(a => renderer.toOutput(OK, analyzerJson(isAdmin)(a)))
4343
}
4444

4545
private def analyzerJson(isAdmin: Boolean)(analyzer: Worker): JsObject =
4646
if (isAdmin)
47-
analyzer.toJson + ("configuration" → Json.parse(analyzer.configuration())) + ("analyzerDefinitionId" → JsString(analyzer.workerDefinitionId()))
47+
analyzer.toJson + ("configuration" -> Json.parse(analyzer.configuration())) + ("analyzerDefinitionId" -> JsString(analyzer.workerDefinitionId()))
4848
else
49-
analyzer.toJson + ("analyzerDefinitionId" → JsString(analyzer.workerDefinitionId()))
49+
analyzer.toJson + ("analyzerDefinitionId" -> JsString(analyzer.workerDefinitionId()))
5050

51-
def listForType(dataType: String): Action[AnyContent] = authenticated(Roles.read).async { request ⇒
51+
def listForType(dataType: String): Action[AnyContent] = authenticated(Roles.read).async { request =>
5252
import org.elastic4play.services.QueryDSL._
5353
val (responderList, responderCount) = workerSrv.findAnalyzersForUser(request.userId, "dataTypeList" ~= dataType, Some("all"), Nil)
5454
renderer.toOutput(OK, responderList.map(analyzerJson(isAdmin = false)), responderCount)
5555
}
5656

57-
def create(analyzerDefinitionId: String): Action[Fields] = authenticated(Roles.orgAdmin).async(fieldsBodyParser) { implicit request ⇒
57+
def create(analyzerDefinitionId: String): Action[Fields] = authenticated(Roles.orgAdmin).async(fieldsBodyParser) { implicit request =>
5858
for {
59-
organizationId ← userSrv.getOrganizationId(request.userId)
60-
workerDefinition ← Future.fromTry(workerSrv.getDefinition(analyzerDefinitionId))
61-
analyzer ← workerSrv.create(organizationId, workerDefinition, request.body)
59+
organizationId <- userSrv.getOrganizationId(request.userId)
60+
workerDefinition <- Future.fromTry(workerSrv.getDefinition(analyzerDefinitionId))
61+
analyzer <- workerSrv.create(organizationId, workerDefinition, request.body)
6262
} yield renderer.toOutput(CREATED, analyzerJson(isAdmin = false)(analyzer))
6363
}
6464

65-
def listDefinitions: Action[AnyContent] = authenticated(Roles.orgAdmin, Roles.superAdmin).async { _ ⇒
65+
def listDefinitions: Action[AnyContent] = authenticated(Roles.orgAdmin, Roles.superAdmin).async { _ =>
6666
val (analyzers, analyzerTotal) = workerSrv.listAnalyzerDefinitions
6767
renderer.toOutput(OK, analyzers, analyzerTotal)
6868
}
6969

70-
def scan: Action[AnyContent] = authenticated(Roles.orgAdmin, Roles.superAdmin) { _ ⇒
70+
def scan: Action[AnyContent] = authenticated(Roles.orgAdmin, Roles.superAdmin) { _ =>
7171
workerSrv.rescan()
7272
NoContent
7373
}
7474

75-
def delete(analyzerId: String): Action[AnyContent] = authenticated(Roles.orgAdmin, Roles.superAdmin).async { implicit request ⇒
75+
def delete(analyzerId: String): Action[AnyContent] = authenticated(Roles.orgAdmin, Roles.superAdmin).async { implicit request =>
7676
for {
77-
analyzer ← workerSrv.getForUser(request.userId, analyzerId)
78-
_ ← workerSrv.delete(analyzer)
77+
analyzer <- workerSrv.getForUser(request.userId, analyzerId)
78+
_ <- workerSrv.delete(analyzer)
7979
} yield NoContent
8080
}
8181

82-
def update(analyzerId: String): Action[Fields] = authenticated(Roles.orgAdmin).async(fieldsBodyParser) { implicit request ⇒
82+
def update(analyzerId: String): Action[Fields] = authenticated(Roles.orgAdmin).async(fieldsBodyParser) { implicit request =>
8383
for {
84-
analyzer ← workerSrv.getForUser(request.userId, analyzerId)
85-
updatedAnalyzer ← workerSrv.update(analyzer, request.body)
84+
analyzer <- workerSrv.getForUser(request.userId, analyzerId)
85+
updatedAnalyzer <- workerSrv.update(analyzer, request.body)
8686
} yield renderer.toOutput(OK, analyzerJson(isAdmin = true)(updatedAnalyzer))
8787
}
8888
}

‎app/org/thp/cortex/controllers/AssetCtrl.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ trait AssetCtrl {
1313
}
1414

1515
@Singleton
16-
class AssetCtrlProd @Inject()(errorHandler: HttpErrorHandler, meta: AssetsMetadata) extends Assets(errorHandler, meta) with AssetCtrl {
16+
class AssetCtrlProd @Inject() (errorHandler: HttpErrorHandler, meta: AssetsMetadata) extends Assets(errorHandler, meta) with AssetCtrl {
1717
def get(file: String): Action[AnyContent] = at("/www", file)
1818
}
1919

2020
@Singleton
21-
class AssetCtrlDev @Inject()(environment: Environment)(implicit ec: ExecutionContext, fileMimeTypes: FileMimeTypes)
21+
class AssetCtrlDev @Inject() (environment: Environment)(implicit ec: ExecutionContext, fileMimeTypes: FileMimeTypes)
2222
extends ExternalAssets(environment)
2323
with AssetCtrl {
2424
def get(file: String): Action[AnyContent] = at("www/dist", file)

‎app/org/thp/cortex/controllers/AttachmentCtrl.scala

+8-8
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ class AttachmentCtrl(
4949
* open the document directly. It must be used only for safe file
5050
*/
5151
@Timed("controllers.AttachmentCtrl.download")
52-
def download(hash: String, name: Option[String]): Action[AnyContent] = authenticated(Roles.read) { _ ⇒
52+
def download(hash: String, name: Option[String]): Action[AnyContent] = authenticated(Roles.read) { _ =>
5353
if (hash.startsWith("{{")) // angularjs hack
5454
NoContent
5555
else if (!name.getOrElse("").intersect(AttachmentAttributeFormat.forbiddenChar).isEmpty)
5656
mvc.Results.BadRequest("File name is invalid")
5757
else
5858
Result(
59-
header = ResponseHeader(200, Map("Content-Disposition" → s"""attachment; filename="${URLEncoder
60-
.encode(name.getOrElse(hash), "utf-8")}"""", "Content-Transfer-Encoding" → "binary")),
59+
header = ResponseHeader(200, Map("Content-Disposition" -> s"""attachment; filename="${URLEncoder
60+
.encode(name.getOrElse(hash), "utf-8")}"""", "Content-Transfer-Encoding" -> "binary")),
6161
body = HttpEntity.Streamed(attachmentSrv.source(hash), None, None)
6262
)
6363
}
@@ -68,7 +68,7 @@ class AttachmentCtrl(
6868
* File name can be specified (zip extension is append)
6969
*/
7070
@Timed("controllers.AttachmentCtrl.downloadZip")
71-
def downloadZip(hash: String, name: Option[String]): Action[AnyContent] = authenticated(Roles.read) { _ ⇒
71+
def downloadZip(hash: String, name: Option[String]): Action[AnyContent] = authenticated(Roles.read) { _ =>
7272
if (!name.getOrElse("").intersect(AttachmentAttributeFormat.forbiddenChar).isEmpty)
7373
BadRequest("File name is invalid")
7474
else {
@@ -88,10 +88,10 @@ class AttachmentCtrl(
8888
header = ResponseHeader(
8989
200,
9090
Map(
91-
"Content-Disposition" → s"""attachment; filename="${URLEncoder.encode(name.getOrElse(hash), "utf-8")}.zip"""",
92-
"Content-Type" → "application/zip",
93-
"Content-Transfer-Encoding" → "binary",
94-
"Content-Length" → Files.size(f).toString
91+
"Content-Disposition" -> s"""attachment; filename="${URLEncoder.encode(name.getOrElse(hash), "utf-8")}.zip"""",
92+
"Content-Type" -> "application/zip",
93+
"Content-Transfer-Encoding" -> "binary",
94+
"Content-Length" -> Files.size(f).toString
9595
)
9696
),
9797
body = HttpEntity.Streamed(FileIO.fromPath(f), Some(Files.size(f)), Some("application/zip"))

‎app/org/thp/cortex/controllers/AuthenticationCtrl.scala

+13-13
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import play.api.mvc._
1414
import scala.concurrent.{ExecutionContext, Future}
1515

1616
@Singleton
17-
class AuthenticationCtrl @Inject()(
17+
class AuthenticationCtrl @Inject() (
1818
configuration: Configuration,
1919
authSrv: AuthSrv,
2020
userSrv: UserSrv,
@@ -27,34 +27,34 @@ class AuthenticationCtrl @Inject()(
2727
) extends AbstractController(components) {
2828

2929
@Timed
30-
def login: Action[Fields] = Action.async(fieldsBodyParser) { implicit request ⇒
30+
def login: Action[Fields] = Action.async(fieldsBodyParser) { implicit request =>
3131
dbIndex.getIndexStatus.flatMap {
32-
case false ⇒ Future.successful(Results.Status(520))
33-
case _ ⇒
32+
case false => Future.successful(Results.Status(520))
33+
case _ =>
3434
for {
35-
user ← request.body.getString("user").fold[Future[String]](Future.failed(MissingAttributeError("user")))(Future.successful)
36-
password ← request.body.getString("password").fold[Future[String]](Future.failed(MissingAttributeError("password")))(Future.successful)
37-
authContext ← authSrv.authenticate(user, password)
35+
user <- request.body.getString("user").fold[Future[String]](Future.failed(MissingAttributeError("user")))(Future.successful)
36+
password <- request.body.getString("password").fold[Future[String]](Future.failed(MissingAttributeError("password")))(Future.successful)
37+
authContext <- authSrv.authenticate(user, password)
3838
} yield authenticated.setSessingUser(renderer.toOutput(OK, authContext), authContext)
3939
}
4040
}
4141

4242
@Timed
43-
def ssoLogin: Action[AnyContent] = Action.async { implicit request ⇒
43+
def ssoLogin: Action[AnyContent] = Action.async { implicit request =>
4444
dbIndex.getIndexStatus.flatMap {
45-
case false ⇒ Future.successful(Results.Status(520))
46-
case _ ⇒
45+
case false => Future.successful(Results.Status(520))
46+
case _ =>
4747
authSrv
4848
.authenticate()
4949
.flatMap {
50-
case Right(authContext) ⇒
51-
userSrv.get(authContext.userId).map { user ⇒
50+
case Right(authContext) =>
51+
userSrv.get(authContext.userId).map { user =>
5252
if (user.status() == UserStatus.Ok)
5353
authenticated.setSessingUser(Redirect(configuration.get[String]("play.http.context").stripSuffix("/") + "/index.html"), authContext)
5454
else
5555
throw AuthorizationError("Your account is locked")
5656
}
57-
case Left(result) ⇒ Future.successful(result)
57+
case Left(result) => Future.successful(result)
5858
}
5959
}
6060
}

0 commit comments

Comments
 (0)