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

Add check for internal users around group lock ordering.

Browse source
This commit is contained in:
Greyson Parrelli 2023-06-23 12:29:22 -04:00 • committed by Nicholas
parent 9d979217fa
commit b042945fef
3 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/crypto/ReentrantSessionLock.java
View file

@ -18,4 +18,8 @@ public enum ReentrantSessionLock implements SignalSessionLock {
LOCK.lock();
return LOCK::unlock;
}
public boolean isHeldByCurrentThread() {
return LOCK.isHeldByCurrentThread();
}
}

2
app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV1MigrationUtil.java
View file

@ -137,7 +137,7 @@ public final class GroupsV1MigrationUtil {
public static void performLocalMigration(@NonNull Context context, @NonNull GroupId.V1 gv1Id) throws IOException
{
Log.i(TAG, "Beginning local migration! V1 ID: " + gv1Id, new Throwable());
try (Closeable ignored = GroupsV2ProcessingLock.acquireGroupProcessingLock()) {
try (Closeable ignored = GroupsV2ProcessingLock.acquireGroupProcessingLock(1000)) {
if (SignalDatabase.groups().groupExists(gv1Id.deriveV2MigrationGroupId())) {
Log.w(TAG, "Group was already migrated! Could have been waiting for the lock.", new Throwable());
return;

17
app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2ProcessingLock.java
View file

@ -4,6 +4,9 @@ import androidx.annotation.WorkerThread;
import org.signal.core.util.ThreadUtil;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.util.FeatureFlags;
import java.io.Closeable;
import java.util.concurrent.TimeUnit;
@ -17,15 +20,25 @@ public final class GroupsV2ProcessingLock {
private GroupsV2ProcessingLock() {
}
private static final Lock lock = new ReentrantLock();
private static final ReentrantLock lock = new ReentrantLock();
@WorkerThread
public static Closeable acquireGroupProcessingLock() throws GroupChangeBusyException {
if (FeatureFlags.internalUser()) {
if (!lock.isHeldByCurrentThread()) {
if (SignalDatabase.inTransaction()) {
throw new AssertionError("Tried to acquire the group lock inside of a database transaction!");
}
if (ReentrantSessionLock.INSTANCE.isHeldByCurrentThread()) {
throw new AssertionError("Tried to acquire the group lock inside of the ReentrantSessionLock!!");
}
}
}
return acquireGroupProcessingLock(5000);
}
@WorkerThread
static Closeable acquireGroupProcessingLock(long timeoutMs) throws GroupChangeBusyException {
public static Closeable acquireGroupProcessingLock(long timeoutMs) throws GroupChangeBusyException {
ThreadUtil.assertNotMainThread();
try {