diff --git a/app/src/androidTest/java/com/owncloud/android/EncryptedFoldersIT.kt b/app/src/androidTest/java/com/owncloud/android/EncryptedFoldersIT.kt index 0a7d511741d0..047634b14bf2 100644 --- a/app/src/androidTest/java/com/owncloud/android/EncryptedFoldersIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/EncryptedFoldersIT.kt @@ -185,12 +185,12 @@ open class EncryptedFoldersIT : AbstractOnServerIT() { } private fun uploadFolderMetadata(ocFile: OCFile) { - val publicKey = arbitraryDataProvider.getValue(user, EncryptionUtils.PUBLIC_KEY) + val certificate = arbitraryDataProvider.getValue(user, EncryptionUtils.CERTIFICATE) val privateKey = arbitraryDataProvider.getValue(user, EncryptionUtils.PRIVATE_KEY) val uploadedMetadata = encryptionKeyGenerator.uploadEncryptedFolderMetadata( ocFile, client, - publicKey, + certificate, privateKey, storageManager, arbitraryDataProvider diff --git a/app/src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java b/app/src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java index 86582ec14288..6028417cbf78 100644 --- a/app/src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java +++ b/app/src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java @@ -118,7 +118,7 @@ public class EncryptionTestIT extends AbstractIT { "JLecOFu3ZlQl/RStQb69QKb5MNOIMmQhg8WOxZxHcpmIDbkDAm/J/ovJXFSoBdOr5o" + "uQsYsDZhsWW97zvLMzg5pH9/3/1BNz5q3Vu4HgfBSwWGt4E2NENj+XA+QAVmGA=="; - public static final String publicKey = "-----BEGIN CERTIFICATE-----\n" + + public static final String certificate = "-----BEGIN CERTIFICATE-----\n" + "MIIDpzCCAo+gAwIBAgIBADANBgkqhkiG9w0BAQUFADBuMRowGAYDVQQDDBF3d3cu\n" + "bmV4dGNsb3VkLmNvbTESMBAGA1UECgwJTmV4dGNsb3VkMRIwEAYDVQQHDAlTdHV0\n" + "dGdhcnQxGzAZBgNVBAgMEkJhZGVuLVd1ZXJ0dGVtYmVyZzELMAkGA1UEBhMCREUw\n" + @@ -146,7 +146,7 @@ public void encryptStringAsymmetric() throws Exception { byte[] key1 = generateKey(); String base64encodedKey = encodeBytesToBase64String(key1); - String encryptedString = EncryptionUtils.encryptStringAsymmetric(base64encodedKey, publicKey); + String encryptedString = EncryptionUtils.encryptStringAsymmetric(base64encodedKey, certificate); String decryptedString = decryptStringAsymmetric(encryptedString, privateKey); byte[] key2 = decodeStringToBase64Bytes(decryptedString); @@ -292,7 +292,7 @@ public void encryptionMetadataV1() throws Exception { // encrypt EncryptedFolderMetadataFileV1 encryptedFolderMetadata1 = encryptFolderMetadata( decryptedFolderMetadata1, - publicKey, + certificate, 1, user, arbitraryDataProvider); @@ -326,7 +326,7 @@ public void testChangedMetadataKey() throws Exception { // encrypt EncryptedFolderMetadataFileV1 encryptedFolderMetadata1 = encryptFolderMetadata( decryptedFolderMetadata1, - publicKey, + certificate, folderID, user, arbitraryDataProvider); @@ -338,7 +338,7 @@ public void testChangedMetadataKey() throws Exception { // encrypt EncryptedFolderMetadataFileV1 encryptedFolderMetadata2 = encryptFolderMetadata( decryptedFolderMetadata1, - publicKey, + certificate, folderID, user, arbitraryDataProvider); @@ -356,7 +356,7 @@ public void testMigrateMetadataKey() throws Exception { // encrypt EncryptedFolderMetadataFileV1 encryptedFolderMetadata1 = encryptFolderMetadata( decryptedFolderMetadata1, - publicKey, + certificate, folderID, user, arbitraryDataProvider); @@ -369,7 +369,7 @@ public void testMigrateMetadataKey() throws Exception { // encrypt EncryptedFolderMetadataFileV1 encryptedFolderMetadata2 = encryptFolderMetadata( decryptedFolderMetadata1, - publicKey, + certificate, folderID, user, arbitraryDataProvider); @@ -414,7 +414,7 @@ public void bigMetadata() throws Exception { // encrypt EncryptedFolderMetadataFileV1 encryptedFolderMetadata1 = encryptFolderMetadata( decryptedFolderMetadata1, - publicKey, + certificate, folderID, user, arbitraryDataProvider); @@ -452,7 +452,7 @@ public void bigMetadata() throws Exception { // encrypt encryptedFolderMetadata1 = encryptFolderMetadata(decryptedFolderMetadata1, - publicKey, + certificate, folderID, user, arbitraryDataProvider); @@ -489,7 +489,7 @@ public void bigMetadata2() throws Exception { // encrypt EncryptedFolderMetadataFileV1 encryptedFolderMetadata1 = encryptFolderMetadata( decryptedFolderMetadata1, - publicKey, + certificate, folderID, user, arbitraryDataProvider); @@ -528,7 +528,7 @@ public void bigMetadata2() throws Exception { // encrypt encryptedFolderMetadata1 = encryptFolderMetadata( decryptedFolderMetadata1, - publicKey, + certificate, folderID, user, arbitraryDataProvider); @@ -584,11 +584,11 @@ public void filedrop() throws Exception { // encrypt EncryptedFolderMetadataFileV1 encryptedFolderMetadata1 = encryptFolderMetadata( decryptedFolderMetadata1, - publicKey, + certificate, folderID, user, arbitraryDataProvider); - EncryptionUtils.encryptFileDropFiles(decryptedFolderMetadata1, encryptedFolderMetadata1, publicKey); + EncryptionUtils.encryptFileDropFiles(decryptedFolderMetadata1, encryptedFolderMetadata1, certificate); // serialize String encryptedJson = serializeJSON(encryptedFolderMetadata1, true); @@ -785,9 +785,9 @@ private DecryptedFolderMetadataFileV1 generateFolderMetadataV1_1() throws Except String metadataKey1 = encodeBytesToBase64String(generateKey()); String metadataKey2 = encodeBytesToBase64String(generateKey()); HashMap metadataKeys = new HashMap<>(); - metadataKeys.put(0, EncryptionUtils.encryptStringAsymmetric(metadataKey0, publicKey)); - metadataKeys.put(1, EncryptionUtils.encryptStringAsymmetric(metadataKey1, publicKey)); - metadataKeys.put(2, EncryptionUtils.encryptStringAsymmetric(metadataKey2, publicKey)); + metadataKeys.put(0, EncryptionUtils.encryptStringAsymmetric(metadataKey0, certificate)); + metadataKeys.put(1, EncryptionUtils.encryptStringAsymmetric(metadataKey1, certificate)); + metadataKeys.put(2, EncryptionUtils.encryptStringAsymmetric(metadataKey2, certificate)); Encrypted encrypted = new Encrypted(); encrypted.setMetadataKeys(metadataKeys); diff --git a/app/src/androidTest/java/com/owncloud/android/utils/EncryptionTestUtils.kt b/app/src/androidTest/java/com/owncloud/android/utils/EncryptionTestUtils.kt index 34d6621bed3a..bb8068c11db1 100644 --- a/app/src/androidTest/java/com/owncloud/android/utils/EncryptionTestUtils.kt +++ b/app/src/androidTest/java/com/owncloud/android/utils/EncryptionTestUtils.kt @@ -33,7 +33,7 @@ class EncryptionTestUtils { "GsYOFuUehKUBXSJ0929hdP0sjOQDJN3DEDISzmgdWX5NyLJxEYgFWNivpePjWCWzOzyua3nPSpvxPIUB7xh27gjT91glj1hEmy" + "sCd7+9yoMPiCXR7iigRycxegI/Krd39QzISSk9O0finfytU=" - val t1PublicKey = """-----BEGIN CERTIFICATE----- + val t1Certificate = """-----BEGIN CERTIFICATE----- MIIC6DCCAdCgAwIBAgIBADANBgkqhkiG9w0BAQUFADANMQswCQYDVQQDDAJ0MTAe Fw0yMzA3MjUwNzU3MTJaFw00MzA3MjAwNzU3MTJaMA0xCzAJBgNVBAMMAnQxMIIB IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtafHmDBcBqIu4HmMxMDW3j0S diff --git a/app/src/androidTest/java/com/owncloud/android/utils/EncryptionUtilsIT.kt b/app/src/androidTest/java/com/owncloud/android/utils/EncryptionUtilsIT.kt index 6e248e0d0af5..8b805d81ff03 100644 --- a/app/src/androidTest/java/com/owncloud/android/utils/EncryptionUtilsIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/utils/EncryptionUtilsIT.kt @@ -26,15 +26,15 @@ class EncryptionUtilsIT : EncryptionIT() { org.bouncycastle.operator.OperatorCreationException::class ) @Test - fun saveAndRestorePublicKey() { + fun saveAndRestoreShareeCertificate() { val arbitraryDataProvider = ArbitraryDataProviderImpl(targetContext) val keyPair = EncryptionKeyGenerator.generateKeyPair() val e2eUser = "e2e-user" val key = CsrHelper().generateCsrPemEncodedString(keyPair, e2eUser) - EncryptionUtils.savePublicKey(user, key, e2eUser, arbitraryDataProvider) + EncryptionUtils.saveShareeCertificate(user, key, e2eUser, arbitraryDataProvider) - assertEquals(key, EncryptionUtils.getPublicKey(user, e2eUser, arbitraryDataProvider)) + assertEquals(key, EncryptionUtils.getShareeCertificate(user, e2eUser, arbitraryDataProvider)) } @Test diff --git a/app/src/androidTest/java/com/owncloud/android/utils/EncryptionUtilsV2IT.kt b/app/src/androidTest/java/com/owncloud/android/utils/EncryptionUtilsV2IT.kt index 1aa2367ff87b..bc68f27e6935 100644 --- a/app/src/androidTest/java/com/owncloud/android/utils/EncryptionUtilsV2IT.kt +++ b/app/src/androidTest/java/com/owncloud/android/utils/EncryptionUtilsV2IT.kt @@ -232,7 +232,7 @@ class EncryptionUtilsV2IT : EncryptionIT() { val metadataKeyBase64 = EncryptionUtils.generateKeyString() val metadataKey = EncryptionUtils.decodeStringToBase64Bytes(metadataKeyBase64) - val user = DecryptedUser("t1", encryptionTestUtils.t1PublicKey, null) + val user = DecryptedUser("t1", encryptionTestUtils.t1Certificate, null) val encryptedUser = encryptionUtilsV2.encryptUser(user, metadataKey) assertNotEquals(encryptedUser.encryptedMetadataKey, metadataKeyBase64) @@ -861,7 +861,7 @@ class EncryptionUtilsV2IT : EncryptionIT() { """.trimMargin() val privateKey = EncryptionUtils.PEMtoPrivateKey(encryptionTestUtils.t1PrivateKey) - val certificateT1 = EncryptionUtils.convertCertFromString(encryptionTestUtils.t1PublicKey) + val certificateT1 = EncryptionUtils.convertCertFromString(encryptionTestUtils.t1Certificate) val certificateEnc2 = EncryptionUtils.convertCertFromString(enc2Cert) val signed = encryptionUtilsV2.signMessage( @@ -884,7 +884,7 @@ class EncryptionUtilsV2IT : EncryptionIT() { val sut = "randomstring123" val privateKey = EncryptionUtils.PEMtoPrivateKey(encryptionTestUtils.t1PrivateKey) - val certificate = EncryptionUtils.convertCertFromString(encryptionTestUtils.t1PublicKey) + val certificate = EncryptionUtils.convertCertFromString(encryptionTestUtils.t1Certificate) val signed = encryptionUtilsV2.signMessage( certificate, @@ -907,7 +907,7 @@ class EncryptionUtilsV2IT : EncryptionIT() { val metadata = EncryptionTestUtils().generateFolderMetadataV2( client.userId, - EncryptionTestIT.publicKey + EncryptionTestIT.certificate ) RefreshFolderOperation.updateFileNameForEncryptedFile(storageManager, metadata, folder) @@ -923,7 +923,7 @@ class EncryptionUtilsV2IT : EncryptionIT() { @Throws(Exception::class, Throwable::class) fun encryptionMetadataV2() { val decryptedFolderMetadata1: DecryptedFolderMetadataFile = - EncryptionTestUtils().generateFolderMetadataV2(client.userId, EncryptionTestIT.publicKey) + EncryptionTestUtils().generateFolderMetadataV2(client.userId, EncryptionTestIT.certificate) setE2EECapabilityVersion(E2EVersion.fromValue(decryptedFolderMetadata1.version)) val root = OCFile("/") storageManager.saveFile(root) @@ -942,7 +942,7 @@ class EncryptionUtilsV2IT : EncryptionIT() { folder, storageManager, client, - EncryptionTestIT.publicKey, + EncryptionTestIT.certificate, user, targetContext, arbitraryDataProvider diff --git a/app/src/main/java/com/nextcloud/utils/e2ee/E2EEActionResolver.kt b/app/src/main/java/com/nextcloud/utils/e2ee/E2EEActionResolver.kt index 7b09a81ad08a..3346064ab3cb 100644 --- a/app/src/main/java/com/nextcloud/utils/e2ee/E2EEActionResolver.kt +++ b/app/src/main/java/com/nextcloud/utils/e2ee/E2EEActionResolver.kt @@ -38,6 +38,12 @@ class E2EEActionResolver @Inject constructor( storageManager.setReadOnly(file, true) } + suspend fun setReadOnlyAndCanDecrypt(file: OCFile): Boolean = withContext(Dispatchers.IO) { + storageManager.setReadOnly(file, true) + val capability = storageManager.getCapability(accountManager.user.accountName) + return@withContext inspector.canDecryptFolderMetadata(file, capability) + } + suspend fun checkFolderMetadataKey(file: OCFile): Boolean = withContext(Dispatchers.IO) { val capability = storageManager.getCapability(accountManager.user.accountName) val canDecrypt = inspector.canDecryptFolderMetadata(file, capability) @@ -75,13 +81,15 @@ class E2EEActionResolver @Inject constructor( } private suspend fun compareKeys(): E2EEKeyCheck { - val storedPublicKey = arbitraryDataProvider.getValue(accountManager.user, EncryptionUtils.PUBLIC_KEY) + val storedCertificate = arbitraryDataProvider.getValue(accountManager.user, EncryptionUtils.CERTIFICATE) - return when (val result = inspector.compareWithServerKey(storedPublicKey)) { + return when (val result = inspector.compareWithServerCertificate(storedCertificate)) { is DownloadKeyResult.CompareKeys -> if (result.same) E2EEKeyCheck.SAME_AS_SERVER else E2EEKeyCheck.DIFFERS_FROM_SERVER - is DownloadKeyResult.NoServerKey -> E2EEKeyCheck.ONLY_ON_DEVICE + is DownloadKeyResult.NoCertificateOnServer -> E2EEKeyCheck.ONLY_ON_DEVICE + + is DownloadKeyResult.CertificateNotSignedByStoredServerKey -> E2EEKeyCheck.UNTRUSTED_CERTIFICATE else -> E2EEKeyCheck.CHECK_FAILED } diff --git a/app/src/main/java/com/nextcloud/utils/e2ee/E2EEKeyInspector.kt b/app/src/main/java/com/nextcloud/utils/e2ee/E2EEKeyInspector.kt index 18b4c98d4542..1cc639a4682c 100644 --- a/app/src/main/java/com/nextcloud/utils/e2ee/E2EEKeyInspector.kt +++ b/app/src/main/java/com/nextcloud/utils/e2ee/E2EEKeyInspector.kt @@ -9,6 +9,7 @@ package com.nextcloud.utils.e2ee import android.content.Context import com.google.gson.reflect.TypeToken +import com.nextcloud.client.account.User import com.nextcloud.client.account.UserAccountManager import com.owncloud.android.datamodel.ArbitraryDataProvider import com.owncloud.android.datamodel.FileDataStorageManager @@ -29,8 +30,10 @@ import com.owncloud.android.utils.EncryptionUtilsV2 import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.apache.commons.httpclient.HttpStatus +import java.security.cert.CertificateException import javax.inject.Inject +@Suppress("TooGenericExceptionCaught", "ReturnCount", "DEPRECATION") class E2EEKeyInspector @Inject constructor( private val context: Context, private val storageManager: FileDataStorageManager, @@ -44,7 +47,7 @@ class E2EEKeyInspector @Inject constructor( fun isLocalKeysAbsent(): Boolean = arbitraryDataProvider.getValue(accountManager.user, EncryptionUtils.PRIVATE_KEY).isEmpty() || - arbitraryDataProvider.getValue(accountManager.user, EncryptionUtils.PUBLIC_KEY).isEmpty() + arbitraryDataProvider.getValue(accountManager.user, EncryptionUtils.CERTIFICATE).isEmpty() suspend fun fetchCapabilities(): Boolean = withContext(Dispatchers.IO) { val result = GetCapabilitiesOperation(storageManager).execute(context).isSuccess @@ -56,30 +59,65 @@ class E2EEKeyInspector @Inject constructor( return@withContext result } - suspend fun compareWithServerKey(storedPublicKey: String): DownloadKeyResult = withContext(Dispatchers.IO) { - Log_OC.d(TAG, "comparing local public key with remote public key") + suspend fun compareWithServerCertificate(storedCertificate: String): DownloadKeyResult = + withContext(Dispatchers.IO) { + Log_OC.d(TAG, "comparing stored certificate against server certificate") - val user = accountManager.user + val user = accountManager.user - val certificateResult = GetCertificateRemoteOperation().executeNextcloudClient(user, context) - if (!certificateResult.isSuccess) { - return@withContext if (certificateResult.httpCode == HttpStatus.SC_NOT_FOUND) { - DownloadKeyResult.NoServerKey - } else { - DownloadKeyResult.CertificateUnavailable() + val certificateResult = GetCertificateRemoteOperation().executeNextcloudClient(user, context) + if (!certificateResult.isSuccess) { + return@withContext if (certificateResult.httpCode == HttpStatus.SC_NOT_FOUND) { + DownloadKeyResult.NoCertificateOnServer + } else { + DownloadKeyResult.CertificateUnavailable() + } + } + + val remoteCertificate = certificateResult.resultData + val storedServerPublicKey = arbitraryDataProvider.getValue(user, EncryptionUtils.SERVER_PUBLIC_KEY) + if (storedServerPublicKey.isEmpty()) { + return@withContext fetchServerPublicKeyStoreAndCompare(user, storedCertificate, remoteCertificate) + } + + val isSignedByStoredServerPublicKey = certificateValidator.validate( + serverPublicKeyString = storedServerPublicKey, + certificate = remoteCertificate + ) + if (!isSignedByStoredServerPublicKey) { + Log_OC.w(TAG, "certificate cannot be verified with the stored server public key") + return@withContext DownloadKeyResult.CertificateNotSignedByStoredServerKey } + + return@withContext DownloadKeyResult.CompareKeys( + same = haveSamePublicKey(storedCertificate, remoteCertificate) + ) } + private fun fetchServerPublicKeyStoreAndCompare( + user: User, + storedCertificate: String, + remoteCertificate: String + ): DownloadKeyResult { val serverPublicKeyResult = GetServerPublicKeyRemoteOperation().executeNextcloudClient(user, context) - if (!serverPublicKeyResult.isSuccess) return@withContext DownloadKeyResult.ServerPublicKeyUnavailable() + if (!serverPublicKeyResult.isSuccess) return DownloadKeyResult.ServerPublicKeyUnavailable() - val isCertificateValid = certificateValidator.validate( - serverPublicKeyResult.resultData, - certificateResult.resultData - ) - if (!isCertificateValid) return@withContext DownloadKeyResult.CertificateVerificationFailed() + val serverPublicKey = serverPublicKeyResult.resultData + if (!certificateValidator.validate(serverPublicKeyString = serverPublicKey, certificate = remoteCertificate)) { + return DownloadKeyResult.CertificateNotSignedByCurrentServerKey() + } + + arbitraryDataProvider.storeOrUpdateKeyValue(user, EncryptionUtils.SERVER_PUBLIC_KEY, serverPublicKey) + return DownloadKeyResult.CompareKeys(same = haveSamePublicKey(storedCertificate, remoteCertificate)) + } - return@withContext DownloadKeyResult.CompareKeys(same = (storedPublicKey == certificateResult.resultData)) + private fun haveSamePublicKey(firstCertificate: String, secondCertificate: String): Boolean = try { + val firstPublicKey = EncryptionUtils.convertPublicKeyFromString(firstCertificate) + val secondPublicKey = EncryptionUtils.convertPublicKeyFromString(secondCertificate) + firstPublicKey.encoded.contentEquals(secondPublicKey.encoded) + } catch (e: CertificateException) { + Log_OC.w(TAG, "certificate could not be parsed: $e") + false } suspend fun canDecryptFolderMetadata(folder: OCFile, capability: OCCapability): Boolean = @@ -122,7 +160,7 @@ class E2EEKeyInspector @Inject constructor( context, arbitraryDataProvider ) - !metadataKey.isEmpty() + metadataKey.isNotEmpty() } catch (e: Exception) { Log_OC.w(TAG, "user tried to decrypt folder's metadata with different private key: $e") false diff --git a/app/src/main/java/com/nextcloud/utils/e2ee/model/E2EEDialog.kt b/app/src/main/java/com/nextcloud/utils/e2ee/model/E2EEDialog.kt index 489f30d94407..5fe11ec6494b 100644 --- a/app/src/main/java/com/nextcloud/utils/e2ee/model/E2EEDialog.kt +++ b/app/src/main/java/com/nextcloud/utils/e2ee/model/E2EEDialog.kt @@ -11,19 +11,9 @@ import androidx.annotation.StringRes import com.owncloud.android.R enum class E2EEDialog(@param:StringRes val titleId: Int, @param:StringRes val descriptionId: Int) { - KeysRevokedOrChangedWhenEncrypting( + KeysChangedOnServer( titleId = R.string.encryption_key_handle_key_removed_title, - descriptionId = R.string.encryption_key_handle_setup_new_key_before_encrypting_description - ), - - KeysLocallyOutdated( - titleId = R.string.encryption_key_handle_key_removed_title, - descriptionId = R.string.encryption_key_handle_key_keys_only_on_device_outdated_description - ), - - KeysOnlyExistsOnDeviceWhenCreatingFolder( - titleId = R.string.encryption_key_handle_key_removed_title, - descriptionId = R.string.encryption_key_handle_key_keys_only_on_device_description + descriptionId = R.string.encryption_key_handle_keys_changed_on_server_description ), KeysUnusableWhenOpeningFolder( diff --git a/app/src/main/java/com/nextcloud/utils/e2ee/model/E2EEKeyCheck.kt b/app/src/main/java/com/nextcloud/utils/e2ee/model/E2EEKeyCheck.kt index 17e1a328f2db..b41060d1491d 100644 --- a/app/src/main/java/com/nextcloud/utils/e2ee/model/E2EEKeyCheck.kt +++ b/app/src/main/java/com/nextcloud/utils/e2ee/model/E2EEKeyCheck.kt @@ -17,87 +17,27 @@ enum class E2EEKeyCheck { MISSING_EVERYWHERE, ONLY_ON_DEVICE, SAME_AS_SERVER, - DIFFERS_FROM_SERVER; + DIFFERS_FROM_SERVER, + UNTRUSTED_CERTIFICATE; - fun getDialog(action: E2EEAction): E2EEDialog? = when (this) { - ONLY_ON_DEVICE -> { - when (action) { - E2EEAction.OPEN -> { - E2EEDialog.KeysUnusableWhenOpeningFolder - } - - E2EEAction.ENCRYPT -> { - E2EEDialog.KeysRevokedOrChangedWhenEncrypting - } - - else -> { - E2EEDialog.KeysOnlyExistsOnDeviceWhenCreatingFolder - } - } - } - - DIFFERS_FROM_SERVER -> { - when (action) { - E2EEAction.OPEN -> { - E2EEDialog.KeysUnusableWhenOpeningFolder - } - - E2EEAction.ENCRYPT -> { - E2EEDialog.KeysRevokedOrChangedWhenEncrypting - } - - else -> { - E2EEDialog.KeysLocallyOutdated - } - } - } - - else -> null - } - - @Suppress("CyclomaticComplexMethod") fun getMessageId(action: E2EEAction): Int? = when (this) { - NO_NETWORK -> when (action) { - E2EEAction.NEW_FOLDER -> { - R.string.encryption_new_folder_no_network - } - - E2EEAction.OPEN -> { - R.string.encryption_open_no_network - } - - else -> { - R.string.encryption_encrypt_no_network - } - } - - CHECK_FAILED -> when (action) { - E2EEAction.NEW_FOLDER -> { - R.string.encryption_new_folder_check_failed - } - - E2EEAction.OPEN -> { - R.string.encryption_open_check_failed - } - - else -> { - R.string.encryption_encrypt_check_failed - } - } - - E2EE_UNAVAILABLE -> when (action) { - E2EEAction.NEW_FOLDER -> { - R.string.encryption_new_folder_unavailable - } - - E2EEAction.OPEN -> { - R.string.encryption_open_unavailable - } - - else -> { - R.string.encryption_encrypt_unavailable - } - } + NO_NETWORK -> action.pickMessageId( + newFolderId = R.string.encryption_new_folder_no_network, + openId = R.string.encryption_open_no_network, + encryptId = R.string.encryption_encrypt_no_network + ) + + CHECK_FAILED -> action.pickMessageId( + newFolderId = R.string.encryption_new_folder_check_failed, + openId = R.string.encryption_open_check_failed, + encryptId = R.string.encryption_encrypt_check_failed + ) + + E2EE_UNAVAILABLE -> action.pickMessageId( + newFolderId = R.string.encryption_new_folder_unavailable, + openId = R.string.encryption_open_unavailable, + encryptId = R.string.encryption_encrypt_unavailable + ) MISSING_EVERYWHERE -> { if (action == E2EEAction.OPEN) { @@ -109,4 +49,10 @@ enum class E2EEKeyCheck { else -> null } + + private fun E2EEAction.pickMessageId(newFolderId: Int, openId: Int, encryptId: Int): Int = when (this) { + E2EEAction.NEW_FOLDER -> newFolderId + E2EEAction.OPEN -> openId + E2EEAction.ENCRYPT -> encryptId + } } diff --git a/app/src/main/java/com/owncloud/android/datamodel/ArbitraryDataProvider.kt b/app/src/main/java/com/owncloud/android/datamodel/ArbitraryDataProvider.kt index f9d570356c73..f9e567721cfb 100644 --- a/app/src/main/java/com/owncloud/android/datamodel/ArbitraryDataProvider.kt +++ b/app/src/main/java/com/owncloud/android/datamodel/ArbitraryDataProvider.kt @@ -31,7 +31,7 @@ interface ArbitraryDataProvider { const val DIRECT_EDITING = "DIRECT_EDITING" const val DIRECT_EDITING_ETAG = "DIRECT_EDITING_ETAG" const val PREDEFINED_STATUS = "PREDEFINED_STATUS" - const val PUBLIC_KEY = "PUBLIC_KEY_" + const val SHAREE_CERTIFICATE_PREFIX = "PUBLIC_KEY_" const val E2E_ERRORS = "E2E_ERRORS" const val E2E_ERRORS_TIMESTAMP = "E2E_ERRORS_TIMESTAMP" } diff --git a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java index ae793c845797..16b225116773 100644 --- a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -2685,6 +2685,11 @@ public void setReadOnly(OCFile file, boolean readOnly) { OCFile root = getEncryptedRootFolder(file); if (root != null) { fileDao.setReadOnly(user.getAccountName(), root.getRemotePath(), readOnly ? 1 : 0); + + // RefreshFolderOperation saves the opened folder object back to the database + if (root.getRemotePath().equals(file.getRemotePath())) { + file.setReadOnly(readOnly); + } } } diff --git a/app/src/main/java/com/owncloud/android/operations/CreateFolderOperation.java b/app/src/main/java/com/owncloud/android/operations/CreateFolderOperation.java index 7a3357cfbf7c..0297a0e56112 100644 --- a/app/src/main/java/com/owncloud/android/operations/CreateFolderOperation.java +++ b/app/src/main/java/com/owncloud/android/operations/CreateFolderOperation.java @@ -52,7 +52,6 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import static com.owncloud.android.datamodel.OCFile.PATH_SEPARATOR; -import static com.owncloud.android.datamodel.OCFile.ROOT_PATH; /** * Access to remote operation performing the creation of a new folder in the ownCloud server. Save the new folder in @@ -131,7 +130,7 @@ protected RemoteOperationResult run(OwnCloudClient client) { private RemoteOperationResult encryptedCreateV1(OCFile parent, OwnCloudClient client) { ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(context); String privateKey = arbitraryDataProvider.getValue(user.getAccountName(), EncryptionUtils.PRIVATE_KEY); - String publicKey = arbitraryDataProvider.getValue(user.getAccountName(), EncryptionUtils.PUBLIC_KEY); + String certificate = arbitraryDataProvider.getValue(user.getAccountName(), EncryptionUtils.CERTIFICATE); String token = null; Boolean metadataExists; @@ -150,7 +149,7 @@ private RemoteOperationResult encryptedCreateV1(OCFile parent, OwnCloudClient cl Pair metadataPair = EncryptionUtils.retrieveMetadataV1(parent, client, privateKey, - publicKey, + certificate, arbitraryDataProvider, user, e2eeVersion); @@ -176,12 +175,12 @@ private RemoteOperationResult encryptedCreateV1(OCFile parent, OwnCloudClient cl // update metadata metadata.getFiles().put(encryptedFileName, createDecryptedFile(filename)); - EncryptedFolderMetadataFileV1 encryptedFolderMetadata = EncryptionUtils.encryptFolderMetadata(metadata, - publicKey, - parent.getLocalId(), - user, - arbitraryDataProvider - ); + EncryptedFolderMetadataFileV1 encryptedFolderMetadata = EncryptionUtils.encryptFolderMetadata( + metadata, + certificate, + parent.getLocalId(), + user, + arbitraryDataProvider); String serializedFolderMetadata = EncryptionUtils.serializeJSON(encryptedFolderMetadata); final var e2eeVersionAsObject = getStorageManager().getE2EEVersionObject(user); diff --git a/app/src/main/java/com/owncloud/android/operations/CreateShareWithShareeOperation.java b/app/src/main/java/com/owncloud/android/operations/CreateShareWithShareeOperation.java index 82a24c0d8c66..3744506c0d14 100644 --- a/app/src/main/java/com/owncloud/android/operations/CreateShareWithShareeOperation.java +++ b/app/src/main/java/com/owncloud/android/operations/CreateShareWithShareeOperation.java @@ -127,14 +127,15 @@ protected RemoteOperationResult run(OwnCloudClient client) { // E2E: lock folder if (isEncrypted) { try { - String publicKey = EncryptionUtils.getPublicKey(user, shareeName, arbitraryDataProvider); + String shareeCertificate = + EncryptionUtils.getShareeCertificate(user, shareeName, arbitraryDataProvider); - if (publicKey.isEmpty()) { + if (shareeCertificate.isEmpty()) { NextcloudClient nextcloudClient = new ClientFactoryImpl(context).createNextcloudClient(user); RemoteOperationResult result = new GetCertificateRemoteOperation(shareeName).execute(nextcloudClient); if (result.isSuccess()) { // store it - EncryptionUtils.savePublicKey( + EncryptionUtils.saveShareeCertificate( user, result.getResultData(), shareeName, @@ -188,7 +189,7 @@ protected RemoteOperationResult run(OwnCloudClient client) { boolean metadataExists; if (metadata == null) { - String cert = EncryptionUtils.retrievePublicKeyForUser(user, context); + String cert = EncryptionUtils.retrieveCertificateForUser(user, context); String e2eeVersion = getStorageManager().getE2EEVersion(user); metadata = new EncryptionUtilsV2().createDecryptedFolderMetadataFile(e2eeVersion); metadata.getUsers().add(new DecryptedUser(client.getUserId(), cert, null)); @@ -201,12 +202,12 @@ protected RemoteOperationResult run(OwnCloudClient client) { EncryptionUtilsV2 encryptionUtilsV2 = new EncryptionUtilsV2(); // add sharee to metadata - String publicKey = EncryptionUtils.getPublicKey(user, shareeName, arbitraryDataProvider); + String shareeCertificate = EncryptionUtils.getShareeCertificate(user, shareeName, arbitraryDataProvider); String decryptedMetadataKey = DecryptedUserExtensionsKt.findMetadataKeyByUserId(metadata.getUsers(), shareeName); DecryptedFolderMetadataFile newMetadata = encryptionUtilsV2.addShareeToMetadata(metadata, shareeName, - publicKey, + shareeCertificate, decryptedMetadataKey); // upload metadata diff --git a/app/src/main/java/com/owncloud/android/operations/RemoveRemoteEncryptedFileOperation.kt b/app/src/main/java/com/owncloud/android/operations/RemoveRemoteEncryptedFileOperation.kt index e97363f50850..9c83e279f93b 100644 --- a/app/src/main/java/com/owncloud/android/operations/RemoveRemoteEncryptedFileOperation.kt +++ b/app/src/main/java/com/owncloud/android/operations/RemoveRemoteEncryptedFileOperation.kt @@ -120,13 +120,13 @@ class RemoveRemoteEncryptedFileOperation internal constructor( @Suppress("DEPRECATION") val arbitraryDataProvider: ArbitraryDataProvider = ArbitraryDataProviderImpl(context) val privateKey = arbitraryDataProvider.getValue(user.accountName, EncryptionUtils.PRIVATE_KEY) - val publicKey = arbitraryDataProvider.getValue(user.accountName, EncryptionUtils.PUBLIC_KEY) + val certificate = arbitraryDataProvider.getValue(user.accountName, EncryptionUtils.CERTIFICATE) val (metadataExists, metadata) = EncryptionUtils.retrieveMetadataV1( parentFolder, client, privateKey, - publicKey, + certificate, arbitraryDataProvider, user, e2eeVersion.value @@ -140,7 +140,7 @@ class RemoveRemoteEncryptedFileOperation internal constructor( val encryptedFolderMetadata = EncryptionUtils.encryptFolderMetadata( metadata, - publicKey, + certificate, parentFolder.localId, user, arbitraryDataProvider diff --git a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java index 2c436591a4c9..4270b3e4bdb2 100644 --- a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java +++ b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java @@ -525,7 +525,7 @@ private RemoteOperationResult encryptedUpload(OwnCloudClient client, OCFile pare Object object = null; FileChannel channel = null; ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(getContext()); - String publicKey = arbitraryDataProvider.getValue(user.getAccountName(), EncryptionUtils.PUBLIC_KEY); + String certificate = arbitraryDataProvider.getValue(user.getAccountName(), EncryptionUtils.CERTIFICATE); try { result = checkConditions(e2eFiles.getOriginalFile()); @@ -547,7 +547,7 @@ private RemoteOperationResult encryptedUpload(OwnCloudClient client, OCFile pare return new RemoteOperationResult<>(new IllegalStateException("Metadata does not exist")); } } else { - object = getDecryptedFolderMetadataV1(publicKey, object); + object = getDecryptedFolderMetadataV1(certificate, object); } long counter = E2ECounterHelper.INSTANCE.getCounter(mContext, parentFile, object); @@ -560,7 +560,7 @@ private RemoteOperationResult encryptedUpload(OwnCloudClient client, OCFile pare return new RemoteOperationResult<>(e); } - E2EClientData clientData = new E2EClientData(client, token, publicKey); + E2EClientData clientData = new E2EClientData(client, token, certificate); List fileNames = uploadFileResolver.getCollidedFileNames(object); @@ -647,7 +647,7 @@ private String getFolderUnlockTokenOrLockFolder(OwnCloudClient client, OCFile pa return token; } - private DecryptedFolderMetadataFileV1 getDecryptedFolderMetadataV1(String publicKey, Object object) + private DecryptedFolderMetadataFileV1 getDecryptedFolderMetadataV1(String certificate, Object object) throws NoSuchPaddingException, IllegalBlockSizeException, CertificateException, NoSuchAlgorithmException, BadPaddingException, InvalidKeyException { DecryptedFolderMetadataFileV1 metadata = new DecryptedFolderMetadataFileV1(); @@ -655,7 +655,7 @@ private DecryptedFolderMetadataFileV1 getDecryptedFolderMetadataV1(String public metadata.getMetadata().setVersion(1.2); metadata.getMetadata().setMetadataKeys(new HashMap<>()); String metadataKey = EncryptionUtils.encodeBytesToBase64String(EncryptionUtils.generateKey()); - String encryptedMetadataKey = EncryptionUtils.encryptStringAsymmetric(metadataKey, publicKey); + String encryptedMetadataKey = EncryptionUtils.encryptStringAsymmetric(metadataKey, certificate); metadata.getMetadata().setMetadataKey(encryptedMetadataKey); if (object instanceof DecryptedFolderMetadataFileV1) { @@ -848,7 +848,7 @@ private void updateMetadataForV1(DecryptedFolderMetadataFileV1 metadata, E2EData EncryptedFolderMetadataFileV1 encryptedFolderMetadata = EncryptionUtils.encryptFolderMetadata(metadata, - clientData.getPublicKey(), + clientData.getCertificate(), parentFile.getLocalId(), user, arbitraryDataProvider diff --git a/app/src/main/java/com/owncloud/android/operations/e2e/E2ECertificateRenewalService.kt b/app/src/main/java/com/owncloud/android/operations/e2e/E2ECertificateRenewalService.kt index 3929a1e54ee4..19522e38b551 100644 --- a/app/src/main/java/com/owncloud/android/operations/e2e/E2ECertificateRenewalService.kt +++ b/app/src/main/java/com/owncloud/android/operations/e2e/E2ECertificateRenewalService.kt @@ -39,7 +39,7 @@ class E2ECertificateRenewalService( private val mainHandler = Handler(Looper.getMainLooper()) fun getCertificateValidity(user: User): E2ECertificateValidity? { - val certificate = arbitraryDataProvider.getValue(user.accountName, EncryptionUtils.PUBLIC_KEY) + val certificate = arbitraryDataProvider.getValue(user.accountName, EncryptionUtils.CERTIFICATE) if (certificate.isEmpty()) { return null } @@ -102,7 +102,7 @@ class E2ECertificateRenewalService( return E2ECertificateRenewalResult.Failure(R.string.renew_e2e_certificate_error) } - arbitraryDataProvider.storeOrUpdateKeyValue(user.accountName, EncryptionUtils.PUBLIC_KEY, renewedCertificate) + arbitraryDataProvider.storeOrUpdateKeyValue(user.accountName, EncryptionUtils.CERTIFICATE, renewedCertificate) Log_OC.i(TAG, "E2E certificate renewed successfully for " + user.accountName) return E2ECertificateRenewalResult.Success @@ -116,7 +116,7 @@ class E2ECertificateRenewalService( private fun reconstructKeyPair(user: User): KeyPair? { val privateKeyString = arbitraryDataProvider.getValue(user.accountName, EncryptionUtils.PRIVATE_KEY) - val certificate = arbitraryDataProvider.getValue(user.accountName, EncryptionUtils.PUBLIC_KEY) + val certificate = arbitraryDataProvider.getValue(user.accountName, EncryptionUtils.CERTIFICATE) if (privateKeyString.isEmpty() || certificate.isEmpty()) { return null } diff --git a/app/src/main/java/com/owncloud/android/operations/e2e/E2EClientData.kt b/app/src/main/java/com/owncloud/android/operations/e2e/E2EClientData.kt index 892152a5163c..3b8d8f3301b1 100644 --- a/app/src/main/java/com/owncloud/android/operations/e2e/E2EClientData.kt +++ b/app/src/main/java/com/owncloud/android/operations/e2e/E2EClientData.kt @@ -9,4 +9,4 @@ package com.owncloud.android.operations.e2e import com.owncloud.android.lib.common.OwnCloudClient -data class E2EClientData(val client: OwnCloudClient, val token: String, val publicKey: String) +data class E2EClientData(val client: OwnCloudClient, val token: String, val certificate: String) diff --git a/app/src/main/java/com/owncloud/android/operations/e2e/E2EDeletionService.kt b/app/src/main/java/com/owncloud/android/operations/e2e/E2EDeletionService.kt index ea520435c84c..de79e7e94daf 100644 --- a/app/src/main/java/com/owncloud/android/operations/e2e/E2EDeletionService.kt +++ b/app/src/main/java/com/owncloud/android/operations/e2e/E2EDeletionService.kt @@ -62,7 +62,7 @@ class E2EDeletionService(private val clientFactory: ClientFactory) { successfulOperationResultCount -= 1 } - Log_OC.i(TAG, "🗝" + "public key is deleted") + Log_OC.i(TAG, "📜" + "certificate is deleted") if (!DeleteEncryptedFilesRemoteOperation().execute(client).isSuccess) { successfulOperationResultCount -= 1 diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/CertificateValidator.kt b/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/CertificateValidator.kt index 5c76f170610d..3a7fa6899895 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/CertificateValidator.kt +++ b/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/CertificateValidator.kt @@ -41,9 +41,6 @@ class CertificateValidator @Inject constructor() { val certificateInputStream = ByteArrayInputStream(certificate.toByteArray()) val x509Certificate = certificateFactory.generateCertificate(certificateInputStream) as X509Certificate - // Check date of the certificate - x509Certificate.checkValidity() - // Verify certificate with serverPublicKey x509Certificate.verify(serverPublicKey) Log_OC.d(tag, "Client certificate is valid against server public key") diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/EncryptionKeyGenerator.kt b/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/EncryptionKeyGenerator.kt index f968332a8607..dfce3963d12c 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/EncryptionKeyGenerator.kt +++ b/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/EncryptionKeyGenerator.kt @@ -21,6 +21,7 @@ import com.owncloud.android.lib.common.utils.Log_OC import com.owncloud.android.lib.resources.e2ee.CsrHelper import com.owncloud.android.lib.resources.status.E2EVersion import com.owncloud.android.lib.resources.users.DeletePublicKeyRemoteOperation +import com.owncloud.android.lib.resources.users.GetServerPublicKeyRemoteOperation import com.owncloud.android.lib.resources.users.SendCSRRemoteOperation import com.owncloud.android.lib.resources.users.StorePrivateKeyRemoteOperation import com.owncloud.android.utils.EncryptionUtils @@ -52,7 +53,7 @@ class EncryptionKeyGenerator(val context: Context, val user: User) { suspend fun generatePrivateKey(keyWords: ArrayList): PrivateKeyResult = withContext(Dispatchers.IO) { val arbitraryDataProvider = ArbitraryDataProviderImpl(context) - // - create CSR, push to server, store returned public key in database + // - create CSR, push to server, store returned certificate in database // - encrypt private key, push key to server, store unencrypted private key in database try { val certificate: String @@ -77,7 +78,10 @@ class EncryptionKeyGenerator(val context: Context, val user: User) { EncryptionUtils.reportE2eError(arbitraryDataProvider, user) throw RuntimeException("Wrong CSR returned") } - Log_OC.d(TAG, "public key success") + Log_OC.d(TAG, "certificate success") + + val serverPublicKey = fetchServerPublicKeyOrRevokeCertificate(certificate) + ?: return@withContext PrivateKeyResult.Failed val privateKey = keyPair.private val privateKeyString = EncryptionUtils.encodeBytesToBase64String(privateKey.encoded) @@ -104,7 +108,7 @@ class EncryptionKeyGenerator(val context: Context, val user: User) { ) arbitraryDataProvider.storeOrUpdateKeyValue( user.accountName, - EncryptionUtils.PUBLIC_KEY, + EncryptionUtils.CERTIFICATE, certificate ) arbitraryDataProvider.storeOrUpdateKeyValue( @@ -112,6 +116,7 @@ class EncryptionKeyGenerator(val context: Context, val user: User) { EncryptionUtils.MNEMONIC, generateMnemonicString(keyWords, true) ) + arbitraryDataProvider.storeOrUpdateKeyValue(user, EncryptionUtils.SERVER_PUBLIC_KEY, serverPublicKey) return@withContext PrivateKeyResult.Success(storePrivateKeyResult.resultData) } catch (e: Exception) { Log_OC.e(TAG, e.message) @@ -119,10 +124,26 @@ class EncryptionKeyGenerator(val context: Context, val user: User) { return@withContext PrivateKeyResult.Failed } + private fun fetchServerPublicKeyOrRevokeCertificate(certificate: String): String? { + val result = GetServerPublicKeyRemoteOperation().executeNextcloudClient(user, context) + val serverPublicKey = result.resultData + if (result.isSuccess && CertificateValidator().validate( + serverPublicKeyString = serverPublicKey, + certificate = certificate + ) + ) { + return serverPublicKey + } + + Log_OC.e(TAG, "certificate could not be verified with the server public key") + DeletePublicKeyRemoteOperation().executeNextcloudClient(user, context) + return null + } + fun uploadEncryptedFolderMetadata( folder: OCFile, client: OwnCloudClient, - publicKey: String, + certificate: String, privateKey: String, storageManager: FileDataStorageManager, arbitraryDataProvider: ArbitraryDataProvider @@ -141,7 +162,7 @@ class EncryptionKeyGenerator(val context: Context, val user: User) { folder, client, privateKey, - publicKey, + certificate, storageManager, user, context, diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/SetupEncryptionDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/SetupEncryptionDialogFragment.kt index d7f08af54111..089f7eeeca0f 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/SetupEncryptionDialogFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/SetupEncryptionDialogFragment.kt @@ -149,47 +149,28 @@ class SetupEncryptionDialogFragment : lifecycleScope.launch(Dispatchers.IO) { try { - if (downloadKeyResult !is DownloadKeyResult.Success) { + val downloadedKeys = downloadKeyResult as? DownloadKeyResult.Success + if (downloadedKeys == null) { Log_OC.d(TAG, "DownloadKeyResult is not success") return@launch } - val privateKey = (downloadKeyResult as DownloadKeyResult.Success).privateKey val mnemonicUnchanged = binding.encryptionPasswordInput.text.toString().trim() val mnemonic = binding.encryptionPasswordInput.text.toString().replace("\\s".toRegex(), "") .lowercase() val decryptedPrivateKey = CryptoHelper.decryptPrivateKey( - privateKey, + downloadedKeys.privateKey, mnemonic ) val accountName = user?.accountName ?: return@launch - arbitraryDataProvider?.storeOrUpdateKeyValue( - accountName, - EncryptionUtils.PRIVATE_KEY, - decryptedPrivateKey - ) - - Log_OC.d(TAG, "Private key successfully decrypted and stored") - - arbitraryDataProvider?.storeOrUpdateKeyValue( - accountName, - EncryptionUtils.MNEMONIC, - mnemonicUnchanged - ) - - // check if private key and public key match - val publicKey = arbitraryDataProvider?.getValue( - accountName, - EncryptionUtils.PUBLIC_KEY - ) - + // check if private key matches the certificate val firstKey = EncryptionUtils.generateKey() val base64encodedKey = EncryptionUtils.encodeBytesToBase64String(firstKey) val encryptedString = EncryptionUtils.encryptStringAsymmetric( base64encodedKey, - publicKey + downloadedKeys.certificate ) val decryptedString = EncryptionUtils.decryptStringAsymmetric( encryptedString, @@ -202,6 +183,18 @@ class SetupEncryptionDialogFragment : throw Exception("Keys do not match") } + arbitraryDataProvider?.run { + storeOrUpdateKeyValue(accountName, EncryptionUtils.PRIVATE_KEY, decryptedPrivateKey) + storeOrUpdateKeyValue(accountName, EncryptionUtils.MNEMONIC, mnemonicUnchanged) + storeOrUpdateKeyValue(accountName, EncryptionUtils.CERTIFICATE, downloadedKeys.certificate) + storeOrUpdateKeyValue( + accountName, + EncryptionUtils.SERVER_PUBLIC_KEY, + downloadedKeys.serverPublicKey + ) + } + Log_OC.d(TAG, "Private key successfully decrypted and stored") + withContext(Dispatchers.Main) { dialog.dismiss() notifyResult() @@ -265,7 +258,6 @@ class SetupEncryptionDialogFragment : downloadKeyResult = withContext(Dispatchers.IO) { val weakContext = WeakReference(context).get() ?: return@withContext DownloadKeyResult.UnexpectedError() val user = user ?: return@withContext DownloadKeyResult.UnexpectedError() - val dataProvider = arbitraryDataProvider ?: return@withContext DownloadKeyResult.UnexpectedError() val certificateOperation = GetCertificateRemoteOperation() val certificateResult = certificateOperation.executeNextcloudClient(user, weakContext) @@ -285,20 +277,17 @@ class SetupEncryptionDialogFragment : return@withContext DownloadKeyResult.ServerPublicKeyUnavailable() } - val serverKey = serverPublicKeyResult.resultData + val serverPublicKey = serverPublicKeyResult.resultData val certificateAsString = certificateResult.resultData - val isCertificateValid = certificateValidator?.validate(serverKey, certificateAsString) + val isCertificateValid = certificateValidator?.validate( + serverPublicKeyString = serverPublicKey, + certificate = certificateAsString + ) if (isCertificateValid == false) { - return@withContext DownloadKeyResult.CertificateVerificationFailed() + return@withContext DownloadKeyResult.CertificateNotSignedByCurrentServerKey() } - dataProvider.storeOrUpdateKeyValue( - user.accountName, - EncryptionUtils.PUBLIC_KEY, - certificateAsString - ) - val privateKeyOperation = GetPrivateKeyRemoteOperation() val privateKeyResult = privateKeyOperation.executeNextcloudClient(user, weakContext) return@withContext if (privateKeyResult.isSuccess) { @@ -306,12 +295,12 @@ class SetupEncryptionDialogFragment : keyResult = KEY_EXISTING_USED val privateKey = privateKeyResult.resultData?.getKey() if (privateKey == null) { - DownloadKeyResult.ServerPrivateKeyUnavailable() + DownloadKeyResult.PrivateKeyUnavailable() } else { - DownloadKeyResult.Success(privateKey) + DownloadKeyResult.Success(privateKey, certificateAsString, serverPublicKey) } } else { - DownloadKeyResult.ServerPrivateKeyUnavailable() + DownloadKeyResult.PrivateKeyUnavailable() } } diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/model/DownloadKeyResult.kt b/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/model/DownloadKeyResult.kt index a57fd121608d..38059324f514 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/model/DownloadKeyResult.kt +++ b/app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/model/DownloadKeyResult.kt @@ -10,15 +10,15 @@ package com.owncloud.android.ui.dialog.setupEncryption.model import com.owncloud.android.R sealed class DownloadKeyResult(open val descriptionId: Int? = null) { - data class CertificateVerificationFailed( - override val descriptionId: Int = R.string.end_to_end_encryption_certificate_verification_failed + data class CertificateNotSignedByCurrentServerKey( + override val descriptionId: Int = R.string.end_to_end_encryption_could_not_verify_certificate ) : DownloadKeyResult(descriptionId) data class ServerPublicKeyUnavailable( override val descriptionId: Int = R.string.end_to_end_encryption_server_public_key_unavailable ) : DownloadKeyResult(descriptionId) - data class ServerPrivateKeyUnavailable( + data class PrivateKeyUnavailable( override val descriptionId: Int = R.string.end_to_end_encryption_server_private_key_unavailable ) : DownloadKeyResult(descriptionId) @@ -32,9 +32,12 @@ sealed class DownloadKeyResult(open val descriptionId: Int? = null) { data object GeneratePassphraseSendCSR : DownloadKeyResult() - data object NoServerKey : DownloadKeyResult() + data object NoCertificateOnServer : DownloadKeyResult() + + data object CertificateNotSignedByStoredServerKey : DownloadKeyResult() data class CompareKeys(val same: Boolean) : DownloadKeyResult() - data class Success(val privateKey: String) : DownloadKeyResult() + data class Success(val privateKey: String, val certificate: String, val serverPublicKey: String) : + DownloadKeyResult() } diff --git a/app/src/main/java/com/owncloud/android/ui/events/EncryptionEvent.kt b/app/src/main/java/com/owncloud/android/ui/events/EncryptionEvent.kt index 98474ec56c20..261f930f1ffd 100644 --- a/app/src/main/java/com/owncloud/android/ui/events/EncryptionEvent.kt +++ b/app/src/main/java/com/owncloud/android/ui/events/EncryptionEvent.kt @@ -9,6 +9,7 @@ package com.owncloud.android.ui.events import androidx.lifecycle.lifecycleScope import com.nextcloud.utils.SnackbarUtil import com.nextcloud.utils.e2ee.model.E2EEAction +import com.nextcloud.utils.e2ee.model.E2EEDialog import com.nextcloud.utils.e2ee.model.E2EEKeyCheck import com.nextcloud.utils.extensions.showEncryptionDialog import com.owncloud.android.ui.fragment.OCFileListFragment @@ -25,12 +26,12 @@ class EncryptionEvent(val localId: Long, val remoteId: String, val remotePath: S state.getMessageId(E2EEAction.ENCRYPT)?.let { SnackbarUtil.show(fragment, it) } } - E2EEKeyCheck.ONLY_ON_SERVER, E2EEKeyCheck.MISSING_EVERYWHERE -> { + E2EEKeyCheck.ONLY_ON_SERVER, E2EEKeyCheck.MISSING_EVERYWHERE, E2EEKeyCheck.UNTRUSTED_CERTIFICATE -> { fragment.showEncryptionDialog(remotePath, E2EEAction.ENCRYPT) } E2EEKeyCheck.ONLY_ON_DEVICE, E2EEKeyCheck.DIFFERS_FROM_SERVER -> { - state.getDialog(E2EEAction.ENCRYPT)?.let { fragment.e2eeDialogPresenter.show(it) } + fragment.e2eeDialogPresenter.show(E2EEDialog.KeysChangedOnServer) } E2EEKeyCheck.SAME_AS_SERVER -> { diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/EncryptedFolderClickHandler.kt b/app/src/main/java/com/owncloud/android/ui/fragment/EncryptedFolderClickHandler.kt index 64db2b2a59df..bb31de91ccec 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/EncryptedFolderClickHandler.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/EncryptedFolderClickHandler.kt @@ -11,6 +11,7 @@ import androidx.lifecycle.lifecycleScope import com.google.android.material.snackbar.Snackbar import com.nextcloud.utils.SnackbarUtil import com.nextcloud.utils.e2ee.model.E2EEAction +import com.nextcloud.utils.e2ee.model.E2EEDialog import com.nextcloud.utils.e2ee.model.E2EEKeyCheck import com.nextcloud.utils.extensions.showEncryptionDialog import com.owncloud.android.R @@ -46,8 +47,8 @@ class EncryptedFolderClickHandler(private val fragment: OCFileListFragment) { state.getMessageId(E2EEAction.NEW_FOLDER)?.let { SnackbarUtil.show(fragment, it) } } - E2EEKeyCheck.ONLY_ON_SERVER, E2EEKeyCheck.MISSING_EVERYWHERE -> { - Log_OC.d(TAG, "keys found on server but missing locally, redirecting to encryption setup") + E2EEKeyCheck.ONLY_ON_SERVER, E2EEKeyCheck.MISSING_EVERYWHERE, E2EEKeyCheck.UNTRUSTED_CERTIFICATE -> { + Log_OC.d(TAG, "$state, redirecting to encryption setup") fragment.showEncryptionDialog(OCFile.ROOT_PATH, E2EEAction.NEW_FOLDER) } @@ -57,7 +58,7 @@ class EncryptedFolderClickHandler(private val fragment: OCFileListFragment) { } E2EEKeyCheck.ONLY_ON_DEVICE, E2EEKeyCheck.DIFFERS_FROM_SERVER -> { - state.getDialog(E2EEAction.NEW_FOLDER)?.let { fragment.e2eeDialogPresenter.show(it) } + fragment.e2eeDialogPresenter.show(E2EEDialog.KeysChangedOnServer) } } } @@ -85,7 +86,7 @@ class EncryptedFolderClickHandler(private val fragment: OCFileListFragment) { state.getMessageId(E2EEAction.OPEN)?.let { SnackbarUtil.show(fragment, it) } } - E2EEKeyCheck.ONLY_ON_SERVER -> { + E2EEKeyCheck.ONLY_ON_SERVER, E2EEKeyCheck.UNTRUSTED_CERTIFICATE -> { fragment.showEncryptionDialog(file.remotePath, E2EEAction.OPEN) } @@ -95,8 +96,11 @@ class EncryptedFolderClickHandler(private val fragment: OCFileListFragment) { } E2EEKeyCheck.ONLY_ON_DEVICE, E2EEKeyCheck.DIFFERS_FROM_SERVER -> { - e2eeActionResolver.markFolderReadOnly(file) - state.getDialog(E2EEAction.OPEN)?.let { e2eeDialogPresenter.show(it) } + if (e2eeActionResolver.setReadOnlyAndCanDecrypt(file)) { + onFolderKeyVerified(file, position, fileActivity) + } else { + e2eeDialogPresenter.show(E2EEDialog.KeysUnusableWhenOpeningFolder) + } } E2EEKeyCheck.SAME_AS_SERVER -> { diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FolderEncryption.kt b/app/src/main/java/com/owncloud/android/ui/fragment/FolderEncryption.kt index 8d8c31403101..ddffc525f8a3 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/FolderEncryption.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/FolderEncryption.kt @@ -43,7 +43,7 @@ class FolderEncryption(private val fragment: OCFileListFragment) { val user = fragment.accountManager.user val provider = fragment.arbitraryDataProvider - val publicKey = provider.getValue(user, EncryptionUtils.PUBLIC_KEY) + val certificate = provider.getValue(user, EncryptionUtils.CERTIFICATE) val privateKey = provider.getValue(user, EncryptionUtils.PRIVATE_KEY) val client = fragment.clientRepository.getOwncloudClient() ?: run { Log_OC.e(TAG, "client is not available, cannot toggle encryption of $remotePath") @@ -60,7 +60,7 @@ class FolderEncryption(private val fragment: OCFileListFragment) { folder, client, user, - publicKey, + certificate, privateKey, storageManager ) @@ -89,7 +89,7 @@ class FolderEncryption(private val fragment: OCFileListFragment) { folder: OCFile, client: OwnCloudClient, user: User, - publicKey: String, + certificate: String, privateKey: String, storageManager: FileDataStorageManager ): Boolean { @@ -97,7 +97,7 @@ class FolderEncryption(private val fragment: OCFileListFragment) { .uploadEncryptedFolderMetadata( folder, client, - publicKey, + certificate, privateKey, storageManager, fragment.arbitraryDataProvider diff --git a/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java b/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java index 76c146d31e9b..f2b9c759707a 100755 --- a/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java +++ b/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java @@ -1256,9 +1256,9 @@ public static Long getAvailableSpaceOnDevice() { public static boolean isEndToEndEncryptionSetup(Context context, User user) { ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(context); - String publicKey = arbitraryDataProvider.getValue(user, EncryptionUtils.PUBLIC_KEY); + String certificate = arbitraryDataProvider.getValue(user, EncryptionUtils.CERTIFICATE); String privateKey = arbitraryDataProvider.getValue(user, EncryptionUtils.PRIVATE_KEY); - return !publicKey.isEmpty() && !privateKey.isEmpty(); + return !certificate.isEmpty() && !privateKey.isEmpty(); } } diff --git a/app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java b/app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java index 2f8313fe7643..395765ee410f 100644 --- a/app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java +++ b/app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java @@ -18,7 +18,6 @@ import com.google.gson.reflect.TypeToken; import com.nextcloud.client.account.User; import com.nextcloud.common.SessionTimeOutKt; -import com.nextcloud.utils.AppConstants; import com.nextcloud.utils.e2ee.E2EVersionHelper; import com.owncloud.android.R; import com.owncloud.android.datamodel.ArbitraryDataProvider; @@ -114,11 +113,11 @@ public final class EncryptionUtils { private static final String TAG = EncryptionUtils.class.getSimpleName(); // PUBLIC_KEY actually represents certificate this confusion caused by - // later PUBLIC_KEY must rename to CERTIFICATE - public static final String PUBLIC_KEY = "PUBLIC_KEY"; + public static final String CERTIFICATE = "PUBLIC_KEY"; public static final String PRIVATE_KEY = "PRIVATE_KEY"; public static final String MNEMONIC = "MNEMONIC"; + public static final String SERVER_PUBLIC_KEY = "SERVER_PUBLIC_KEY"; private static final int GCM_AUTHENTICATION_TAG_LENGTH = 16; public static final int ivLength = 16; public static final int saltLength = 40; @@ -192,7 +191,7 @@ public static String serializeJSON(Object data) { */ public static EncryptedFolderMetadataFileV1 encryptFolderMetadata( DecryptedFolderMetadataFileV1 decryptedFolderMetadata, - String publicKey, + String certificate, long parentId, User user, ArbitraryDataProvider arbitraryDataProvider @@ -212,7 +211,7 @@ public static EncryptedFolderMetadataFileV1 encryptFolderMetadata( byte[] metadataKeyBytes = EncryptionUtils.generateKey(); String encryptedMetadataKey = EncryptionUtils.encryptStringAsymmetric( EncryptionUtils.encodeBytesToBase64String(metadataKeyBytes), - publicKey); + certificate); encryptedFolderMetadata.getMetadata().setMetadataKey(encryptedMetadataKey); // store that this folder has been migrated @@ -438,7 +437,7 @@ public static DecryptedFolderMetadataFileV1 decryptFolderMetaData(EncryptedFolde } else if (E2EVersionHelper.INSTANCE.isV1(version)) { ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(context); String privateKey = arbitraryDataProvider.getValue(user.getAccountName(), EncryptionUtils.PRIVATE_KEY); - String publicKey = arbitraryDataProvider.getValue(user.getAccountName(), EncryptionUtils.PUBLIC_KEY); + String certificate = arbitraryDataProvider.getValue(user.getAccountName(), EncryptionUtils.CERTIFICATE); EncryptedFolderMetadataFileV1 encryptedFolderMetadata = EncryptionUtils.deserializeJSON( serializedEncryptedMetadata, new TypeToken<>() { }); @@ -455,7 +454,7 @@ public static DecryptedFolderMetadataFileV1 decryptFolderMetaData(EncryptedFolde new EncryptionUtilsV2().migrateV1ToV2andUpload( v1, client.getUserId(), - publicKey, + certificate, folder, new FileDataStorageManager(user, context.getContentResolver()), client, @@ -1194,7 +1193,7 @@ public static String lockFolder(ServerFileInterface parentFile, OwnCloudClient c public static Pair retrieveMetadataV1(ServerFileInterface parentFile, OwnCloudClient client, String privateKey, - String publicKey, + String certificate, ArbitraryDataProvider arbitraryDataProvider, User user, String e2eeVersion) @@ -1231,7 +1230,7 @@ public static Pair retrieveMetadataV1(Se metadata.getMetadata().setVersion(Double.parseDouble(e2eeVersion)); metadata.getMetadata().setMetadataKeys(new HashMap<>()); String metadataKey = EncryptionUtils.encodeBytesToBase64String(EncryptionUtils.generateKey()); - String encryptedMetadataKey = EncryptionUtils.encryptStringAsymmetric(metadataKey, publicKey); + String encryptedMetadataKey = EncryptionUtils.encryptStringAsymmetric(metadataKey, certificate); metadata.getMetadata().setMetadataKey(encryptedMetadataKey); return new Pair<>(Boolean.FALSE, metadata); @@ -1248,7 +1247,7 @@ public static Pair retrieveMetadataV1(Se public static Pair retrieveMetadata(OCFile parentFile, OwnCloudClient client, String privateKey, - String publicKey, + String certificate, FileDataStorageManager storageManager, User user, Context context, @@ -1294,7 +1293,7 @@ public static Pair retrieveMetadata(OCFile new ArrayList<>(), new HashMap<>(), e2eeVersion); - metadata.getUsers().add(new DecryptedUser(client.getUserId(), publicKey, null)); + metadata.getUsers().add(new DecryptedUser(client.getUserId(), certificate, null)); byte[] metadataKey = EncryptionUtils.generateKey(); if (metadataKey == null) { @@ -1396,14 +1395,15 @@ public static RSAPublicKey convertPublicKeyFromString(String string) throws Cert public static void removeE2E(ArbitraryDataProvider arbitraryDataProvider, User user) { // delete stored E2E keys and mnemonic arbitraryDataProvider.deleteKeyForAccount(user.getAccountName(), EncryptionUtils.PRIVATE_KEY); - arbitraryDataProvider.deleteKeyForAccount(user.getAccountName(), EncryptionUtils.PUBLIC_KEY); + arbitraryDataProvider.deleteKeyForAccount(user.getAccountName(), EncryptionUtils.CERTIFICATE); arbitraryDataProvider.deleteKeyForAccount(user.getAccountName(), EncryptionUtils.MNEMONIC); + arbitraryDataProvider.deleteKeyForAccount(user.getAccountName(), EncryptionUtils.SERVER_PUBLIC_KEY); } - public static boolean isMatchingKeys(KeyPair keyPair, String publicKeyString) throws CertificateException { + public static boolean isMatchingKeys(KeyPair keyPair, String certificate) throws CertificateException { // check key RSAPrivateCrtKey privateKey = (RSAPrivateCrtKey) keyPair.getPrivate(); - RSAPublicKey publicKey = EncryptionUtils.convertPublicKeyFromString(publicKeyString); + RSAPublicKey publicKey = EncryptionUtils.convertPublicKeyFromString(certificate); BigInteger modulusPublic = publicKey.getModulus(); BigInteger modulusPrivate = privateKey.getModulus(); @@ -1504,7 +1504,7 @@ public static void reportE2eError(ArbitraryDataProvider arbitraryDataProvider, U arbitraryDataProvider.storeOrUpdateKeyValue( user.getAccountName(), ArbitraryDataProvider.E2E_ERRORS_TIMESTAMP, - System.currentTimeMillis() / AppConstants.MILLIS_PER_SECOND + System.currentTimeMillis() / 1000 ); } } @@ -1533,26 +1533,26 @@ public static String generateUid() { return UUID.randomUUID().toString().replaceAll("-", ""); } - public static String retrievePublicKeyForUser(User user, Context context) { - return new ArbitraryDataProviderImpl(context).getValue(user, PUBLIC_KEY); + public static String retrieveCertificateForUser(User user, Context context) { + return new ArbitraryDataProviderImpl(context).getValue(user, CERTIFICATE); } public static byte[] generateIV() { return EncryptionUtils.randomBytes(EncryptionUtils.ivLength); } - public static void savePublicKey(User currentUser, - String key, - String user, - ArbitraryDataProvider arbitraryDataProvider) { + public static void saveShareeCertificate(User currentUser, + String certificate, + String user, + ArbitraryDataProvider arbitraryDataProvider) { arbitraryDataProvider.storeOrUpdateKeyValue(currentUser, - ArbitraryDataProvider.PUBLIC_KEY + user, - key); + ArbitraryDataProvider.SHAREE_CERTIFICATE_PREFIX + user, + certificate); } - public static String getPublicKey(User currentUser, - String user, - ArbitraryDataProvider arbitraryDataProvider) { - return arbitraryDataProvider.getValue(currentUser, ArbitraryDataProvider.PUBLIC_KEY + user); + public static String getShareeCertificate(User currentUser, + String user, + ArbitraryDataProvider arbitraryDataProvider) { + return arbitraryDataProvider.getValue(currentUser, ArbitraryDataProvider.SHAREE_CERTIFICATE_PREFIX + user); } } diff --git a/app/src/main/java/com/owncloud/android/utils/EncryptionUtilsV2.kt b/app/src/main/java/com/owncloud/android/utils/EncryptionUtilsV2.kt index f463f4358274..95e0aee245b4 100644 --- a/app/src/main/java/com/owncloud/android/utils/EncryptionUtilsV2.kt +++ b/app/src/main/java/com/owncloud/android/utils/EncryptionUtilsV2.kt @@ -557,9 +557,9 @@ class EncryptionUtilsV2 { } else { // new metadata val arbitraryDataProvider: ArbitraryDataProvider = ArbitraryDataProviderImpl(context) - val publicKey: String = arbitraryDataProvider.getValue(user.accountName, EncryptionUtils.PUBLIC_KEY) + val certificate: String = arbitraryDataProvider.getValue(user.accountName, EncryptionUtils.CERTIFICATE) createDecryptedFolderMetadataFile(storageManager.getE2EEVersion(user)).apply { - users = mutableListOf(DecryptedUser(client.userId, publicKey, null)) + users = mutableListOf(DecryptedUser(client.userId, certificate, null)) } } @@ -625,16 +625,16 @@ class EncryptionUtilsV2 { user, folder.localId ) - val publicKey: String = arbitraryDataProvider.getValue( + val certificate: String = arbitraryDataProvider.getValue( user.accountName, - EncryptionUtils.PUBLIC_KEY + EncryptionUtils.CERTIFICATE ) // migrate to v2 migrateV1ToV2andUpload( decryptedV1, client.userIdPlain, - publicKey, + certificate, folder, storageManager, client, @@ -796,7 +796,7 @@ class EncryptionUtilsV2 { ) { val arbitraryDataProvider: ArbitraryDataProvider = ArbitraryDataProviderImpl(context) val privateKeyString: String = arbitraryDataProvider.getValue(user.accountName, EncryptionUtils.PRIVATE_KEY) - val publicKeyString: String = arbitraryDataProvider.getValue(user.accountName, EncryptionUtils.PUBLIC_KEY) + val certificateString: String = arbitraryDataProvider.getValue(user.accountName, EncryptionUtils.CERTIFICATE) val encryptedFolderMetadata = encryptFolderMetadataFile( metadata, @@ -810,7 +810,7 @@ class EncryptionUtilsV2 { arbitraryDataProvider ) val serializedFolderMetadata = EncryptionUtils.serializeJSON(encryptedFolderMetadata, true) - val cert = EncryptionUtils.convertCertFromString(publicKeyString) + val cert = EncryptionUtils.convertCertFromString(certificateString) val privateKey = EncryptionUtils.PEMtoPrivateKey(privateKeyString) val signature = getMessageSignature(cert, privateKey, encryptedFolderMetadata) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 31901ff1e355..5150f56aca4d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1019,7 +1019,7 @@ No app available to select contacts You cannot create a share, sharing is already active from this user. - Failed to verify public key + Could not verify the encryption certificate Unable to retrieve public key Unable to retrieve private key Unable to retrieve server certificate @@ -1517,9 +1517,7 @@ Encryption keys changed This folder cannot be opened because its encryption keys no longer exist on this device or on the server. The encryption keys of this account were removed or replaced, so the contents of this folder can no longer be decrypted.\n\nThe folder is read only from now on. To use encrypted folders again, backup this folder and set up your new encryption key in the settings. - The encryption keys of this account were removed or replaced.\n\nSet up your new encryption key in the settings before you encrypt a folder. - The encryption key stored on this device is not valid anymore. Keys are revoked from server. \n\nBackup previously created encrypted folder. \n\nThen remove encryption locally from settings to create new encryption folder. - The encryption key stored on this device is not valid anymore. Keys are revoked from server. \n\nRemove encryption locally from settings to create new encryption folder. + The encryption keys on the server were removed or replaced, so encrypted folders are read-only on this device.\n\nTo keep using end-to-end encryption, back up your encrypted files, remove encryption locally in the settings and set it up again. Internal two way sync Manage internal folders for two way sync