MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

basic websocket test

This commit is contained in:
Moxie Marlinspike 2014-01-24 16:07:32 -08:00
parent 7bb505db4c
commit 866f8bf1ef
3 changed files with 120 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/whispersystems/textsecuregcm/entities/AcknowledgeWebsocketMessage.java
View File

@ -9,6 +9,13 @@ public class AcknowledgeWebsocketMessage extends IncomingWebsocketMessage {
@JsonProperty
private long id;
public AcknowledgeWebsocketMessage() {}
public AcknowledgeWebsocketMessage(long id) {
this.type = TYPE_ACKNOWLEDGE_MESSAGE;
this.id = id;
}
public long getId() {
return id;
}

4
src/main/java/org/whispersystems/textsecuregcm/entities/IncomingWebsocketMessage.java
View File

@ -3,7 +3,7 @@ package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
@JsonIgnoreProperties(ignoreUnknown = false)
@JsonIgnoreProperties(ignoreUnknown = true)
public class IncomingWebsocketMessage {
public static final int TYPE_ACKNOWLEDGE_MESSAGE = 1;
@ -11,7 +11,7 @@ public class IncomingWebsocketMessage {
public static final int TYPE_PONG_MESSAGE = 3;
@JsonProperty
private int type;
protected int type;
public IncomingWebsocketMessage() {}

111
src/test/java/org/whispersystems/textsecuregcm/tests/controllers/WebsocketControllerTest.java Normal file
View File

@ -0,0 +1,111 @@
package org.whispersystems.textsecuregcm.tests.controllers;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Optional;
import com.yammer.dropwizard.auth.basic.BasicCredentials;
import org.eclipse.jetty.websocket.WebSocket;
import org.junit.Test;
import org.whispersystems.textsecuregcm.auth.AccountAuthenticator;
import org.whispersystems.textsecuregcm.controllers.WebsocketController;
import org.whispersystems.textsecuregcm.controllers.WebsocketControllerFactory;
import org.whispersystems.textsecuregcm.entities.AcknowledgeWebsocketMessage;
import org.whispersystems.textsecuregcm.storage.Account;
import org.whispersystems.textsecuregcm.storage.Device;
import org.whispersystems.textsecuregcm.storage.PubSubManager;
import org.whispersystems.textsecuregcm.storage.StoredMessageManager;
import org.whispersystems.textsecuregcm.websocket.WebsocketAddress;
import javax.servlet.http.HttpServletRequest;
import java.util.LinkedList;
import java.util.List;
import static org.fest.assertions.api.Assertions.assertThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*;
public class WebsocketControllerTest {
private static final ObjectMapper mapper = new ObjectMapper();
private static final String VALID_USER = "+14152222222";
private static final String INVALID_USER = "+14151111111";
private static final String VALID_PASSWORD = "secure";
private static final String INVALID_PASSWORD = "insecure";
private final StoredMessageManager storedMessageManager = mock(StoredMessageManager.class);
private final AccountAuthenticator accountAuthenticator = mock(AccountAuthenticator.class);
private final PubSubManager pubSubManager = mock(PubSubManager.class );
private final Account account = mock(Account.class );
private final Device device = mock(Device.class );
private final HttpServletRequest request = mock(HttpServletRequest.class );
private final WebSocket.Connection connection = mock(WebSocket.Connection.class);
@Test
public void testCredentials() throws Exception {
when(accountAuthenticator.authenticate(eq(new BasicCredentials(VALID_USER, VALID_PASSWORD))))
.thenReturn(Optional.of(account));
when(accountAuthenticator.authenticate(eq(new BasicCredentials(INVALID_USER, INVALID_PASSWORD))))
.thenReturn(Optional.<Account>absent());
WebsocketControllerFactory factory = new WebsocketControllerFactory(accountAuthenticator,
storedMessageManager,
pubSubManager);
when(request.getParameter(eq("user"))).thenReturn(VALID_USER);
when(request.getParameter(eq("password"))).thenReturn(VALID_PASSWORD);
assertThat(factory.checkOrigin(request, "foobar")).isEqualTo(true);
when(request.getParameter(eq("user"))).thenReturn(INVALID_USER);
when(request.getParameter(eq("password"))).thenReturn(INVALID_PASSWORD);
assertThat(factory.checkOrigin(request, "foobar")).isEqualTo(false);
}
@Test
public void testOpen() throws Exception {
List<String> outgoingMessages = new LinkedList<String>() {{
add("first");
add("second");
add("third");
}};
when(device.getId()).thenReturn(2L);
when(account.getId()).thenReturn(31337L);
when(account.getAuthenticatedDevice()).thenReturn(Optional.of(device));
when(request.getParameter(eq("user"))).thenReturn(VALID_USER);
when(request.getParameter(eq("password"))).thenReturn(VALID_PASSWORD);
when(accountAuthenticator.authenticate(eq(new BasicCredentials(VALID_USER, VALID_PASSWORD))))
.thenReturn(Optional.of(account));
when(storedMessageManager.getOutgoingMessages(eq(account), eq(device))).thenReturn(outgoingMessages);
WebsocketControllerFactory factory = new WebsocketControllerFactory(accountAuthenticator,
storedMessageManager,
pubSubManager);
assertThat(factory.checkOrigin(request, "foobar")).isEqualTo(true);
WebsocketController socket = (WebsocketController)factory.doWebSocketConnect(request, "foo");
socket.onOpen(connection);
verify(pubSubManager).subscribe(eq(new WebsocketAddress(31337L, 2L)), eq((socket)));
verify(connection, times(3)).sendMessage(anyString());
socket.onMessage(mapper.writeValueAsString(new AcknowledgeWebsocketMessage(1)));
socket.onClose(1000, "Closed");
List<String> pending = new LinkedList<String>() {{
add("first");
add("third");
}};
verify(storedMessageManager).storeMessages(eq(account), eq(device), eq(pending));
}
}