#1316 Set new permissions when user switch of organisation

TheHive-Project · Jul 20, 2020 · 7d4aa7d · 7d4aa7d
1 parent 5ce8607
commit 7d4aa7d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/ScalliGraph b/ScalliGraph
diff --git a/thehive/app/org/thp/thehive/controllers/v1/UserCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/UserCtrl.scala
@@ -68,7 +68,12 @@ class UserCtrl @Inject() (
           .current
           .richUserWithCustomRenderer(request.organisation, _.organisationWithRole.map(_.asScala.toSeq))
           .getOrFail("User")
-          .map(user => Results.Ok(user.toJson).withHeaders("X-Organisation" -> request.organisation))
+          .map(user =>
+            Results
+              .Ok(user.toJson)
+              .withHeaders("X-Organisation" -> request.organisation)
+              .withHeaders("X-Permissions" -> user._1.permissions.mkString(","))
+          )
       }
 
   def create: Action[AnyContent] =

diff --git a/thehive/app/org/thp/thehive/services/LocalUserSrv.scala b/thehive/app/org/thp/thehive/services/LocalUserSrv.scala
@@ -37,7 +37,7 @@ class LocalUserSrv @Inject() (
               userSteps
                 .getAuthContext(requestId, Organisation.administration.name)
                 .headOption()
-                .map(_.changeOrganisation(org))
+                .map(authContext => authContext.changeOrganisation(org, authContext.permissions))
             }
           }
           .fold[Try[AuthContext]](Failure(AuthenticationError("Authentication failure")))(Success.apply)
+6 −1		core/src/main/scala/org/thp/scalligraph/auth/SessionAuthSrv.scala
+3 −2		core/src/main/scala/org/thp/scalligraph/auth/UserSrv.scala
+8 −7		core/src/main/scala/org/thp/scalligraph/controllers/AuthenticatedRequest.scala
+1 −1		core/src/main/scala/org/thp/scalligraph/steps/StepsOps.scala