Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 18:30:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of split message/media cdn backup credentials.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-11-01 16:53:05 -04:00
parent d115835606
commit 4d39679144
5 changed files with 78 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
View File

@@ -812,7 +812,7 @@ object BackupRepository {
.then { credential ->
SignalNetwork.archive.getBackupInfo(backupKey, SignalStore.account.requireAci(), credential.messageCredential)
}
.then { info -> getCdnReadCredentials(info.cdn ?: Cdn.CDN_3.cdnNumber).map { it.headers to info } }
.then { info -> getCdnReadCredentials(CredentialType.MESSAGE, info.cdn ?: Cdn.CDN_3.cdnNumber).map { it.headers to info } }
.map { pair ->
val (cdnCredentials, info) = pair
val messageReceiver = AppDependencies.signalServiceMessageReceiver
@@ -828,7 +828,7 @@ object BackupRepository {
.then { credential ->
SignalNetwork.archive.getBackupInfo(backupKey, SignalStore.account.requireAci(), credential.messageCredential)
}
.then { info -> getCdnReadCredentials(info.cdn ?: Cdn.CDN_3.cdnNumber).map { it.headers to info } }
.then { info -> getCdnReadCredentials(CredentialType.MESSAGE, info.cdn ?: Cdn.CDN_3.cdnNumber).map { it.headers to info } }
.then { pair ->
val (cdnCredentials, info) = pair
val messageReceiver = AppDependencies.signalServiceMessageReceiver
@@ -1053,27 +1053,40 @@ object BackupRepository {
/**
* Retrieve credentials for reading from the backup cdn.
*/
fun getCdnReadCredentials(cdnNumber: Int): NetworkResult<GetArchiveCdnCredentialsResponse> {
val cached = SignalStore.backup.cdnReadCredentials
fun getCdnReadCredentials(credentialType: CredentialType, cdnNumber: Int): NetworkResult<GetArchiveCdnCredentialsResponse> {
val credentialStore = when (credentialType) {
CredentialType.MESSAGE -> SignalStore.backup.messageCredentials
CredentialType.MEDIA -> SignalStore.backup.mediaCredentials
}
val cached = credentialStore.cdnReadCredentials
if (cached != null) {
return NetworkResult.Success(cached)
}
val backupKey = SignalStore.backup.messageBackupKey
val messageBackupKey = SignalStore.backup.messageBackupKey
val mediaRootBackupKey = SignalStore.backup.mediaRootBackupKey
return initBackupAndFetchAuth(backupKey, mediaRootBackupKey)
val credentialBackupKey = when (credentialType) {
CredentialType.MESSAGE -> messageBackupKey
CredentialType.MEDIA -> mediaRootBackupKey
}
return initBackupAndFetchAuth(messageBackupKey, mediaRootBackupKey)
.then { credential ->
SignalNetwork.archive.getCdnReadCredentials(
cdnNumber = cdnNumber,
messageBackupKey = backupKey,
backupKey = credentialBackupKey,
aci = SignalStore.account.requireAci(),
serviceCredential = credential.mediaCredential
serviceCredential = when (credentialType) {
CredentialType.MESSAGE -> credential.messageCredential
CredentialType.MEDIA -> credential.mediaCredential
}
)
}
.also {
if (it is NetworkResult.Success) {
SignalStore.backup.cdnReadCredentials = it.result
credentialStore.cdnReadCredentials = it.result
}
}
.also { Log.i(TAG, "getCdnReadCredentialsResult: $it") }
@@ -1282,6 +1295,10 @@ object BackupRepository {
fun onMessage()
fun onAttachment(currentProgress: Long, totalCount: Long)
}
enum class CredentialType {
MESSAGE, MEDIA
}
}
data class ArchivedMediaObject(val mediaId: String, val cdn: Int)