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

Require that message bundles include all linked devices

This commit is contained in:
Jon Chambers 2024-06-24 16:35:19 -04:00 committed by Jon Chambers
parent cb5cd64c05
commit 90e622b307
8 changed files with 89 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/main/java/org/whispersystems/textsecuregcm/util/DestinationDeviceValidator.java
View File

@ -96,12 +96,6 @@ public class DestinationDeviceValidator {
final Set<Byte> missingDeviceIds = new HashSet<>(accountDeviceIds); final Set<Byte> missingDeviceIds = new HashSet<>(accountDeviceIds);
missingDeviceIds.removeAll(messageDeviceIds); missingDeviceIds.removeAll(messageDeviceIds);
// Temporarily "excuse" missing devices if they're missing a message delivery channel as a transitional measure
missingDeviceIds.removeAll(account.getDevices().stream()
.filter(device -> !device.hasMessageDeliveryChannel())
.map(Device::getId)
.collect(Collectors.toSet()));
final Set<Byte> extraDeviceIds = new HashSet<>(messageDeviceIds); final Set<Byte> extraDeviceIds = new HashSet<>(messageDeviceIds);
extraDeviceIds.removeAll(accountDeviceIds); extraDeviceIds.removeAll(accountDeviceIds);

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

@ -562,7 +562,7 @@ class MessageControllerTest {
final ArgumentCaptor<Envelope> envelopeCaptor = ArgumentCaptor.forClass(Envelope.class); final ArgumentCaptor<Envelope> envelopeCaptor = ArgumentCaptor.forClass(Envelope.class);
verify(messageSender, times(2)) verify(messageSender, times(3))
.sendMessage(any(Account.class), any(Device.class), envelopeCaptor.capture(), eq(false)); .sendMessage(any(Account.class), any(Device.class), envelopeCaptor.capture(), eq(false));
envelopeCaptor.getAllValues().forEach(envelope -> assertTrue(envelope.getUrgent())); envelopeCaptor.getAllValues().forEach(envelope -> assertTrue(envelope.getUrgent()));
@ -584,7 +584,7 @@ class MessageControllerTest {
final ArgumentCaptor<Envelope> envelopeCaptor = ArgumentCaptor.forClass(Envelope.class); final ArgumentCaptor<Envelope> envelopeCaptor = ArgumentCaptor.forClass(Envelope.class);
verify(messageSender, times(2)) verify(messageSender, times(3))
.sendMessage(any(Account.class), any(Device.class), envelopeCaptor.capture(), eq(false)); .sendMessage(any(Account.class), any(Device.class), envelopeCaptor.capture(), eq(false));
envelopeCaptor.getAllValues().forEach(envelope -> assertFalse(envelope.getUrgent())); envelopeCaptor.getAllValues().forEach(envelope -> assertFalse(envelope.getUrgent()));
@ -604,7 +604,7 @@ class MessageControllerTest {
assertThat("Good Response Code", response.getStatus(), is(equalTo(200))); assertThat("Good Response Code", response.getStatus(), is(equalTo(200)));
verify(messageSender, times(2)) verify(messageSender, times(3))
.sendMessage(any(Account.class), any(Device.class), any(Envelope.class), eq(false)); .sendMessage(any(Account.class), any(Device.class), any(Envelope.class), eq(false));
} }
} }
@ -1220,21 +1220,22 @@ class MessageControllerTest {
} }
private static Map<ServiceIdentifier, Map<Byte, Integer>> multiRecipientTargetMap() { private static Map<ServiceIdentifier, Map<Byte, Integer>> multiRecipientTargetMap() {
return return Map.of(
SINGLE_DEVICE_ACI_ID, Map.of(SINGLE_DEVICE_ID1, SINGLE_DEVICE_REG_ID1),
SINGLE_DEVICE_PNI_ID, Map.of(SINGLE_DEVICE_ID1, SINGLE_DEVICE_PNI_REG_ID1),
MULTI_DEVICE_ACI_ID,
Map.of( Map.of(
SINGLE_DEVICE_ACI_ID, Map.of(SINGLE_DEVICE_ID1, SINGLE_DEVICE_REG_ID1), MULTI_DEVICE_ID1, MULTI_DEVICE_REG_ID1,
SINGLE_DEVICE_PNI_ID, Map.of(SINGLE_DEVICE_ID1, SINGLE_DEVICE_PNI_REG_ID1), MULTI_DEVICE_ID2, MULTI_DEVICE_REG_ID2,
MULTI_DEVICE_ACI_ID, MULTI_DEVICE_ID3, MULTI_DEVICE_REG_ID3),
Map.of( MULTI_DEVICE_PNI_ID,
MULTI_DEVICE_ID1, MULTI_DEVICE_REG_ID1, Map.of(
MULTI_DEVICE_ID2, MULTI_DEVICE_REG_ID2), MULTI_DEVICE_ID1, MULTI_DEVICE_PNI_REG_ID1,
MULTI_DEVICE_PNI_ID, MULTI_DEVICE_ID2, MULTI_DEVICE_PNI_REG_ID2,
Map.of( MULTI_DEVICE_ID3, MULTI_DEVICE_PNI_REG_ID3),
MULTI_DEVICE_ID1, MULTI_DEVICE_PNI_REG_ID1, NONEXISTENT_ACI_ID, Map.of(SINGLE_DEVICE_ID1, SINGLE_DEVICE_REG_ID1),
MULTI_DEVICE_ID2, MULTI_DEVICE_PNI_REG_ID2), NONEXISTENT_PNI_ID, Map.of(SINGLE_DEVICE_ID1, SINGLE_DEVICE_PNI_REG_ID1)
NONEXISTENT_ACI_ID, Map.of(SINGLE_DEVICE_ID1, SINGLE_DEVICE_REG_ID1), );
NONEXISTENT_PNI_ID, Map.of(SINGLE_DEVICE_ID1, SINGLE_DEVICE_PNI_REG_ID1)
);
} }
private record MultiRecipientMessageTestCase( private record MultiRecipientMessageTestCase(
@ -1273,9 +1274,9 @@ class MessageControllerTest {
return ArgumentSets return ArgumentSets
.argumentsForFirstParameter( .argumentsForFirstParameter(
new MultiRecipientMessageTestCase(singleDeviceAci, unauth, story, 200, 1), new MultiRecipientMessageTestCase(singleDeviceAci, unauth, story, 200, 1),
new MultiRecipientMessageTestCase(multiDeviceAci, unauth, story, 200, 2), new MultiRecipientMessageTestCase(multiDeviceAci, unauth, story, 200, 3),
new MultiRecipientMessageTestCase(bothAccountsAci, unauth, story, 200, 3), new MultiRecipientMessageTestCase(bothAccountsAci, unauth, story, 200, 4),
new MultiRecipientMessageTestCase(realAndFakeAci, unauth, story, 200, 3), new MultiRecipientMessageTestCase(realAndFakeAci, unauth, story, 200, 4),
new MultiRecipientMessageTestCase(singleDeviceAci, unauth, notStory, 401, 0), new MultiRecipientMessageTestCase(singleDeviceAci, unauth, notStory, 401, 0),
new MultiRecipientMessageTestCase(multiDeviceAci, unauth, notStory, 401, 0), new MultiRecipientMessageTestCase(multiDeviceAci, unauth, notStory, 401, 0),
@ -1283,13 +1284,13 @@ class MessageControllerTest {
new MultiRecipientMessageTestCase(realAndFakeAci, unauth, notStory, 404, 0), new MultiRecipientMessageTestCase(realAndFakeAci, unauth, notStory, 404, 0),
new MultiRecipientMessageTestCase(singleDeviceAci, auth, story, 200, 1), new MultiRecipientMessageTestCase(singleDeviceAci, auth, story, 200, 1),
new MultiRecipientMessageTestCase(multiDeviceAci, auth, story, 200, 2), new MultiRecipientMessageTestCase(multiDeviceAci, auth, story, 200, 3),
new MultiRecipientMessageTestCase(bothAccountsAci, auth, story, 200, 3), new MultiRecipientMessageTestCase(bothAccountsAci, auth, story, 200, 4),
new MultiRecipientMessageTestCase(realAndFakeAci, auth, story, 200, 3), new MultiRecipientMessageTestCase(realAndFakeAci, auth, story, 200, 4),
new MultiRecipientMessageTestCase(singleDeviceAci, auth, notStory, 200, 1), new MultiRecipientMessageTestCase(singleDeviceAci, auth, notStory, 200, 1),
new MultiRecipientMessageTestCase(multiDeviceAci, auth, notStory, 200, 2), new MultiRecipientMessageTestCase(multiDeviceAci, auth, notStory, 200, 3),
new MultiRecipientMessageTestCase(bothAccountsAci, auth, notStory, 200, 3), new MultiRecipientMessageTestCase(bothAccountsAci, auth, notStory, 200, 4),
new MultiRecipientMessageTestCase(realAndFakeAci, auth, notStory, 404, 0)) new MultiRecipientMessageTestCase(realAndFakeAci, auth, notStory, 404, 0))
.argumentsForNextParameter(false, true) // urgent .argumentsForNextParameter(false, true) // urgent
.argumentsForNextParameter(false, true); // explicitIdentifiers .argumentsForNextParameter(false, true); // explicitIdentifiers
@ -1326,9 +1327,9 @@ class MessageControllerTest {
.argumentsForFirstParameter( .argumentsForFirstParameter(
new MultiRecipientMessageTestCase(singleDevicePni, unauth, story, 200, 1), new MultiRecipientMessageTestCase(singleDevicePni, unauth, story, 200, 1),
new MultiRecipientMessageTestCase(singleDeviceAciAndPni, unauth, story, 200, 2), new MultiRecipientMessageTestCase(singleDeviceAciAndPni, unauth, story, 200, 2),
new MultiRecipientMessageTestCase(multiDevicePni, unauth, story, 200, 2), new MultiRecipientMessageTestCase(multiDevicePni, unauth, story, 200, 3),
new MultiRecipientMessageTestCase(bothAccountsMixed, unauth, story, 200, 3), new MultiRecipientMessageTestCase(bothAccountsMixed, unauth, story, 200, 4),
new MultiRecipientMessageTestCase(realAndFakeMixed, unauth, story, 200, 3), new MultiRecipientMessageTestCase(realAndFakeMixed, unauth, story, 200, 4),
new MultiRecipientMessageTestCase(singleDevicePni, unauth, notStory, 401, 0), new MultiRecipientMessageTestCase(singleDevicePni, unauth, notStory, 401, 0),
new MultiRecipientMessageTestCase(singleDeviceAciAndPni, unauth, notStory, 401, 0), new MultiRecipientMessageTestCase(singleDeviceAciAndPni, unauth, notStory, 401, 0),
@ -1338,14 +1339,14 @@ class MessageControllerTest {
new MultiRecipientMessageTestCase(singleDevicePni, auth, story, 200, 1), new MultiRecipientMessageTestCase(singleDevicePni, auth, story, 200, 1),
new MultiRecipientMessageTestCase(singleDeviceAciAndPni, auth, story, 200, 2), new MultiRecipientMessageTestCase(singleDeviceAciAndPni, auth, story, 200, 2),
new MultiRecipientMessageTestCase(multiDevicePni, auth, story, 200, 2), new MultiRecipientMessageTestCase(multiDevicePni, auth, story, 200, 3),
new MultiRecipientMessageTestCase(bothAccountsMixed, auth, story, 200, 3), new MultiRecipientMessageTestCase(bothAccountsMixed, auth, story, 200, 4),
new MultiRecipientMessageTestCase(realAndFakeMixed, auth, story, 200, 3), new MultiRecipientMessageTestCase(realAndFakeMixed, auth, story, 200, 4),
new MultiRecipientMessageTestCase(singleDevicePni, auth, notStory, 200, 1), new MultiRecipientMessageTestCase(singleDevicePni, auth, notStory, 200, 1),
new MultiRecipientMessageTestCase(singleDeviceAciAndPni, unauth, story, 200, 2), new MultiRecipientMessageTestCase(singleDeviceAciAndPni, unauth, story, 200, 2),
new MultiRecipientMessageTestCase(multiDevicePni, auth, notStory, 200, 2), new MultiRecipientMessageTestCase(multiDevicePni, auth, notStory, 200, 3),
new MultiRecipientMessageTestCase(bothAccountsMixed, auth, notStory, 200, 3), new MultiRecipientMessageTestCase(bothAccountsMixed, auth, notStory, 200, 4),
new MultiRecipientMessageTestCase(realAndFakeMixed, auth, notStory, 404, 0)) new MultiRecipientMessageTestCase(realAndFakeMixed, auth, notStory, 404, 0))
.argumentsForNextParameter(false, true); // urgent .argumentsForNextParameter(false, true); // urgent
} }
@ -1355,7 +1356,8 @@ class MessageControllerTest {
final List<Recipient> recipients = List.of( final List<Recipient> recipients = List.of(
new Recipient(SINGLE_DEVICE_ACI_ID, SINGLE_DEVICE_ID1, SINGLE_DEVICE_REG_ID1, new byte[48]), new Recipient(SINGLE_DEVICE_ACI_ID, SINGLE_DEVICE_ID1, SINGLE_DEVICE_REG_ID1, new byte[48]),
new Recipient(MULTI_DEVICE_ACI_ID, MULTI_DEVICE_ID1, MULTI_DEVICE_REG_ID1, new byte[48]), new Recipient(MULTI_DEVICE_ACI_ID, MULTI_DEVICE_ID1, MULTI_DEVICE_REG_ID1, new byte[48]),
new Recipient(MULTI_DEVICE_ACI_ID, MULTI_DEVICE_ID2, MULTI_DEVICE_REG_ID2, new byte[48])); new Recipient(MULTI_DEVICE_ACI_ID, MULTI_DEVICE_ID2, MULTI_DEVICE_REG_ID2, new byte[48]),
new Recipient(MULTI_DEVICE_ACI_ID, MULTI_DEVICE_ID3, MULTI_DEVICE_REG_ID3, new byte[48]));
// initialize our binary payload and create an input stream // initialize our binary payload and create an input stream
byte[] buffer = new byte[2048]; byte[] buffer = new byte[2048];
@ -1378,7 +1380,7 @@ class MessageControllerTest {
assertThat("Unexpected response", response.getStatus(), is(equalTo(200))); assertThat("Unexpected response", response.getStatus(), is(equalTo(200)));
verify(messageSender, verify(messageSender,
exactly(3)) exactly(4))
.sendMessage( .sendMessage(
any(), any(),
any(), any(),
@ -1527,8 +1529,9 @@ class MessageControllerTest {
Recipient r2 = new Recipient(MULTI_DEVICE_ACI_ID, MULTI_DEVICE_ID1, MULTI_DEVICE_REG_ID1, new byte[48]); Recipient r2 = new Recipient(MULTI_DEVICE_ACI_ID, MULTI_DEVICE_ID1, MULTI_DEVICE_REG_ID1, new byte[48]);
Recipient r3 = new Recipient(MULTI_DEVICE_ACI_ID, MULTI_DEVICE_ID2, MULTI_DEVICE_REG_ID2, new byte[48]); Recipient r3 = new Recipient(MULTI_DEVICE_ACI_ID, MULTI_DEVICE_ID2, MULTI_DEVICE_REG_ID2, new byte[48]);
Recipient r4 = new Recipient(MULTI_DEVICE_ACI_ID, MULTI_DEVICE_ID3, MULTI_DEVICE_REG_ID3, new byte[48]);
List<Recipient> recipients = List.of(r1, r2, r3); List<Recipient> recipients = List.of(r1, r2, r3, r4);
byte[] buffer = new byte[2048]; byte[] buffer = new byte[2048];
InputStream stream = initializeMultiPayload(recipients, buffer, useExplicitIdentifier); InputStream stream = initializeMultiPayload(recipients, buffer, useExplicitIdentifier);
@ -1635,7 +1638,8 @@ class MessageControllerTest {
void sendMultiRecipientMessageStaleDevices(final ServiceIdentifier serviceIdentifier) throws JsonProcessingException { void sendMultiRecipientMessageStaleDevices(final ServiceIdentifier serviceIdentifier) throws JsonProcessingException {
final List<Recipient> recipients = List.of( final List<Recipient> recipients = List.of(
new Recipient(serviceIdentifier, MULTI_DEVICE_ID1, MULTI_DEVICE_REG_ID1 + 1, new byte[48]), new Recipient(serviceIdentifier, MULTI_DEVICE_ID1, MULTI_DEVICE_REG_ID1 + 1, new byte[48]),
new Recipient(serviceIdentifier, MULTI_DEVICE_ID2, MULTI_DEVICE_REG_ID2 + 1, new byte[48])); new Recipient(serviceIdentifier, MULTI_DEVICE_ID2, MULTI_DEVICE_REG_ID2 + 1, new byte[48]),
new Recipient(serviceIdentifier, MULTI_DEVICE_ID3, MULTI_DEVICE_REG_ID3 + 1, new byte[48]));
// initialize our binary payload and create an input stream // initialize our binary payload and create an input stream
byte[] buffer = new byte[2048]; byte[] buffer = new byte[2048];
@ -1668,7 +1672,7 @@ class MessageControllerTest {
assertEquals(1, staleDevices.size()); assertEquals(1, staleDevices.size());
assertEquals(serviceIdentifier, staleDevices.getFirst().uuid()); assertEquals(serviceIdentifier, staleDevices.getFirst().uuid());
assertEquals(Set.of(MULTI_DEVICE_ID1, MULTI_DEVICE_ID2), assertEquals(Set.of(MULTI_DEVICE_ID1, MULTI_DEVICE_ID2, MULTI_DEVICE_ID3),
new HashSet<>(staleDevices.getFirst().devices().staleDevices())); new HashSet<>(staleDevices.getFirst().devices().staleDevices()));
} }
} }

25
service/src/test/java/org/whispersystems/textsecuregcm/util/DestinationDeviceValidatorTest.java
View File

@ -123,18 +123,21 @@ class DestinationDeviceValidatorTest {
final byte id1 = 1; final byte id1 = 1;
final byte id2 = 2; final byte id2 = 2;
final byte id3 = 3; final byte id3 = 3;
final Account account = mockAccountWithDeviceAndEnabled(Map.of(id1, true, id2, false, id3, true));
return Stream.of( return Stream.of(
// Device IDs provided for all enabled devices // Device IDs provided for all enabled devices
arguments( arguments(
mockAccountWithDeviceAndEnabled(Map.of(id1, true, id2, false, id3, true)), account,
Set.of(id1, id3), Set.of(id1, id3),
null, Set.of(id2),
null, null,
Collections.emptySet()), Collections.emptySet()),
// Device ID provided for disabled device // Device ID provided for disabled device
arguments( arguments(
mockAccountWithDeviceAndEnabled(Map.of(id1, true, id2, false, id3, true)), account,
Set.of(id1, id2, id3), Set.of(id1, id2, id3),
null, null,
null, null,
@ -142,15 +145,15 @@ class DestinationDeviceValidatorTest {
// Device ID omitted for enabled device // Device ID omitted for enabled device
arguments( arguments(
mockAccountWithDeviceAndEnabled(Map.of(id1, true, id2, false, id3, true)), account,
Set.of(id1), Set.of(id1),
Set.of(id3), Set.of(id2, id3),
null, null,
Collections.emptySet()), Collections.emptySet()),
// Device ID included for disabled device, omitted for enabled device // Device ID included for disabled device, omitted for enabled device
arguments( arguments(
mockAccountWithDeviceAndEnabled(Map.of(id1, true, id2, false, id3, true)), account,
Set.of(id1, id2), Set.of(id1, id2),
Set.of(id3), Set.of(id3),
null, null,
@ -158,16 +161,16 @@ class DestinationDeviceValidatorTest {
// Device ID omitted for enabled device, included for device in excluded list // Device ID omitted for enabled device, included for device in excluded list
arguments( arguments(
mockAccountWithDeviceAndEnabled(Map.of(id1, true, id2, false, id3, true)), account,
Set.of(id1), Set.of(id1),
Set.of(id3), Set.of(id2, id3),
Set.of(id1), Set.of(id1),
Set.of(id1) Set.of(id1)
), ),
// Device ID omitted for enabled device, included for disabled device, omitted for excluded device // Device ID omitted for enabled device, included for disabled device, omitted for excluded device
arguments( arguments(
mockAccountWithDeviceAndEnabled(Map.of(id1, true, id2, false, id3, true)), account,
Set.of(id2), Set.of(id2),
Set.of(id3), Set.of(id3),
null, null,
@ -176,9 +179,9 @@ class DestinationDeviceValidatorTest {
// Device ID included for enabled device, omitted for excluded device // Device ID included for enabled device, omitted for excluded device
arguments( arguments(
mockAccountWithDeviceAndEnabled(Map.of(id1, true, id2, false, id3, true)), account,
Set.of(id3), Set.of(id3),
null, Set.of(id2),
null, null,
Set.of(id1) Set.of(id1)
) )

9
service/src/test/resources/fixtures/current_message_multi_device.json
View File

@ -12,5 +12,12 @@
"destinationRegistrationId" : 333, "destinationRegistrationId" : 333,
"content" : "Zm9vYmFyego", "content" : "Zm9vYmFyego",
"timestamp" : 1234 "timestamp" : 1234
}] },
{
"type" : 1,
"destinationDeviceId" : 3,
"destinationRegistrationId" : 444,
"content" : "Zm9vYmFyego",
"timestamp" : 1234
}]
} }

7
service/src/test/resources/fixtures/current_message_multi_device_not_urgent.json
View File

@ -14,6 +14,13 @@
"destinationRegistrationId": 333, "destinationRegistrationId": 333,
"content": "Zm9vYmFyego", "content": "Zm9vYmFyego",
"timestamp": 1234 "timestamp": 1234
},
{
"type": 1,
"destinationDeviceId": 3,
"destinationRegistrationId": 444,
"content": "Zm9vYmFyego",
"timestamp": 1234
} }
] ]
} }

9
service/src/test/resources/fixtures/current_message_multi_device_pni.json
View File

@ -12,5 +12,12 @@
"destinationRegistrationId" : 3333, "destinationRegistrationId" : 3333,
"content" : "Zm9vYmFyego", "content" : "Zm9vYmFyego",
"timestamp" : 1234 "timestamp" : 1234
}] },
{
"type" : 1,
"destinationDeviceId" : 3,
"destinationRegistrationId" : 4444,
"content" : "Zm9vYmFyego",
"timestamp" : 1234
}]
} }

9
service/src/test/resources/fixtures/current_message_registration_id.json
View File

@ -12,5 +12,12 @@
"destinationRegistrationId" : 999, "destinationRegistrationId" : 999,
"content" : "Zm9vYmFyego", "content" : "Zm9vYmFyego",
"timestamp" : 1234 "timestamp" : 1234
}] },
{
"type" : 1,
"destinationDeviceId" : 3,
"destinationRegistrationId" : 444,
"content" : "Zm9vYmFyego",
"timestamp" : 1234
}]
} }

4
service/src/test/resources/fixtures/missing_device_response.json
View File

@ -1,4 +1,4 @@
{ {
"missingDevices" : [2], "missingDevices" : [2, 3],
"extraDevices" : [] "extraDevices" : []
} }