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

Fix TODO.

Browse Source
This commit is contained in:
takezoe
2013-07-04 04:10:53 +09:00
parent f34927e3aa
commit d771cb5102
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/scala/servlet/BasicAuthenticationFilter.scala
View File

@@ -54,15 +54,9 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
} }
private def isWritableUser(username: String, password: String, repository: RepositoryService.RepositoryInfo): Boolean = { private def isWritableUser(username: String, password: String, repository: RepositoryService.RepositoryInfo): Boolean = {
getAccountByUserName(username) match { getAccountByUserName(username).map { account =>
case Some(account) if(account.password == encrypt(password)) => { account.password == encrypt(password) && hasWritePermission(repository.owner, repository.name, Some(account))
// TODO Use hasWritePermission? } getOrElse false
(account.isAdmin // administrator
|| account.userName == repository.owner // repository owner
|| getCollaborators(repository.owner, repository.name).contains(account.userName)) // collaborator
}
case _ => false
}
} }
private def requireAuth(response: HttpServletResponse): Unit = { private def requireAuth(response: HttpServletResponse): Unit = {