Ensure interceptors apply to all HandlerMappings. Fixes #9622 and Fixes #9724

Author: graemerocher

grails-plugin-interceptors/src/main/groovy/grails/artefact/Interceptor.groovy

@@ -35,9 +35,8 @@ import org.grails.web.util.GrailsApplicationAttributes
 import org.grails.web.util.WebUtils
 import org.springframework.core.Ordered
 import org.springframework.web.servlet.ModelAndView
-import org.springframework.web.servlet.View
-import org.springframework.web.servlet.ViewResolver
 
+import javax.annotation.PostConstruct
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
 import java.util.concurrent.ConcurrentLinkedQueue
@@ -80,13 +79,6 @@ trait Interceptor implements ResponseRenderer, ResponseRedirector, RequestForwar
             return (Boolean)existing
         }
 
-        if(matchers.isEmpty()) {
-            // default to map just the controller by convention
-            def matcher = new UrlMappingMatcher(this)
-            matcher.matches(controller:Pattern.compile(GrailsNameUtils.getLogicalPropertyName(getClass().simpleName, "Interceptor")))
-            matchers << matcher
-        }
-
         def req = request
         def uri = req.requestURI
 
@@ -268,4 +260,17 @@ trait Interceptor implements ResponseRenderer, ResponseRedirector, RequestForwar
         }
     }
 
+    /**
+     * Registers the default match strategy if non has been registered
+     */
+    @PostConstruct
+    void defaultMatcher() {
+        if(matchers.isEmpty()) {
+            // default to map just the controller by convention
+            def matcher = new UrlMappingMatcher(this)
+            matcher.matches(controller:Pattern.compile(GrailsNameUtils.getLogicalPropertyName(getClass().simpleName, InterceptorArtefactHandler.TYPE)))
+            matchers << matcher
+        }
+
+    }
 }

grails-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorsGrailsPlugin.groovy

@@ -22,6 +22,8 @@ import grails.plugins.Plugin
 import grails.util.GrailsUtil
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
+import org.springframework.web.servlet.HandlerInterceptor
+import org.springframework.web.servlet.handler.MappedInterceptor
 
 
 /**
@@ -45,7 +47,7 @@ class InterceptorsGrailsPlugin extends Plugin {
             GrailsClass[] interceptors = grailsApplication.getArtefacts(InterceptorArtefactHandler.TYPE)
             if(interceptors.length == 0) return
 
-            grailsInterceptorHandlerInterceptorAdapter(GrailsInterceptorHandlerInterceptorAdapter)
+            grailsInterceptorMappedInterceptor(MappedInterceptor, ['/**'] as String[], bean(GrailsInterceptorHandlerInterceptorAdapter))
 
             def enableJsessionId = config.getProperty(Settings.GRAILS_VIEWS_ENABLE_JSESSIONID, Boolean, false)
             for(GrailsClass i in interceptors) {
@@ -61,8 +63,8 @@ class InterceptorsGrailsPlugin extends Plugin {
 
     @Override
     void doWithApplicationContext() {
-        if(applicationContext.containsBeanDefinition("grailsInterceptorHandlerInterceptorAdapter")) {
-            interceptorAdapter = applicationContext.getBean("grailsInterceptorHandlerInterceptorAdapter", GrailsInterceptorHandlerInterceptorAdapter)
+        if(applicationContext.containsBeanDefinition("grailsInterceptorMappedInterceptor")) {
+            interceptorAdapter = (GrailsInterceptorHandlerInterceptorAdapter)applicationContext.getBean("grailsInterceptorMappedInterceptor", MappedInterceptor).getInterceptor()
         }
     }
 
@@ -76,7 +78,7 @@ class InterceptorsGrailsPlugin extends Plugin {
             def interceptorClass = (Class) source
             def grailsClass = grailsApplication.addArtefact(InterceptorArtefactHandler.TYPE, interceptorClass)
 
-            def interceptorAdapter = this.interceptorAdapter ?: applicationContext.getBean(GrailsInterceptorHandlerInterceptorAdapter)
+            def interceptorAdapter = this.interceptorAdapter ?: (GrailsInterceptorHandlerInterceptorAdapter)applicationContext.getBean("grailsInterceptorMappedInterceptor", MappedInterceptor).getInterceptor()
             defineInterceptorBean(grailsClass, interceptorClass, enableJsessionId)
             interceptorAdapter.setInterceptors(
                     applicationContext.getBeansOfType(Interceptor).values() as Interceptor[]

grails-plugin-interceptors/src/test/groovy/grails/artefact/InterceptorSpec.groovy

@@ -39,6 +39,7 @@ class InterceptorSpec extends Specification {
     void "Test the default interceptor mappings"() {
         given:"A test interceptor"
             def i = new TestInterceptor()
+            i.defaultMatcher()
             def webRequest = GrailsWebMockUtil.bindMockWebRequest()
             HttpServletRequest request = webRequest.request
         when:"The current request is for a controller called test"

grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMapping.groovy

@@ -61,11 +61,6 @@ class UrlMappingsHandlerMapping extends AbstractHandlerMapping {
         setOrder(-5)
     }
 
-    @Autowired
-    void setHandlerInterceptors(HandlerInterceptor[] handlerInterceptors) {
-        setInterceptors(handlerInterceptors)
-    }
-
     @Autowired(required = false)
     void setWebRequestInterceptors(WebRequestInterceptor[] webRequestInterceptors) {
         webRequestHandlerInterceptors = webRequestInterceptors.collect( { WebRequestInterceptor wri ->
@@ -80,23 +75,12 @@ class UrlMappingsHandlerMapping extends AbstractHandlerMapping {
 
     @Override
     protected HandlerExecutionChain getHandlerExecutionChain(Object handler, HttpServletRequest request) {
-        HandlerExecutionChain chain = (handler instanceof HandlerExecutionChain ?
-                (HandlerExecutionChain) handler : new HandlerExecutionChain(handler));
+        def chain = super.getHandlerExecutionChain(handler, request)
 
         // WebRequestInterceptor need to come first, as these include things like Hibernate OSIV
         if(webRequestHandlerInterceptors) {
             chain.addInterceptors webRequestHandlerInterceptors
         }
-
-        chain.addInterceptors getAdaptedInterceptors()
-
-        String lookupPath = this.urlPathHelper.getLookupPathForRequest(request)
-        for (MappedInterceptor mappedInterceptor in getMappedInterceptors()) {
-            if (mappedInterceptor.matches(lookupPath, this.pathMatcher)) {
-                chain.addInterceptor(mappedInterceptor.interceptor)
-            }
-        }
-
         chain.addInterceptor(new ErrorHandlingHandler())
         return chain
     }