Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 21:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix retrieving user name and repository name from request path in Authenticator.

Browse Source
This commit is contained in:
takezoe
2013-07-03 14:23:41 +09:00
parent aca64cf45d
commit 1393d919c3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/util/Authenticator.scala
View File

@@ -65,13 +65,15 @@ trait CollaboratorsAuthenticator { self: ControllerBase with RepositoryService =
protected def collaboratorsOnly[T](action: T => Any) = (form: T) => authenticate({action(form)}) protected def collaboratorsOnly[T](action: T => Any) = (form: T) => authenticate({action(form)})
private def authenticate(action: => Any) = { private def authenticate(action: => Any) = {
val paths = request.getRequestURI.split("/") {
val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
context.loginAccount match { context.loginAccount match {
case Some(x) if(x.isAdmin) => action case Some(x) if(x.isAdmin) => action
case Some(x) if(paths(1) == x.userName) => action case Some(x) if(paths(1) == x.userName) => action
case Some(x) if(getCollaborators(paths(1), paths(2)).contains(x.userName)) => action case Some(x) if(getCollaborators(paths(1), paths(2)).contains(x.userName)) => action
case _ => Unauthorized() case _ => Unauthorized()
} }
}
} }
} }
@@ -84,7 +86,7 @@ trait ReferrerAuthenticator { self: ControllerBase with RepositoryService =>
private def authenticate(action: => Any) = { private def authenticate(action: => Any) = {
{ {
val paths = request.getRequestURI.split("/") val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
getRepository(paths(1), paths(2), baseUrl) match { getRepository(paths(1), paths(2), baseUrl) match {
case None => NotFound() case None => NotFound()
case Some(repository) => case Some(repository) =>
@@ -112,7 +114,7 @@ trait ReadableUsersAuthenticator { self: ControllerBase with RepositoryService =
private def authenticate(action: => Any) = { private def authenticate(action: => Any) = {
{ {
val paths = request.getRequestURI.split("/") val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
getRepository(paths(1), paths(2), baseUrl) match { getRepository(paths(1), paths(2), baseUrl) match {
case None => NotFound() case None => NotFound()
case Some(repository) => context.loginAccount match { case Some(repository) => context.loginAccount match {