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

Fix plugin controller handling

Browse Source
This commit is contained in:
Naoki Takezoe
2017-07-13 01:52:26 +09:00
parent db88458a14
commit 5641fee39a
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/main/resources/plugins/gitbucket-notifications-plugin_2.12-1.0.0.jar
View File

Binary file not shown.

18
src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala
View File

@@ -3,6 +3,7 @@ package gitbucket.core.servlet
import javax.servlet._ import javax.servlet._
import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletRequest
import gitbucket.core.controller.ControllerBase
import gitbucket.core.plugin.PluginRegistry import gitbucket.core.plugin.PluginRegistry
class PluginControllerFilter extends Filter { class PluginControllerFilter extends Filter {
@@ -20,18 +21,25 @@ class PluginControllerFilter extends Filter {
} }
override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = { override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = {
val controller = PluginRegistry().getControllers().find { case (_, path) => val controller = PluginRegistry().getControllers().filter { case (_, path) =>
val requestUri = request.asInstanceOf[HttpServletRequest].getRequestURI val requestUri = request.asInstanceOf[HttpServletRequest].getRequestURI
path.endsWith("/*") && requestUri.startsWith(path.replaceFirst("/\\*$", "/")) val start = path.replaceFirst("/\\*$", "/")
path.endsWith("/*") && (requestUri + "/").startsWith(start)
} }
controller.map { case (controller, _) => val filterChainWrapper = controller.foldLeft(chain){ case (chain, (controller, _)) =>
new FilterChainWrapper(controller, chain)
}
filterChainWrapper.doFilter(request, response)
}
class FilterChainWrapper(controller: ControllerBase, chain: FilterChain) extends FilterChain {
override def doFilter(request: ServletRequest, response: ServletResponse): Unit = {
if(controller.config == null){ if(controller.config == null){
controller.init(filterConfig) controller.init(filterConfig)
} }
controller.doFilter(request, response, chain) controller.doFilter(request, response, chain)
}.getOrElse{
chain.doFilter(request, response)
} }
} }
} }