Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-06 07:40:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove code in authenticators which keeps backward compatibility

Browse Source
This commit is contained in:
Naoki Takezoe
2018-04-25 01:55:02 +09:00
parent 07182cf946
commit 8b2b36df0e
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/scala/gitbucket/core/util/Authenticator.scala
View File

@@ -31,9 +31,8 @@ trait OwnerAuthenticator { self: ControllerBase with RepositoryService with Acco
protected def ownerOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
private def authenticate(action: (RepositoryInfo) => Any) = {
val paths = request.paths
val userName = params.getOrElse("owner", paths(0))
val repoName = params.getOrElse("repository", paths(1))
val userName = params("owner")
val repoName = params("repository")
getRepository(userName, repoName).map { repository =>
context.loginAccount match {
case Some(x) if (x.isAdmin) => action(repository)
@@ -89,9 +88,8 @@ trait ReferrerAuthenticator { self: ControllerBase with RepositoryService with A
protected def referrersOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
private def authenticate(action: (RepositoryInfo) => Any) = {
val paths = request.paths
val userName = params.getOrElse("owner", paths(0))
val repoName = params.getOrElse("repository", paths(1))
val userName = params("owner")
val repoName = params("repository")
getRepository(userName, repoName).map { repository =>
if (isReadable(repository.repository, context.loginAccount)) {
action(repository)
@@ -112,9 +110,8 @@ trait ReadableUsersAuthenticator { self: ControllerBase with RepositoryService w
}
private def authenticate(action: (RepositoryInfo) => Any) = {
val paths = request.paths
val userName = params.getOrElse("owner", paths(0))
val repoName = params.getOrElse("repository", paths(1))
val userName = params("owner")
val repoName = params("repository")
getRepository(userName, repoName).map { repository =>
context.loginAccount match {
case Some(x) if (x.isAdmin) => action(repository)
@@ -138,9 +135,8 @@ trait WritableUsersAuthenticator { self: ControllerBase with RepositoryService w
}
private def authenticate(action: (RepositoryInfo) => Any) = {
val paths = request.paths
val userName = params.getOrElse("owner", paths(0))
val repoName = params.getOrElse("repository", paths(1))
val userName = params("owner")
val repoName = params("repository")
getRepository(userName, repoName).map { repository =>
context.loginAccount match {
case Some(x) if (x.isAdmin) => action(repository)