Skip to content

Refactored code to use PGPainless/WrongPassphraseException #1240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomholub merged 1 commit into from
May 19, 2021
Merged

Refactored code to use PGPainless/WrongPassphraseException #1240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpDecrypt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import org.pgpainless.PGPainless
import org.pgpainless.decryption_verification.OpenPgpMetadata
import org.pgpainless.exception.MessageNotIntegrityProtectedException
import org.pgpainless.exception.ModificationDetectionException
import org.pgpainless.exception.WrongPassphraseException
import org.pgpainless.key.protection.SecretKeyRingProtector
import java.io.InputStream
import java.io.OutputStream
Expand Down Expand Up @@ -53,21 +54,8 @@ object PgpDecrypt {

private fun processDecryptionException(e: Exception): Exception {
return when (e) {
is PGPException -> {
when {
e.message == "checksum mismatch at 0 of 20" -> {
DecryptionException(DecryptionErrorType.WRONG_PASSPHRASE, e)
}

e.message?.contains("exception decrypting session info") == true
|| e.message?.contains("encoded length out of range") == true
|| e.message?.contains("Exception recovering session info") == true
|| e.message?.contains("No suitable decryption key") == true -> {
DecryptionException(DecryptionErrorType.KEY_MISMATCH, e)
}

else -> DecryptionException(DecryptionErrorType.OTHER, e)
}
is WrongPassphraseException -> {
DecryptionException(DecryptionErrorType.WRONG_PASSPHRASE, e)
}

is MessageNotIntegrityProtectedException -> {
Expand All @@ -84,6 +72,19 @@ object PgpDecrypt {

is DecryptionException -> e

is PGPException -> {
when {
e.message?.contains("exception decrypting session info") == true
|| e.message?.contains("encoded length out of range") == true
|| e.message?.contains("Exception recovering session info") == true
|| e.message?.contains("No suitable decryption key") == true -> {
DecryptionException(DecryptionErrorType.KEY_MISMATCH, e)
}

else -> DecryptionException(DecryptionErrorType.OTHER, e)
}
}

else -> DecryptionException(DecryptionErrorType.OTHER, e)
}
}
Expand Down