Skip to content

Remove redundant slashes in URI-string before it's URI will be resolve. #1423

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

Closed
wants to merge 1 commit into from
Closed

Remove redundant slashes in URI-string before it's URI will be resolve. #1423

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
15 changes: 14 additions & 1 deletion ...-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;

import static java.util.Objects.isNull;

/**
* Adapt {@link ServerHttpRequest} to the Reactor {@link HttpServerRequest}.
*
Expand All @@ -58,10 +60,21 @@ public ReactorServerHttpRequest(HttpServerRequest request, NettyDataBufferFactor
private static URI initUri(HttpServerRequest channel) {
Assert.notNull(channel, "'channel' must not be null");
InetSocketAddress address = channel.remoteAddress();
String requestUri = channel.uri();
String requestUri = squashSlashes(channel.uri());
return (address != null ? getBaseUrl(address).resolve(requestUri) : URI.create(requestUri));
}

/**
* Remove redundant slashes from request URI-string
*
* <p>
* http://example.com/// -> http://example.com/
* </p>
*/
private static String squashSlashes(String uri) {
return isNull(uri) ? uri : uri.replaceAll("/{2,}", "/");
Copy link
Contributor

@Shredder121 Shredder121 May 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't this collapse http://example.com/// to http:/example.com/?

Copy link
Author

@daggerok daggerok May 15, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Shredder121, you are talking about URL, but not URI, which actually i'm replacing..
so answering on your question: no, it wouldn't, it should collapse only URI: /// -> /

Copy link

@luyuanwan luyuanwan May 23, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think function squashSlashes should move to some tool utility class. :)

}

private static URI getBaseUrl(InetSocketAddress address) {
try {
return new URI(null, null, address.getHostString(), address.getPort(), null, null, null);
Expand Down