fix(GODT-2802): missing error on unlock failed

Author: cuthix

keyring.go

@@ -12,6 +12,7 @@ import (
 	"github.com/ProtonMail/go-crypto/openpgp/armor"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
 	"github.com/bradenaw/juniper/xslices"
+	"github.com/sirupsen/logrus"
 )
 
 func ExtractSignatures(kr *crypto.KeyRing, arm string) ([]Signature, error) {
@@ -151,6 +152,7 @@ func (keys Keys) Unlock(passphrase []byte, userKR *crypto.KeyRing) (*crypto.KeyR
 	for _, key := range xslices.Filter(keys, func(key Key) bool { return bool(key.Active) }) {
 		unlocked, err := key.Unlock(passphrase, userKR)
 		if err != nil {
+			logrus.WithField("KeyID", key.ID).WithError(err).Warning("Cannot unlock key")
 			continue
 		}
 
@@ -159,6 +161,10 @@ func (keys Keys) Unlock(passphrase []byte, userKR *crypto.KeyRing) (*crypto.KeyR
 		}
 	}
 
+	if kr.CountEntities() == 0 {
+		return nil, errors.New("not able to unlock any key")
+	}
+
 	return kr, nil
 }
 

keyring_test.go

@@ -0,0 +1,47 @@
+package proton
+
+import (
+	"testing"
+
+	"github.com/ProtonMail/gopenpgp/v2/crypto"
+	"github.com/ProtonMail/gopenpgp/v2/helper"
+	"github.com/stretchr/testify/require"
+)
+
+func TestKeyring_Unlock(t *testing.T) {
+	r := require.New(t)
+
+	newKey := func(id, passphrase string) Key {
+		arm, err := helper.GenerateKey(id, id+"@email.com", []byte(passphrase), "rsa", 2048)
+		r.NoError(err)
+
+		privKey, err := crypto.NewKeyFromArmored(arm)
+		r.NoError(err)
+
+		serial, err := privKey.Serialize()
+		r.NoError(err)
+
+		return Key{
+			ID:         id,
+			PrivateKey: serial,
+			Active:     true,
+		}
+	}
+
+	keys := Keys{
+		newKey("1", "good_phrase"),
+		newKey("2", "good_phrase"),
+		newKey("3", "bad_phrase"),
+	}
+
+	_, err := keys.Unlock([]byte("ugly_phrase"), nil)
+	r.Error(err)
+
+	kr, err := keys.Unlock([]byte("bad_phrase"), nil)
+	r.NoError(err)
+	r.Equal(1, kr.CountEntities())
+
+	kr, err = keys.Unlock([]byte("good_phrase"), nil)
+	r.NoError(err)
+	r.Equal(2, kr.CountEntities())
+}