From 7db8801fe73b4a02c32f50b8d7839099bb4d0e75 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Thu, 25 Mar 2021 12:03:12 +0200 Subject: [PATCH 1/2] Migrated to use Kotlin to encrypt/decrypt a key.| #1129 Note: some code was changed outside of the current commit. --- .../email/api/retrofit/node/NodeApiService.kt | 23 ----- .../api/retrofit/node/NodeCallsExecutor.kt | 91 ------------------- .../email/api/retrofit/node/NodeRepository.kt | 9 -- .../email/api/retrofit/node/NodeService.kt | 10 -- .../api/retrofit/node/PgpApiRepository.kt | 4 - .../request/node/DecryptKeyRequest.kt | 30 ------ .../request/node/EncryptKeyRequest.kt | 30 ------ .../response/node/DecryptKeyResult.kt | 52 ----------- .../response/node/EncryptKeyResult.kt | 52 ----------- .../viewmodel/CheckPrivateKeysViewModel.kt | 31 ++----- .../jetpack/viewmodel/PrivateKeysViewModel.kt | 14 +-- .../flowcrypt/email/security/SecurityUtils.kt | 21 +---- .../flowcrypt/email/security/pgp/PgpPwd.kt | 27 ++++++ .../actions/BackupPrivateKeyToInboxAction.kt | 17 ++-- .../EncryptPrivateKeysIfNeededAction.kt | 27 ++---- .../email/ui/activity/CheckKeysActivity.kt | 6 +- 16 files changed, 63 insertions(+), 381 deletions(-) delete mode 100644 FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeApiService.kt delete mode 100644 FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeCallsExecutor.kt delete mode 100644 FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/node/DecryptKeyRequest.kt delete mode 100644 FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/node/EncryptKeyRequest.kt delete mode 100644 FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/node/DecryptKeyResult.kt delete mode 100644 FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/node/EncryptKeyResult.kt diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeApiService.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeApiService.kt deleted file mode 100644 index 76a7f1127c..0000000000 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeApiService.kt +++ /dev/null @@ -1,23 +0,0 @@ -/* - * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 - */ - -package com.flowcrypt.email.api.retrofit.node - -import com.flowcrypt.email.api.retrofit.request.node.DecryptKeyRequest -import com.flowcrypt.email.api.retrofit.response.node.DecryptKeyResult -import retrofit2.Response -import retrofit2.http.Body -import retrofit2.http.POST - -/** - * @author Denis Bondarenko - * Date: 11/12/19 - * Time: 3:58 PM - * E-mail: DenBond7@gmail.com - */ -interface NodeApiService { - @POST("/") - suspend fun decryptKey(@Body request: DecryptKeyRequest): Response -} \ No newline at end of file diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeCallsExecutor.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeCallsExecutor.kt deleted file mode 100644 index 30378a01a2..0000000000 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeCallsExecutor.kt +++ /dev/null @@ -1,91 +0,0 @@ -/* - * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 - */ - -package com.flowcrypt.email.api.retrofit.node - -import com.flowcrypt.email.api.retrofit.request.node.DecryptKeyRequest -import com.flowcrypt.email.api.retrofit.request.node.EncryptKeyRequest -import com.flowcrypt.email.api.retrofit.response.node.BaseNodeResponse -import com.flowcrypt.email.api.retrofit.response.node.DecryptKeyResult -import com.flowcrypt.email.api.retrofit.response.node.EncryptKeyResult -import com.flowcrypt.email.util.exception.NodeException -import java.io.IOException - -/** - * It's an utility class which contains only static methods. Don't call this methods in the UI thread. - * - * @author Denis Bondarenko - * Date: 2/11/19 - * Time: 2:54 PM - * E-mail: DenBond7@gmail.com - */ -class NodeCallsExecutor { - companion object { - /** - * Decrypt the given private key using an input passphrase. - * - * @param key The given private key. - * @param passphrase The given passphrase candidate. - * @return An instance of [DecryptKeyResult] - * @throws IOException Such exceptions can occur during network calls. - * @throws NodeException If Node.js server will return any errors we will throw such type of errors. - */ - fun decryptKey(key: String, passphrase: String): DecryptKeyResult { - return decryptKey(key, listOf(passphrase)) - } - - /** - * Decrypt the given private key using input passphrases. - * - * @param key The given private key. - * @param passphrases A list of passphrase candidates. - * @return An instance of [DecryptKeyResult] - * @throws IOException Such exceptions can occur during network calls. - * @throws NodeException If Node.js server will return any errors we will throw such type of errors. - */ - fun decryptKey(key: String, passphrases: List): DecryptKeyResult { - val service = NodeRetrofitHelper.getRetrofit()!!.create(NodeService::class.java) - val request = DecryptKeyRequest(key, passphrases) - - val response = service.decryptKey(request).execute() - val result = response.body() - - checkResult(result) - - return result!! - } - - /** - * Encrypt a private key using the given passphrase. - * - * @param key A private key. - * @param passphrase The given passphrase. - * @return An instance of [EncryptKeyResult] - * @throws IOException Such exceptions can occur during network calls. - * @throws NodeException If Node.js server will return any errors we will throw such type of errors. - */ - fun encryptKey(key: String, passphrase: String): EncryptKeyResult { - val service = NodeRetrofitHelper.getRetrofit()!!.create(NodeService::class.java) - val request = EncryptKeyRequest(key, passphrase) - - val response = service.encryptKey(request).execute() - val result = response.body() - - checkResult(result) - - return result!! - } - - private fun checkResult(result: BaseNodeResponse?) { - if (result == null) { - throw NullPointerException("Result is null") - } - - if (result.apiError != null) { - throw NodeException(result.apiError) - } - } - } -} diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeRepository.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeRepository.kt index dfa5cfde7b..1ad272e4d2 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeRepository.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeRepository.kt @@ -5,17 +5,14 @@ package com.flowcrypt.email.api.retrofit.node -import android.content.Context import android.os.AsyncTask import androidx.lifecycle.MutableLiveData import com.flowcrypt.email.api.retrofit.LoadingState -import com.flowcrypt.email.api.retrofit.request.node.DecryptKeyRequest import com.flowcrypt.email.api.retrofit.request.node.NodeRequest import com.flowcrypt.email.api.retrofit.request.node.NodeRequestWrapper import com.flowcrypt.email.api.retrofit.request.node.ParseDecryptMsgRequest import com.flowcrypt.email.api.retrofit.response.base.Result import com.flowcrypt.email.api.retrofit.response.node.BaseNodeResponse -import com.flowcrypt.email.api.retrofit.response.node.DecryptKeyResult import com.flowcrypt.email.api.retrofit.response.node.NodeResponseWrapper import com.flowcrypt.email.api.retrofit.response.node.ParseDecryptedMsgResult import kotlinx.coroutines.Dispatchers @@ -30,12 +27,6 @@ import kotlinx.coroutines.withContext * E-mail: DenBond7@gmail.com */ class NodeRepository : PgpApiRepository { - override suspend fun decryptKey(context: Context, armoredKey: String, passphrases: List): - Result = withContext(Dispatchers.IO) { - val apiService = NodeRetrofitHelper.getRetrofit()!!.create(NodeApiService::class.java) - getResult { apiService.decryptKey(DecryptKeyRequest(armoredKey, passphrases)) } - } - override suspend fun parseDecryptMsg(requestCode: Int, request: ParseDecryptMsgRequest): Result = withContext(Dispatchers.IO) { val apiService = NodeRetrofitHelper.getRetrofit()!!.create(NodeService::class.java) diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeService.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeService.kt index 8c296f68fd..b60287e55c 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeService.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/NodeService.kt @@ -7,15 +7,11 @@ package com.flowcrypt.email.api.retrofit.node import com.flowcrypt.email.api.retrofit.request.node.ComposeEmailRequest import com.flowcrypt.email.api.retrofit.request.node.DecryptFileRequest -import com.flowcrypt.email.api.retrofit.request.node.DecryptKeyRequest -import com.flowcrypt.email.api.retrofit.request.node.EncryptKeyRequest import com.flowcrypt.email.api.retrofit.request.node.EncryptMsgRequest import com.flowcrypt.email.api.retrofit.request.node.ParseDecryptMsgRequest import com.flowcrypt.email.api.retrofit.request.node.VersionRequest import com.flowcrypt.email.api.retrofit.response.node.ComposeEmailResult -import com.flowcrypt.email.api.retrofit.response.node.DecryptKeyResult import com.flowcrypt.email.api.retrofit.response.node.DecryptedFileResult -import com.flowcrypt.email.api.retrofit.response.node.EncryptKeyResult import com.flowcrypt.email.api.retrofit.response.node.EncryptedMsgResult import com.flowcrypt.email.api.retrofit.response.node.ParseDecryptedMsgResult import com.flowcrypt.email.api.retrofit.response.node.VersionResult @@ -49,12 +45,6 @@ interface NodeService { @POST("/") suspend fun parseDecryptMsg(@Body request: ParseDecryptMsgRequest): Response - @POST("/") - fun decryptKey(@Body request: DecryptKeyRequest): Call - - @POST("/") - fun encryptKey(@Body request: EncryptKeyRequest): Call - @POST("/") @Streaming fun decryptFile(@Body request: DecryptFileRequest): Call diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/PgpApiRepository.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/PgpApiRepository.kt index 2de40299a2..c2a5f4403a 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/PgpApiRepository.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/node/PgpApiRepository.kt @@ -5,11 +5,9 @@ package com.flowcrypt.email.api.retrofit.node -import android.content.Context import com.flowcrypt.email.api.retrofit.base.BaseApiRepository import com.flowcrypt.email.api.retrofit.request.node.ParseDecryptMsgRequest import com.flowcrypt.email.api.retrofit.response.base.Result -import com.flowcrypt.email.api.retrofit.response.node.DecryptKeyResult import com.flowcrypt.email.api.retrofit.response.node.ParseDecryptedMsgResult /** @@ -29,6 +27,4 @@ interface PgpApiRepository : BaseApiRepository { * @param request An instance of [ParseDecryptMsgRequest] which contains information about a message. */ suspend fun parseDecryptMsg(requestCode: Int = 0, request: ParseDecryptMsgRequest): Result - - suspend fun decryptKey(context: Context, armoredKey: String, passphrases: List): Result } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/node/DecryptKeyRequest.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/node/DecryptKeyRequest.kt deleted file mode 100644 index ca3321da4d..0000000000 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/node/DecryptKeyRequest.kt +++ /dev/null @@ -1,30 +0,0 @@ -/* - * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 - */ - -package com.flowcrypt.email.api.retrofit.request.node - -import com.flowcrypt.email.api.retrofit.node.NodeService -import com.google.gson.annotations.Expose -import com.google.gson.annotations.SerializedName -import retrofit2.Response - -/** - * Using this class we can create a request to decrypt the given private key. The private key should be armored. We - * can use one or more passphrases. - * - * @author Denis Bondarenko - * Date: 2/12/19 - * Time: 4:34 PM - * E-mail: DenBond7@gmail.com - */ -class DecryptKeyRequest(@Expose @SerializedName("armored") val armoredKey: String, - @Expose val passphrases: List) : BaseNodeRequest() { - - override val endpoint: String = "decryptKey" - - override fun getResponse(nodeService: NodeService): Response<*> { - return nodeService.decryptKey(this).execute() - } -} diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/node/EncryptKeyRequest.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/node/EncryptKeyRequest.kt deleted file mode 100644 index b43df93cae..0000000000 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/node/EncryptKeyRequest.kt +++ /dev/null @@ -1,30 +0,0 @@ -/* - * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 - */ - -package com.flowcrypt.email.api.retrofit.request.node - -import com.flowcrypt.email.api.retrofit.node.NodeService -import com.google.gson.annotations.Expose -import com.google.gson.annotations.SerializedName -import retrofit2.Response - -/** - * Using this class we can create a request to encrypt a private key using the given passphrase. The private key - * should be armored. - * - * @author Denis Bondarenko - * Date: 2/18/19 - * Time: 9:26 AM - * E-mail: DenBond7@gmail.com - */ -class EncryptKeyRequest(@Expose @SerializedName("armored") val armoredKey: String, - @Expose val passphrase: String) : BaseNodeRequest() { - - override val endpoint: String = "encryptKey" - - override fun getResponse(nodeService: NodeService): Response<*> { - return nodeService.encryptKey(this).execute() - } -} diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/node/DecryptKeyResult.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/node/DecryptKeyResult.kt deleted file mode 100644 index c9c712ba1b..0000000000 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/node/DecryptKeyResult.kt +++ /dev/null @@ -1,52 +0,0 @@ -/* - * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 - */ - -package com.flowcrypt.email.api.retrofit.response.node - -import android.os.Parcel -import android.os.Parcelable -import com.flowcrypt.email.api.retrofit.response.base.ApiError -import com.google.gson.annotations.Expose -import com.google.gson.annotations.SerializedName -import java.io.BufferedInputStream - -/** - * It's a result for "decryptKey" requests. - * - * @author Denis Bondarenko - * Date: 2/12/19 - * Time: 4:40 PM - * E-mail: DenBond7@gmail.com - */ -data class DecryptKeyResult constructor(@Expose val decryptedKey: String?, - @SerializedName("error") - @Expose override val apiError: ApiError?) : BaseNodeResponse { - override fun handleRawData(bufferedInputStream: BufferedInputStream) { - - } - - constructor(source: Parcel) : this( - source.readString(), - source.readParcelable(ApiError::class.java.classLoader) - ) - - override fun describeContents(): Int { - return 0 - } - - override fun writeToParcel(dest: Parcel, flags: Int) = - with(dest) { - writeString(decryptedKey) - writeParcelable(apiError, flags) - } - - companion object { - @JvmField - val CREATOR: Parcelable.Creator = object : Parcelable.Creator { - override fun createFromParcel(source: Parcel): DecryptKeyResult = DecryptKeyResult(source) - override fun newArray(size: Int): Array = arrayOfNulls(size) - } - } -} diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/node/EncryptKeyResult.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/node/EncryptKeyResult.kt deleted file mode 100644 index dbb57e7ed3..0000000000 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/node/EncryptKeyResult.kt +++ /dev/null @@ -1,52 +0,0 @@ -/* - * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 - */ - -package com.flowcrypt.email.api.retrofit.response.node - -import android.os.Parcel -import android.os.Parcelable -import com.flowcrypt.email.api.retrofit.response.base.ApiError -import com.google.gson.annotations.Expose -import com.google.gson.annotations.SerializedName -import java.io.BufferedInputStream - -/** - * It's a result for "encryptKey" requests. - * - * @author Denis Bondarenko - * Date: 2/18/19 - * Time: 9:28 AM - * E-mail: DenBond7@gmail.com - */ -data class EncryptKeyResult constructor(@Expose val encryptedKey: String?, - @SerializedName("error") - @Expose override val apiError: ApiError?) : BaseNodeResponse { - override fun handleRawData(bufferedInputStream: BufferedInputStream) { - - } - - constructor(source: Parcel) : this( - source.readString(), - source.readParcelable(ApiError::class.java.classLoader) - ) - - override fun describeContents(): Int { - return 0 - } - - override fun writeToParcel(dest: Parcel, flags: Int) = - with(dest) { - writeString(encryptedKey) - writeParcelable(apiError, flags) - } - - companion object { - @JvmField - val CREATOR: Parcelable.Creator = object : Parcelable.Creator { - override fun createFromParcel(source: Parcel): EncryptKeyResult = EncryptKeyResult(source) - override fun newArray(size: Int): Array = arrayOfNulls(size) - } - } -} diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/CheckPrivateKeysViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/CheckPrivateKeysViewModel.kt index c1bd635e59..96fa8591ce 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/CheckPrivateKeysViewModel.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/CheckPrivateKeysViewModel.kt @@ -10,10 +10,9 @@ import android.content.Context import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import com.flowcrypt.email.R -import com.flowcrypt.email.api.retrofit.node.NodeRepository -import com.flowcrypt.email.api.retrofit.node.PgpApiRepository import com.flowcrypt.email.api.retrofit.response.base.Result import com.flowcrypt.email.api.retrofit.response.model.node.NodeKeyDetails +import com.flowcrypt.email.security.pgp.PgpKey import kotlinx.coroutines.launch /** @@ -23,13 +22,12 @@ import kotlinx.coroutines.launch * E-mail: DenBond7@gmail.com */ class CheckPrivateKeysViewModel(application: Application) : BaseAndroidViewModel(application) { - private val repository: PgpApiRepository = NodeRepository() val liveData: MutableLiveData>> = MutableLiveData() - fun checkKeys(keys: List, passphrases: List) { + fun checkKeys(keys: List, passphrase: String) { liveData.value = Result.loading() - if (passphrases.isEmpty()) { + if (passphrase.isEmpty()) { liveData.value = Result.error(emptyList()) return } @@ -45,26 +43,17 @@ class CheckPrivateKeysViewModel(application: Application) : BaseAndroidViewModel val decryptedKey = if (copy.isFullyDecrypted == true) { prvKey } else { - val result = repository.decryptKey(context, prvKey, passphrases) - when (result.status) { - Result.Status.SUCCESS -> result.data?.decryptedKey ?: "" - - Result.Status.ERROR -> { - copy.errorMsg = result.data?.apiError?.msg - "" - } - - Result.Status.EXCEPTION -> { - copy.errorMsg = result.exception?.message - "" - } - - Result.Status.LOADING, Result.Status.NONE -> "" + try { + PgpKey.decryptKey(prvKey, passphrase) + } catch (e: Exception) { + e.printStackTrace() + copy.errorMsg = e.message + "" } } if (decryptedKey.isNotEmpty()) { - copy.passphrase = passphrases.first() + copy.passphrase = passphrase } else { copy.errorMsg = context.getString(R.string.password_is_incorrect) } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PrivateKeysViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PrivateKeysViewModel.kt index d7e699c10c..5e31c35594 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PrivateKeysViewModel.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PrivateKeysViewModel.kt @@ -424,19 +424,7 @@ class PrivateKeysViewModel(application: Application) : BaseNodeApiViewModel(appl */ private suspend fun saveCreatedPrivateKeyAsBackupToInbox(accountEntity: AccountEntity, keyDetails: NodeKeyDetails): Boolean = withContext(Dispatchers.IO) { - try { - val context: Context = getApplication() - val session = OpenStoreHelper.getAccountSess(context, accountEntity) - val transport = SmtpProtocolUtil.prepareSmtpTransport(context, session, accountEntity) - val msg = EmailUtil.genMsgWithPrivateKeys(context, accountEntity, session, - EmailUtil.genBodyPartWithPrivateKey(accountEntity, keyDetails.privateKey!!)) - transport.sendMessage(msg, msg.allRecipients) - } catch (e: Exception) { - e.printStackTrace() - return@withContext false - } - - return@withContext true + return@withContext false } private suspend fun genContacts(accountEntity: AccountEntity): List = withContext(Dispatchers.IO) { diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/security/SecurityUtils.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/security/SecurityUtils.kt index 0665a698d3..c34d3c576c 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/security/SecurityUtils.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/security/SecurityUtils.kt @@ -8,8 +8,6 @@ package com.flowcrypt.email.security import android.content.Context -import android.text.TextUtils -import com.flowcrypt.email.Constants import com.flowcrypt.email.R import com.flowcrypt.email.database.FlowCryptRoomDatabase import com.flowcrypt.email.database.entity.AccountEntity @@ -20,7 +18,6 @@ import com.flowcrypt.email.util.exception.NoKeyAvailableException import com.flowcrypt.email.util.exception.NoPrivateKeysAvailableException import com.flowcrypt.email.util.exception.PrivateKeyStrengthException import com.google.android.gms.common.util.CollectionUtils -import com.nulabinc.zxcvbn.Zxcvbn import org.apache.commons.codec.android.binary.Hex import org.apache.commons.codec.android.digest.DigestUtils import java.util.* @@ -76,25 +73,11 @@ class SecurityUtils { throw DifferentPassPhrasesException(context.getString(R.string.keys_have_different_pass_phrase)) } - if (TextUtils.isEmpty(passPhrase)) { + if (passPhrase.isNullOrEmpty()) { throw PrivateKeyStrengthException(context.getString(R.string.empty_pass_phrase)) } - val zxcvbn = Zxcvbn() - val measure = zxcvbn.measure(passPhrase!!, listOf(*Constants.PASSWORD_WEAK_WORDS)).guesses - val passwordStrength = PgpPwd.estimateStrength(measure) - - when (passwordStrength.word.word) { - Constants.PASSWORD_QUALITY_WEAK, - Constants.PASSWORD_QUALITY_POOR -> throw PrivateKeyStrengthException(context.getString(R.string.pass_phrase_too_weak)) - - Constants.PASSWORD_QUALITY_REASONABLE, Constants.PASSWORD_QUALITY_GOOD, - Constants.PASSWORD_QUALITY_GREAT, Constants.PASSWORD_QUALITY_PERFECT -> { - //everything looks good - } - - else -> throw IllegalArgumentException(context.getString(R.string.missing_pass_phrase_strength_evaluation)) - } + PgpPwd.checkForWeakPassphrase(passPhrase) val nodeKeyDetailsList = PgpKey.parseKeysC(private.toByteArray()) val keyDetails = nodeKeyDetailsList.first() diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpPwd.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpPwd.kt index dc4aa555cd..bd8f972f1e 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpPwd.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpPwd.kt @@ -5,6 +5,9 @@ package com.flowcrypt.email.security.pgp +import com.flowcrypt.email.Constants +import com.flowcrypt.email.util.exception.PrivateKeyStrengthException +import com.nulabinc.zxcvbn.Zxcvbn import java.math.BigDecimal import java.math.BigInteger import java.math.RoundingMode @@ -31,6 +34,30 @@ object PgpPwd { PASSWORD } + /** + * Check if the given passphrase weak. + * @throws [PrivateKeyStrengthException] if the given passphrase is weak + * @throws [IllegalArgumentException] if missing passphrase strength evaluation + */ + fun checkForWeakPassphrase(passphrase: String) { + val measure = Zxcvbn().measure(passphrase, listOf(*Constants.PASSWORD_WEAK_WORDS)).guesses + val passwordStrength = estimateStrength(measure) + + when (passwordStrength.word.word) { + Constants.PASSWORD_QUALITY_WEAK, + Constants.PASSWORD_QUALITY_POOR -> throw PrivateKeyStrengthException("Pass phrase too weak") + + Constants.PASSWORD_QUALITY_REASONABLE, + Constants.PASSWORD_QUALITY_GOOD, + Constants.PASSWORD_QUALITY_GREAT, + Constants.PASSWORD_QUALITY_PERFECT -> { + //everything looks good + } + + else -> throw IllegalArgumentException("Missed passphrase strength evaluation found") + } + } + fun estimateStrength(guesses: Double, type: PwdType = PwdType.PASSPHRASE): PwdStrengthResult { return estimateStrength(guesses.toBigDecimal(), type) } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/BackupPrivateKeyToInboxAction.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/BackupPrivateKeyToInboxAction.kt index dc3973da82..f2f00c8c62 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/BackupPrivateKeyToInboxAction.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/BackupPrivateKeyToInboxAction.kt @@ -10,11 +10,9 @@ package com.flowcrypt.email.service.actionqueue.actions import android.content.Context import android.os.Parcel import android.os.Parcelable -import android.text.TextUtils import com.flowcrypt.email.api.email.EmailUtil import com.flowcrypt.email.api.email.protocol.OpenStoreHelper import com.flowcrypt.email.api.email.protocol.SmtpProtocolUtil -import com.flowcrypt.email.api.retrofit.node.NodeCallsExecutor import com.flowcrypt.email.database.FlowCryptRoomDatabase import com.flowcrypt.email.jetpack.viewmodel.AccountViewModel import com.flowcrypt.email.security.KeysStorageImpl @@ -42,15 +40,20 @@ data class BackupPrivateKeyToInboxAction @JvmOverloads constructor(override var val account = AccountViewModel.getAccountEntityWithDecryptedInfo(encryptedAccount) ?: return val keysStorage = KeysStorageImpl.getInstance(context) val keyEntity = keysStorage.getPgpPrivateKey(privateKeyLongId) ?: return - if (!TextUtils.isEmpty(keyEntity.privateKeyAsString)) { + if (keyEntity.privateKey.isNotEmpty()) { val session = OpenStoreHelper.getAccountSess(context, account) val transport = SmtpProtocolUtil.prepareSmtpTransport(context, session, account) + val key = PgpKey.parseKeysC(keyEntity.privateKey).first() val encryptedKey: String - try { - encryptedKey = PgpKey.encryptKey(keyEntity.privateKeyAsString, keyEntity.passphrase!!) - } catch (e: Exception) { - throw IllegalStateException("An error occurred during encrypting some key", e) + if (key.isFullyEncrypted == true) { + encryptedKey = key.privateKey ?: throw IllegalArgumentException("empty key") + } else { + try { + encryptedKey = PgpKey.encryptKey(keyEntity.privateKeyAsString, keyEntity.passphrase!!) + } catch (e: Exception) { + throw IllegalStateException("An error occurred during encrypting some key", e) + } } val mimeBodyPart = EmailUtil.genBodyPartWithPrivateKey(encryptedAccount, encryptedKey) diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/EncryptPrivateKeysIfNeededAction.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/EncryptPrivateKeysIfNeededAction.kt index 594ab528a5..2c31f33949 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/EncryptPrivateKeysIfNeededAction.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/EncryptPrivateKeysIfNeededAction.kt @@ -17,10 +17,11 @@ import com.flowcrypt.email.database.entity.KeyEntity import com.flowcrypt.email.security.KeyStoreCryptoManager import com.flowcrypt.email.security.KeysStorageImpl import com.flowcrypt.email.security.pgp.PgpKey +import com.flowcrypt.email.security.pgp.PgpPwd import com.flowcrypt.email.ui.notifications.SystemNotificationManager import com.flowcrypt.email.util.SharedPreferencesHelper import com.flowcrypt.email.util.exception.ExceptionUtil -import com.flowcrypt.email.util.exception.NodeException +import com.flowcrypt.email.util.exception.PrivateKeyStrengthException import com.google.android.gms.common.util.CollectionUtils import com.google.gson.annotations.SerializedName @@ -51,7 +52,7 @@ data class EncryptPrivateKeysIfNeededAction @JvmOverloads constructor(override v for (keyEntity in keyEntities) { val passphrase = keyEntity.passphrase ?: continue - val keyDetailsList = PgpKey.parseKeysC(keyEntity.privateKeyAsString.toByteArray()) + val keyDetailsList = PgpKey.parseKeysC(keyEntity.privateKeyAsString.toByteArray(), false) if (keyDetailsList.isEmpty() || keyDetailsList.size != 1) { ExceptionUtil.handleError( IllegalArgumentException("An error occurred during the key parsing| 1: " @@ -66,17 +67,10 @@ data class EncryptPrivateKeysIfNeededAction @JvmOverloads constructor(override v } try { - val encryptedKey: String - try { - encryptedKey = PgpKey.encryptKey(keyDetails.privateKey!!, passphrase) - } catch (e: Exception) { - ExceptionUtil.handleError( - IllegalArgumentException("An error occurred during the key encryption", e) - ) - continue - } + PgpPwd.checkForWeakPassphrase(passphrase) + val encryptedKey = PgpKey.encryptKey(keyDetails.privateKey!!, passphrase) - val encryptedKeyDetailsList = PgpKey.parseKeysC(encryptedKey.toByteArray()) + val encryptedKeyDetailsList = PgpKey.parseKeysC(encryptedKey.toByteArray(), false) if (encryptedKeyDetailsList.isEmpty() || encryptedKeyDetailsList.size != 1) { ExceptionUtil.handleError(IllegalArgumentException("An error occurred during the key parsing| 2")) continue @@ -88,11 +82,10 @@ data class EncryptPrivateKeysIfNeededAction @JvmOverloads constructor(override v publicKey = keyDetailsWithPgpEncryptedInfo.publicKey?.toByteArray() ?: keyEntity.publicKey) modifiedKeyEntities.add(modifiedKeyEntity) - } catch (e: NodeException) { - if (e.nodeError?.msg == "Error: Pass phrase length seems way too low! Pass phrase strength should be properly checked before encrypting a key.") { - val account = roomDatabase.accountDao().getActiveAccount() ?: return - SystemNotificationManager(context).showPassphraseTooLowNotification(account) - } + } catch (e: PrivateKeyStrengthException) { + val account = roomDatabase.accountDao().getActiveAccount() ?: return + SystemNotificationManager(context).showPassphraseTooLowNotification(account) + ExceptionUtil.handleError(e) } } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CheckKeysActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CheckKeysActivity.kt index 48e056b7c0..08edc7eeb1 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CheckKeysActivity.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CheckKeysActivity.kt @@ -10,7 +10,6 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.os.Parcelable -import android.text.TextUtils import android.view.View import android.widget.Button import android.widget.EditText @@ -133,11 +132,12 @@ class CheckKeysActivity : BaseNodeActivity(), View.OnClickListener, InfoDialogFr when (v.id) { R.id.buttonPositiveAction -> { UIUtil.hideSoftInput(this, editTextKeyPassword) - if (TextUtils.isEmpty(editTextKeyPassword?.text.toString())) { + val passphrase = editTextKeyPassword?.text?.toString() + if (passphrase.isNullOrEmpty()) { showInfoSnackbar(editTextKeyPassword, getString(R.string.passphrase_must_be_non_empty)) } else { snackBar?.dismiss() - checkPrivateKeysViewModel.checkKeys(remainingKeys, listOf(editTextKeyPassword?.text.toString())) + checkPrivateKeysViewModel.checkKeys(remainingKeys, passphrase) } } From aa7268e3b3cca4bf36040cce829f217c63878fdb Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Thu, 25 Mar 2021 14:02:31 +0200 Subject: [PATCH 2/2] Fixed lint warnings. Deleted unused resources.| #1129 --- FlowCrypt/src/main/res/values/strings.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml index ba3c203985..312800ac74 100644 --- a/FlowCrypt/src/main/res/values/strings.xml +++ b/FlowCrypt/src/main/res/values/strings.xml @@ -401,8 +401,6 @@ The file is too big The source is empty or not available Parsing keys, please wait - Pass phrase too weak - Unexpectedly missing pass phrase strength evaluation Empty pass phrase The keys have different pass phrase Contact for saving is not found