Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ import com.nextcloud.client.database.entity.FileEntity
import com.nextcloud.client.network.NetworkModule
import com.nextcloud.test.SinceServer
import com.nextcloud.utils.e2ee.E2EEActionResolver
import com.nextcloud.utils.e2ee.E2EECertificateManager
import com.nextcloud.utils.e2ee.E2EEKeyInspector
import com.nextcloud.repository.ClientRepository
import org.mockito.kotlin.mock
import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.lib.resources.e2ee.ToggleEncryptionRemoteOperation
import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation
Expand Down Expand Up @@ -61,12 +64,17 @@ open class EncryptedFoldersIT : AbstractOnServerIT() {

init {
val accountManager: UserAccountManager = UserAccountManagerImpl.fromContext(targetContext)
val clientRepository: ClientRepository = mock {
onBlocking { getOwncloudClient() }.thenReturn(client)
onBlocking { getNextcloudClient() }.thenReturn(nextcloudClient)
}
val inspector = E2EEKeyInspector(
targetContext,
storageManager,
CertificateValidator(),
E2EECertificateManager(CertificateValidator(), arbitraryDataProvider),
arbitraryDataProvider,
accountManager
accountManager,
clientRepository
)
e2eeActionResolver = E2EEActionResolver(
storageManager,
Expand Down
11 changes: 7 additions & 4 deletions app/src/main/java/com/nextcloud/client/di/AppModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import com.nextcloud.client.preferences.AppPreferences
import com.nextcloud.repository.ClientRepository
import com.nextcloud.repository.RemoteClientRepository
import com.nextcloud.utils.e2ee.E2EEActionResolver
import com.nextcloud.utils.e2ee.E2EECertificateManager
import com.nextcloud.utils.e2ee.E2EEKeyInspector
import com.nextcloud.utils.thumbnail.FolderThumbnailGenerator
import com.owncloud.android.authentication.PassCodeManager
Expand Down Expand Up @@ -237,15 +238,17 @@ internal class AppModule {
fun e2eeKeyInspector(
context: Context,
fileDataStorageManager: FileDataStorageManager,
certificateValidator: CertificateValidator,
certificateManager: E2EECertificateManager,
arbitraryDataProvider: ArbitraryDataProvider,
accountManager: UserAccountManager
accountManager: UserAccountManager,
clientRepository: ClientRepository
): E2EEKeyInspector = E2EEKeyInspector(
context,
fileDataStorageManager,
certificateValidator,
certificateManager,
arbitraryDataProvider,
accountManager
accountManager,
clientRepository
)

@Provides
Expand Down
32 changes: 18 additions & 14 deletions app/src/main/java/com/nextcloud/utils/e2ee/E2EEActionResolver.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import com.nextcloud.client.account.UserAccountManager
import com.nextcloud.client.di.Injectable
import com.nextcloud.client.network.ConnectivityService
import com.nextcloud.utils.e2ee.model.E2EEKeyCheck
import com.nextcloud.utils.e2ee.model.E2EEKeyCheckResult
import com.nextcloud.utils.extensions.isNetworkAndServerAvailableSuspended
import com.owncloud.android.datamodel.ArbitraryDataProvider
import com.owncloud.android.datamodel.FileDataStorageManager
Expand Down Expand Up @@ -51,47 +52,50 @@ class E2EEActionResolver @Inject constructor(
return@withContext canDecrypt
}

suspend fun checkKeys(): E2EEKeyCheck = withContext(Dispatchers.IO) { resolveKeyCheck() }
suspend fun checkKeys(): E2EEKeyCheckResult = withContext(Dispatchers.IO) {
resolveKeyCheck().also { Log_OC.d(TAG, "e2ee key check result: ${it.state}") }
}

private suspend fun resolveKeyCheck(): E2EEKeyCheck {
private suspend fun resolveKeyCheck(): E2EEKeyCheckResult {
val keysAbsentLocally = inspector.isLocalKeysAbsent()

if (!inspector.fetchCapabilities()) {
return if (connectivityService.isNetworkAndServerAvailableSuspended()) {
inspector.fetchCapabilities()?.let { capabilitiesError ->
val state = if (connectivityService.isNetworkAndServerAvailableSuspended()) {
E2EEKeyCheck.CHECK_FAILED
} else {
E2EEKeyCheck.NO_NETWORK
}
return E2EEKeyCheckResult(state, capabilitiesError.descriptionId)
}

val capability = storageManager.getCapability(accountManager.user)
val keysExistOnServer = capability.endToEndEncryptionKeysExist

val result = when {
val state = when {
keysExistOnServer.isUnknown || capability.endToEndEncryption.isUnknown -> E2EEKeyCheck.E2EE_UNAVAILABLE
keysAbsentLocally && keysExistOnServer.isTrue -> E2EEKeyCheck.ONLY_ON_SERVER
keysAbsentLocally -> E2EEKeyCheck.MISSING_EVERYWHERE
!keysExistOnServer.isTrue -> E2EEKeyCheck.ONLY_ON_DEVICE
else -> compareKeys()
else -> return compareKeys()
}

Log_OC.d(TAG, "e2ee key check result: $result")

return result
return E2EEKeyCheckResult(state)
}

private suspend fun compareKeys(): E2EEKeyCheck {
private suspend fun compareKeys(): E2EEKeyCheckResult {
val storedCertificate = arbitraryDataProvider.getValue(accountManager.user, EncryptionUtils.CERTIFICATE)

return when (val result = inspector.compareWithServerCertificate(storedCertificate)) {
is DownloadKeyResult.CompareKeys ->
is DownloadKeyResult.CompareKeys -> E2EEKeyCheckResult(
if (result.same) E2EEKeyCheck.SAME_AS_SERVER else E2EEKeyCheck.DIFFERS_FROM_SERVER
)

is DownloadKeyResult.NoCertificateOnServer -> E2EEKeyCheck.ONLY_ON_DEVICE
is DownloadKeyResult.NoCertificateOnServer -> E2EEKeyCheckResult(E2EEKeyCheck.ONLY_ON_DEVICE)

is DownloadKeyResult.CertificateNotSignedByStoredServerKey -> E2EEKeyCheck.UNTRUSTED_CERTIFICATE
is DownloadKeyResult.CertificateNotSignedByStoredServerKey ->
E2EEKeyCheckResult(E2EEKeyCheck.UNTRUSTED_CERTIFICATE)

else -> E2EEKeyCheck.CHECK_FAILED
else -> E2EEKeyCheckResult(E2EEKeyCheck.CHECK_FAILED, result.descriptionId)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
/*
* Nextcloud - Android Client
*
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

package com.nextcloud.utils.e2ee

import com.nextcloud.client.account.User
import com.owncloud.android.datamodel.ArbitraryDataProvider
import com.owncloud.android.lib.common.utils.Log_OC
import com.owncloud.android.ui.dialog.setupEncryption.CertificateValidator
import com.owncloud.android.ui.dialog.setupEncryption.model.CertificateValidationResult
import com.owncloud.android.ui.dialog.setupEncryption.model.DownloadKeyResult
import com.owncloud.android.utils.EncryptionUtils
import com.owncloud.android.utils.crypto.CryptoStringUtils
import java.security.GeneralSecurityException
import java.security.KeyFactory
import java.security.Signature
import java.security.cert.X509Certificate
import java.security.spec.PKCS8EncodedKeySpec
import java.util.Base64
import javax.inject.Inject

class E2EECertificateManager @Inject constructor(
private val validator: CertificateValidator,
private val arbitraryDataProvider: ArbitraryDataProvider
) {
fun compareAndRefresh(
user: User,
storedCertificate: String,
remoteCertificate: String,
serverPublicKey: String
): DownloadKeyResult {
val validation = validator.validateWithResult(serverPublicKey, remoteCertificate)
if (validation != CertificateValidationResult.VALID) {
return DownloadKeyResult.CertificateVerificationFailed(validation)
}

val remote = validator.parseCertificate(remoteCertificate)
try {
val stored = validator.parseCertificate(storedCertificate)
if (!stored.publicKey.encoded.contentEquals(remote.publicKey.encoded)) {
return DownloadKeyResult.CompareKeys(same = false)
}

val privateKey = arbitraryDataProvider.getValue(user, EncryptionUtils.PRIVATE_KEY)
if (!matchesPrivateKey(remote, privateKey)) {
return DownloadKeyResult.LocalKeysInvalid()
}
} catch (e: GeneralSecurityException) {
Log_OC.w(TAG, "Cannot verify local encryption keys: $e")
return DownloadKeyResult.LocalKeysInvalid()
} catch (e: IllegalArgumentException) {
Log_OC.w(TAG, "Cannot decode local encryption keys: $e")
return DownloadKeyResult.LocalKeysInvalid()
}

if (storedCertificate != remoteCertificate) {
arbitraryDataProvider.storeOrUpdateKeyValue(user, EncryptionUtils.CERTIFICATE, remoteCertificate)
}
return DownloadKeyResult.CompareKeys(same = true)
}

private fun matchesPrivateKey(certificate: X509Certificate, privateKey: String): Boolean {
val encodedKey = CryptoStringUtils.rawPrivateKey(privateKey).replace("\\s+".toRegex(), "")
val keySpec = PKCS8EncodedKeySpec(Base64.getDecoder().decode(encodedKey))
val key = KeyFactory.getInstance("RSA").generatePrivate(keySpec)
val message = certificate.publicKey.encoded
val signer = Signature.getInstance("SHA256withRSA")
signer.initSign(key)
signer.update(message)
val signature = signer.sign()

val verifier = Signature.getInstance("SHA256withRSA")
verifier.initVerify(certificate.publicKey)
verifier.update(message)
return verifier.verify(signature)
}

companion object {
private const val TAG = "E2EECertificateManager"
}
}
24 changes: 24 additions & 0 deletions app/src/main/java/com/nextcloud/utils/e2ee/E2EEDialogPresenter.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@

package com.nextcloud.utils.e2ee

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.E2EEKeyCheckResult
import com.owncloud.android.R
import com.owncloud.android.lib.common.utils.Log_OC
import com.owncloud.android.ui.dialog.ConfirmationDialogFragment
Expand Down Expand Up @@ -47,4 +50,25 @@ class E2EEDialogPresenter(private val fragment: OCFileListFragment) {
override fun onNeutral(callerTag: String?) = Unit
override fun onCancel(callerTag: String?) = Unit
}

fun showKeyCheckError(result: E2EEKeyCheckResult, action: E2EEAction) {
val messageId = result.getMessageId(action) ?: return
if (result.errorMessageId == null) {
SnackbarUtil.show(fragment, messageId)
return
}
if (fragment.parentFragmentManager.findFragmentByTag(ENCRYPTION_KEY_ALERT_DIALOG_TAG) != null) {
return
}

ConfirmationDialogFragment.newInstance(
titleResId = R.string.end_to_end_encryption_title,
titleIconId = R.drawable.ic_lock_open_white,
messageResId = messageId,
positiveButtonTextId = R.string.common_ok,
neutralButtonTextId = NO_BUTTON,
negativeButtonTextId = NO_BUTTON,
messageArguments = null
).show(fragment.parentFragmentManager, ENCRYPTION_KEY_ALERT_DIALOG_TAG)
}
}
Loading