Merge pull request #143 from delphi-hub/release/1.0.0

Release/1.0.0

Author: ishwaryamamidi

app/actors/ClientSocketActor.scala

@@ -24,7 +24,7 @@ class ClientSocketActor(out: ActorRef, publisher: ActorRef) extends Actor with E
 
   override def preStart() {
     Logger.debug("pre start called in client" + self)
-    out ! "successfully registered"
+    out ! Json.obj("msg" -> "successfully registered").toString()
   }
 
   override def postStop() {

app/authorization/AuthAction.scala

@@ -25,13 +25,15 @@ import play.api.Configuration
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Failure, Success}
 
+// The following is based on https://auth0.com/blog/build-and-secure-a-scala-play-framework-api/
 // A custom request type to hold our JWT claims, we can pass these on to the
 // handling action
-//case class UserRequest[A](jwt: JwtClaim, token: String, request: Request[A]) extends WrappedRequest[A](request)
+
+case class UserRequest[A](token: String, request: Request[A]) extends WrappedRequest[A](request)
 
 // Our custom action implementation
 class AuthAction @Inject()(bodyParser: BodyParsers.Default)(implicit ec: ExecutionContext, config: Configuration)
-  extends ActionBuilder[Request, AnyContent] {
+  extends ActionBuilder[UserRequest, AnyContent] {
 
   override def parser: BodyParser[AnyContent] = bodyParser
   override protected def executionContext: ExecutionContext = ec
@@ -41,10 +43,10 @@ class AuthAction @Inject()(bodyParser: BodyParsers.Default)(implicit ec: Executi
 
   // Called when a request is invoked. We should validate the bearer token here
   // and allow the request to proceed if it is valid.
-  override def invokeBlock[A](request: Request[A], block: Request[A] => Future[Result]): Future[Result] =
+  override def invokeBlock[A](request: Request[A], block: UserRequest[A] => Future[Result]): Future[Result] =
     extractBearerToken(request) map { token =>
       if(AuthProvider.validateJwt(token)) {
-        block(request)   // token was valid - proceed!
+        block(UserRequest(token,request))  // token was valid - proceed!
       } else {
         Future.successful(Results.Unauthorized("Invalid"))  // token was invalid - return 401
       }

app/authorization/AuthProvider.scala

@@ -40,7 +40,7 @@ import play.api.Configuration
             .expiresIn(validFor * 300)
             .startsNow
             . +("user_id", configuration.get[String]("play.http.instance"))
-            . +("user_type", "Admin")
+            . +("user_type", "Component")
 
           Token = Jwt.encode(claim, jwtSecretKey, JwtAlgorithm.HS256)
         }

app/controllers/ApiRouter.scala

@@ -37,6 +37,7 @@ class ApiRouter @Inject()(irController: InstanceRegistryController, sysControlle
     case GET(p"/instances" ? q"componentType=$componentType") => irController.instances(componentType)
     case GET(p"/systemInfo") => sysController.getInfo()
     case GET(p"/network") => irController.getNetwork()
+    case GET(p"/users") => irController.users()
     case POST(p"/postInstance" ? q"componentType=$componentType"& q"name=$name") => irController.postInstance(componentType, name)
     case POST(p"/startInstance" ? q"instanceID=$instanceID") => irController.handleRequest(action="/start", instanceID)
     case POST(p"/stopInstance" ? q"instanceID=$instanceID") => irController.handleRequest(action="/stop", instanceID)
@@ -46,5 +47,8 @@ class ApiRouter @Inject()(irController: InstanceRegistryController, sysControlle
     case POST(p"/reconnectInstance" ? q"from=$from"& q"to=$to") => irController.reconnect(from.toInt, to.toInt)
     case POST(p"/authenticate") => irController.authentication()
     case POST(p"/labelInstance" ? q"instanceID=$instanceID"& q"label=$label") => irController.labelInstance(instanceID, label)
+    case POST(p"/postUser") => irController.postUser()
+    case POST(p"/deleteUser" ? q"userID=$userID") => irController.deleteUser(userID)
+    case POST(p"/deleteLabel" ? q"instanceID=$instanceID"& q"label=$label") => irController.deleteLabel(instanceID, label)
   }
 }

app/controllers/InstanceRegistryController.scala

@@ -70,12 +70,13 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
     * @return
     */
   def instances(componentType: String): Action[AnyContent] = authAction.async {
-    ws.url(instanceRegistryUri).addQueryStringParameters("ComponentType" -> componentType)
-      .withHttpHeaders(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
-      .get().map { response =>
-      // TODO: possible handling of parsing the data can be done here
+    request =>
+      ws.url(instanceRegistryUri).addQueryStringParameters("ComponentType" -> componentType)
+        .withHttpHeaders(("Authorization", s"Bearer ${request.token}"))
+        .get().map { response =>
+        // TODO: possible handling of parsing the data can be done here
 
-      Ok(response.body)
+        Ok(response.body)
     }(myExecutionContext)
   }
 
@@ -87,22 +88,39 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
     }
   }
 
+  /** This method lists all Users.
+    * @return
+    */
+
+  def users(): Action[AnyContent] = authAction.async{
+    request =>
+      ws.url(instanceRegistryUri + "/users").withHttpHeaders(("Authorization", s"Bearer ${request.token}"))
+        .get().map { response =>
+        if (response.status == 200) {
+          Ok(response.body)
+        } else {
+          new Status(response.status)
+        }
+    }(myExecutionContext)
+  }
+
   /** Called to fetch network graph of current registry. Contains a list of all instances and all links
     * currently registered.
     *
     * @return
     */
 
   def getNetwork(): Action[AnyContent] = authAction.async {
-    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)
-      if (response.status == 200) {
-        Ok(response.body)
-      } else {
-        new Status(response.status)
-      }
+    request =>
+      ws.url(instanceRegistryUri + "/instances/network").withHttpHeaders(("Authorization", s"Bearer ${request.token}"))
+        .get().map { response =>
+        // TODO: possible handling of parsing the data can be done here
+        Logger.debug(response.body)
+        if (response.status == 200) {
+          Ok(response.body)
+        } else {
+          new Status(response.status)
+        }
     }(myExecutionContext)
   }
 
@@ -117,15 +135,16 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
   def numberOfInstances(componentType: String): Action[AnyContent] = authAction.async {
     // 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(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
-      .get().map { response =>
-      // TODO: possible handling of parsing the data can be done here
-      if (response.status == 200) {
-        Ok(response.body)
-      } else {
-        new Status(response.status)
-      }
+    request =>
+      ws.url(instanceRegistryUri + "/count").addQueryStringParameters("ComponentType" -> componentType)
+        .withHttpHeaders(("Authorization", s"Bearer ${request.token}"))
+        .get().map { response =>
+        // TODO: possible handling of parsing the data can be done here
+        if (response.status == 200) {
+          Ok(response.body)
+        } else {
+          new Status(response.status)
+        }
     }(myExecutionContext)
   }
 
@@ -139,7 +158,7 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
 
   def handleRequest(action: String, instanceID: String): Action[AnyContent] = authAction.async { request =>
     ws.url(instanceRegistryUri + "/instances/" + instanceID + action)
-      .withHttpHeaders(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
+      .withHttpHeaders(("Authorization", s"Bearer ${request.token}"))
       .post("")
       .map { response =>
         new Status(response.status)
@@ -157,7 +176,7 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
 
     ws.url(instanceRegistryUri + "/instances/" + from + "/assignInstance"
     )
-      .withHttpHeaders(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
+      .withHttpHeaders(("Authorization", s"Bearer ${request.token}"))
       .post(Json.obj("AssignedInstanceId" -> to))
       .map { response =>
         response.status match {
@@ -180,7 +199,7 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
   def postInstance(compType: String, name: String): Action[AnyContent] = authAction.async {
     request =>
       ws.url(instanceRegistryUri + "/instances/deploy")
-        .withHttpHeaders(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
+        .withHttpHeaders(("Authorization", s"Bearer ${request.token}"))
         .post(Json.obj("ComponentType" -> compType, "InstanceName" -> name))
         .map { response =>
           response.status match {
@@ -203,8 +222,6 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
 
   def authentication(): Action[AnyContent] = Action.async {
     request =>
-      //val json = request.body.asJson.get
-
 
       val jsonBody: Option[JsValue] = request.body.asJson
 
@@ -219,7 +236,7 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
           .post("")
           .map { response =>
             if (response.status == 200) {
-              Ok(Json.obj("token" -> response.body, "refreshToken" -> ""))
+              Ok(response.body)
             } else {
               new Status(response.status)
             }
@@ -239,7 +256,7 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
   {
     request =>
     ws.url(instanceRegistryUri + "/instances/" + instanceID + "/label")
-      .withHttpHeaders(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
+      .withHttpHeaders(("Authorization", s"Bearer ${request.token}"))
       .post(Json.obj("Label" -> label))
       .map { response =>
         response.status match {
@@ -252,4 +269,74 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
         }
       }(myExecutionContext)
   }
+
+  /**
+    * This function is used to add a User.
+    * Username, Secret and UserType are sent in the body post
+    * Instance registry returns a valid userID
+    * @return
+    */
+
+   def postUser(): Action[AnyContent] = authAction.async {
+    request =>
+      val jsonBody: Option[JsValue] = request.body.asJson
+       jsonBody.map { json =>
+        val userName = (json \ "userName").as[String]
+        val secret = (json \ "secret").as[String]
+        val userType = (json \ "userType").as[String]
+        ws.url(instanceRegistryUri + "/users" + "/add")
+        .withHttpHeaders(("Authorization", s"Bearer ${request.token}"))
+        .post(json)
+        .map { response =>
+           if (response.status == 200) {
+              Ok(response.body)
+            } else {
+              Logger.info(s"$ws")
+              Logger.debug(s"$ws")
+              new Status(response.status)
+            }
+        }
+    }.getOrElse{ Future(BadRequest("Invalid body"))}
+  }
+
+/**
+    * This function is used to delete a user.
+    * @param userID ID of the user that is to be deleted
+    * @return
+    */
+  def deleteUser( userID: String): Action[AnyContent] = authAction.async {
+    request =>
+    ws.url(instanceRegistryUri + "/users/" + userID + "/remove")
+      .withHttpHeaders(("Authorization", s"Bearer ${request.token}"))
+      .post("")
+      .map { response =>
+      response.status match {
+          // scalastyle:off magic.number
+          case 202 =>
+          // scalastyle:on magic.number
+            Ok(Json.obj("msg" -> response.body))
+          case x: Any =>
+            new Status(x)
+        }
+      }(myExecutionContext)
+  }
+
+ def deleteLabel(instanceID: String, label: String): Action[AnyContent] = authAction.async
+  {
+    request =>
+    ws.url(instanceRegistryUri + "/instances/" + instanceID + "/label/" + label + "/delete")
+      .withHttpHeaders(("Authorization", s"Bearer ${request.token}"))
+      .post("")
+      .map { response =>
+        response.status match {
+          // scalastyle:off magic.number
+          case 202 =>
+          // scalastyle:on magic.number
+            Ok(response.body)
+          case x: Any =>
+            new Status(x)
+        }
+      }(myExecutionContext)
+  }
 }
+

build.sbt

@@ -5,7 +5,7 @@ name := "delphi-management"
 organization := "de.upb"
 
 
-version := "0.9.5"
+version := "1.0.0"
 
 
 scalaVersion := "2.12.4"
@@ -42,7 +42,7 @@ libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "3.1.2
 libraryDependencies += "net.codingwell" %% "scala-guice" % "4.1.1"
 libraryDependencies += "com.iheart" %% "ficus" % "1.4.3"
 libraryDependencies += "org.webjars" % "bootstrap" % "4.1.0"
-libraryDependencies += "org.webjars" %% "webjars-play" % "2.6.3"
+libraryDependencies += "org.webjars" %% "webjars-play" % "2.7.0"
 libraryDependencies += "com.adrianhurt" %% "play-bootstrap" % "1.4-P26-B4-SNAPSHOT"
 libraryDependencies += "eu.bitwalker" % "UserAgentUtils" % "1.20"
 libraryDependencies += "com.typesafe.akka" %% "akka-http" % "10.1.5"
@@ -58,7 +58,7 @@ libraryDependencies ++= Seq(
   "com.nimbusds" % "nimbus-jose-jwt" % "5.14",
   "org.bouncycastle" % "bcprov-jdk15on" % "1.60",
   "com.google.guava" % "guava" % "25.1-jre",
-  "org.apache.commons" % "commons-compress" % "1.16"
+  "org.apache.commons" % "commons-compress" % "1.18"
 )
 
 libraryDependencies += "com.pauldijou" %% "jwt-core" % "1.0.0"