fix: harden copy/move/delete transfers, add CI, dead code cleanup
All checks were successful
CI / test (push) Successful in 10m0s

Audited every copy/move/delete path (local, remote same-host, cross-host)
and fixed:

- Shell command injection in same-host remote cp/mv (unescaped paths
  interpolated into exec strings); added remote.ShellQuote.
- Missing guard against copying/moving a directory into its own
  subdirectory, locally and on same-host remote transfers (unbounded
  recursion / disk fill). New regression tests in ops_test.go.
- Remote-to-remote same-path file copy silently truncating the source
  file via Create() before it finished being read.
- Overwrite warning ("N existing target(s)") never shown for remote
  destinations, only local ones.
- Remote same-host server-side cp never advancing the file-done counter
  (waited on -v output that was never requested).
- Removed a dead "plan-then-confirm" subsystem (5 functions, 2 message
  types, 2 unreachable Update() cases) superseded by the current design.
- Remote delete (SFTP) now runs as a cancellable job with the same
  progress modal as local delete, instead of a single blocking call.

Also add a CI workflow that runs build/vet/test on every push and PR,
since previously they only ran on release tags.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
vrubelroman 2026-07-03 20:36:00 +00:00
parent c15ade247a
commit 135f5e0d19
5 changed files with 268 additions and 321 deletions

View file

@ -406,6 +406,15 @@ func (c *SSHClient) IsConnected() bool {
return c.sftpCli != nil && c.sshConn != nil
}
// ShellQuote wraps s in single quotes so it's safe to interpolate into a
// shell command string passed to Exec/ExecWithProgress, regardless of
// spaces, `$`, backticks, or other shell metacharacters it contains. Any
// single quote in s is escaped by closing the quote, emitting an escaped
// literal quote, and reopening it (the standard POSIX shell idiom).
func ShellQuote(s string) string {
return "'" + strings.ReplaceAll(s, "'", `'\''`) + "'"
}
// Exec runs a shell command on the remote server and returns combined output.
func (c *SSHClient) Exec(cmd string) ([]byte, error) {
if c.sshConn == nil {
@ -678,6 +687,12 @@ func CopyFileBetweenRemotes(srcClient, dstClient *SSHClient, srcPath, dstPath st
if dstClient.sftpCli == nil {
return fmt.Errorf("destination client not connected")
}
if srcClient.SameHostAs(dstClient) && path.Clean(srcPath) == path.Clean(dstPath) {
// Same file on the same host: dstClient.Create() below would
// truncate it before srcFile has finished being read, corrupting
// the "copy" into an empty file.
return fmt.Errorf("source and target are the same: %s", dstPath)
}
srcFile, err := srcClient.sftpCli.Open(srcPath)
if err != nil {
@ -711,6 +726,13 @@ func CopyDirBetweenRemotes(srcClient, dstClient *SSHClient, srcDir, dstDir strin
}
func copyDirBetweenRemotes(srcClient, dstClient *SSHClient, srcDir, dstDir string, onFile func(path string, done, total int), ctx context.Context) error {
if srcClient.SameHostAs(dstClient) && remotePathWithin(dstDir, srcDir) {
// Same host, and the destination is srcDir itself or nested inside
// it: MkdirAll below would create the destination inside the very
// tree Walk is reading, so the walk would recurse into its own
// output and never terminate on its own.
return fmt.Errorf("cannot copy %q into itself", srcDir)
}
done := 0
return srcClient.Walk(srcDir, func(remotePath string, info os.FileInfo, err error) error {
if err != nil {
@ -815,6 +837,18 @@ func (c *SSHClient) walk(dirPath string, walkFn walkFunc, info os.FileInfo) erro
// filepathSkipDir is used as a return value from Walk to skip a directory.
var filepathSkipDir = fmt.Errorf("skip this directory")
// remotePathWithin reports whether child is parent itself or a path nested
// inside it, using POSIX path semantics (remote paths are always "/"
// separated regardless of the local OS).
func remotePathWithin(child, parent string) bool {
childClean := path.Clean(child)
parentClean := path.Clean(parent)
if childClean == parentClean {
return true
}
return strings.HasPrefix(childClean, parentClean+"/")
}
// isSymlinkToDir reports whether the walk entry at remotePath is a symlink
// whose target is a directory. Such entries can't be copied with a plain
// Open()/Create() file copy (the server rejects opening a directory for