#52 Add ability to provide multiple roles on controller helper

TheHive-Project · Feb 19, 2018 · 7d391e4 · 7d391e4
1 parent e0bfd1f
commit 7d391e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/org/elastic4play/Errors.scala b/app/org/elastic4play/Errors.scala
@@ -32,6 +32,7 @@ case class AttributeCheckingError(
 sealed trait AttributeError extends Throwable {
   def withName(name: String): AttributeError
   val name: String
+  override def getMessage: String = toString
 }
 
 case class InvalidFormatAttributeError(name: String, format: String, value: InputValue) extends AttributeError {

diff --git a/app/org/elastic4play/controllers/Authenticated.scala b/app/org/elastic4play/controllers/Authenticated.scala
@@ -5,7 +5,6 @@ import java.util.Date
 import javax.inject.{ Inject, Singleton }
 import javax.naming.ldap.LdapName
 
-import scala.collection.JavaConverters._
 import scala.concurrent.duration.{ DurationLong, FiniteDuration }
 import scala.concurrent.{ ExecutionContext, Future }
 import scala.collection.JavaConverters._
@@ -226,15 +225,15 @@ class Authenticated(
     * If user has sufficient right (have required role) action is executed
     * otherwise, action returns a not authorized error
     */
-  def apply(requiredRole: Role): ActionBuilder[AuthenticatedRequest, AnyContent] =
+  def apply(requiredRole: Role*): ActionBuilder[AuthenticatedRequest, AnyContent] =
     new ActionBuilder[AuthenticatedRequest, AnyContent] {
       val executionContext: ExecutionContext = ec
 
       def parser: BodyParser[AnyContent] = defaultParser
 
       def invokeBlock[A](request: Request[A], block: (AuthenticatedRequest[A]) ⇒ Future[Result]): Future[Result] = {
         getContext(request).flatMap { authContext ⇒
-          if (authContext.roles.contains(requiredRole))
+          if (requiredRole.isEmpty || requiredRole.toSet.intersect(authContext.roles.toSet).nonEmpty)
             block(new AuthenticatedRequest(authContext, request))
               .map(result ⇒ setSessingUser(result, authContext)(request))
           else