Skip to content

Make sure to catch the exception in config merging so we don't break the whole thing #978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: release/1.21.0
Choose a base branch
from
Open

Make sure to catch the exception in config merging so we don't break the whole thing #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions app/src/main/java/org/thoughtcrime/securesms/dependencies/ConfigFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import org.session.libsignal.crypto.ecc.DjbECPublicKey
import org.session.libsignal.utilities.AccountId
import org.session.libsignal.utilities.Hex
import org.session.libsignal.utilities.IdPrefix
import org.session.libsignal.utilities.Log
import org.session.libsignal.utilities.toHexString
import org.thoughtcrime.securesms.configs.ConfigToDatabaseSync
import org.thoughtcrime.securesms.database.ConfigDatabase
Expand Down Expand Up @@ -275,10 +276,11 @@ class ConfigFactory @Inject constructor(

override fun <T> withMutableGroupConfigs(
groupId: AccountId,
forceChangeNotification: Boolean,
cb: (MutableGroupConfigs) -> T
): T {
return doWithMutableGroupConfigs(groupId = groupId) {
cb(it) to it.dumpIfNeeded(clock)
cb(it) to (it.dumpIfNeeded(clock) || forceChangeNotification)
}
}

Expand Down Expand Up @@ -323,14 +325,30 @@ class ConfigFactory @Inject constructor(
val changed = doWithMutableGroupConfigs(groupId) { configs ->
// Keys must be loaded first as they are used to decrypt the other config messages
val keysLoaded = keys.fold(false) { acc, msg ->
configs.groupKeys.loadKey(msg.data, msg.hash, msg.timestamp, configs.groupInfo.pointer, configs.groupMembers.pointer) || acc
val loaded = runCatching {
configs.groupKeys.loadKey(msg.data, msg.hash, msg.timestamp)
}.onFailure { e ->
Log.w("ConfigFactory", "Failed to load group key for $groupId", e)
}.getOrDefault(false)

loaded || acc
}

val infoMerged = info.isNotEmpty() &&
configs.groupInfo.merge(info.map { it.hash to it.data }.toTypedArray()).isNotEmpty()
runCatching {
configs.groupInfo.merge(info.map { it.hash to it.data }.toTypedArray()).isNotEmpty()
}.onFailure { e ->
Log.w("ConfigFactory", "Failed to merge group info for $groupId", e)
}.getOrDefault(false)


val membersMerged = members.isNotEmpty() &&
configs.groupMembers.merge(members.map { it.hash to it.data }.toTypedArray()).isNotEmpty()
runCatching {
configs.groupMembers.merge(members.map { it.hash to it.data }.toTypedArray()).isNotEmpty()
}.onFailure { e ->
Log.w("ConfigFactory", "Failed to merge group members for $groupId", e)
}.getOrDefault(false)


configs.dumpIfNeeded(clock)

Expand Down Expand Up @@ -396,7 +414,7 @@ class ConfigFactory @Inject constructor(
keysPush?.let { (hash, timestamp) ->
val pendingConfig = configs.groupKeys.pendingConfig()
if (pendingConfig != null) {
configs.groupKeys.loadKey(pendingConfig, hash, timestamp, configs.groupInfo.pointer, configs.groupMembers.pointer)
configs.groupKeys.loadKey(pendingConfig, hash, timestamp)
}
}

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,8 @@ class GroupManagerV2Impl @Inject constructor(

// Update our promote state
configFactory.withMutableGroupConfigs(
groupId = groupId
groupId = groupId,
forceChangeNotification = true,
) { configs ->
configs.groupKeys.loadAdminKey(adminKey)

Expand Down
2 changes: 1 addition & 1 deletion libsession-util/src/main/java/network/loki/messenger/libsession_util/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ class GroupKeysConfig private constructor(
external override fun groupKeys(): Stack<ByteArray>
external override fun needsDump(): Boolean
external override fun dump(): ByteArray
external fun loadKey(message: ByteArray,
private external fun loadKey(message: ByteArray,
hash: String,
timestampMs: Long,
infoPtr: Long,
Expand Down
7 changes: 5 additions & 2 deletions libsession/src/main/java/org/session/libsession/utilities/ConfigFactoryProtocol.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,12 @@ interface ConfigFactoryProtocol {
fun saveGroupConfigs(groupId: AccountId, groupConfigs: MutableGroupConfigs)

/**
* @param recreateConfigInstances If true, the group configs will be recreated before calling the callback. This is useful when you have received an admin key or otherwise.
* @param forceChangeNotification If true, the group configs will be marked as changed even if no changes were made.
* Normally this is not needed, as in most cases the underlying config system will be able to work out
* something has changed, but in some very rare cases it might not be able to, and in those cases you
* will need to force a change notification so that other parts of the app can react to the change.
*/
fun <T> withMutableGroupConfigs(groupId: AccountId, cb: (MutableGroupConfigs) -> T): T
fun <T> withMutableGroupConfigs(groupId: AccountId, forceChangeNotification: Boolean = false, cb: (MutableGroupConfigs) -> T): T

fun conversationInConfig(publicKey: String?, groupPublicKey: String?, openGroupId: String?, visibleOnly: Boolean): Boolean
fun canPerformChange(variant: String, publicKey: String, changeTimestampMs: Long): Boolean
Expand Down