Merge pull request #41 from GGP1/enhancements_and_fixes

Enhancements and fixes

Author: GGP1

.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: 1.23
 
       - name: Run tests
         run: go test ./... -race

.goreleaser.yml

@@ -5,7 +5,7 @@ before:
     - go mod tidy
 builds:
   -
-    ldflags: -s -w -X main.version={{ .Version }} -X main.commit={{ .ShortCommit }} -X main.date={{ .CommitDate }}
+    ldflags: -s -w -X main.version={{ .Tag }} -X main.commit={{ .ShortCommit }} -X main.date={{ .CommitDate }}
     mod_timestamp: "{{ .CommitTimestamp }}"
     flags:
       - -trimpath

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22-alpine3.20 as builder
+FROM golang:1.23-alpine3.20 as builder
 
 WORKDIR /kure
 

Dockerfile.secure

@@ -1,4 +1,4 @@
-FROM golang:1.22-alpine3.20 as builder
+FROM golang:1.23-alpine3.20 as builder
 
 WORKDIR /kure
 

commands/2fa/2fa.go

@@ -52,10 +52,6 @@ Use the [-i info] flag to display information about the setup key, it also gener
 		Example: example,
 		Args:    cmdutil.MustExistLs(db, cmdutil.TOTP),
 		RunE:    run2FA(db, &opts),
-		PostRun: func(cmd *cobra.Command, args []string) {
-			// Reset variables (session)
-			opts = tfaOptions{}
-		},
 	}
 
 	cmd.AddCommand(add.NewCmd(db, os.Stdin), rm.NewCmd(db, os.Stdin))
@@ -65,6 +61,12 @@ Use the [-i info] flag to display information about the setup key, it also gener
 	f.BoolVarP(&opts.info, "info", "i", false, "display information about the setup key")
 	f.DurationVarP(&opts.timeout, "timeout", "t", 0, "clipboard clearing timeout")
 
+	cmd.PostRun = func(cmd *cobra.Command, args []string) {
+		// Reset variables (session)
+		opts = tfaOptions{}
+		f.Lookup("timeout").Changed = false
+	}
+
 	return cmd
 }
 

commands/2fa/rm/rm.go

@@ -14,33 +14,55 @@ import (
 )
 
 const example = `
-kure 2fa rm Sample`
+* Remove a TOTP
+kure 2fa rm Sample
+
+* Remove a directory
+kure 2fa rm SampleDir/
+
+* Remove multiple totp
+kure 2fa rm Sample Sample2 Sample3`
 
 // NewCmd returns the a new command.
 func NewCmd(db *bolt.DB, r io.Reader) *cobra.Command {
 	return &cobra.Command{
-		Use:     "rm <name>",
-		Short:   "Remove a two-factor authentication code from an entry",
+		Use:     "rm <names>",
+		Short:   "Remove two-factor authentication codes or directories",
 		Example: example,
-		Args:    cmdutil.MustExist(db, cmdutil.TOTP),
+		Args:    cmdutil.MustExist(db, cmdutil.TOTP, true),
 		RunE:    runRm(db, r),
 	}
 }
 
 func runRm(db *bolt.DB, r io.Reader) cmdutil.RunEFunc {
 	return func(cmd *cobra.Command, args []string) error {
-		name := strings.Join(args, " ")
-		name = cmdutil.NormalizeName(name)
-
 		if !terminal.Confirm(r, "Are you sure you want to proceed?") {
 			return nil
 		}
 
-		if err := totp.Remove(db, name); err != nil {
-			return err
+		names := make([]string, 0, len(args))
+		for _, name := range args {
+			name = cmdutil.NormalizeName(name, true)
+
+			if !strings.HasSuffix(name, "/") {
+				names = append(names, name)
+				fmt.Println("Remove:", name)
+				continue
+			}
+
+			totps, err := totp.ListNames(db)
+			if err != nil {
+				return err
+			}
+
+			for _, c := range totps {
+				if strings.HasPrefix(c, name) {
+					names = append(names, c)
+					fmt.Println("Remove:", c)
+				}
+			}
 		}
 
-		fmt.Printf("\n%q TOTP removed\n", name)
-		return nil
+		return totp.Remove(db, names...)
 	}
 }

commands/2fa/rm/rm_test.go

@@ -14,62 +14,90 @@ import (
 func TestRm(t *testing.T) {
 	db := cmdutil.SetContext(t)
 
-	err := totp.Create(db, &pb.TOTP{Name: "test"})
-	assert.NoError(t, err)
+	names := []string{"test", "directory/test", "kure", "atoll"}
+	for _, name := range names {
+		err := totp.Create(db, &pb.TOTP{Name: name})
+		assert.NoErrorf(t, err, "Failed creating %q", name)
+	}
 
 	cases := []struct {
-		desc         string
-		name         string
-		confirmation string
+		desc  string
+		input string
+		names []string
 	}{
 		{
-			desc:         "Abort",
-			name:         "test",
-			confirmation: "n",
+			desc:  "Do not proceed",
+			names: []string{"test"},
+			input: "n",
 		},
 		{
-			desc:         "Proceed",
-			name:         "test",
-			confirmation: "y",
+			desc:  "Remove one entry",
+			names: []string{"test"},
+			input: "y",
+		},
+		{
+			desc:  "Remove multiple entries",
+			names: []string{"kure", "atoll"},
+			input: "y",
+		},
+		{
+			desc:  "Remove directory",
+			names: []string{"directory/"},
+			input: "y",
 		},
 	}
 
 	for _, tc := range cases {
 		t.Run(tc.desc, func(t *testing.T) {
-			buf := bytes.NewBufferString(tc.confirmation)
+			buf := bytes.NewBufferString(tc.input)
 			cmd := NewCmd(db, buf)
-			cmd.SetArgs([]string{tc.name})
+			cmd.SetArgs(tc.names)
 
 			err := cmd.Execute()
-			assert.NoError(t, err, "Failed removing the TOTP")
+			assert.NoError(t, err)
+
+			if tc.input == "y" {
+				for _, name := range tc.names {
+					_, err := totp.Get(db, name)
+					assert.Error(t, err)
+				}
+			}
 		})
 	}
 }
 
 func TestRmErrors(t *testing.T) {
 	db := cmdutil.SetContext(t)
 
+	name := "random"
+	err := totp.Create(db, &pb.TOTP{Name: name})
+	assert.NoErrorf(t, err, "Failed creating %q", name)
+
 	cases := []struct {
 		desc         string
-		name         string
 		confirmation string
+		names        []string
 	}{
 		{
-			desc: "Invalid name",
-			name: "",
+			desc:  "Invalid name",
+			names: []string{""},
 		},
 		{
 			desc:         "Does not exists",
-			name:         "non-existent",
+			names:        []string{"non-existent"},
 			confirmation: "y",
 		},
+		{
+			desc:  "Second name does not exist",
+			names: []string{"random", "non-existent"},
+		},
 	}
 
 	for _, tc := range cases {
 		t.Run(tc.desc, func(t *testing.T) {
 			buf := bytes.NewBufferString(tc.confirmation)
 			cmd := NewCmd(db, buf)
-			cmd.SetArgs([]string{tc.name})
+			cmd.SetArgs(tc.names)
 
 			err := cmd.Execute()
 			assert.Error(t, err)

commands/backup/backup.go

@@ -57,6 +57,8 @@ func NewCmd(db *bolt.DB) *cobra.Command {
 	f.StringVar(&opts.path, "path", "", "destination file path")
 	f.Uint16Var(&opts.port, "port", 8080, "server port")
 
+	cmd.MarkFlagsMutuallyExclusive("http", "path")
+
 	return cmd
 }
 

commands/backup/backup_test.go

@@ -87,6 +87,11 @@ func TestBackupErrors(t *testing.T) {
 			desc: "Mkdir error",
 			path: "backup.go/",
 		},
+		{
+			desc: "Mutually exclusive flags",
+			http: "true",
+			path: "backup.db",
+		},
 	}
 
 	cmd := NewCmd(db)

commands/card/ls/ls.go

@@ -3,7 +3,7 @@ package ls
 import (
 	"errors"
 	"fmt"
-	"path/filepath"
+	"regexp"
 	"strings"
 
 	cmdutil "github.com/GGP1/kure/commands"
@@ -79,7 +79,7 @@ func runLs(db *bolt.DB, opts *lsOptions) cmdutil.RunEFunc {
 
 			var matches []string
 			for _, card := range cards {
-				matched, err := filepath.Match(name, card)
+				matched, err := regexp.MatchString(name, card)
 				if err != nil {
 					return err
 				}

commands/card/rm/rm.go

@@ -18,13 +18,16 @@ const example = `
 kure card rm Sample
 
 * Remove a directory
-kure card rm SampleDir/`
+kure card rm SampleDir/
+
+* Remove multiple cards
+kure card rm Sample Sample2 Sample3`
 
 // NewCmd returns the a new command.
 func NewCmd(db *bolt.DB, r io.Reader) *cobra.Command {
 	return &cobra.Command{
-		Use:     "rm <name>",
-		Short:   "Remove a card or directory",
+		Use:     "rm <names>",
+		Short:   "Remove cards or directories",
 		Example: example,
 		Args:    cmdutil.MustExist(db, cmdutil.Card, true),
 		RunE:    runRm(db, r),
@@ -33,39 +36,33 @@ func NewCmd(db *bolt.DB, r io.Reader) *cobra.Command {
 
 func runRm(db *bolt.DB, r io.Reader) cmdutil.RunEFunc {
 	return func(cmd *cobra.Command, args []string) error {
-		name := strings.Join(args, " ")
-		name = cmdutil.NormalizeName(name, true)
-
 		if !terminal.Confirm(r, "Are you sure you want to proceed?") {
 			return nil
 		}
 
-		// Remove single file
-		if !strings.HasSuffix(name, "/") {
-			if err := card.Remove(db, name); err != nil {
-				return err
-			}
+		names := make([]string, 0, len(args))
+		for _, name := range args {
+			name = cmdutil.NormalizeName(name, true)
 
-			fmt.Printf("\n%q removed\n", name)
-			return nil
-		}
-
-		fmt.Printf("Removing %q directory...\n", name)
+			if !strings.HasSuffix(name, "/") {
+				names = append(names, name)
+				fmt.Println("Remove:", name)
+				continue
+			}
 
-		cards, err := card.ListNames(db)
-		if err != nil {
-			return err
-		}
+			cards, err := card.ListNames(db)
+			if err != nil {
+				return err
+			}
 
-		for _, c := range cards {
-			if strings.HasPrefix(c, name) {
-				if err := card.Remove(db, c); err != nil {
-					return err
+			for _, c := range cards {
+				if strings.HasPrefix(c, name) {
+					names = append(names, c)
+					fmt.Println("Remove:", c)
 				}
-				fmt.Println("Remove:", c)
 			}
 		}
 
-		return nil
+		return card.Remove(db, names...)
 	}
 }