Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-07 21:17:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1959 from gitbucket/expand-api-auth

Browse Source 
Apply ApiAuthenticationFilter to /api/* to cover APIs other than GitHub API
This commit is contained in:
Naoki Takezoe
2018-04-17 10:15:23 +09:00
committed by GitHub
parent 1fb0eeff22 db17508559
commit 34df9ae739
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
context.addFilter("apiAuthenticationFilter", new ApiAuthenticationFilter)
context
.getFilterRegistration("apiAuthenticationFilter")
.addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/v3/*")
.addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/*")
// Register controllers
context.mount(new PreProcessController, "/*")

12
src/main/scala/gitbucket/core/controller/ControllerBase.scala
View File

@@ -2,7 +2,7 @@ package gitbucket.core.controller
import java.io.FileInputStream
import gitbucket.core.api.ApiError
import gitbucket.core.api.{ApiError, JsonFormat}
import gitbucket.core.model.Account
import gitbucket.core.service.{AccountService, RepositoryService, SystemSettingsService}
import gitbucket.core.util.SyntaxSugars._
@@ -46,6 +46,7 @@ abstract class ControllerBase
before("/api/v3/*") {
contentType = formats("json")
request.setAttribute(Keys.Request.APIv3, true)
}
override def requestPath(uri: String, idx: Int): String = {
@@ -67,9 +68,6 @@ abstract class ControllerBase
// Git repository
chain.doFilter(request, response)
} else {
if (path.startsWith("/api/v3/")) {
httpRequest.setAttribute(Keys.Request.APIv3, true)
}
// Scalatra actions
super.doFilter(request, response, chain)
}
@@ -125,7 +123,7 @@ abstract class ControllerBase
org.scalatra.NotFound()
} else if (request.hasAttribute(Keys.Request.APIv3)) {
contentType = formats("json")
org.scalatra.NotFound(ApiError("Not Found"))
org.scalatra.NotFound(JsonFormat(ApiError("Not Found")))
} else {
org.scalatra.NotFound(gitbucket.core.html.error("Not Found"))
}
@@ -145,7 +143,7 @@ abstract class ControllerBase
org.scalatra.Unauthorized()
} else if (request.hasAttribute(Keys.Request.APIv3)) {
contentType = formats("json")
org.scalatra.Unauthorized(ApiError("Requires authentication"))
org.scalatra.Unauthorized(JsonFormat(ApiError("Requires authentication")))
} else if (!isBrowser(request.getHeader("USER-AGENT"))) {
org.scalatra.Unauthorized()
} else {
@@ -177,7 +175,7 @@ abstract class ControllerBase
org.scalatra.InternalServerError()
} else if (request.hasAttribute(Keys.Request.APIv3)) {
contentType = formats("json")
org.scalatra.InternalServerError(ApiError("Internal Server Error"))
org.scalatra.InternalServerError(JsonFormat(ApiError("Internal Server Error")))
} else {
org.scalatra.InternalServerError(gitbucket.core.html.error("Internal Server Error", Some(e)))
}