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

Fix error response processing of APIs

Browse Source
This commit is contained in:
Naoki Takezoe
2018-04-17 10:05:05 +09:00
parent 3abe398244
commit db17508559
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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