Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-10 15:35:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #1247) cleanup

Browse Source
This commit is contained in:
Naoki Takezoe
2016-07-27 02:36:30 +09:00
parent 0e787eddfd
commit 743965d3b8
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/ScalatraBootstrap.scala
View File

@@ -1,7 +1,7 @@
import gitbucket.core.controller._ import gitbucket.core.controller._
import gitbucket.core.plugin.PluginRegistry import gitbucket.core.plugin.PluginRegistry
import gitbucket.core.servlet.{AccessTokenAuthenticationFilter, BasicAuthenticationFilter, Database, TransactionFilter} import gitbucket.core.servlet.{ApiAuthenticationFilter, GitAuthenticationFilter, Database, TransactionFilter}
import gitbucket.core.util.Directory import gitbucket.core.util.Directory
import java.util.EnumSet import java.util.EnumSet
@@ -15,10 +15,10 @@ class ScalatraBootstrap extends LifeCycle {
// Register TransactionFilter and BasicAuthenticationFilter at first // Register TransactionFilter and BasicAuthenticationFilter at first
context.addFilter("transactionFilter", new TransactionFilter) context.addFilter("transactionFilter", new TransactionFilter)
context.getFilterRegistration("transactionFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*") context.getFilterRegistration("transactionFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
context.addFilter("basicAuthenticationFilter", new BasicAuthenticationFilter) context.addFilter("gitAuthenticationFilter", new GitAuthenticationFilter)
context.getFilterRegistration("basicAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*") context.getFilterRegistration("gitAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
context.addFilter("accessTokenAuthenticationFilter", new AccessTokenAuthenticationFilter) context.addFilter("apiAuthenticationFilter", new ApiAuthenticationFilter)
context.getFilterRegistration("accessTokenAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/v3/*") context.getFilterRegistration("apiAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/v3/*")
// Register controllers // Register controllers
context.mount(new AnonymousAccessController, "/*") context.mount(new AnonymousAccessController, "/*")

9
src/main/scala/gitbucket/core/servlet/AccessTokenAuthenticationFilter.scala → src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala
View File

@@ -11,8 +11,7 @@ import org.scalatra.servlet.ServletApiImplicits._
import org.scalatra._ import org.scalatra._
class AccessTokenAuthenticationFilter extends Filter with AccessTokenService with AccountService with SystemSettingsService { class ApiAuthenticationFilter extends Filter with AccessTokenService with AccountService with SystemSettingsService {
private val tokenHeaderPrefix = "token "
override def init(filterConfig: FilterConfig): Unit = {} override def init(filterConfig: FilterConfig): Unit = {}
@@ -23,9 +22,9 @@ class AccessTokenAuthenticationFilter extends Filter with AccessTokenService wit
implicit val session = req.getAttribute(Keys.Request.DBSession).asInstanceOf[slick.jdbc.JdbcBackend#Session] implicit val session = req.getAttribute(Keys.Request.DBSession).asInstanceOf[slick.jdbc.JdbcBackend#Session]
val response = res.asInstanceOf[HttpServletResponse] val response = res.asInstanceOf[HttpServletResponse]
Option(request.getHeader("Authorization")).map{ Option(request.getHeader("Authorization")).map{
case auth if auth.startsWith("token ") => AccessTokenService.getAccountByAccessToken(auth.substring(6).trim).toRight(Unit) case auth if auth.startsWith("token ") => AccessTokenService.getAccountByAccessToken(auth.substring(6).trim).toRight(())
case auth if auth.startsWith("Basic ") => doBasicAuth(auth, loadSystemSettings(), request).toRight(Unit) case auth if auth.startsWith("Basic ") => doBasicAuth(auth, loadSystemSettings(), request).toRight(())
case _ => Left(Unit) case _ => Left(())
}.orElse{ }.orElse{
Option(request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]).map(Right(_)) Option(request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]).map(Right(_))
} match { } match {

4
src/main/scala/gitbucket/core/servlet/BasicAuthenticationFilter.scala → src/main/scala/gitbucket/core/servlet/GitAuthenticationFilter.scala
View File

@@ -12,9 +12,9 @@ import Implicits._
/** /**
* Provides BASIC Authentication for [[GitRepositoryServlet]]. * Provides BASIC Authentication for [[GitRepositoryServlet]].
*/ */
class BasicAuthenticationFilter extends Filter with RepositoryService with AccountService with SystemSettingsService { class GitAuthenticationFilter extends Filter with RepositoryService with AccountService with SystemSettingsService {
private val logger = LoggerFactory.getLogger(classOf[BasicAuthenticationFilter]) private val logger = LoggerFactory.getLogger(classOf[GitAuthenticationFilter])
def init(config: FilterConfig) = {} def init(config: FilterConfig) = {}

2
src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
View File

@@ -27,7 +27,7 @@ import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
* Provides Git repository via HTTP. * Provides Git repository via HTTP.
* *
* This servlet provides only Git repository functionality. * This servlet provides only Git repository functionality.
* Authentication is provided by [[BasicAuthenticationFilter]]. * Authentication is provided by [[GitAuthenticationFilter]].
*/ */
class GitRepositoryServlet extends GitServlet with SystemSettingsService { class GitRepositoryServlet extends GitServlet with SystemSettingsService {