From 705556f13449ff222ce937f2c184aede3cb86234 Mon Sep 17 00:00:00 2001 From: Yakul Garg <2000yeshu@gmail.com> Date: Sat, 12 Aug 2023 23:54:40 +0530 Subject: [PATCH] Check for arguments before opening remote connection in cat command Signed-off-by: Yakul Garg <2000yeshu@gmail.com> --- cmd/restic/cmd_cat.go | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/cmd/restic/cmd_cat.go b/cmd/restic/cmd_cat.go index 7c4373812..237925ee3 100644 --- a/cmd/restic/cmd_cat.go +++ b/cmd/restic/cmd_cat.go @@ -3,6 +3,7 @@ package main import ( "context" "encoding/json" + "strings" "github.com/spf13/cobra" @@ -12,6 +13,8 @@ import ( "github.com/restic/restic/internal/restic" ) +var allowedCmds = []string{"config", "index", "snapshot", "key", "masterkey", "lock", "pack", "blob", "tree"} + var cmdCat = &cobra.Command{ Use: "cat [flags] [masterkey|config|pack ID|blob ID|snapshot ID|index ID|key ID|lock ID|tree snapshot:subfolder]", Short: "Print internal objects to stdout", @@ -33,9 +36,26 @@ func init() { cmdRoot.AddCommand(cmdCat) } +func validateParam(param string) bool { + for _, v := range allowedCmds { + if v == param { + return true + } + } + return false +} + func runCat(ctx context.Context, gopts GlobalOptions, args []string) error { - if len(args) < 1 || (args[0] != "masterkey" && args[0] != "config" && len(args) != 2) { - return errors.Fatal("type or ID not specified") + if len(args) < 1 { + return errors.Fatal("type not specified") + } + + if ok := validateParam(args[0]); !ok { + return errors.Fatalf("invalid type %q, must be one of [%s]", args[0], strings.Join(allowedCmds, "|")) + } + + if args[0] != "masterkey" && args[0] != "config" && len(args) != 2 { + return errors.Fatal("ID not specified") } repo, err := OpenRepository(ctx, gopts)