Make interceptors context path aware

Author: jameskleeh

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

@@ -87,14 +87,18 @@ trait Interceptor implements ResponseRenderer, ResponseRedirector, RequestForwar
         }
 
         def req = request
+        def ctxPath = req.contextPath
         def uri = req.requestURI
+        def noCtxUri = uri - ctxPath
+        def checkNoCtxUri = ctxPath && uri.startsWith(ctxPath)
 
         def matchedInfo = request.getAttribute(UrlMappingsHandlerMapping.MATCHED_REQUEST)
 
         UrlMappingInfo grailsMappingInfo = (UrlMappingInfo)matchedInfo
 
         for(Matcher matcher in allMatchers) {
-            if(matcher.doesMatch(uri, grailsMappingInfo, req.method)) {
+            if(matcher.doesMatch(uri, grailsMappingInfo, req.method) ||
+               (checkNoCtxUri && matcher.doesMatch(noCtxUri, grailsMappingInfo, req.method))) {
                 request.setAttribute(interceptorMatchKey, Boolean.TRUE)
                 return true
             }

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

@@ -178,6 +178,78 @@ class InterceptorSpec extends Specification {
         'GET'      | false
     }
 
+    void "Test match with uri no context path"() {
+        given:"A test interceptor"
+        def i = new TestUriInterceptor()
+        def webRequest = GrailsWebMockUtil.bindMockWebRequest(new MockServletContext(), new MockHttpServletRequest("", requestUri), new MockHttpServletResponse())
+        def request = webRequest.request
+
+        when:"The uri of the current request is ${requestUri}"
+        request.setAttribute(UrlMappingsHandlerMapping.MATCHED_REQUEST, new ForwardUrlMappingInfo(controllerName: "test", action: "save"))
+
+        then: "We match: ${shouldMatch}"
+        i.doesMatch() == shouldMatch
+
+        where:
+        requestUri | shouldMatch
+        '/bar'     | true
+        '/bar/x'   | true
+        '/fooBar'  | false
+        '/foo'     | true
+        '/foo/x'   | false
+        '/foo/bar' | true
+    }
+
+    void "Test match with uri and context path"() {
+        given:"A test interceptor"
+        def i = new TestUriInterceptor()
+        def mockRequest = new MockHttpServletRequest("", requestUri)
+        mockRequest.setContextPath('/grails')
+        def webRequest = GrailsWebMockUtil.bindMockWebRequest(new MockServletContext(), mockRequest, new MockHttpServletResponse())
+
+        def request = webRequest.request
+
+        when:"The uri of the current request is ${requestUri}"
+        request.setAttribute(UrlMappingsHandlerMapping.MATCHED_REQUEST, new ForwardUrlMappingInfo(controllerName: "test", action: "save"))
+
+        then: "We match: ${shouldMatch}"
+        i.doesMatch() == shouldMatch
+
+        where:
+        requestUri        | shouldMatch
+        '/grails/bar'     | true
+        '/grails/bar/x'   | true
+        '/grails/fooBar'  | false
+        '/grails/foo'     | true
+        '/grails/foo/x'   | false
+        '/grails/foo/bar' | true
+    }
+
+    void "Test match with uri and context path with an interceptor that defines the context path"() {
+        given:"A test interceptor"
+        def i = new TestContextUriInterceptor()
+        def mockRequest = new MockHttpServletRequest("", requestUri)
+        mockRequest.setContextPath('/grails')
+        def webRequest = GrailsWebMockUtil.bindMockWebRequest(new MockServletContext(), mockRequest, new MockHttpServletResponse())
+
+        def request = webRequest.request
+
+        when:"The uri of the current request is ${requestUri}"
+        request.setAttribute(UrlMappingsHandlerMapping.MATCHED_REQUEST, new ForwardUrlMappingInfo(controllerName: "test", action: "save"))
+
+        then: "We match: ${shouldMatch}"
+        i.doesMatch() == shouldMatch
+
+        where:
+        requestUri        | shouldMatch
+        '/grails/bar'     | true
+        '/grails/bar/x'   | true
+        '/grails/fooBar'  | false
+        '/grails/foo'     | true
+        '/grails/foo/x'   | false
+        '/grails/foo/bar' | true
+    }
+
     void clearMatch(i, HttpServletRequest request) {
         request.removeAttribute(i.getClass().name + InterceptorArtefactHandler.MATCH_SUFFIX)
     }
@@ -226,3 +298,19 @@ class TestMethodInterceptor implements Interceptor {
         match(method: 'POST')
     }
 }
+
+class TestUriInterceptor implements Interceptor {
+    TestUriInterceptor() {
+        match(uri: '/bar/**')
+        match(uri: '/foo')
+        match(uri: '/foo/bar')
+    }
+}
+
+class TestContextUriInterceptor implements Interceptor {
+    TestContextUriInterceptor() {
+        match(uri: '/grails/bar/**')
+        match(uri: '/grails/foo')
+        match(uri: '/grails/foo/bar')
+    }
+}