Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Additional test for duplicate wipe messages

Browse Source
This commit is contained in:
ameba23
2021-05-11 09:57:36 +02:00
parent 3404a7d02a
commit ad14a0cef8
2 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-core/src/main/java/org/briarproject/briar/remotewipe/RemoteWipeManagerImpl.java
View File

@@ -97,7 +97,6 @@ public class RemoteWipeManagerImpl extends ConversationClientImpl
@Override
public void onDatabaseOpened(Transaction txn) throws DbException {
System.out.println("DATAbase opened");
if (db.containsGroup(txn, localGroup.getId())) return;
db.addGroup(txn, localGroup);
// Set things up for any pre-existing contacts
@@ -140,7 +139,10 @@ public class RemoteWipeManagerImpl extends ConversationClientImpl
for (int i = 0; i < receivedWipeMessages.size(); i++) {
BdfList receivedWipeMessage = receivedWipeMessages.getList(i);
// If we already have one from this contact, ignore
if (receivedWipeMessage.getLong(0).intValue() == contactId.getInt()) return false;
if (receivedWipeMessage.getLong(0).intValue() == contactId.getInt()) {
System.out.println("Duplicate wipe message received - ignoring");
return false;
}
// TODO filter the messages for old ones
// long timestamp = receivedWipeMessage.getLong(1);

56
briar-core/src/test/java/org/briarproject/briar/remotewipe/RemoteWipeIntegrationTest.java
View File

@@ -130,6 +130,62 @@ public class RemoteWipeIntegrationTest extends BriarIntegrationTest<BriarIntegra
assertTrue(panicCalled);
}
@Test
public void testRemoteWipeFailsOnDuplicateMessage() throws Exception {
remoteWipeManager0.listenForPanic(this);
db0.transaction(false, txn -> {
// Assert that we do not already have a wipe setup
assertFalse(remoteWipeManager0.remoteWipeIsSetup(txn));
remoteWipeManager0.setup(txn,
asList(contactId1From0, contactId2From0));
// Now check that we do have a wipe setup
assertTrue(remoteWipeManager0.remoteWipeIsSetup(txn));
});
// Sync the setup messages to the contacts
sync0To1(1, true);
sync0To2(1, true);
// The setup message from 0 should have arrived at 1
Collection<ConversationMessageHeader> messages0At1 =
getMessages0At1();
assertEquals(1, messages0At1.size());
Collection<ConversationMessageHeader> messages0At2 =
getMessages0At2();
assertEquals(1, messages0At2.size());
for (ConversationMessageHeader h : messages0At1) {
assertTrue(h instanceof RemoteWipeMessageHeader);
RemoteWipeMessageHeader r = (RemoteWipeMessageHeader) h;
assertFalse(r.isLocal());
}
// The wipers check that they are now wipers
db1.transaction(false, txn -> {
assertTrue(remoteWipeManager1.amWiper(txn, contactId0From1));
remoteWipeManager1.wipe(txn, contact0From1);
remoteWipeManager1.wipe(txn, contact0From1);
});
db2.transaction(false, txn -> {
assertTrue(remoteWipeManager2.amWiper(txn, contactId0From2));
// remoteWipeManager2.wipe(txn, contact0From2);
});
// Sync the wipe messages to the wipee
sync1To0(2, true);
// sync2To0(1, true);
Collection<ConversationMessageHeader> messages1At0 =
getMessages1At0();
assertEquals(1, messages1At0.size());
Collection<ConversationMessageHeader> messages2At0 =
getMessages2At0();
assertEquals(1, messages2At0.size());
assertFalse(panicCalled);
}
private Collection<ConversationMessageHeader> getMessages1At0()
throws DbException {
return db0.transactionWithResult(true, txn -> remoteWipeManager0