From 12fd9dea59cad9b4da5576da4a427c2472981349 Mon Sep 17 00:00:00 2001 From: Radu Tanasa Date: Mon, 18 Jan 2016 14:46:57 +0200 Subject: [PATCH 1/2] Integrate basic authentication --- app/loader/Global.scala | 10 ++++++++++ app/loader/KafkaManagerLoader.scala | 3 +++ build.sbt | 5 ++++- conf/application.conf | 3 +++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 app/loader/Global.scala diff --git a/app/loader/Global.scala b/app/loader/Global.scala new file mode 100644 index 000000000..240866c86 --- /dev/null +++ b/app/loader/Global.scala @@ -0,0 +1,10 @@ +package loader + +import net.kaliber.basicAuthentication.BasicAuthenticationFilter +import play.api.GlobalSettings +import play.api.mvc.WithFilters + +/** + * Created by radu on 15/01/16. + */ +object Global extends WithFilters(BasicAuthenticationFilter()) with GlobalSettings diff --git a/app/loader/KafkaManagerLoader.scala b/app/loader/KafkaManagerLoader.scala index 3cda91b24..6d476df49 100644 --- a/app/loader/KafkaManagerLoader.scala +++ b/app/loader/KafkaManagerLoader.scala @@ -8,6 +8,7 @@ package loader import controllers.KafkaManagerContext import features.ApplicationFeatures import models.navigation.Menus +import net.kaliber.basicAuthentication.BasicAuthenticationFilter import play.api.ApplicationLoader import play.api.ApplicationLoader.Context import play.api.BuiltInComponentsFromContext @@ -39,6 +40,8 @@ class ApplicationComponents(context: Context) extends BuiltInComponentsFromConte private[this] lazy val assetsC = new controllers.Assets(httpErrorHandler) private[this] lazy val webJarsAssetsC = new controllers.WebJarAssets(httpErrorHandler, context.initialConfiguration, context.environment) + override lazy val httpFilters = Seq(BasicAuthenticationFilter(context.initialConfiguration)) + override val router: Router = new Routes( httpErrorHandler, applicationC, diff --git a/build.sbt b/build.sbt index 9fca14f6c..cf0042501 100644 --- a/build.sbt +++ b/build.sbt @@ -18,6 +18,8 @@ assemblyMergeStrategy in assembly := { case other => (assemblyMergeStrategy in assembly).value(other) } +resolvers += "Kaliber Repository" at "https://jars.kaliber.io/artifactory/libs-release-local" + libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-actor" % "2.3.14", "com.typesafe.akka" %% "akka-slf4j" % "2.3.14", @@ -39,7 +41,8 @@ libraryDependencies ++= Seq( "org.scalatest" %% "scalatest" % "2.2.1" % "test", "org.apache.curator" % "curator-test" % "2.9.1" % "test", "org.mockito" % "mockito-core" % "1.10.19" % "test", - "com.yammer.metrics" % "metrics-core" % "2.2.0" force() + "com.yammer.metrics" % "metrics-core" % "2.2.0" force(), + "net.kaliber" %% "play-basic-authentication-filter" % "0.7" ) routesGenerator := InjectedRoutesGenerator diff --git a/conf/application.conf b/conf/application.conf index 89714ba2a..843990a91 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -26,6 +26,9 @@ pinned-dispatcher.type="PinnedDispatcher" pinned-dispatcher.executor="thread-pool-executor" application.features=["KMClusterManagerFeature","KMTopicManagerFeature","KMPreferredReplicaElectionFeature","KMReassignPartitionsFeature"] +basicAuthentication.username=username +basicAuthentication.password=password + akka { loggers = ["akka.event.slf4j.Slf4jLogger"] loglevel = "INFO" From 538d96d089eb6fb67a148fc349833dad764f259c Mon Sep 17 00:00:00 2001 From: Radu Tanasa Date: Tue, 19 Jan 2016 14:56:00 +0200 Subject: [PATCH 2/2] Not required --- app/loader/Global.scala | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 app/loader/Global.scala diff --git a/app/loader/Global.scala b/app/loader/Global.scala deleted file mode 100644 index 240866c86..000000000 --- a/app/loader/Global.scala +++ /dev/null @@ -1,10 +0,0 @@ -package loader - -import net.kaliber.basicAuthentication.BasicAuthenticationFilter -import play.api.GlobalSettings -import play.api.mvc.WithFilters - -/** - * Created by radu on 15/01/16. - */ -object Global extends WithFilters(BasicAuthenticationFilter()) with GlobalSettings