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

Use the envelope’s destination UUID for receipt source UUID

This commit is contained in:
Chris Eager 2022-07-29 16:05:49 -05:00 committed by Chris Eager
parent 3d2f7e731f
commit a06a663b94
5 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
View File

@ -467,7 +467,9 @@ public class MessageController {
if (deletedMessage.hasSourceUuid() && deletedMessage.getType() != Type.SERVER_DELIVERY_RECEIPT) { if (deletedMessage.hasSourceUuid() && deletedMessage.getType() != Type.SERVER_DELIVERY_RECEIPT) {
try { try {
receiptSender.sendReceipt(auth, UUID.fromString(deletedMessage.getSourceUuid()), deletedMessage.getTimestamp()); receiptSender.sendReceipt(
UUID.fromString(deletedMessage.getDestinationUuid()), auth.getAuthenticatedDevice().getId(),
UUID.fromString(deletedMessage.getSourceUuid()), deletedMessage.getTimestamp());
} catch (Exception e) { } catch (Exception e) {
logger.warn("Failed to send delivery receipt", e); logger.warn("Failed to send delivery receipt", e);
} }

11
service/src/main/java/org/whispersystems/textsecuregcm/push/ReceiptSender.java
View File

@ -12,7 +12,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount;
import org.whispersystems.textsecuregcm.controllers.NoSuchUserException; import org.whispersystems.textsecuregcm.controllers.NoSuchUserException;
import org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope; import org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
import org.whispersystems.textsecuregcm.metrics.MetricsUtil; import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
@ -38,9 +37,9 @@ public class ReceiptSender {
MetricsUtil.name(ReceiptSender.class, "executor")); MetricsUtil.name(ReceiptSender.class, "executor"));
} }
public CompletableFuture<Void> sendReceipt(AuthenticatedAccount source, UUID destinationUuid, long messageId) throws NoSuchUserException { public CompletableFuture<Void> sendReceipt(UUID sourceUuid, long sourceDeviceId, UUID destinationUuid, long messageId)
final Account sourceAccount = source.getAccount(); throws NoSuchUserException {
if (sourceAccount.getUuid().equals(destinationUuid)) { if (sourceUuid.equals(destinationUuid)) {
return CompletableFuture.completedFuture(null); return CompletableFuture.completedFuture(null);
} }
@ -49,8 +48,8 @@ public class ReceiptSender {
final Envelope.Builder message = Envelope.newBuilder() final Envelope.Builder message = Envelope.newBuilder()
.setServerTimestamp(System.currentTimeMillis()) .setServerTimestamp(System.currentTimeMillis())
.setSourceUuid(sourceAccount.getUuid().toString()) .setSourceUuid(sourceUuid.toString())
.setSourceDevice((int) source.getAuthenticatedDevice().getId()) .setSourceDevice((int) sourceDeviceId)
.setDestinationUuid(destinationUuid.toString()) .setDestinationUuid(destinationUuid.toString())
.setTimestamp(messageId) .setTimestamp(messageId)
.setType(Envelope.Type.SERVER_DELIVERY_RECEIPT); .setType(Envelope.Type.SERVER_DELIVERY_RECEIPT);

4
service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
View File

@ -231,7 +231,9 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
} }
try { try {
receiptSender.sendReceipt(auth, UUID.fromString(message.getSourceUuid()), message.getTimestamp()); receiptSender.sendReceipt(UUID.fromString(message.getDestinationUuid()),
auth.getAuthenticatedDevice().getId(), UUID.fromString(message.getSourceUuid()),
message.getTimestamp());
} catch (NoSuchUserException e) { } catch (NoSuchUserException e) {
logger.info("No longer registered: {}", e.getMessage()); logger.info("No longer registered: {}", e.getMessage());
} catch (WebApplicationException e) { } catch (WebApplicationException e) {

3
service/src/test/java/org/whispersystems/textsecuregcm/controllers/MessageControllerTest.java
View File

@ -465,7 +465,8 @@ class MessageControllerTest {
.delete(); .delete();
assertThat("Good Response Code", response.getStatus(), is(equalTo(204))); assertThat("Good Response Code", response.getStatus(), is(equalTo(204)));
verify(receiptSender).sendReceipt(any(AuthenticatedAccount.class), eq(sourceUuid), eq(timestamp)); verify(receiptSender).sendReceipt(eq(AuthHelper.VALID_UUID), eq(1L),
eq(sourceUuid), eq(timestamp));
response = resources.getJerseyTest() response = resources.getJerseyTest()
.target(String.format("/v1/messages/uuid/%s", uuid2)) .target(String.format("/v1/messages/uuid/%s", uuid2))

39
service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java
View File

@ -68,10 +68,12 @@ import org.whispersystems.websocket.session.WebSocketSessionContext;
class WebSocketConnectionTest { class WebSocketConnectionTest {
private static final String VALID_USER = "+14152222222"; private static final String VALID_USER = "+14152222222";
private static final String INVALID_USER = "+14151111111"; private static final String INVALID_USER = "+14151111111";
private static final String VALID_PASSWORD = "secure"; private static final int SOURCE_DEVICE_ID = 1;
private static final String VALID_PASSWORD = "secure";
private static final String INVALID_PASSWORD = "insecure"; private static final String INVALID_PASSWORD = "insecure";
private AccountAuthenticator accountAuthenticator; private AccountAuthenticator accountAuthenticator;
@ -138,15 +140,16 @@ class WebSocketConnectionTest {
void testOpen() throws Exception { void testOpen() throws Exception {
MessagesManager storedMessages = mock(MessagesManager.class); MessagesManager storedMessages = mock(MessagesManager.class);
UUID accountUuid = UUID.randomUUID(); UUID accountUuid = UUID.randomUUID();
UUID senderOneUuid = UUID.randomUUID(); UUID senderOneUuid = UUID.randomUUID();
UUID senderTwoUuid = UUID.randomUUID(); UUID senderTwoUuid = UUID.randomUUID();
List<Envelope> outgoingMessages = List.of(createMessage("sender1", senderOneUuid, UUID.randomUUID(), 1111, "first"), List<Envelope> outgoingMessages = List.of(createMessage("sender1", senderOneUuid, accountUuid, 1111, "first"),
createMessage("sender1", senderOneUuid, UUID.randomUUID(), 2222, "second"), createMessage("sender1", senderOneUuid, accountUuid, 2222, "second"),
createMessage("sender2", senderTwoUuid, UUID.randomUUID(), 3333, "third")); createMessage("sender2", senderTwoUuid, accountUuid, 3333, "third"));
when(device.getId()).thenReturn(2L); final long deviceId = 2L;
when(device.getId()).thenReturn(deviceId);
when(account.getNumber()).thenReturn("+14152222222"); when(account.getNumber()).thenReturn("+14152222222");
when(account.getUuid()).thenReturn(accountUuid); when(account.getUuid()).thenReturn(accountUuid);
@ -196,8 +199,10 @@ class WebSocketConnectionTest {
futures.get(0).completeExceptionally(new IOException()); futures.get(0).completeExceptionally(new IOException());
futures.get(2).completeExceptionally(new IOException()); futures.get(2).completeExceptionally(new IOException());
verify(storedMessages, times(1)).delete(eq(accountUuid), eq(2L), eq(UUID.fromString(outgoingMessages.get(1).getServerGuid())), eq(outgoingMessages.get(1).getServerTimestamp())); verify(storedMessages, times(1)).delete(eq(accountUuid), eq(deviceId),
verify(receiptSender, times(1)).sendReceipt(eq(auth), eq(senderOneUuid), eq(2222L)); eq(UUID.fromString(outgoingMessages.get(1).getServerGuid())), eq(outgoingMessages.get(1).getServerTimestamp()));
verify(receiptSender, times(1)).sendReceipt(eq(accountUuid), eq(deviceId), eq(senderOneUuid),
eq(2222L));
connection.stop(); connection.stop();
verify(client).close(anyInt(), anyString()); verify(client).close(anyInt(), anyString());
@ -268,12 +273,13 @@ class WebSocketConnectionTest {
void testPendingSend() throws Exception { void testPendingSend() throws Exception {
MessagesManager storedMessages = mock(MessagesManager.class); MessagesManager storedMessages = mock(MessagesManager.class);
final UUID accountUuid = UUID.randomUUID();
final UUID senderTwoUuid = UUID.randomUUID(); final UUID senderTwoUuid = UUID.randomUUID();
final Envelope firstMessage = Envelope.newBuilder() final Envelope firstMessage = Envelope.newBuilder()
.setServerGuid(UUID.randomUUID().toString()) .setServerGuid(UUID.randomUUID().toString())
.setSourceUuid(UUID.randomUUID().toString()) .setSourceUuid(UUID.randomUUID().toString())
.setDestinationUuid(UUID.randomUUID().toString()) .setDestinationUuid(accountUuid.toString())
.setUpdatedPni(UUID.randomUUID().toString()) .setUpdatedPni(UUID.randomUUID().toString())
.setTimestamp(System.currentTimeMillis()) .setTimestamp(System.currentTimeMillis())
.setSourceDevice(1) .setSourceDevice(1)
@ -283,7 +289,7 @@ class WebSocketConnectionTest {
final Envelope secondMessage = Envelope.newBuilder() final Envelope secondMessage = Envelope.newBuilder()
.setServerGuid(UUID.randomUUID().toString()) .setServerGuid(UUID.randomUUID().toString())
.setSourceUuid(senderTwoUuid.toString()) .setSourceUuid(senderTwoUuid.toString())
.setDestinationUuid(UUID.randomUUID().toString()) .setDestinationUuid(accountUuid.toString())
.setTimestamp(System.currentTimeMillis()) .setTimestamp(System.currentTimeMillis())
.setSourceDevice(2) .setSourceDevice(2)
.setType(Envelope.Type.CIPHERTEXT) .setType(Envelope.Type.CIPHERTEXT)
@ -291,10 +297,11 @@ class WebSocketConnectionTest {
final List<Envelope> pendingMessages = List.of(firstMessage, secondMessage); final List<Envelope> pendingMessages = List.of(firstMessage, secondMessage);
when(device.getId()).thenReturn(2L); final long deviceId = 2L;
when(device.getId()).thenReturn(deviceId);
when(account.getNumber()).thenReturn("+14152222222"); when(account.getNumber()).thenReturn("+14152222222");
when(account.getUuid()).thenReturn(UUID.randomUUID()); when(account.getUuid()).thenReturn(accountUuid);
final Device sender1device = mock(Device.class); final Device sender1device = mock(Device.class);
@ -336,7 +343,8 @@ class WebSocketConnectionTest {
futures.get(1).complete(response); futures.get(1).complete(response);
futures.get(0).completeExceptionally(new IOException()); futures.get(0).completeExceptionally(new IOException());
verify(receiptSender, times(1)).sendReceipt(eq(auth), eq(senderTwoUuid), eq(secondMessage.getTimestamp())); verify(receiptSender, times(1)).sendReceipt(eq(account.getUuid()), eq(deviceId), eq(senderTwoUuid),
eq(secondMessage.getTimestamp()));
connection.stop(); connection.stop();
verify(client).close(anyInt(), anyString()); verify(client).close(anyInt(), anyString());
@ -627,6 +635,7 @@ class WebSocketConnectionTest {
when(account.getNumber()).thenReturn("+18005551234"); when(account.getNumber()).thenReturn("+18005551234");
when(account.getUuid()).thenReturn(accountUuid); when(account.getUuid()).thenReturn(accountUuid);
when(device.getId()).thenReturn(1L); when(device.getId()).thenReturn(1L);
when(client.isOpen()).thenReturn(true);
when(client.getUserAgent()).thenReturn("Test-UA"); when(client.getUserAgent()).thenReturn("Test-UA");
when(messagesManager.getMessagesForDevice(eq(accountUuid), eq(1L), eq("Test-UA"), anyBoolean())) when(messagesManager.getMessagesForDevice(eq(accountUuid), eq(1L), eq("Test-UA"), anyBoolean()))
@ -853,7 +862,7 @@ class WebSocketConnectionTest {
.setTimestamp(timestamp) .setTimestamp(timestamp)
.setServerTimestamp(0) .setServerTimestamp(0)
.setSourceUuid(senderUuid.toString()) .setSourceUuid(senderUuid.toString())
.setSourceDevice(1) .setSourceDevice(SOURCE_DEVICE_ID)
.setDestinationUuid(destinationUuid.toString()) .setDestinationUuid(destinationUuid.toString())
.setContent(ByteString.copyFrom(content.getBytes(StandardCharsets.UTF_8))) .setContent(ByteString.copyFrom(content.getBytes(StandardCharsets.UTF_8)))
.build(); .build();