* feat(mcp): add workspace root validation to prevent path traversal - Add workspaceRoot field to Service for restricting file operations - Add WithWorkspaceRoot() option for configuring the workspace directory - Add validatePath() helper to check paths are within workspace - Apply validation to all file operation handlers - Default to current working directory for security - Add comprehensive tests for path validation Closes #82 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor: move CLI commands from pkg/ to internal/cmd/ - Move 18 CLI command packages to internal/cmd/ (not externally importable) - Keep 16 library packages in pkg/ (externally importable) - Update all import paths throughout codebase - Cleaner separation between CLI logic and reusable libraries CLI commands moved: ai, ci, dev, docs, doctor, gitcmd, go, monitor, php, pkgcmd, qa, sdk, security, setup, test, updater, vm, workspace Libraries remaining: agentic, build, cache, cli, container, devops, errors, framework, git, i18n, io, log, mcp, process, release, repos Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor(mcp): use pkg/io Medium for sandboxed file operations Replace manual path validation with pkg/io.Medium for all file operations. This delegates security (path traversal, symlink bypass) to the sandboxed local.Medium implementation. Changes: - Add io.NewSandboxed() for creating sandboxed Medium instances - Refactor MCP Service to use io.Medium instead of direct os.* calls - Remove validatePath and resolvePathWithSymlinks functions - Update tests to verify Medium-based behaviour Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: correct import path and workflow references - Fix pkg/io/io.go import from core-gui to core - Update CI workflows to use internal/cmd/updater path Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(security): address CodeRabbit review issues for path validation - pkg/io/local: add symlink resolution and boundary-aware containment - Reject absolute paths in sandboxed Medium - Use filepath.EvalSymlinks to prevent symlink bypass attacks - Fix prefix check to prevent /tmp/root matching /tmp/root2 - pkg/mcp: fix resolvePath to validate and return errors - Changed resolvePath from (string) to (string, error) - Update deleteFile, renameFile, listDirectory, fileExists to handle errors - Changed New() to return (*Service, error) instead of *Service - Properly propagate option errors instead of silently discarding - pkg/io: wrap errors with E() helper for consistent context - Copy() and MockMedium.Read() now use coreerr.E() - tests: rename to use _Good/_Bad/_Ugly suffixes per coding guidelines - Fix hardcoded /tmp in TestPath to use t.TempDir() - Add TestResolvePath_Bad_SymlinkTraversal test Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * style: fix gofmt formatting Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * style: fix gofmt formatting across all files Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
130 lines
3 KiB
Go
130 lines
3 KiB
Go
package dev
|
|
|
|
import (
|
|
"context"
|
|
"os/exec"
|
|
|
|
"github.com/host-uk/core/pkg/cli"
|
|
"github.com/host-uk/core/pkg/git"
|
|
"github.com/host-uk/core/pkg/i18n"
|
|
)
|
|
|
|
// Pull command flags
|
|
var (
|
|
pullRegistryPath string
|
|
pullAll bool
|
|
)
|
|
|
|
// AddPullCommand adds the 'pull' command to the given parent command.
|
|
func AddPullCommand(parent *cli.Command) {
|
|
pullCmd := &cli.Command{
|
|
Use: "pull",
|
|
Short: i18n.T("cmd.dev.pull.short"),
|
|
Long: i18n.T("cmd.dev.pull.long"),
|
|
RunE: func(cmd *cli.Command, args []string) error {
|
|
return runPull(pullRegistryPath, pullAll)
|
|
},
|
|
}
|
|
|
|
pullCmd.Flags().StringVar(&pullRegistryPath, "registry", "", i18n.T("common.flag.registry"))
|
|
pullCmd.Flags().BoolVar(&pullAll, "all", false, i18n.T("cmd.dev.pull.flag.all"))
|
|
|
|
parent.AddCommand(pullCmd)
|
|
}
|
|
|
|
func runPull(registryPath string, all bool) error {
|
|
ctx := context.Background()
|
|
|
|
// Find or use provided registry
|
|
reg, _, err := loadRegistryWithConfig(registryPath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Build paths and names for git operations
|
|
var paths []string
|
|
names := make(map[string]string)
|
|
|
|
for _, repo := range reg.List() {
|
|
if repo.IsGitRepo() {
|
|
paths = append(paths, repo.Path)
|
|
names[repo.Path] = repo.Name
|
|
}
|
|
}
|
|
|
|
if len(paths) == 0 {
|
|
cli.Text(i18n.T("cmd.dev.no_git_repos"))
|
|
return nil
|
|
}
|
|
|
|
// Get status for all repos
|
|
statuses := git.Status(ctx, git.StatusOptions{
|
|
Paths: paths,
|
|
Names: names,
|
|
})
|
|
|
|
// Find repos to pull
|
|
var toPull []git.RepoStatus
|
|
for _, s := range statuses {
|
|
if s.Error != nil {
|
|
continue
|
|
}
|
|
if all || s.HasUnpulled() {
|
|
toPull = append(toPull, s)
|
|
}
|
|
}
|
|
|
|
if len(toPull) == 0 {
|
|
cli.Text(i18n.T("cmd.dev.pull.all_up_to_date"))
|
|
return nil
|
|
}
|
|
|
|
// Show what we're pulling
|
|
if all {
|
|
cli.Print("\n%s\n\n", i18n.T("cmd.dev.pull.pulling_repos", map[string]interface{}{"Count": len(toPull)}))
|
|
} else {
|
|
cli.Print("\n%s\n\n", i18n.T("cmd.dev.pull.repos_behind", map[string]interface{}{"Count": len(toPull)}))
|
|
for _, s := range toPull {
|
|
cli.Print(" %s: %s\n",
|
|
repoNameStyle.Render(s.Name),
|
|
dimStyle.Render(i18n.T("cmd.dev.pull.commits_behind", map[string]interface{}{"Count": s.Behind})),
|
|
)
|
|
}
|
|
cli.Blank()
|
|
}
|
|
|
|
// Pull each repo
|
|
var succeeded, failed int
|
|
for _, s := range toPull {
|
|
cli.Print(" %s %s... ", dimStyle.Render(i18n.T("cmd.dev.pull.pulling")), s.Name)
|
|
|
|
err := gitPull(ctx, s.Path)
|
|
if err != nil {
|
|
cli.Print("%s\n", errorStyle.Render("x "+err.Error()))
|
|
failed++
|
|
} else {
|
|
cli.Print("%s\n", successStyle.Render("v"))
|
|
succeeded++
|
|
}
|
|
}
|
|
|
|
// Summary
|
|
cli.Blank()
|
|
cli.Print("%s", successStyle.Render(i18n.T("cmd.dev.pull.done_pulled", map[string]interface{}{"Count": succeeded})))
|
|
if failed > 0 {
|
|
cli.Print(", %s", errorStyle.Render(i18n.T("common.count.failed", map[string]interface{}{"Count": failed})))
|
|
}
|
|
cli.Blank()
|
|
|
|
return nil
|
|
}
|
|
|
|
func gitPull(ctx context.Context, path string) error {
|
|
cmd := exec.CommandContext(ctx, "git", "pull", "--ff-only")
|
|
cmd.Dir = path
|
|
output, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
return cli.Err("%s", string(output))
|
|
}
|
|
return nil
|
|
}
|