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

fix ipban login

Browse source
This commit is contained in:
Thibault Duplessis 2018-05-12 08:48:53 -05:00
parent e64869aff1
commit 2d87373446
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/Auth.scala
View file

@ -74,7 +74,7 @@ object Auth extends LilaController {
private val is2fa = Set("MissingTotpToken", "InvalidTotpToken")
def authenticate = OpenBody { implicit ctx =>
Firewall {
Firewall({
implicit val req = ctx.body
val referrer = get("referrer")
api.usernameForm.bindFromRequest.fold(
@ -109,7 +109,7 @@ object Auth extends LilaController {
}
}
)
}
}, Ok(s"ok:/").fuccess)
}
def logout = Open { implicit ctx =>

8
app/controllers/LilaController.scala
View file

@ -158,9 +158,11 @@ private[controllers] trait LilaController
} map { _ as JSON }
}
protected def Firewall[A <: Result](a: => Fu[A])(implicit ctx: Context): Fu[Result] =
if (Env.security.firewall accepts ctx.req) a
else fuccess(Redirect(routes.Lobby.home()))
protected def Firewall[A <: Result](
a: => Fu[A],
or: => Fu[Result] = fuccess(Redirect(routes.Lobby.home()))
)(implicit ctx: Context): Fu[Result] =
if (Env.security.firewall accepts ctx.req) a else or
protected def NoTor(res: => Fu[Result])(implicit ctx: Context) =
if (Env.security.tor isExitNode HTTPRequest.lastRemoteAddress(ctx.req))