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

Add OneselfAuthenticator.

Browse Source
This commit is contained in:
takezoe
2013-07-03 16:53:04 +09:00
parent 45f7dc4998
commit b59a4ce94b
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/app/AccountController.scala
View File

@@ -1,15 +1,15 @@
package app package app
import service._ import service._
import util.OwnerOnlyAuthenticator import util.OneselfAuthenticator
import util.StringUtil._ import util.StringUtil._
import jp.sf.amateras.scalatra.forms._ import jp.sf.amateras.scalatra.forms._
class AccountController extends AccountControllerBase class AccountController extends AccountControllerBase
with SystemSettingsService with AccountService with RepositoryService with OwnerOnlyAuthenticator with SystemSettingsService with AccountService with RepositoryService with OneselfAuthenticator
trait AccountControllerBase extends ControllerBase { trait AccountControllerBase extends ControllerBase {
self: SystemSettingsService with AccountService with RepositoryService with OwnerOnlyAuthenticator => self: SystemSettingsService with AccountService with RepositoryService with OneselfAuthenticator =>
case class AccountNewForm(userName: String, password: String,mailAddress: String, url: Option[String]) case class AccountNewForm(userName: String, password: String,mailAddress: String, url: Option[String])
@@ -38,12 +38,12 @@ trait AccountControllerBase extends ControllerBase {
} getOrElse NotFound } getOrElse NotFound
} }
get("/:userName/_edit")(ownerOnly { get("/:userName/_edit")(oneselfOnly {
val userName = params("userName") val userName = params("userName")
getAccountByUserName(userName).map(x => account.html.edit(Some(x))) getOrElse NotFound getAccountByUserName(userName).map(x => account.html.edit(Some(x))) getOrElse NotFound
}) })
post("/:userName/_edit", editForm)(ownerOnly { form => post("/:userName/_edit", editForm)(oneselfOnly { form =>
val userName = params("userName") val userName = params("userName")
getAccountByUserName(userName).map { account => getAccountByUserName(userName).map { account =>
updateAccount(account.copy( updateAccount(account.copy(

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

@@ -4,9 +4,29 @@ import app.ControllerBase
import service._ import service._
import RepositoryService.RepositoryInfo import RepositoryService.RepositoryInfo
/**
* Allows only oneself and administrators.
*/
trait OneselfAuthenticator { self: ControllerBase =>
protected def oneselfOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
protected def oneselfOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
private def authenticate(action: (RepositoryInfo) => Any) = {
{
val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
context.loginAccount match {
case Some(x) if(x.isAdmin) => action
case Some(x) if(paths(1) == x.userName) => action
case _ => Unauthorized()
}
}
}
}
/** /**
* Allows only the repository owner and administrators. * Allows only the repository owner and administrators.
*/ */
// TODO rename to OwnerAuthenticator
trait OwnerOnlyAuthenticator { self: ControllerBase with RepositoryService => trait OwnerOnlyAuthenticator { self: ControllerBase with RepositoryService =>
protected def ownerOnly(action: (RepositoryInfo) => Any) = { authenticate(action) } protected def ownerOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
protected def ownerOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) } protected def ownerOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
@@ -28,6 +48,7 @@ trait OwnerOnlyAuthenticator { self: ControllerBase with RepositoryService =>
/** /**
* Allows only signed in users. * Allows only signed in users.
*/ */
// TODO rename to UsersAuthenticator
trait UsersOnlyAuthenticator { self: ControllerBase => trait UsersOnlyAuthenticator { self: ControllerBase =>
protected def usersOnly(action: => Any) = { authenticate(action) } protected def usersOnly(action: => Any) = { authenticate(action) }
protected def usersOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) } protected def usersOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) }
@@ -45,6 +66,7 @@ trait UsersOnlyAuthenticator { self: ControllerBase =>
/** /**
* Allows only administrators. * Allows only administrators.
*/ */
// TODO rename to AdminAuthenticator
trait AdminOnlyAuthenticator { self: ControllerBase => trait AdminOnlyAuthenticator { self: ControllerBase =>
protected def adminOnly(action: => Any) = { authenticate(action) } protected def adminOnly(action: => Any) = { authenticate(action) }
protected def adminOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) } protected def adminOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) }