From d8f76b33e9ea74eb567a115dd63559f6b27b2fce Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Mon, 25 Dec 2023 15:36:01 +0530
Subject: fix: check if passphrase is necessary before asking for it

Updates #2836
---
 .../src/main/kotlin/app/passwordstore/crypto/CryptoHandler.kt     | 6 ++++++
 .../src/main/kotlin/app/passwordstore/crypto/PGPKeyManager.kt     | 8 ++++++++
 .../kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt    | 6 ++++++
 3 files changed, 20 insertions(+)

(limited to 'crypto')

diff --git a/crypto/common/src/main/kotlin/app/passwordstore/crypto/CryptoHandler.kt b/crypto/common/src/main/kotlin/app/passwordstore/crypto/CryptoHandler.kt
index 898cf058..20a4d1d9 100644
--- a/crypto/common/src/main/kotlin/app/passwordstore/crypto/CryptoHandler.kt
+++ b/crypto/common/src/main/kotlin/app/passwordstore/crypto/CryptoHandler.kt
@@ -41,4 +41,10 @@ public interface CryptoHandler<Key, EncOpts : CryptoOptions, DecryptOpts : Crypt
 
   /** Given a [fileName], return whether this instance can handle it. */
   public fun canHandle(fileName: String): Boolean
+
+  /**
+   * Inspects the given encrypted [message] to notify user if a passphrase is necessary to decrypt
+   * it.
+   */
+  public fun isPassphraseProtected(message: InputStream): Boolean
 }
diff --git a/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKeyManager.kt b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKeyManager.kt
index 8aa11803..41a797b6 100644
--- a/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKeyManager.kt
+++ b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKeyManager.kt
@@ -139,6 +139,14 @@ constructor(
   /** @see KeyManager.getKeyById */
   override suspend fun getKeyId(key: PGPKey): PGPIdentifier? = tryGetId(key)
 
+  public suspend fun isPasswordProtected(key: PGPKey): Boolean {
+    val keyring = tryParseKeyring(key)
+    if (keyring is PGPSecretKeyRing) {
+      keyring.secretKey.keyEncryptionAlgorithm
+    }
+    return false
+  }
+
   /** Checks if [keyDir] exists and attempts to create it if not. */
   private fun keyDirExists(): Boolean {
     return keyDir.exists() || keyDir.mkdirs()
diff --git a/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt
index a7087acf..72baa81a 100644
--- a/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt
+++ b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt
@@ -22,6 +22,7 @@ import org.bouncycastle.openpgp.PGPSecretKeyRingCollection
 import org.bouncycastle.util.io.Streams
 import org.pgpainless.PGPainless
 import org.pgpainless.decryption_verification.ConsumerOptions
+import org.pgpainless.decryption_verification.MessageInspector
 import org.pgpainless.encryption_signing.EncryptionOptions
 import org.pgpainless.encryption_signing.ProducerOptions
 import org.pgpainless.exception.WrongPassphraseException
@@ -136,4 +137,9 @@ public class PGPainlessCryptoHandler @Inject constructor() :
   public override fun canHandle(fileName: String): Boolean {
     return fileName.substringAfterLast('.', "") == "gpg"
   }
+
+  public override fun isPassphraseProtected(message: InputStream): Boolean {
+    val info = MessageInspector.determineEncryptionInfoForMessage(message)
+    return info.isPassphraseEncrypted
+  }
 }
-- 
cgit v1.2.3