TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 11:18:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent ZkGroup link crashes.

Browse Source
This commit is contained in:
Alan Evans 2020-05-14 10:30:36 -03:00 committed by Alex Hart
parent 8861ad76ed
commit 4de86cb6cf
5 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/groups/BadGroupIdException.java
View File

@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
public final class BadGroupIdException extends Exception { public final class BadGroupIdException extends Exception {
BadGroupIdException() { public BadGroupIdException() {
super(); super();
} }

7
app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
View File

@ -92,7 +92,6 @@ import org.thoughtcrime.securesms.util.RemoteDeleteUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.libsignal.state.SessionStore; import org.whispersystems.libsignal.state.SessionStore;
import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.libsignal.util.guava.Preconditions;
import org.whispersystems.signalservice.api.groupsv2.InvalidGroupStateException; import org.whispersystems.signalservice.api.groupsv2.InvalidGroupStateException;
import org.whispersystems.signalservice.api.groupsv2.NoCredentialForRedemptionTimeException; import org.whispersystems.signalservice.api.groupsv2.NoCredentialForRedemptionTimeException;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachment; import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
@ -413,7 +412,11 @@ public final class PushProcessMessageJob extends BaseJob {
Log.w(TAG, e); Log.w(TAG, e);
handleCorruptMessage(e.getSender(), e.getSenderDevice(), timestamp, smsMessageId); handleCorruptMessage(e.getSender(), e.getSenderDevice(), timestamp, smsMessageId);
} catch (BadGroupIdException e) { } catch (BadGroupIdException e) {
Log.w(TAG, "Ignoring message with bad group id", e); if (!FeatureFlags.ZK_GROUPS) {
Log.w(TAG, "Ignoring message with GV2 - no ZK_GROUP library", e);
} else {
Log.w(TAG, "Ignoring message with bad group id", e);
}
} }
} }

6
app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupV2InfoJob.java
View File

@ -13,6 +13,7 @@ import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.groupsv2.NoCredentialForRedemptionTimeException; import org.whispersystems.signalservice.api.groupsv2.NoCredentialForRedemptionTimeException;
import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
@ -72,6 +73,11 @@ public final class RequestGroupV2InfoJob extends BaseJob {
@Override @Override
public void onRun() throws IOException, GroupNotAMemberException, GroupChangeBusyException { public void onRun() throws IOException, GroupNotAMemberException, GroupChangeBusyException {
if (!FeatureFlags.groupsV2()) {
Log.w(TAG, "Group update skipped due to feature flag " + groupId);
return;
}
Log.i(TAG, "Updating group to revision " + toRevision); Log.i(TAG, "Updating group to revision " + toRevision);
Optional<GroupDatabase.GroupRecord> group = DatabaseFactory.getGroupDatabase(context).getGroup(groupId); Optional<GroupDatabase.GroupRecord> group = DatabaseFactory.getGroupDatabase(context).getGroup(groupId);

3
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View File

@ -507,4 +507,7 @@ public final class FeatureFlags {
/** Read and write versioned profile information. */ /** Read and write versioned profile information. */
public static final boolean VERSIONED_PROFILES = org.whispersystems.signalservice.FeatureFlags.VERSIONED_PROFILES; public static final boolean VERSIONED_PROFILES = org.whispersystems.signalservice.FeatureFlags.VERSIONED_PROFILES;
/** Enabled ZKGroups library. */
public static final boolean ZK_GROUPS = org.whispersystems.signalservice.FeatureFlags.ZK_GROUPS;
} }

3
app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java
View File

@ -41,6 +41,9 @@ public final class GroupUtil {
if (groupContext.getGroupV1().isPresent()) { if (groupContext.getGroupV1().isPresent()) {
return GroupId.v1(groupContext.getGroupV1().get().getGroupId()); return GroupId.v1(groupContext.getGroupV1().get().getGroupId());
} else if (groupContext.getGroupV2().isPresent()) { } else if (groupContext.getGroupV2().isPresent()) {
if (!FeatureFlags.ZK_GROUPS) {
throw new BadGroupIdException();
}
return GroupId.v2(groupContext.getGroupV2().get().getMasterKey()); return GroupId.v2(groupContext.getGroupV2().get().getMasterKey());
} else { } else {
throw new AssertionError(); throw new AssertionError();