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

Mitigate PNI editor server bug for group member add updates.

Browse source
This commit is contained in:
Cody Henthorne 2025-01-08 16:59:44 -05:00 • committed by Greyson Parrelli
parent 8c3774b3ee
commit 0dbab7ede0
5 changed files with 113 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt
View file

@ -119,6 +119,7 @@ import org.thoughtcrime.securesms.database.helpers.migration.V259_AdjustNotifica
import org.thoughtcrime.securesms.database.helpers.migration.V260_RemapQuoteAuthors
import org.thoughtcrime.securesms.database.helpers.migration.V261_RemapCallRingers
import org.thoughtcrime.securesms.database.helpers.migration.V263_InAppPaymentsSubscriberTableRebuild
import org.thoughtcrime.securesms.database.helpers.migration.V264_FixGroupAddMemberUpdate
/**
* Contains all of the database migrations for [SignalDatabase]. Broken into a separate file for cleanliness.
@ -241,10 +242,11 @@ object SignalDatabaseMigrations {
260 to V260_RemapQuoteAuthors,
261 to V261_RemapCallRingers,
// V263 was originally V262, but a typo in the version mapping caused it not to be run.
263 to V263_InAppPaymentsSubscriberTableRebuild
263 to V263_InAppPaymentsSubscriberTableRebuild,
264 to V264_FixGroupAddMemberUpdate
)
const val DATABASE_VERSION = 263
const val DATABASE_VERSION = 264
@JvmStatic
fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {

78
app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V264_FixGroupAddMemberUpdate.kt Normal file
View file

@ -0,0 +1,78 @@
/*
* Copyright 2024 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.thoughtcrime.securesms.database.helpers.migration
import android.app.Application
import androidx.core.content.contentValuesOf
import net.zetetic.database.sqlcipher.SQLiteDatabase
import okio.IOException
import org.signal.core.util.forEach
import org.signal.core.util.logging.Log
import org.signal.core.util.requireBlob
import org.signal.core.util.requireLong
import org.thoughtcrime.securesms.backup.v2.proto.GroupMemberAddedUpdate
import org.thoughtcrime.securesms.database.model.databaseprotos.MessageExtras
import org.whispersystems.signalservice.api.push.ServiceId
/**
* Ensure we store ACIs only in the ACI fields for [GroupMemberAddedUpdate.updaterAci] in [GroupMemberAddedUpdate].
*/
@Suppress("ClassName")
object V264_FixGroupAddMemberUpdate : SignalDatabaseMigration {
private val TAG = Log.tag(V264_FixGroupAddMemberUpdate::class)
override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
val messageExtrasFixes = mutableListOf<Pair<Long, ByteArray>>()
db.query("message", arrayOf("_id", "message_extras"), "message_extras IS NOT NULL AND type & 0x10000 != 0", null, null, null, null)
.forEach { cursor ->
val blob = cursor.requireBlob("message_extras")!!
val messageExtras: MessageExtras? = try {
MessageExtras.ADAPTER.decode(blob)
} catch (e: IOException) {
Log.w(TAG, "Unable to decode message extras", e)
null
}
if (messageExtras?.gv2UpdateDescription?.groupChangeUpdate?.updates?.any { it.groupMemberAddedUpdate != null } != true) {
return@forEach
}
val groupUpdateDescription = messageExtras.gv2UpdateDescription
val groupUpdate = groupUpdateDescription.groupChangeUpdate!!
val updates = groupUpdate.updates.toMutableList()
var dataMigrated = false
updates
.replaceAll { change ->
if (change.groupMemberAddedUpdate != null && ServiceId.parseOrNull(change.groupMemberAddedUpdate.updaterAci) is ServiceId.PNI) {
dataMigrated = true
change.copy(groupMemberAddedUpdate = change.groupMemberAddedUpdate.copy(updaterAci = null))
} else {
change
}
}
if (dataMigrated) {
val updatedMessageExtras = messageExtras.copy(
gv2UpdateDescription = groupUpdateDescription.copy(
groupChangeUpdate = groupUpdate.copy(
updates = updates
)
)
)
messageExtrasFixes += cursor.requireLong("_id") to updatedMessageExtras.encode()
}
}
messageExtrasFixes.forEach { (id, extras) ->
db.update("message", contentValuesOf("message_extras" to extras), "_id = $id", null)
}
}
}

7
app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageConverter.kt
View file

@ -6,7 +6,6 @@
package org.thoughtcrime.securesms.database.model
import okio.ByteString
import okio.ByteString.Companion.toByteString
import org.signal.core.util.StringUtil
import org.signal.core.util.isNullOrEmpty
import org.signal.storageservice.protos.groups.AccessControl
@ -136,7 +135,7 @@ object GroupsV2UpdateMessageConverter {
if (editorServiceId == null || editorServiceId.isUnknown) {
editorUnknown = true
}
translateMemberAdditions(change, editorUnknown, updates)
translateMemberAdditions(change, editorUnknown, editorServiceId, updates)
translateModifyMemberRoles(change, editorUnknown, updates)
translateInvitations(selfIds, change, editorUnknown, updates)
translateRevokedInvitations(selfIds, change, editorUnknown, updates)
@ -161,7 +160,7 @@ object GroupsV2UpdateMessageConverter {
}
@JvmStatic
fun translateMemberAdditions(change: DecryptedGroupChange, editorUnknown: Boolean, updates: MutableList<GroupChangeChatUpdate.Update>) {
fun translateMemberAdditions(change: DecryptedGroupChange, editorUnknown: Boolean, editorServiceId: ServiceId?, updates: MutableList<GroupChangeChatUpdate.Update>) {
for (member in change.newMembers) {
if (!editorUnknown && member.aciBytes == change.editorServiceIdBytes) {
updates.add(
@ -173,7 +172,7 @@ object GroupsV2UpdateMessageConverter {
updates.add(
GroupChangeChatUpdate.Update(
groupMemberAddedUpdate = GroupMemberAddedUpdate(
updaterAci = if (editorUnknown) null else change.editorServiceIdBytes,
updaterAci = if (editorUnknown || editorServiceId is ServiceId.PNI) null else change.editorServiceIdBytes,
newMemberAci = member.aciBytes,
hadOpenInvitation = false
)

7
app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java
View file

@ -166,9 +166,10 @@ public class ApplicationMigrations {
static final int QUOTE_AUTHOR_FIX = 122;
static final int BAD_E164_FIX = 123;
static final int GPB_TOKEN_MIGRATION = 124;
static final int GROUP_ADD_MIGRATION = 125;
}
public static final int CURRENT_VERSION = 124;
public static final int CURRENT_VERSION = 125;
/**
* This *must* be called after the {@link JobManager} has been instantiated, but *before* the call
@ -763,6 +764,10 @@ public class ApplicationMigrations {
jobs.put(Version.GPB_TOKEN_MIGRATION, new GooglePlayBillingPurchaseTokenMigrationJob());
}
if (lastSeenVersion < Version.GROUP_ADD_MIGRATION) {
jobs.put(Version.GROUP_ADD_MIGRATION, new DatabaseMigrationJob());
}
return jobs;
}

24
libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java
View file

@ -524,13 +524,15 @@ public final class GroupsV2Operations {
throws VerificationFailedException, InvalidGroupStateException
{
DecryptedGroupChange.Builder builder = new DecryptedGroupChange.Builder();
ServiceId editorServiceId;
// Field 1
if (source != null) {
builder.editorServiceIdBytes(source.toByteString());
editorServiceId = source;
} else {
builder.editorServiceIdBytes(decryptServiceIdToBinary(actions.sourceServiceId));
editorServiceId = decryptServiceId(actions.sourceServiceId);
}
builder.editorServiceIdBytes(editorServiceId.toByteString());
// Field 2
builder.revision(actions.revision);
@ -752,6 +754,24 @@ public final class GroupsV2Operations {
}
builder.promotePendingPniAciMembers(promotePendingPniAciMembers);
if (editorServiceId instanceof ServiceId.PNI) {
if (actions.addMembers.size() == 1 && builder.newMembers.size() == 1) {
GroupChange.Actions.AddMemberAction addMemberAction = actions.addMembers.get(0);
DecryptedMember decryptedMember = builder.newMembers.get(0);
if (addMemberAction.joinFromInviteLink) {
Log.d(TAG, "Replacing PNI editor with ACI for buggy join from invite link");
builder.editorServiceIdBytes(decryptedMember.aciBytes);
} else {
Log.w(TAG, "Unable to replace PNI editor with ACI for add member update");
builder.editorServiceIdBytes(ByteString.EMPTY);
}
} else if (actions.deletePendingMembers.isEmpty() && actions.promotePendingPniAciMembers.isEmpty()) {
Log.w(TAG, "Received group change with PNI editor for a non-PNI editor eligible update, clearing editor");
builder.editorServiceIdBytes(ByteString.EMPTY);
}
}
return builder.build();
}