Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-06 13:59:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

400512 - ClientUpgradeRequet.addExtension() should fail if extension is not installed

Browse Source
This commit is contained in:
Joakim Erdfelt 2013-02-12 11:37:16 -07:00
parent e09d401fd2
commit 5c68d23138
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
View File

@ -123,6 +123,15 @@ public class WebSocketClient extends ContainerLifeCycle
request.setRequestURI(toUri);
request.setCookiesFrom(this.cookieStore);
// Validate Requested Extensions
for (ExtensionConfig reqExt : request.getExtensions())
{
if (!extensionRegistry.isAvailable(reqExt.getName()))
{
throw new IllegalArgumentException("Requested extension [" + reqExt.getName() + "] is not installed");
}
}
// Validate websocket URI
LOG.debug("connect websocket:{} to:{}",websocket,toUri);

16
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java
View File

@ -70,6 +70,22 @@ public class WebSocketClientTest
server.stop();
}
@Test(expected = IllegalArgumentException.class)
public void testAddExtension_NotInstalled() throws Exception
{
TrackingSocket cliSock = new TrackingSocket();
client.getPolicy().setIdleTimeout(10000);
URI wsUri = server.getWsUri();
ClientUpgradeRequest request = new ClientUpgradeRequest();
request.setSubProtocols("echo");
request.addExtensions("x-bad");
// Should trigger failure on bad extension
client.connect(cliSock,wsUri,request);
}
@Test
public void testBasicEcho_FromClient() throws Exception
{