fix: check multisig key list to prevent unexpected key deletion

CHANGELOG.md

@@ -114,6 +114,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/foundation) [\#732](https://github.com/line/lbm-sdk/pull/732) add verification on accounts into x/foundation Grants cli
 * (x/foundation) [\#730](https://github.com/line/lbm-sdk/pull/730) prune stale x/foundation proposals at voting period end
 * (cli) [\#734](https://github.com/line/lbm-sdk/pull/734) add restrictions on the number of args in the CLIs
+* (client) [\#737](https://github.com/line/lbm-sdk/pull/737) check multisig key list to prevent unexpected key deletion
 
 ### Breaking Changes
 * (proto) [\#564](https://github.com/line/lbm-sdk/pull/564) change gRPC path to original cosmos path

client/keys/add.go

@@ -8,7 +8,7 @@ import (
 	"math"
 	"sort"
 
-	bip39 "github.com/cosmos/go-bip39"
+	"github.com/cosmos/go-bip39"
 	"github.com/spf13/cobra"
 
 	"github.com/line/lbm-sdk/client"
@@ -95,15 +95,17 @@ func runAddCmdPrepare(cmd *cobra.Command, args []string) error {
 
 /*
 input
-	- bip39 mnemonic
-	- bip39 passphrase
-	- bip44 path
-	- local encryption password
+  - bip39 mnemonic
+  - bip39 passphrase
+  - bip44 path
+  - local encryption password
+
 output
-	- armor encrypted private key (saved to file)
+  - armor encrypted private key (saved to file)
 */
 func runAddCmd(ctx client.Context, cmd *cobra.Command, args []string, inBuf *bufio.Reader) error {
 	var err error
+	var multisigThreshold int
 
 	name := args[0]
 	interactive, _ := cmd.Flags().GetBool(flagInteractive)
@@ -118,6 +120,18 @@ func runAddCmd(ctx client.Context, cmd *cobra.Command, args []string, inBuf *buf
 	if err != nil {
 		return err
 	}
+	multisigKeys, _ := cmd.Flags().GetStringSlice(flagMultisig)
+	if len(multisigKeys) != 0 {
+		multisigThreshold, _ = cmd.Flags().GetInt(flagMultiSigThreshold)
+		if err = validateMultisigThreshold(multisigThreshold, len(multisigKeys)); err != nil {
+			return err
+		}
+
+		err = verifyMultisigTarget(kb, multisigKeys, name)
+		if err != nil {
+			return err
+		}
+	}
 
 	if dryRun, _ := cmd.Flags().GetBool(flags.FlagDryRun); dryRun {
 		// use in memory keybase
@@ -141,13 +155,8 @@ func runAddCmd(ctx client.Context, cmd *cobra.Command, args []string, inBuf *buf
 			}
 		}
 
-		multisigKeys, _ := cmd.Flags().GetStringSlice(flagMultisig)
 		if len(multisigKeys) != 0 {
 			pks := make([]cryptotypes.PubKey, len(multisigKeys))
-			multisigThreshold, _ := cmd.Flags().GetInt(flagMultiSigThreshold)
-			if err := validateMultisigThreshold(multisigThreshold, len(multisigKeys)); err != nil {
-				return err
-			}
 
 			for i, keyname := range multisigKeys {
 				k, err := kb.Key(keyname)
@@ -327,3 +336,32 @@ func printCreate(cmd *cobra.Command, info keyring.Info, showMnemonic bool, mnemo
 
 	return nil
 }
+
+func verifyMultisigTarget(kb keyring.Keyring, multisigKeys []string, newkey string) error {
+	kl, err := kb.List()
+	if err != nil {
+		return err
+	}
+
+	kmap := make(map[string]bool)
+	for i := 0; i < len(kl); i++ {
+		kmap[kl[i].GetName()] = true
+	}
+
+	if _, ok := kmap[newkey]; ok {
+		return errors.New("you cannot specify a new key as one of the names of the keys that make up a multisig")
+	}
+
+	cnt := 0
+	for _, k := range multisigKeys {
+		if _, ok := kmap[k]; ok {
+			cnt++
+		}
+	}
+
+	if cnt != len(multisigKeys) {
+		return errors.New("part of the multisig target key does not exist")
+	}
+
+	return nil
+}

client/keys/add_test.go

@@ -7,7 +7,8 @@ import (
 	"io"
 	"testing"
 
-	bip39 "github.com/cosmos/go-bip39"
+	"github.com/cosmos/go-bip39"
+	"github.com/spf13/pflag"
 	"github.com/stretchr/testify/require"
 
 	"github.com/line/ostracon/libs/cli"
@@ -32,8 +33,9 @@ func Test_runAddCmdBasic(t *testing.T) {
 	kb, err := keyring.New(sdk.KeyringServiceName(), keyring.BackendTest, kbHome, mockIn)
 	require.NoError(t, err)
 
-	clientCtx := client.Context{}.WithKeyringDir(kbHome).WithInput(mockIn)
-	ctx := context.WithValue(context.Background(), client.ClientContextKey, &clientCtx)
+	clientCtx := client.Context{}.WithKeyringDir(kbHome).WithInput(mockIn).WithKeyring(kb)
+	clientCtxPtr := &clientCtx
+	ctx := context.WithValue(context.Background(), client.ClientContextKey, clientCtxPtr)
 
 	t.Cleanup(func() {
 		_ = kb.Delete("keyname1")
@@ -62,7 +64,6 @@ func Test_runAddCmdBasic(t *testing.T) {
 	})
 
 	require.NoError(t, cmd.ExecuteContext(ctx))
-	require.Error(t, cmd.ExecuteContext(ctx))
 
 	mockIn.Reset("y\n")
 	require.NoError(t, cmd.ExecuteContext(ctx))
@@ -76,7 +77,58 @@ func Test_runAddCmdBasic(t *testing.T) {
 	})
 
 	require.NoError(t, cmd.ExecuteContext(ctx))
-	require.Error(t, cmd.ExecuteContext(ctx))
+
+	// In Multisig
+	tcs := []struct {
+		args []string
+		err  string
+	}{
+		{[]string{
+			"keyname1",
+			fmt.Sprintf("--%s=%s", flags.FlagHome, kbHome),
+			fmt.Sprintf("--%s=%s", cli.OutputFlag, OutputFormatText),
+			fmt.Sprintf("--%s=%s", flags.FlagKeyAlgorithm, string(hd.Secp256k1Type)),
+			fmt.Sprintf("--%s=%s", flags.FlagKeyringBackend, keyring.BackendTest),
+			fmt.Sprintf("--%s=%s", "multisig", "keyname1,keyname2"),
+		},
+			"you cannot specify a new key as one of the names of the keys that make up a multisig",
+		},
+		{[]string{
+			"keyname-multi",
+			fmt.Sprintf("--%s=%s", flags.FlagHome, kbHome),
+			fmt.Sprintf("--%s=%s", cli.OutputFlag, OutputFormatText),
+			fmt.Sprintf("--%s=%s", flags.FlagKeyAlgorithm, string(hd.Secp256k1Type)),
+			fmt.Sprintf("--%s=%s", flags.FlagKeyringBackend, keyring.BackendTest),
+			fmt.Sprintf("--%s=%s", "multisig", "keyname1,keyname11"),
+		},
+			"part of the multisig target key does not exist",
+		},
+		{[]string{
+			"keyname-multi",
+			fmt.Sprintf("--%s=%s", flags.FlagHome, kbHome),
+			fmt.Sprintf("--%s=%s", cli.OutputFlag, OutputFormatText),
+			fmt.Sprintf("--%s=%s", flags.FlagKeyAlgorithm, string(hd.Secp256k1Type)),
+			fmt.Sprintf("--%s=%s", flags.FlagKeyringBackend, keyring.BackendTest),
+			fmt.Sprintf("--%s=%s", "multisig", "keyname1,keyname2"),
+		},
+			"",
+		},
+	}
+
+	for _, tc := range tcs {
+		cmd.SetArgs(tc.args)
+		if tc.err != "" {
+			require.Contains(t, cmd.ExecuteContext(ctx).Error(), tc.err)
+		} else {
+			require.NoError(t, cmd.ExecuteContext(ctx))
+		}
+
+		cmd.Flags().Visit(func(f *pflag.Flag) {
+			if f.Name == "multisig" {
+				f.Value.(pflag.SliceValue).Replace([]string{})
+			}
+		})
+	}
 
 	cmd.SetArgs([]string{
 		"keyname5",
@@ -85,7 +137,7 @@ func Test_runAddCmdBasic(t *testing.T) {
 		fmt.Sprintf("--%s=%s", cli.OutputFlag, OutputFormatText),
 		fmt.Sprintf("--%s=%s", flags.FlagKeyAlgorithm, string(hd.Secp256k1Type)),
 	})
-
+	mockIn.Reset("\n")
 	require.NoError(t, cmd.ExecuteContext(ctx))
 
 	// In recovery mode