Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 21:29:54 +01:00
Code Issues Projects Releases Wiki Activity

Revoke existing wipers that are not in the updated set of wipers

Browse Source
This commit is contained in:
ameba23
2021-09-07 12:44:41 +02:00
parent 342cfeab08
commit 336866da51
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,6 @@ import static org.briarproject.briar.api.remotewipe.MessageType.REVOKE;
import static org.briarproject.briar.api.remotewipe.MessageType.SETUP; import static org.briarproject.briar.api.remotewipe.MessageType.SETUP;
import static org.briarproject.briar.api.remotewipe.MessageType.WIPE; import static org.briarproject.briar.api.remotewipe.MessageType.WIPE;
import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.GROUP_KEY_AM_WIPER; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.GROUP_KEY_AM_WIPER;
import static org.briarproject.briar.client.MessageTrackerConstants.MSG_KEY_READ;
import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.GROUP_KEY_CONTACT_ID; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.GROUP_KEY_CONTACT_ID;
import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.GROUP_KEY_RECEIVED_WIPE; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.GROUP_KEY_RECEIVED_WIPE;
import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.GROUP_KEY_WIPERS; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.GROUP_KEY_WIPERS;
@@ -60,6 +59,7 @@ import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.MSG_KEY_
import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.MSG_KEY_MESSAGE_TYPE; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.MSG_KEY_MESSAGE_TYPE;
import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.MSG_KEY_TIMESTAMP; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.MSG_KEY_TIMESTAMP;
import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.THRESHOLD; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.THRESHOLD;
import static org.briarproject.briar.client.MessageTrackerConstants.MSG_KEY_READ;
public class RemoteWipeManagerImpl extends ConversationClientImpl public class RemoteWipeManagerImpl extends ConversationClientImpl
implements RemoteWipeManager, ContactManager.ContactHook, implements RemoteWipeManager, ContactManager.ContactHook,
@@ -146,7 +146,8 @@ public class RemoteWipeManagerImpl extends ConversationClientImpl
if (!db.containsGroup(txn, localGroup.getId())) if (!db.containsGroup(txn, localGroup.getId()))
db.addGroup(txn, localGroup); db.addGroup(txn, localGroup);
clientHelper.mergeGroupMetadata(txn, localGroup.getId(), localRecord); clientHelper
.mergeGroupMetadata(txn, localGroup.getId(), localRecord);
} else if (type == WIPE) { } else if (type == WIPE) {
if (!remoteWipeIsSetup(txn)) return false; if (!remoteWipeIsSetup(txn)) return false;
if (clock.currentTimeMillis() - m.getTimestamp() > MAX_MESSAGE_AGE) if (clock.currentTimeMillis() - m.getTimestamp() > MAX_MESSAGE_AGE)
@@ -224,17 +225,35 @@ public class RemoteWipeManagerImpl extends ConversationClientImpl
if (!db.containsGroup(txn, localGroup.getId())) if (!db.containsGroup(txn, localGroup.getId()))
db.addGroup(txn, localGroup); db.addGroup(txn, localGroup);
clientHelper.mergeGroupMetadata(txn, localGroup.getId(), localRecord); clientHelper
.mergeGroupMetadata(txn, localGroup.getId(), localRecord);
} }
return false; return false;
} }
private boolean isInList(Transaction txn, Author a, List<ContactId> wipers)
throws DbException {
for (ContactId c : wipers) {
if (contactManager.getContact(txn, c).getAuthor().equals(a))
return true;
}
return false;
}
public void setup(Transaction txn, List<ContactId> wipers) public void setup(Transaction txn, List<ContactId> wipers)
throws DbException, FormatException { throws DbException, FormatException {
// If we already have a set of wipers do nothing if (remoteWipeIsSetup(txn)) {
// TODO revoke existing wipers who are not present in the new list // Revoke existing wipers who are not present in the new list
if (remoteWipeIsSetup(txn)) throw new FormatException(); List<Author> existingWipers = getWipers(txn);
for (Author existingWiper : existingWipers) {
if (!isInList(txn, existingWiper, wipers)) {
LOG.info("Revoking an existing wiper");
sendRevokeMessage(txn, contactManager.getContact(txn,
authorToContactId(txn, existingWiper)));
}
}
}
if (wipers.size() < 2) throw new FormatException(); if (wipers.size() < 2) throw new FormatException();
@@ -350,7 +369,7 @@ public class RemoteWipeManagerImpl extends ConversationClientImpl
throws DbException, FormatException { throws DbException, FormatException {
// Revoke a contact's wiper status // Revoke a contact's wiper status
Contact contactToRevoke = contactManager.getContact(txn, contactId); Contact contactToRevoke = contactManager.getContact(txn, contactId);
Author authorToRevoke = contactToRevoke.getAuthor(); Author authorToRevoke = contactToRevoke.getAuthor();
List<Author> currentWipers = getWipers(txn); List<Author> currentWipers = getWipers(txn);
BdfList newWipers = new BdfList(); BdfList newWipers = new BdfList();