Skip to content

Add support for empty path prefixes #4023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NiMv1 wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −7
Open

Add support for empty path prefixes #4023

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions ...java/org/springframework/cloud/gateway/filter/factory/PrefixPathGatewayFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ public List<String> shortcutFieldOrder() {
@Override
public GatewayFilter apply(Config config) {
return new GatewayFilter() {
final UriTemplate uriTemplate = new UriTemplate(
Objects.requireNonNull(config.prefix, "prefix must not be null"));
final String prefix = config.prefix != null ? config.prefix : "";
final UriTemplate uriTemplate = prefix.isEmpty() ? null : new UriTemplate(prefix);

@Override
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
Expand All @@ -78,11 +78,16 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
ServerHttpRequest req = exchange.getRequest();
addOriginalRequestUrl(exchange, req.getURI());

Map<String, String> uriVariables = getUriTemplateVariables(exchange);
URI uri = uriTemplate.expand(uriVariables);

String newPath = uri.getRawPath() + req.getURI().getRawPath();
exchange.getAttributes().put(GATEWAY_REQUEST_URL_ATTR, uri);
String newPath;
if (uriTemplate != null) {
Map<String, String> uriVariables = getUriTemplateVariables(exchange);
URI uri = uriTemplate.expand(uriVariables);
newPath = uri.getRawPath() + req.getURI().getRawPath();
exchange.getAttributes().put(GATEWAY_REQUEST_URL_ATTR, uri);
}
else {
newPath = req.getURI().getRawPath();
}
ServerHttpRequest request = req.mutate().path(newPath).build();

if (log.isTraceEnabled()) {
Expand Down