* 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>
185 lines
4.5 KiB
Go
185 lines
4.5 KiB
Go
package dev
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"sort"
|
|
"strings"
|
|
|
|
"github.com/host-uk/core/pkg/cli"
|
|
"github.com/host-uk/core/pkg/git"
|
|
"github.com/host-uk/core/pkg/i18n"
|
|
)
|
|
|
|
// Health command flags
|
|
var (
|
|
healthRegistryPath string
|
|
healthVerbose bool
|
|
)
|
|
|
|
// AddHealthCommand adds the 'health' command to the given parent command.
|
|
func AddHealthCommand(parent *cli.Command) {
|
|
healthCmd := &cli.Command{
|
|
Use: "health",
|
|
Short: i18n.T("cmd.dev.health.short"),
|
|
Long: i18n.T("cmd.dev.health.long"),
|
|
RunE: func(cmd *cli.Command, args []string) error {
|
|
return runHealth(healthRegistryPath, healthVerbose)
|
|
},
|
|
}
|
|
|
|
healthCmd.Flags().StringVar(&healthRegistryPath, "registry", "", i18n.T("common.flag.registry"))
|
|
healthCmd.Flags().BoolVarP(&healthVerbose, "verbose", "v", false, i18n.T("cmd.dev.health.flag.verbose"))
|
|
|
|
parent.AddCommand(healthCmd)
|
|
}
|
|
|
|
func runHealth(registryPath string, verbose bool) error {
|
|
ctx := context.Background()
|
|
|
|
// Load registry and get paths
|
|
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,
|
|
})
|
|
|
|
// Sort for consistent verbose output
|
|
sort.Slice(statuses, func(i, j int) bool {
|
|
return statuses[i].Name < statuses[j].Name
|
|
})
|
|
|
|
// Aggregate stats
|
|
var (
|
|
totalRepos = len(statuses)
|
|
dirtyRepos []string
|
|
aheadRepos []string
|
|
behindRepos []string
|
|
errorRepos []string
|
|
)
|
|
|
|
for _, s := range statuses {
|
|
if s.Error != nil {
|
|
errorRepos = append(errorRepos, s.Name)
|
|
continue
|
|
}
|
|
if s.IsDirty() {
|
|
dirtyRepos = append(dirtyRepos, s.Name)
|
|
}
|
|
if s.HasUnpushed() {
|
|
aheadRepos = append(aheadRepos, s.Name)
|
|
}
|
|
if s.HasUnpulled() {
|
|
behindRepos = append(behindRepos, s.Name)
|
|
}
|
|
}
|
|
|
|
// Print summary line
|
|
cli.Blank()
|
|
printHealthSummary(totalRepos, dirtyRepos, aheadRepos, behindRepos, errorRepos)
|
|
cli.Blank()
|
|
|
|
// Verbose output
|
|
if verbose {
|
|
if len(dirtyRepos) > 0 {
|
|
cli.Print("%s %s\n", warningStyle.Render(i18n.T("cmd.dev.health.dirty_label")), formatRepoList(dirtyRepos))
|
|
}
|
|
if len(aheadRepos) > 0 {
|
|
cli.Print("%s %s\n", successStyle.Render(i18n.T("cmd.dev.health.ahead_label")), formatRepoList(aheadRepos))
|
|
}
|
|
if len(behindRepos) > 0 {
|
|
cli.Print("%s %s\n", warningStyle.Render(i18n.T("cmd.dev.health.behind_label")), formatRepoList(behindRepos))
|
|
}
|
|
if len(errorRepos) > 0 {
|
|
cli.Print("%s %s\n", errorStyle.Render(i18n.T("cmd.dev.health.errors_label")), formatRepoList(errorRepos))
|
|
}
|
|
cli.Blank()
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func printHealthSummary(total int, dirty, ahead, behind, errors []string) {
|
|
parts := []string{
|
|
statusPart(total, i18n.T("cmd.dev.health.repos"), cli.ValueStyle),
|
|
}
|
|
|
|
// Dirty status
|
|
if len(dirty) > 0 {
|
|
parts = append(parts, statusPart(len(dirty), i18n.T("common.status.dirty"), cli.WarningStyle))
|
|
} else {
|
|
parts = append(parts, statusText(i18n.T("cmd.dev.status.clean"), cli.SuccessStyle))
|
|
}
|
|
|
|
// Push status
|
|
if len(ahead) > 0 {
|
|
parts = append(parts, statusPart(len(ahead), i18n.T("cmd.dev.health.to_push"), cli.ValueStyle))
|
|
} else {
|
|
parts = append(parts, statusText(i18n.T("common.status.synced"), cli.SuccessStyle))
|
|
}
|
|
|
|
// Pull status
|
|
if len(behind) > 0 {
|
|
parts = append(parts, statusPart(len(behind), i18n.T("cmd.dev.health.to_pull"), cli.WarningStyle))
|
|
} else {
|
|
parts = append(parts, statusText(i18n.T("common.status.up_to_date"), cli.SuccessStyle))
|
|
}
|
|
|
|
// Errors (only if any)
|
|
if len(errors) > 0 {
|
|
parts = append(parts, statusPart(len(errors), i18n.T("cmd.dev.health.errors"), cli.ErrorStyle))
|
|
}
|
|
|
|
cli.Text(statusLine(parts...))
|
|
}
|
|
|
|
func formatRepoList(reposList []string) string {
|
|
if len(reposList) <= 5 {
|
|
return joinRepos(reposList)
|
|
}
|
|
return joinRepos(reposList[:5]) + " " + i18n.T("cmd.dev.health.more", map[string]interface{}{"Count": len(reposList) - 5})
|
|
}
|
|
|
|
func joinRepos(reposList []string) string {
|
|
result := ""
|
|
for i, r := range reposList {
|
|
if i > 0 {
|
|
result += ", "
|
|
}
|
|
result += r
|
|
}
|
|
return result
|
|
}
|
|
|
|
func statusPart(count int, label string, style *cli.AnsiStyle) string {
|
|
return style.Render(fmt.Sprintf("%d %s", count, label))
|
|
}
|
|
|
|
func statusText(text string, style *cli.AnsiStyle) string {
|
|
return style.Render(text)
|
|
}
|
|
|
|
func statusLine(parts ...string) string {
|
|
return strings.Join(parts, " | ")
|
|
}
|