Merge branch 'rainoko-master'

fixes springfox#2622
wn-doolittle · Aug 3, 2019 · 71553ac · 71553ac
2 parents 55e7991 + 73c808d
commit 71553ac
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/...swagger-common/src/main/java/springfox/documentation/swagger/common/HostNameProvider.java b/...swagger-common/src/main/java/springfox/documentation/swagger/common/HostNameProvider.java
@@ -63,7 +63,10 @@ private static ServletUriComponentsBuilder fromServletMapping(
     ServletUriComponentsBuilder builder = fromContextPath(request);
 
     XForwardPrefixPathAdjuster adjuster = new XForwardPrefixPathAdjuster(request);
-    builder.replacePath(adjuster.adjustedPath(basePath));
+    String adjustedPath = adjuster.adjustedPath(basePath);
+    if (!adjustedPath.equals(basePath)) {
+      builder.replacePath(adjustedPath);
+    }
     if (hasText(new UrlPathHelper().getPathWithinServletMapping(request))) {
       builder.path(request.getServletPath());
     }

diff --git a/...common/src/test/groovy/springfox/documentation/swagger/common/HostNameProviderSpec.groovy b/...common/src/test/groovy/springfox/documentation/swagger/common/HostNameProviderSpec.groovy
@@ -5,13 +5,14 @@ import spock.lang.Specification
 
 import javax.servlet.http.HttpServletRequest
 
+import static java.util.Collections.*
 import static springfox.documentation.swagger.common.HostNameProvider.*
 import static springfox.documentation.swagger.common.XForwardPrefixPathAdjuster.*
 
 class HostNameProviderSpec extends Specification {
   def "should prefix path with x-forwarded-prefix"() {
     given:
-    def request = mockRequest()
+    def request = mockRequest(true)
 
     when:
     def result = componentsFrom(request, "/basePath")
@@ -20,6 +21,17 @@ class HostNameProviderSpec extends Specification {
     result.toUriString() == "http://localhost/prefix"
   }
 
+  def "should preserve contextPath from request if no x-forwarded-prefix"() {
+    given:
+    def request = mockRequest(false)
+
+    when:
+    def result = componentsFrom(request, "/basePath")
+
+    then:
+    result.toUriString() == "http://localhost/contextPath"
+  }
+
   def "should not be allowed to create object from utility class"() {
     when:
     new HostNameProvider()
@@ -28,10 +40,14 @@ class HostNameProviderSpec extends Specification {
     thrown UnsupportedOperationException
   }
 
-  def mockRequest() {
+  def mockRequest(boolean addXForwardedHeaders) {
     def request = Mock(HttpServletRequest.class)
-    request.getHeader(X_FORWARDED_PREFIX) >> "/prefix"
-    request.getHeaders(X_FORWARDED_PREFIX) >> headerValues()
+    if (addXForwardedHeaders) {
+      request.getHeader(X_FORWARDED_PREFIX) >> "/prefix"
+      request.getHeaders(X_FORWARDED_PREFIX) >> headerValues()
+    } else {
+      request.getHeaders(X_FORWARDED_PREFIX) >> emptyEnumeration()
+    }
     request.headerNames >> headerNames()
     request.requestURL >> new StringBuffer("http://localhost/contextPath")
     request.requestURI >> new URI("http://localhost/contextPath")