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

Fix routing in CompositeScalatraFilter

Browse Source
This commit is contained in:
Naoki Takezoe
2017-12-03 04:36:05 +09:00
parent 810cbda123
commit bcd92916ca
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala
View File

@@ -28,12 +28,18 @@ class CompositeScalatraFilter extends Filter {
}
override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = {
val requestUri = request.asInstanceOf[HttpServletRequest].getRequestURI
val contextPath = request.getServletContext.getContextPath
val requestPath = request.asInstanceOf[HttpServletRequest].getRequestURI.substring(contextPath.length)
val checkPath = if(requestPath.endsWith("/")){
requestPath
} else {
requestPath + "/"
}
filters
.filter { case (_, path) =>
val start = path.replaceFirst("/\\*$", "/")
(requestUri + "/").startsWith(start)
checkPath.startsWith(start)
}
.foreach { case (filter, _) =>
val mockChain = new MockFilterChain()