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

Issue #1202 - Adding testcase and fix for NPE in Sec-WebSocket-Extensions use

Browse Source
This commit is contained in:
Joakim Erdfelt 2016-12-27 14:06:33 -07:00
parent 03a283235c
commit bf80d822c0
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrSession.java
View File

@ -21,7 +21,6 @@ package org.eclipse.jetty.websocket.jsr356;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.security.Principal; import java.security.Principal;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@ -29,6 +28,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.EndpointConfig; import javax.websocket.EndpointConfig;
@ -42,7 +42,6 @@ import javax.websocket.WebSocketContainer;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.BatchMode; import org.eclipse.jetty.websocket.api.BatchMode;
import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
import org.eclipse.jetty.websocket.common.LogicalConnection; import org.eclipse.jetty.websocket.common.LogicalConnection;
import org.eclipse.jetty.websocket.common.WebSocketSession; import org.eclipse.jetty.websocket.common.WebSocketSession;
import org.eclipse.jetty.websocket.common.events.EventDriver; import org.eclipse.jetty.websocket.common.events.EventDriver;
@ -241,13 +240,9 @@ public class JsrSession extends WebSocketSession implements javax.websocket.Sess
@Override @Override
public List<Extension> getNegotiatedExtensions() public List<Extension> getNegotiatedExtensions()
{ {
if (negotiatedExtensions == null) if ((negotiatedExtensions == null) && getUpgradeResponse().getExtensions() != null)
{ {
negotiatedExtensions = new ArrayList<Extension>(); negotiatedExtensions = getUpgradeResponse().getExtensions().stream().map(JsrExtension::new).collect(Collectors.toList());
for (ExtensionConfig cfg : getUpgradeResponse().getExtensions())
{
negotiatedExtensions.add(new JsrExtension(cfg));
}
} }
return negotiatedExtensions; return negotiatedExtensions;
} }

25
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java
View File

@ -20,6 +20,7 @@ package org.eclipse.jetty.websocket.jsr356.server;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
@ -36,6 +37,7 @@ import java.util.TimeZone;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;
@ -97,9 +99,19 @@ public class ConfiguratorTest
public static class NoExtensionsSocket public static class NoExtensionsSocket
{ {
@OnMessage @OnMessage
public String echo(String message) public String echo(Session session, String message)
{ {
return message; List<Extension> negotiatedExtensions = session.getNegotiatedExtensions();
if (negotiatedExtensions == null)
{
return "negotiatedExtensions=null";
}
else
{
return "negotiatedExtensions=" + negotiatedExtensions.stream()
.map((ext) -> ext.getName())
.collect(Collectors.joining(",", "[", "]"));
}
} }
} }
@ -420,8 +432,13 @@ public class ConfiguratorTest
client.addExtensions("identity"); client.addExtensions("identity");
client.connect(); client.connect();
client.sendStandardRequest(); client.sendStandardRequest();
HttpResponse response = client.readResponseHeader(); HttpResponse response = client.expectUpgradeResponse();
Assert.assertThat("response.extensions", response.getExtensionsHeader(), nullValue()); assertThat("response.extensions", response.getExtensionsHeader(), nullValue());
client.write(new TextFrame().setPayload("NegoExts"));
EventQueue<WebSocketFrame> frames = client.readFrames(1, 1, TimeUnit.SECONDS);
WebSocketFrame frame = frames.poll();
assertThat("Frame Response", frame.getPayloadAsUTF8(), is("negotiatedExtensions=[]"));
} }
} }