Skip to content

fix(copy): preserve directory structure when copying with trailing slash #3396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dominikschulz wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −37
Open

fix(copy): preserve directory structure when copying with trailing slash #3396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions internal/action/copy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ package action
import (
"context"
"fmt"
"path/filepath"
"strings"

"github.com/gopasspw/gopass/internal/action/exit"
"github.com/gopasspw/gopass/internal/tree"
"github.com/gopasspw/gopass/pkg/ctxutil"
"github.com/gopasspw/gopass/pkg/termio"
"github.com/urfave/cli/v2"
Expand Down Expand Up @@ -43,40 +40,9 @@ func (s *secretHandler) copy(ctx context.Context, from, to string, force bool) e
return exit.Error(exit.NotFound, nil, "%s does not exist", from)
}

isSourceDir := s.Store.IsDir(ctx, from)
hasTrailingSlash := strings.HasSuffix(to, "/")

if isSourceDir && hasTrailingSlash {
return s.copyFlattenDir(ctx, from, to, force)
}

return s.copyRegular(ctx, from, to, force)
}

func (s *secretHandler) copyFlattenDir(ctx context.Context, from, to string, force bool) error {
entries, err := s.Store.List(ctx, tree.INF)
if err != nil {
return exit.Error(exit.List, err, "failed to list entries in %q", from)
}

fromPrefix := from
if !strings.HasSuffix(fromPrefix, "/") {
fromPrefix += "/"
}

for _, entry := range entries {
if strings.HasPrefix(entry, fromPrefix) {
toPath := filepath.Join(to, filepath.Base(entry))

if err := s.copyRegular(ctx, entry, toPath, force); err != nil {
return err
}
}
}

return nil
}

func (s *secretHandler) copyRegular(ctx context.Context, from, to string, force bool) error {
if !force {
if s.Store.Exists(ctx, to) && !termio.AskForConfirmation(ctx, fmt.Sprintf("%s already exists. Overwrite it?", to)) {
Expand Down
7 changes: 4 additions & 3 deletions internal/action/copy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,14 +243,15 @@ func TestCopyWithTrailingSlash(t *testing.T) {
require.NoError(t, act.Copy(c))
buf.Reset()

// Verify the result
// Verify the result: structure should be preserved
require.NoError(t, act.List(gptest.CliCtx(ctx, t)))
want := `gopass
├── bar
├── foo
├── new/
│ ├── baz
│ └── zab
│ └── some/
│ └── zab
└── secret/
├── baz
└── some/
Expand All @@ -263,7 +264,7 @@ func TestCopyWithTrailingSlash(t *testing.T) {

// Verify content of copied files
ctx = ctxutil.WithTerminal(ctx, false)
require.NoError(t, act.show(ctx, c, "new/zab", false))
require.NoError(t, act.show(ctx, c, "new/some/zab", false))
assert.Equal(t, "secret\n", buf.String())
buf.Reset()

Expand Down
Loading