deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

Use negotiate to handle 403 errors, isSynchronousHttp

Browse source 
API, XHR, and Socket requests get proper responses.
This commit is contained in:
Raymond Wanyoike 2017-06-15 16:53:15 +03:00
parent 5adcbf6f30
commit 7c2673fd28
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/LilaController.scala
View file

@ -102,17 +102,17 @@ private[controllers] trait LilaController
protected def Secure[A](p: BodyParser[A])(perm: Permission)(f: Context => UserModel => Fu[Result]): Action[A] =
Auth(p) { implicit ctx => me =>
isGranted(perm).fold(f(ctx)(me), authorizationFailed(ctx.req))
isGranted(perm).fold(f(ctx)(me), authorizationFailed)
}
protected def SecureF(s: UserModel => Boolean)(f: Context => UserModel => Fu[Result]): Action[AnyContent] =
Auth(BodyParsers.parse.anyContent) { implicit ctx => me =>
s(me).fold(f(ctx)(me), authorizationFailed(ctx.req))
s(me).fold(f(ctx)(me), authorizationFailed)
}
protected def SecureBody[A](p: BodyParser[A])(perm: Permission)(f: BodyContext[A] => UserModel => Fu[Result]): Action[A] =
AuthBody(p) { implicit ctx => me =>
isGranted(perm).fold(f(ctx)(me), authorizationFailed(ctx.req))
isGranted(perm).fold(f(ctx)(me), authorizationFailed)
}
protected def SecureBody(perm: Permission.type => Permission)(f: BodyContext[_] => UserModel => Fu[Result]): Action[AnyContent] =
@ -256,8 +256,12 @@ private[controllers] trait LilaController
protected val unauthorizedApiResult = Unauthorized(jsonError("Login required"))
protected def authorizationFailed(req: RequestHeader): Fu[Result] =
reqToCtx(req) flatMap (x => Main authFailed x.req)
protected def authorizationFailed(implicit ctx: Context): Fu[Result] = negotiate(
html =
if (HTTPRequest isSynchronousHttp ctx.req) Main authFailed ctx.req
else fuccess(Results.Forbidden("Authorization failed")),
api = _ => fuccess(Forbidden(jsonError("Authorization failed")))
)
protected def ensureSessionId(req: RequestHeader)(res: Result): Result =
req.session.data.contains(LilaCookie.sessionId).fold(