empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ignore irrelevant P2P updates for inactive groups.

Browse source
This commit is contained in:
Greyson Parrelli 2022-01-24 17:00:05 -05:00 • committed by Alex Hart
parent c0ed6b1d41
commit 8648c74221
1 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java
View file

@ -18,6 +18,7 @@ import org.signal.zkgroup.VerificationFailedException;
import org.signal.zkgroup.groups.GroupMasterKey; import org.signal.zkgroup.groups.GroupMasterKey;
import org.signal.zkgroup.groups.GroupSecretParams; import org.signal.zkgroup.groups.GroupSecretParams;
import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.GroupDatabase;
import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
import org.thoughtcrime.securesms.database.MessageDatabase; import org.thoughtcrime.securesms.database.MessageDatabase;
import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.RecipientDatabase;
import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.database.SignalDatabase;
@ -62,8 +63,10 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Collectors;
/** /**
* Advances a groups state to a specified revision. * Advances a groups state to a specified revision.
@ -169,16 +172,18 @@ public final class GroupsV2StateProcessor {
GlobalGroupState inputGroupState = null; GlobalGroupState inputGroupState = null;
DecryptedGroup localState = groupDatabase.getGroup(groupId) Optional<GroupRecord> localRecord = groupDatabase.getGroup(groupId);
.transform(g -> g.requireV2GroupProperties().getDecryptedGroup()) DecryptedGroup localState = localRecord.transform(g -> g.requireV2GroupProperties().getDecryptedGroup()).orNull();
.orNull();
if (signedGroupChange != null && if (signedGroupChange != null &&
localState != null && localState != null &&
localState.getRevision() + 1 == signedGroupChange.getRevision() && localState.getRevision() + 1 == signedGroupChange.getRevision() &&
revision == signedGroupChange.getRevision()) revision == signedGroupChange.getRevision())
{ {
if (SignalStore.internalValues().gv2IgnoreP2PChanges()) {
if (notInGroupAndNotBeingAdded(localRecord, signedGroupChange)) {
Log.w(TAG, "Ignoring P2P group change because we're not currently in the group and this change doesn't add us in. Falling back to a server fetch.");
} else if (SignalStore.internalValues().gv2IgnoreP2PChanges()) {
Log.w(TAG, "Ignoring P2P group change by setting"); Log.w(TAG, "Ignoring P2P group change by setting");
} else { } else {
try { try {
@ -203,10 +208,14 @@ public final class GroupsV2StateProcessor {
} catch (GroupNotAMemberException e) { } catch (GroupNotAMemberException e) {
if (localState != null && signedGroupChange != null) { if (localState != null && signedGroupChange != null) {
try { try {
Log.i(TAG, "Applying P2P group change when not a member"); if (notInGroupAndNotBeingAdded(localRecord, signedGroupChange)) {
DecryptedGroup newState = DecryptedGroupUtil.applyWithoutRevisionCheck(localState, signedGroupChange); Log.w(TAG, "Server says we're not a member. Ignoring P2P group change because we're not currently in the group and this change doesn't add us in.");
} else {
Log.i(TAG, "Server says we're not a member. Applying P2P group change.");
DecryptedGroup newState = DecryptedGroupUtil.applyWithoutRevisionCheck(localState, signedGroupChange);
inputGroupState = new GlobalGroupState(localState, Collections.singletonList(new ServerGroupLogEntry(newState, signedGroupChange))); inputGroupState = new GlobalGroupState(localState, Collections.singletonList(new ServerGroupLogEntry(newState, signedGroupChange)));
}
} catch (NotAbleToApplyGroupV2ChangeException failed) { } catch (NotAbleToApplyGroupV2ChangeException failed) {
Log.w(TAG, "Unable to apply P2P group change when not a member", failed); Log.w(TAG, "Unable to apply P2P group change when not a member", failed);
} }
@ -251,6 +260,26 @@ public final class GroupsV2StateProcessor {
return new GroupUpdateResult(GroupState.GROUP_UPDATED, newLocalState); return new GroupUpdateResult(GroupState.GROUP_UPDATED, newLocalState);
} }
private boolean notInGroupAndNotBeingAdded(@NonNull Optional<GroupRecord> localRecord, @NonNull DecryptedGroupChange signedGroupChange) {
boolean currentlyInGroup = localRecord.isPresent() && localRecord.get().isActive();
boolean addedAsMember = signedGroupChange.getNewMembersList()
.stream()
.map(DecryptedMember::getUuid)
.map(UuidUtil::fromByteStringOrNull)
.filter(Objects::nonNull)
.collect(Collectors.toSet())
.contains(Recipient.self().requireAci().uuid());
boolean addedAsPendingMember = signedGroupChange.getNewPendingMembersList()
.stream()
.map(DecryptedPendingMember::getUuid)
.map(UuidUtil::fromByteStringOrNull)
.filter(Objects::nonNull)
.collect(Collectors.toSet())
.contains(Recipient.self().requireAci().uuid());
return !currentlyInGroup && !addedAsMember && !addedAsPendingMember;
}
/** /**
* Using network, attempt to bring the local copy of the group up to the revision specified via paging. * Using network, attempt to bring the local copy of the group up to the revision specified via paging.
*/ */