Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 12:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Verify a member is still in the group before using sender key.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-08-04 10:55:44 -04:00
committed by GitHub
parent c7551881b8
commit bdcf390e6e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java
View File

@@ -10,6 +10,8 @@ import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.crypto.SenderKeyUtil; import org.thoughtcrime.securesms.crypto.SenderKeyUtil;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.GroupDatabase;
import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
import org.thoughtcrime.securesms.database.MessageSendLogDatabase; import org.thoughtcrime.securesms.database.MessageSendLogDatabase;
import org.thoughtcrime.securesms.database.model.MessageId; import org.thoughtcrime.securesms.database.model.MessageId;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
@@ -138,18 +140,21 @@ public final class GroupSendUtil {
@Nullable CancelationSignal cancelationSignal) @Nullable CancelationSignal cancelationSignal)
throws IOException, UntrustedIdentityException throws IOException, UntrustedIdentityException
{ {
RecipientData recipients = new RecipientData(context, allTargets); RecipientData recipients = new RecipientData(context, allTargets);
Optional<GroupRecord> groupRecord = groupId != null ? DatabaseFactory.getGroupDatabase(context).getGroup(groupId) : Optional.absent();
List<Recipient> senderKeyTargets = new LinkedList<>(); List<Recipient> senderKeyTargets = new LinkedList<>();
List<Recipient> legacyTargets = new LinkedList<>(); List<Recipient> legacyTargets = new LinkedList<>();
for (Recipient recipient : allTargets) { for (Recipient recipient : allTargets) {
Optional<UnidentifiedAccessPair> access = recipients.getAccessPair(recipient.getId()); Optional<UnidentifiedAccessPair> access = recipients.getAccessPair(recipient.getId());
boolean validMembership = groupRecord.isPresent() && groupRecord.get().getMembers().contains(recipient.getId());
if (recipient.getSenderKeyCapability() == Recipient.Capability.SUPPORTED && if (recipient.getSenderKeyCapability() == Recipient.Capability.SUPPORTED &&
recipient.hasUuid() && recipient.hasUuid() &&
access.isPresent() && access.isPresent() &&
access.get().getTargetUnidentifiedAccess().isPresent()) access.get().getTargetUnidentifiedAccess().isPresent() &&
validMembership)
{ {
senderKeyTargets.add(recipient); senderKeyTargets.add(recipient);
} else { } else {