Skip to content

Commit d9e34c5

Browse files
committed
Merge branch 'thijsnissen-use-adapt-from-forwarded-headers'
2 parents 102f57f + b1e465e commit d9e34c5

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeCommon.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.springdoc.core.properties.SwaggerUiConfigParameters;
3535
import org.springdoc.core.properties.SwaggerUiConfigProperties;
3636
import org.springdoc.ui.AbstractSwaggerWelcome;
37+
import org.springframework.web.util.ForwardedHeaderUtils;
3738
import reactor.core.publisher.Mono;
3839

3940
import org.springframework.http.HttpStatus;
@@ -123,7 +124,7 @@ protected Map<String, Object> getSwaggerUiConfig(ServerHttpRequest request) {
123124
void buildFromCurrentContextPath(SwaggerUiConfigParameters swaggerUiConfigParameters, ServerHttpRequest request) {
124125
super.init(swaggerUiConfigParameters);
125126
swaggerUiConfigParameters.setContextPath(request.getPath().contextPath().value());
126-
String url = UriComponentsBuilder.fromHttpRequest(request).toUriString();
127+
String url = ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders()).toUriString();
127128
String target = UriComponentsBuilder.fromPath(request.getPath().contextPath().value()).toUriString();
128129
int endIndex = url.indexOf(target) + target.length();
129130
if (endIndex > 0) {

0 commit comments

Comments
 (0)