Edit entry selected by fuzzy search (gopasspw#979)

Fixes gopasspw#957

Signed-off-by: Dominik Schulz <[email protected]>

Author: dominikschulz

.travis.yml

@@ -9,7 +9,7 @@ before_install:
   - git config --global user.email [email protected]
 
 go:
-  - '1.10'
+  - '1.11.x'
 
 script:
   - make travis

Makefile

@@ -204,7 +204,7 @@ codequality:
 
 	@echo -n "     INTERFACER"
 	@which interfacer > /dev/null; if [ $$? -ne 0 ]; then \
-		$(GO) get mvdan.cc/interfacer; \
+		$(GO) get -u mvdan.cc/interfacer; \
 	fi
 	@interfacer $(PKGS)
 	@printf '%s\n' '$(OK)'

pkg/action/create/create_test.go

@@ -21,7 +21,7 @@ import (
 
 func TestExtractHostname(t *testing.T) {
 	for in, out := range map[string]string{
-		"": "",
+		"":                                     "",
 		"http://www.example.org/":              "www.example.org",
 		"++#+++#jhlkadsrezu 33 553q ++++##$§&": "jhlkadsrezu_33_553q",
 		"www.example.org/?foo=bar#abc":         "www.example.org",

pkg/action/edit.go

@@ -27,7 +27,7 @@ func (s *Action) Edit(ctx context.Context, c *cli.Context) error {
 	ed := editor.Path(c)
 
 	// get existing content or generate new one from a template
-	content, changed, err := s.editGetContent(ctx, name, c.Bool("create"))
+	name, content, changed, err := s.editGetContent(ctx, name, c.Bool("create"))
 	if err != nil {
 		return err
 	}
@@ -60,7 +60,7 @@ func (s *Action) Edit(ctx context.Context, c *cli.Context) error {
 	return nil
 }
 
-func (s *Action) editGetContent(ctx context.Context, name string, create bool) ([]byte, bool, error) {
+func (s *Action) editGetContent(ctx context.Context, name string, create bool) (string, []byte, bool, error) {
 	if !s.Store.Exists(ctx, name) {
 		newName := ""
 		// capture only the name of the selected secret
@@ -77,17 +77,17 @@ func (s *Action) editGetContent(ctx context.Context, name string, create bool) (
 	if s.Store.Exists(ctx, name) {
 		sec, err := s.Store.Get(ctx, name)
 		if err != nil {
-			return nil, false, ExitError(ctx, ExitDecrypt, err, "failed to decrypt %s: %s", name, err)
+			return name, nil, false, ExitError(ctx, ExitDecrypt, err, "failed to decrypt %s: %s", name, err)
 		}
 		content, err := sec.Bytes()
 		if err != nil {
-			return nil, false, ExitError(ctx, ExitDecrypt, err, "failed to decode %s: %s", name, err)
+			return name, nil, false, ExitError(ctx, ExitDecrypt, err, "failed to decode %s: %s", name, err)
 		}
-		return content, false, nil
+		return name, content, false, nil
 	}
 
 	if !create {
-		return nil, false, ExitError(ctx, ExitNotFound, nil, "entry not %s not found. Use --create to create a new entry with edit", name)
+		return name, nil, false, ExitError(ctx, ExitNotFound, nil, "entry not %s not found. Use --create to create a new entry with edit", name)
 	}
 
 	// new entry with template
@@ -99,9 +99,9 @@ func (s *Action) editGetContent(ctx context.Context, name string, create bool) (
 		} else {
 			fmt.Fprintf(stdout, "failed to execute template: %s\n", err)
 		}
-		return content, true, nil
+		return name, content, true, nil
 	}
 
 	// new entry, no template
-	return nil, false, nil
+	return name, nil, false, nil
 }

pkg/action/update_test.go

@@ -69,9 +69,10 @@ func TestUpdate(t *testing.T) {
 		}()
 		body := "foobar"
 		hdr := &tar.Header{
-			Name: "gopass",
-			Mode: 0600,
-			Size: int64(len(body)),
+			Typeflag: tar.TypeReg,
+			Name:     "gopass",
+			Mode:     0600,
+			Size:     int64(len(body)),
 		}
 		if err := tw.WriteHeader(hdr); err != nil {
 			http.Error(w, "Internal Server Error", http.StatusInternalServerError)

pkg/backend/crypto/xc/utils.go

@@ -126,7 +126,7 @@ func (x *XC) CreatePrivateKeyBatch(ctx context.Context, name, email, passphrase
 	k.Identity.Name = name
 	k.Identity.Email = email
 	if err := x.secring.Set(k); err != nil {
-		return errors.Wrapf(err, "failed to set %s to secring: %s", k, err)
+		return errors.Wrapf(err, "failed to set %v to secring: %s", k, err)
 	}
 	return x.secring.Save()
 }

pkg/config/location_test.go

@@ -10,8 +10,8 @@ import (
 
 func TestPwStoreDirNoEnv(t *testing.T) {
 	for in, out := range map[string]string{
-		"":     filepath.Join(Homedir(), ".password-store"),
-		"work": filepath.Join(Homedir(), ".password-store-work"),
+		"":                          filepath.Join(Homedir(), ".password-store"),
+		"work":                      filepath.Join(Homedir(), ".password-store-work"),
 		filepath.Join("foo", "bar"): filepath.Join(Homedir(), ".password-store-foo-bar"),
 	} {
 		assert.Equal(t, out, PwStoreDir(in))

pkg/fsutil/fsutil_test.go

@@ -32,7 +32,7 @@ func TestCleanPath(t *testing.T) {
 	}()
 
 	m := map[string]string{
-		".": "",
+		".":                                 "",
 		"/home/user/../bob/.password-store": "/home/bob/.password-store",
 		"/home/user//.password-store":       "/home/user/.password-store",
 		tempdir + "/foo.gpg":                tempdir + "/foo.gpg",

pkg/updater/update.go

@@ -136,7 +136,7 @@ func extract(ctx context.Context, archive, dest string) error {
 
 	dfh, err := os.OpenFile(dest, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0755)
 	if err != nil {
-		return err
+		return errors.Wrapf(err, "Failed to open file: %s", dest)
 	}
 	defer func() {
 		_ = dfh.Close()
@@ -154,12 +154,12 @@ func extract(ctx context.Context, archive, dest string) error {
 			break
 		}
 		if err != nil {
-			return err
+			return errors.Wrapf(err, "Failed to read from tar file")
 		}
 		name := filepath.Base(header.Name)
-		if header.Typeflag == 0 && name == "gopass" {
+		if header.Typeflag == tar.TypeReg && name == "gopass" {
 			_, err := io.Copy(dfh, tarReader)
-			return err
+			return errors.Wrapf(err, "Failed to read gopass from tar file")
 		}
 	}
 	return errors.Errorf("file not found in archive")