Merge remote-tracking branch 'origin/feature/Authorization' into feature/dragAndDropEdges

Author: janniclas

app/authorization/AuthProvider.scala

@@ -17,27 +17,30 @@ package authorization
 
 
 import pdi.jwt.{Jwt, JwtAlgorithm, JwtClaim}
-
-
-object AuthProvider  {
-
-  /** This method generates JWT token for registering Delphi-Management at the Instance-Registry
-    *
-    *
-    * @param validFor
-    * @return
-    */
-
-
-  def generateJwt(validFor: Long = 1): String = {
-    val jwtSecretKey = "changeme"// configuration.get[String]("play.http.secret.JWTkey")
-    val claim = JwtClaim()
-      .issuedNow
-      .expiresIn(validFor*1200)
-      .startsNow
-      . + ("user_id", "Management")// configuration.get[String]("play.http.instance"))
-      . + ("user_type", "Admin")
-
-    Jwt.encode(claim, jwtSecretKey, JwtAlgorithm.HS256)
+import play.api.Configuration
+
+  object AuthProvider {
+
+    var Token = "" // scalastyle:ignore
+
+    /** This method generates JWT token for registering Delphi-Management at the Instance-Registry
+      *
+      * @param validFor
+      * @return
+      */
+
+    def generateJwt(validFor: Long = 1)(implicit configuration: Configuration): String = {
+      val jwtSecretKey = configuration.get[String]("play.http.secret.JWTkey")
+      if (Token == "" || !Jwt.isValid(Token, jwtSecretKey, Seq(JwtAlgorithm.HS256))) {
+        val claim = JwtClaim()
+          .issuedNow
+          .expiresIn(validFor * 300)
+          .startsNow
+          . +("user_id",  configuration.get[String]("play.http.instance"))
+          . +("user_type", "Admin")
+
+        Token = Jwt.encode(claim, jwtSecretKey, JwtAlgorithm.HS256)
+      }
+      Token
+    }
   }
-}

app/controllers/InstanceRegistryController.scala

@@ -26,13 +26,13 @@ import play.api.libs.ws.WSClient
 import akka.stream.Materializer
 import play.api.libs.streams.ActorFlow
 import actors.{ClientSocketActor, PublishSocketMessageActor}
-import akka.http.scaladsl.model.headers.{Authorization, BasicHttpCredentials}
 import play.api.mvc._
 import scala.concurrent.ExecutionContext
 import authorization.AuthProvider
 import play.api.libs.json.Json
 
 
+
 trait MyExecutionContext extends ExecutionContext
 
 /**
@@ -63,17 +63,15 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
 
   val instanceRegistryUri = config.get[String]("app.instanceRegistryUri")
   val instanceRegistryBasePath = config.get[String]("app.instanceRegistryBasePath")
-  val authheader = ("Authorization",s"Bearer ${AuthProvider.generateJwt()}")
 
   /**This method maps list of instances with specific componentType.
     *
     * @param componentType
     * @return
     */
   def instances(componentType: String): Action[AnyContent] = Action.async {
-
     ws.url(instanceRegistryUri).addQueryStringParameters("ComponentType" -> componentType)
-      .withHttpHeaders(authheader)
+      .withHttpHeaders(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
       .get().map { response =>
       // TODO: possible handling of parsing the data can be done here
 
@@ -96,8 +94,7 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
     */
 
   def getNetwork(): Action[AnyContent] = Action.async {
-
-    ws.url(instanceRegistryUri + "/instances/network").withHttpHeaders(authheader)
+    ws.url(instanceRegistryUri + "/instances/network").withHttpHeaders(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
       .get().map { response =>
       // TODO: possible handling of parsing the data can be done here
       Logger.debug(response.body)
@@ -121,7 +118,7 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
     // TODO: handle what should happen if the instance registry is not reachable.
     // TODO: create constants for the urls
     ws.url(instanceRegistryUri + "/count").addQueryStringParameters("ComponentType" -> componentType)
-      .withHttpHeaders(authheader)
+      .withHttpHeaders(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
       .get().map { response =>
       // TODO: possible handling of parsing the data can be done here
       if (response.status == 200) {
@@ -142,7 +139,7 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
 
   def handleRequest(action: String, instanceID: String): Action[AnyContent] = Action.async { request =>
     ws.url(instanceRegistryUri + "/instances/" + instanceID + action)
-      .withHttpHeaders(authheader)
+      .withHttpHeaders(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
       .post("")
       .map { response =>
         new Status(response.status)
@@ -176,7 +173,7 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
   {
     request =>
     ws.url(instanceRegistryUri + "/instances/deploy")
-      .withHttpHeaders(authheader)
+      .withHttpHeaders(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
       .post(Json.obj("ComponentType" -> compType, "InstanceName" -> name))
       .map { response =>
         response.status match {
@@ -189,28 +186,4 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
         }
       }(myExecutionContext)
   }
-
-  /**
-    * This function is to authenticate Delphi-Management at the Instance Registry
-    *
-    */
-  //This method might be helpful when User Authentication is implemented.
-   def authentication()(implicit configuration: Configuration): Action[AnyContent] = Action.async {
-
-     val username = configuration.get[String]("play.http.user")
-     val password = configuration.get[String]("play.http.pass")
-     val authHeader= Authorization(BasicHttpCredentials(username, password))
-     ws.url(instanceRegistryUri + "/authenticate")
-       .withHttpHeaders(("Authorization", s"${authHeader}"), ("Delphi-Authorization",s"${AuthProvider.generateJwt()}"))
-            .post("")
-          .map { response =>
-            if (response.status == 200)
-            {
-              Ok
-            } else
-            {
-              new Status(response.status)
-            }
-          }
-  }
-}
+}

conf/application.conf

@@ -378,5 +378,6 @@ app.instanceRegistryBasePath = ${?INSTANCE_REGISTRY_BASE_PATH}
 play.http.secret.JWTkey="changeme"
 play.http.instance="Management"
 
+
 include "silhouette.conf"