Skip to content

[stable-3.36] fix: enforce E2EE metadata validation #16449

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

Merged
alperozturk96 merged 1 commit into from
Feb 5, 2026
+8 −5
Merged

[stable-3.36] fix: enforce E2EE metadata validation #16449

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
13 changes: 8 additions & 5 deletions app/src/main/java/com/owncloud/android/utils/EncryptionUtilsV2.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,9 @@ class EncryptionUtilsV2 {
)
}

verifyMetadata(metadataFile, decryptedFolderMetadataFile, oldCounter, signature)
if (!verifyMetadata(metadataFile, decryptedFolderMetadataFile, oldCounter, signature)) {
throw IllegalStateException("Metadata is corrupt!")
}

val transferredFiledrop = filesDropCountBefore > 0 &&
decryptedFolderMetadataFile.metadata.files.size == filesBefore + filesDropCountBefore
Expand Down Expand Up @@ -953,10 +955,10 @@ class EncryptionUtilsV2 {
decryptedFolderMetadataFile: DecryptedFolderMetadataFile,
oldCounter: Long,
signature: String
) {
): Boolean {
if (decryptedFolderMetadataFile.metadata.counter < oldCounter) {
MainApp.showMessage(R.string.e2e_counter_too_old)
return
return false
}

val message = EncryptionUtils.serializeJSON(encryptedFolderMetadataFile, true)
Expand All @@ -965,14 +967,15 @@ class EncryptionUtilsV2 {

if (certs.isNotEmpty() && !verifySignedData(signedData, certs)) {
MainApp.showMessage(R.string.e2e_signature_does_not_match)
return
return false
}

val hashedMetadataKey = hashMetadataKey(decryptedFolderMetadataFile.metadata.metadataKey)
if (!decryptedFolderMetadataFile.metadata.keyChecksums.contains(hashedMetadataKey)) {
MainApp.showMessage(R.string.e2e_hash_not_found)
return
return false
}
return true
}

private fun getSignedData(base64encodedSignature: String, message: String): CMSSignedData {
Expand Down
Loading