Don't abort processing via filter if request is include or filter. Fixes #9566

Author: graemerocher

grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/RequestForwarder.groovy

@@ -96,8 +96,6 @@ trait RequestForwarder implements WebAttributes {
         WebUtils.exposeRequestAttributes(request, (Map)model);
 
         request.setAttribute(GrailsApplicationAttributes.FORWARD_IN_PROGRESS, true)
-        request.setAttribute(GrailsApplicationAttributes.FORWARD_ISSUED, true)
-
         params.includeContext = false
         def fowardURI = lookupLinkGenerator().link(params)
 
@@ -108,6 +106,7 @@ trait RequestForwarder implements WebAttributes {
         webRequest.removeAttribute(UrlMappingsHandlerMapping.MATCHED_REQUEST, WebRequest.SCOPE_REQUEST);
         webRequest.removeAttribute("grailsWebRequestFilter" + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX, WebRequest.SCOPE_REQUEST);
         dispatcher.forward(request, response);
+        request.setAttribute(GrailsApplicationAttributes.FORWARD_ISSUED, true)
         return fowardURI
     }
 

grails-plugin-filters/src/main/groovy/org/grails/plugins/web/filters/CompositeInterceptor.java

@@ -16,6 +16,7 @@
 package org.grails.plugins.web.filters;
 
 import org.grails.web.util.GrailsApplicationAttributes;
+import org.grails.web.util.WebUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -52,7 +53,8 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
                 return false;
             }
             // if forward is called, bail out
-            if (request.getAttribute(GrailsApplicationAttributes.FORWARD_ISSUED) != null) {
+            if (request.getAttribute(GrailsApplicationAttributes.FORWARD_ISSUED) != null && !WebUtils.isForwardOrInclude(request)) {
+                request.removeAttribute(GrailsApplicationAttributes.FORWARD_ISSUED);
                 return false;
             }
         }
@@ -65,6 +67,12 @@ public void postHandle(HttpServletRequest request, HttpServletResponse response,
         for (HandlerInterceptor handler : handlersReversed) {
             handler.postHandle(request, response, o, modelAndView);
         }
+
+        // remove the FORWARD_ISSUED attribute just in case forward was called from an action
+        // this will ensure the subsequent action works since FORWARD_ISSUED is only used
+        // to know whether forward was called from within a filter
+        request.removeAttribute(GrailsApplicationAttributes.FORWARD_ISSUED);
+
     }
 
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object o, Exception e) throws Exception {

grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequest.java

@@ -68,7 +68,6 @@
  */
 public class GrailsWebRequest extends DispatcherServletWebRequest  {
 
-    private static final String FORWARD_CALLED = GrailsApplicationAttributes.FORWARD_ISSUED;
     private static final String REDIRECT_CALLED = GrailsApplicationAttributes.REDIRECT_ISSUED;
 
     private static final Class<? extends GrailsApplicationAttributes> grailsApplicationAttributesClass = GrailsFactoriesLoader.loadFactoryClasses(GrailsApplicationAttributes.class, GrailsWebRequest.class.getClassLoader()).get(0);

grails-web-common/src/main/groovy/org/grails/web/util/WebUtils.java

@@ -495,4 +495,14 @@ public static boolean isInclude(HttpServletRequest request) {
         return request.getAttribute(INCLUDE_REQUEST_URI_ATTRIBUTE) != null;
     }
 
+    /**
+     * Check whether the given request is an include or forward request
+     *
+     * @param request The request
+     * @return True if it is an include or forward request
+     */
+    public static boolean isForwardOrInclude(HttpServletRequest request) {
+        return isForward(request) || isInclude(request);
+    }
+
 }