Merge branch '6.2.x' into 7.0.x

matrei · Jan 26, 2024 · d1cb568 · d1cb568
2 parents 87cb7f7 + 8d30a96
commit d1cb568
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml
@@ -147,6 +147,6 @@ jobs:
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
         with:
-          arguments: | 
+          arguments: |
             build 
             -x groovydoc
diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/ResponseRedirector.groovy b/grails-web-url-mappings/src/main/groovy/grails/web/mapping/ResponseRedirector.groovy
@@ -122,7 +122,7 @@ class ResponseRedirector {
         if (absolute) {
             redirectURI = processedActualUri.contains("://") ? processedActualUri : serverBaseURL + processedActualUri
         } else {
-            redirectURI = processedActualUri
+            redirectURI = linkGenerator.contextPath + processedActualUri
         }
 
         String redirectUrl = useJessionId ? response.encodeRedirectURL(redirectURI) : redirectURI

diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/AbstractUrlMappingsSpec.groovy b/grails-web-url-mappings/src/test/groovy/grails/web/mapping/AbstractUrlMappingsSpec.groovy
@@ -17,10 +17,17 @@ import spock.lang.Specification
  */
 abstract class AbstractUrlMappingsSpec extends Specification{
 
+    static final String CONTEXT_PATH = 'app-context'
+
     def setup() {
         WebUtils.clearGrailsWebRequest()
     }
 
+    LinkGenerator getLinkGeneratorWithContextPath(Closure mappings) {
+        LinkGeneratorFactory linkGeneratorFactory = new LinkGeneratorFactory()
+        linkGeneratorFactory.contextPath = CONTEXT_PATH
+        linkGeneratorFactory.create(mappings)
+    }
     LinkGenerator getLinkGenerator(Closure mappings) {
         new LinkGeneratorFactory().create(mappings)
     }

diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/RedirectNonAbsoluteURISpec.groovy b/grails-web-url-mappings/src/test/groovy/grails/web/mapping/RedirectNonAbsoluteURISpec.groovy
@@ -91,4 +91,25 @@ class RedirectNonAbsoluteURISpec extends AbstractUrlMappingsSpec {
         cleanup:
         RequestContextHolder.setRequestAttributes(null)
     }
+
+    @Issue('11673')
+    void 'An "absolute=false" redirect includes context-path in Location header'() {
+        given:
+        def linkGenerator = getLinkGeneratorWithContextPath {
+            "/$controller/$action?/$id?"()
+        }
+        def responseRedirector = new ResponseRedirector(linkGenerator)
+        HttpServletRequest request = Mock(HttpServletRequest) { lookup() >> GrailsWebMockUtil.bindMockWebRequest() }
+        HttpServletResponse response = Mock(HttpServletResponse)
+
+        when: 'redirecting with absolute=false where context-path is set'
+        responseRedirector.redirect(request, response, [controller: 'test', action: 'foo', absolute: false])
+
+        then: 'the partial URI includes context-path'
+        1 * response.setStatus(302)
+        1 * response.setHeader(HttpHeaders.LOCATION, CONTEXT_PATH + '/test/foo')
+
+        cleanup:
+        RequestContextHolder.setRequestAttributes(null)
+    }
 }