fix(e2ee): handle E2EE v2.1 #16345
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Nextcloud - Android Client | ||
| * | ||
| * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com> | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| package com.nextcloud.utils.e2ee | ||
|
|
||
| import com.google.gson.reflect.TypeToken | ||
| import com.owncloud.android.datamodel.e2e.v1.encrypted.EncryptedFolderMetadataFileV1 | ||
| import com.owncloud.android.datamodel.e2e.v2.encrypted.EncryptedFolderMetadataFile | ||
| import com.owncloud.android.lib.resources.status.E2EVersion | ||
| import com.owncloud.android.lib.resources.status.OCCapability | ||
| import com.owncloud.android.utils.EncryptionUtils | ||
|
|
||
| object E2EVersionHelper { | ||
|
|
||
| /** | ||
| * Returns true if the given E2EE version is v2 or newer. | ||
| */ | ||
| fun isV2Plus(capability: OCCapability): Boolean = isV2Plus(capability.endToEndEncryptionApiVersion) | ||
|
|
||
| /** | ||
| * Returns true if the given E2EE version is v2 or newer. | ||
| */ | ||
| fun isV2Plus(version: E2EVersion): Boolean = version == E2EVersion.V2_0 || version == E2EVersion.V2_1 | ||
|
|
||
| /** | ||
| * Returns true if the given E2EE version is v1.x. | ||
| */ | ||
| fun isV1(capability: OCCapability): Boolean = isV1(capability.endToEndEncryptionApiVersion) | ||
|
|
||
| /** | ||
| * Returns true if the given E2EE version is v1.x. | ||
| */ | ||
| fun isV1(version: E2EVersion): Boolean = | ||
| version == E2EVersion.V1_0 || version == E2EVersion.V1_1 || version == E2EVersion.V1_2 | ||
|
|
||
| /** | ||
| * Returns the latest supported E2EE version. | ||
| * | ||
| * @param isV2 indicates whether the E2EE v2 series should be used | ||
| */ | ||
| fun latestVersion(isV2: Boolean): E2EVersion = if (isV2) { | ||
| E2EVersion.V2_1 | ||
| } else { | ||
| E2EVersion.V1_2 | ||
| } | ||
|
|
||
| /** | ||
| * Maps a raw version string to an [E2EVersion]. | ||
| * | ||
| * @param version version string | ||
| * @return resolved [E2EVersion] or [E2EVersion.UNKNOWN] if unsupported | ||
| */ | ||
| fun fromVersionString(version: String?): E2EVersion = when (version?.trim()) { | ||
| "1.0" -> E2EVersion.V1_0 | ||
| "1.1" -> E2EVersion.V1_1 | ||
| "1.2" -> E2EVersion.V1_2 | ||
| "2", "2.0" -> E2EVersion.V2_0 | ||
| "2.1" -> E2EVersion.V2_1 | ||
| else -> E2EVersion.UNKNOWN | ||
| } | ||
|
|
||
| /** | ||
| * Determines the E2EE version by inspecting encrypted folder metadata. | ||
| * | ||
| * Supports both V1 and V2 metadata formats and falls back safely | ||
| * to [E2EVersion.UNKNOWN] if parsing fails. | ||
| */ | ||
| fun fromMetadata(metadata: String): E2EVersion = runCatching { | ||
| val v1 = EncryptionUtils.deserializeJSON<EncryptedFolderMetadataFileV1>( | ||
| metadata, | ||
| object : TypeToken<EncryptedFolderMetadataFileV1>() {} | ||
| ) | ||
|
|
||
| fromVersionString(v1?.metadata?.version.toString()).also { | ||
| if (it == E2EVersion.UNKNOWN) { | ||
| throw IllegalStateException("Unknown V1 version") | ||
| } | ||
| } | ||
| }.recoverCatching { | ||
| val v2 = EncryptionUtils.deserializeJSON<EncryptedFolderMetadataFile>( | ||
| metadata, | ||
| object : TypeToken<EncryptedFolderMetadataFile>() {} | ||
| ) | ||
|
|
||
| fromVersionString(v2.version) | ||
| }.getOrDefault(E2EVersion.UNKNOWN) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,8 @@ | |
| */ | ||
| package com.owncloud.android.datamodel.e2e.v2.decrypted | ||
|
|
||
| import com.nextcloud.utils.e2ee.E2EVersionHelper | ||
|
|
||
| /** | ||
| * Decrypted class representation of metadata json of folder metadata. | ||
| */ | ||
|
|
@@ -15,5 +17,5 @@ data class DecryptedFolderMetadataFile( | |
| var users: MutableList<DecryptedUser> = mutableListOf(), | ||
| @Transient | ||
| val filedrop: MutableMap<String, DecryptedFile> = HashMap(), | ||
| val version: String = E2EVersionHelper.latestVersion(true).value | ||
|
Collaborator
Author
There was a problem hiding this comment. Replaces hardcoded hidden strings with actual latest version so that in future we dont come across issues like this. @tobiasKaminsky |
||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Replacement of
public static E2EVersion determinateVersion(String metadata) {Tries v1 if fails v2 if fails E2EVersion.UNKNOWN