Always re-encrypt when fsck is invoked with --decrypt (#2119)

* Always re-encrypt when fsck is invoked with --decrypt
* Explain convertedSecret check

Fixes #2015

RELEASE_NOTES=[BUGFIX] Always re-encrypt when fsck is invoked with --decrypt.

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

internal/backend/storage/gitfs/storage.go

@@ -3,6 +3,8 @@ package gitfs
 import (
 	"context"
 	"fmt"
+
+	"github.com/gopasspw/gopass/pkg/debug"
 )
 
 // Get retrieves the named content.
@@ -58,9 +60,27 @@ func (g *Git) Fsck(ctx context.Context) error {
 	if err := g.fixConfig(ctx); err != nil {
 		return fmt.Errorf("failed to fix git config: %w", err)
 	}
+
+	// add any untracked files.
+	if err := g.addUntrackedFiles(ctx); err != nil {
+		return fmt.Errorf("failed to add untracked files: %w", err)
+	}
 	return g.fs.Fsck(ctx)
 }
 
+func (g *Git) addUntrackedFiles(ctx context.Context) error {
+	ut := g.ListUntrackedFiles(ctx)
+	if len(ut) < 1 && !g.HasStagedChanges(ctx) {
+		debug.Log("no untracked or staged files found")
+		return nil
+	}
+	debug.Log("untracked files found: %v", ut)
+	if err := g.Add(ctx, ut...); err != nil {
+		return fmt.Errorf("failed to add untracked files: %w", err)
+	}
+	return g.Commit(ctx, "fsck")
+}
+
 // Link creates a symlink.
 func (g *Git) Link(ctx context.Context, from, to string) error {
 	return g.fs.Link(ctx, from, to)

internal/store/leaf/fsck.go

@@ -71,20 +71,42 @@ type convertedSecret interface {
 }
 
 func (s *Store) fsckCheckEntry(ctx context.Context, name string) error {
+	if err := s.fsckCheckRecipients(ctx, name); err != nil {
+		out.Warningf(ctx, "Checking recipients for %s failed: %s", name, err)
+	}
+
 	// make sure we can actually decode this secret
 	// if this fails there is no way we could fix this
-	if IsFsckDecrypt(ctx) {
-		// we need to make sure Parsing is enabled in order to parse old Mime secrets
-		ctx = ctxutil.WithShowParsing(ctx, true)
-		secret, err := s.Get(ctx, name)
-		if err != nil {
-			return fmt.Errorf("failed to decode secret %s: %w", name, err)
-		}
-		if cs, ok := secret.(convertedSecret); ok && cs.FromMime() {
-			out.Warningf(ctx, "leftover Mime secret: %s\nYou should consider editing it to re-encrypt it.", name)
-		}
+	if !IsFsckDecrypt(ctx) {
+		return nil
+	}
+
+	// we need to make sure Parsing is enabled in order to parse old Mime secrets
+	ctx = ctxutil.WithShowParsing(ctx, true)
+	sec, err := s.Get(ctx, name)
+	if err != nil {
+		return fmt.Errorf("failed to decode secret %s: %w", name, err)
 	}
 
+	// check if this is still an old MIME secret.
+	// Note: the secret was already converted when it was parsed during Get.
+	// This is just checking if it was converted from MIME or not.
+	// This branch is pretty much useless right now, but I'd like to add some
+	// reporting on how many secrets were converted from MIME to new format.
+	// TODO: report these stats
+	if cs, ok := sec.(convertedSecret); ok && cs.FromMime() {
+		debug.Log("leftover Mime secret: %s", name)
+	}
+
+	out.Printf(ctx, "Re-encrypting %s to fix recipients and storage format.", name)
+	if err := s.Set(ctxutil.WithCommitMessage(ctx, "fsck --decrypt to fix recipients and format"), name, sec); err != nil {
+		return fmt.Errorf("failed to write secret: %w", err)
+	}
+
+	return nil
+}
+
+func (s *Store) fsckCheckRecipients(ctx context.Context, name string) error {
 	// now compare the recipients this secret was encoded for and fix it if
 	// if doesn't match
 	ciphertext, err := s.storage.Get(ctx, s.passfile(name))
@@ -113,18 +135,6 @@ func (s *Store) fsckCheckEntry(ctx context.Context, name string) error {
 	if len(extra) > 0 {
 		out.Errorf(ctx, "Extra recipients on %s: %+v\nRun fsck with the --decrypt flag to re-encrypt it automatically, or edit this secret yourself.", name, extra)
 	}
-
-	if IsFsckDecrypt(ctx) && (len(missing) > 0 || len(extra) > 0) {
-		out.Printf(ctx, "Re-encrypting automatically %s to fix the recipients.", name)
-		sec, err := s.Get(ctx, name)
-		if err != nil {
-			return fmt.Errorf("failed to decode secret: %w", err)
-		}
-		if err := s.Set(ctxutil.WithCommitMessage(ctx, "fsck fix recipients"), name, sec); err != nil {
-			return fmt.Errorf("failed to write secret: %w", err)
-		}
-	}
-
 	return nil
 }