Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-19 14:18:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Always copy HTTP response headers to websocket responses.

Browse Source
This commit is contained in:
Jon Chambers
2020-05-19 15:48:09 -04:00
committed by Jon Chambers
parent 817f057927
commit eb8b5e5c01
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
websocket-resources/src/test/java/org/whispersystems/websocket/WebSocketResourceProviderTest.java
View File

@@ -36,19 +36,21 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.security.Principal;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import io.dropwizard.auth.Auth;
import io.dropwizard.auth.AuthValueFactoryProvider;
import io.dropwizard.jersey.DropwizardResourceConfig;
import io.dropwizard.jersey.jackson.JacksonMessageBodyProvider;
import static org.assertj.core.api.Assertions.assertThat;
@@ -585,6 +587,21 @@ public class WebSocketResourceProviderTest {
assertThat(response.getBody().toStringUtf8()).isEqualTo("my response");
}
@Test
public void testGetHeaderList() {
assertThat(WebSocketResourceProvider.getHeaderList(new MultivaluedHashMap<>())).isEmpty();
{
final MultivaluedMap<String, String> headers = new MultivaluedHashMap<>();
headers.put("test", Arrays.asList("a", "b", "c"));
final List<String> headerStrings = WebSocketResourceProvider.getHeaderList(headers);
assertThat(headerStrings).hasSize(1);
assertThat(headerStrings).contains("test:a");
}
}
private SubProtocol.WebSocketResponseMessage getResponse(ArgumentCaptor<ByteBuffer> responseCaptor) throws InvalidProtocolBufferException {
return SubProtocol.WebSocketMessage.parseFrom(responseCaptor.getValue().array()).getResponse();
}