From dbbc1cd9cf03c6d4998c6081ce1bf506b582f246 Mon Sep 17 00:00:00 2001
From: "Donald J. Brown" <mrdon@apache.org>
Date: Tue, 26 Sep 2006 05:48:00 +0000
Subject: [PATCH] Fixed several url building issues dealing with relative paths
 - omitted forward slash and support for Servlet 2.4 forwarding behaviors
 Patch provided by Erik Pilz WW-1302 WW-1301

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@449915 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/struts2/views/util/UrlHelper.java  | 20 ++++++++++++++--
 .../struts2/views/util/UrlHelperTest.java     | 24 ++++++++++---------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java b/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
index 356c23474..32833646c 100644
--- a/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
+++ b/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
@@ -124,8 +124,17 @@ public class UrlHelper {
                     link.append(contextPath);
                 }
             } else if (changedScheme) {
-                String uri = request.getRequestURI();
-                link.append(uri.substring(0, uri.lastIndexOf('/')));
+                
+                // (Applicable to Servlet 2.4 containers)
+                // If the request was forwarded, the attribute below will be set with the original URL
+                String uri = (String) request.getAttribute("javax.servlet.forward.request_uri");
+                
+                // If the attribute wasn't found, default to the value in the request object
+                if (uri == null) {
+                    uri = request.getRequestURI();
+                }
+                
+                link.append(uri.substring(0, uri.lastIndexOf('/') + 1));
             }
 
             // Add page
@@ -134,6 +143,13 @@ public class UrlHelper {
             // Go to "same page"
             String requestURI = (String) request.getAttribute("struts.request_uri");
 
+            // (Applicable to Servlet 2.4 containers)
+            // If the request was forwarded, the attribute below will be set with the original URL
+            if (requestURI == null) {
+                requestURI = (String) request.getAttribute("javax.servlet.forward.request_uri");
+            }
+            
+            // If neither request attributes were found, default to the value in the request object
             if (requestURI == null) {
                 requestURI = request.getRequestURI();
             }
diff --git a/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java b/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
index 979e85418..62e2f8976 100644
--- a/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
+++ b/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
@@ -249,25 +249,27 @@ public class UrlHelperTest extends StrutsTestCase {
     }
 
     /**
-     * A check to verify that the scheme, server, and port number are omitted when the scheme of the current request
-     * matches the scheme supplied when building the URL.
+     * The UrlHelper should build a URL that starts with "https" followed by the server name when the scheme of the
+     * current request is "http" and the port for the "https" scheme is 443. When the request has been forwarded
+     * in a Servlet 2.4 container, the UrlHelper should use the javax.servlet.forward.request_uri request attribute
+     * instead of a call to HttpServletRequest#getRequestURI().
      */
-    public void testBuildWithSameScheme() {
-        String expectedString = "/mywebapp/MyAction.action?foo=bar&amp;hello=earth&amp;hello=mars";
+    public void testForwardedRequest() {
+        String expectedString = "https://www.example.com/mywebapp/product/widget/promo.html";
 
         Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
-        mockHttpServletRequest.expectAndReturn("getServerName", "www.mydomain.com");
-        mockHttpServletRequest.expectAndReturn("getScheme", "https");
-        mockHttpServletRequest.expectAndReturn("getServerPort", 443);
+        mockHttpServletRequest.expectAndReturn("getServerName", "www.example.com");
+        mockHttpServletRequest.expectAndReturn("getScheme", "http");
+        mockHttpServletRequest.expectAndReturn("getServerPort", 80);
         mockHttpServletRequest.expectAndReturn("getContextPath", "/mywebapp");
+        mockHttpServletRequest.expectAndReturn("getAttribute", "javax.servlet.forward.request_uri", "/mywebapp/product/widget/");
+        mockHttpServletRequest.expectAndReturn("getRequestURI", "/mywebapp/");
 
         Mock mockHttpServletResponse = new Mock(HttpServletResponse.class);
         mockHttpServletResponse.expectAndReturn("encodeURL", expectedString, expectedString);
 
-        String actionName = "/MyAction.action";
-        TreeMap params = new TreeMap();
-        params.put("hello", new String[]{"earth", "mars"});
-        params.put("foo", "bar");
+        String actionName = "promo.html";
+        Map params = new TreeMap();
 
         String urlString = UrlHelper.buildUrl(actionName, (HttpServletRequest) mockHttpServletRequest.proxy(), (HttpServletResponse) mockHttpServletResponse.proxy(), params, "https", true, true);
         assertEquals(expectedString, urlString);