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

Remove pending messages on device unlink

This commit is contained in:
Moxie Marlinspike 2018-02-26 14:21:49 -08:00
parent d765d11c3e
commit acbc2fd490
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java
View File

@ -193,6 +193,7 @@ public class DeviceController {
device.setCreated(System.currentTimeMillis()); device.setCreated(System.currentTimeMillis());
account.get().addDevice(device); account.get().addDevice(device);
messages.clear(account.get().getNumber(), device.getId());
accounts.update(account.get()); accounts.update(account.get());
pendingDevices.remove(number); pendingDevices.remove(number);

8
src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java
View File

@ -102,6 +102,7 @@ public class DeviceControllerTest {
when(rateLimiters.getVerifyDeviceLimiter()).thenReturn(rateLimiter); when(rateLimiters.getVerifyDeviceLimiter()).thenReturn(rateLimiter);
when(account.getNextDeviceId()).thenReturn(42L); when(account.getNextDeviceId()).thenReturn(42L);
when(account.getNumber()).thenReturn(AuthHelper.VALID_NUMBER);
// when(maxedAccount.getActiveDeviceCount()).thenReturn(6); // when(maxedAccount.getActiveDeviceCount()).thenReturn(6);
when(pendingDevicesManager.getCodeForNumber(AuthHelper.VALID_NUMBER)).thenReturn(Optional.of(new StoredVerificationCode("5678901", System.currentTimeMillis()))); when(pendingDevicesManager.getCodeForNumber(AuthHelper.VALID_NUMBER)).thenReturn(Optional.of(new StoredVerificationCode("5678901", System.currentTimeMillis())));
@ -131,6 +132,7 @@ public class DeviceControllerTest {
assertThat(response.getDeviceId()).isEqualTo(42L); assertThat(response.getDeviceId()).isEqualTo(42L);
verify(pendingDevicesManager).remove(AuthHelper.VALID_NUMBER); verify(pendingDevicesManager).remove(AuthHelper.VALID_NUMBER);
verify(messagesManager).clear(eq(AuthHelper.VALID_NUMBER), eq(42L));
} }
@Test @Test
@ -151,6 +153,8 @@ public class DeviceControllerTest {
MediaType.APPLICATION_JSON_TYPE)); MediaType.APPLICATION_JSON_TYPE));
assertThat(response.getStatus()).isEqualTo(403); assertThat(response.getStatus()).isEqualTo(403);
verifyNoMoreInteractions(messagesManager);
} }
@Test @Test
@ -163,6 +167,8 @@ public class DeviceControllerTest {
MediaType.APPLICATION_JSON_TYPE)); MediaType.APPLICATION_JSON_TYPE));
assertThat(response.getStatus()).isEqualTo(403); assertThat(response.getStatus()).isEqualTo(403);
verifyNoMoreInteractions(messagesManager);
} }
@Test @Test
@ -174,6 +180,7 @@ public class DeviceControllerTest {
.get(); .get();
assertEquals(411, response.getStatus()); assertEquals(411, response.getStatus());
verifyNoMoreInteractions(messagesManager);
} }
@Test @Test
@ -186,5 +193,6 @@ public class DeviceControllerTest {
MediaType.APPLICATION_JSON_TYPE)); MediaType.APPLICATION_JSON_TYPE));
assertEquals(response.getStatus(), 422); assertEquals(response.getStatus(), 422);
verifyNoMoreInteractions(messagesManager);
} }
} }