Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9.4.x' into jetty-10.0.x 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
This commit is contained in:
Joakim Erdfelt 2019-11-13 10:58:48 -06:00
parent a9299b2426 9c9e842cd7
commit 1edff35676
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java
View File

@ -26,6 +26,8 @@ import java.net.SocketTimeoutException;
import java.net.URI;
import java.time.Duration;
import java.util.EnumSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
@ -182,6 +184,27 @@ public class ClientConnectTest
}
}
@Test
public void testUpgradeRequest_PercentEncodedQuery() throws Exception
{
CloseTrackingEndpoint cliSock = new CloseTrackingEndpoint();
client.setIdleTimeout(Duration.ofSeconds(10));
URI wsUri = WSURI.toWebsocket(server.getURI().resolve("/echo?name=%25foo"));
ClientUpgradeRequest request = new ClientUpgradeRequest();
request.setSubProtocols("echo");
Future<Session> future = client.connect(cliSock, wsUri);
try (Session sess = future.get(30, TimeUnit.SECONDS))
{
assertThat("Connect.UpgradeRequest", sess.getUpgradeRequest(), notNullValue());
Map<String, List<String>> paramMap = sess.getUpgradeRequest().getParameterMap();
List<String> values = paramMap.get("name");
assertThat("Params[name]", values.get(0), is("%foo"));
assertThat("Connect.UpgradeResponse", sess.getUpgradeResponse(), notNullValue());
}
}
@Test
public void testUpgradeWithAuthorizationHeader() throws Exception
{

8
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java
View File

@ -28,6 +28,7 @@ import java.util.Objects;
import java.util.stream.Collectors;
import org.eclipse.jetty.util.MultiMap;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.UrlEncoded;
import org.eclipse.jetty.websocket.core.ExtensionConfig;
import org.eclipse.jetty.websocket.core.WebSocketConstants;
@ -50,14 +51,17 @@ public class Negotiated
this.extensions = extensions;
this.protocolVersion = protocolVersion;
String rawQuery = requestURI.getRawQuery();
Map<String, List<String>> map;
if (requestURI.getQuery() == null)
if (StringUtil.isBlank(rawQuery))
{
map = Collections.emptyMap();
}
else
{
map = new HashMap<>();
MultiMap<String> params = new MultiMap<>();
UrlEncoded.decodeUtf8To(requestURI.getQuery(), params);
UrlEncoded.decodeUtf8To(rawQuery, params);
for (String p : params.keySet())
{
map.put(p, Collections.unmodifiableList(params.getValues(p)));