* 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>
97 lines
2.5 KiB
Go
97 lines
2.5 KiB
Go
package workspace
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"gopkg.in/yaml.v3"
|
|
)
|
|
|
|
// WorkspaceConfig holds workspace-level configuration from .core/workspace.yaml.
|
|
type WorkspaceConfig struct {
|
|
Version int `yaml:"version"`
|
|
Active string `yaml:"active"` // Active package name
|
|
DefaultOnly []string `yaml:"default_only"` // Default types for setup
|
|
PackagesDir string `yaml:"packages_dir"` // Where packages are cloned
|
|
}
|
|
|
|
// DefaultConfig returns a config with default values.
|
|
func DefaultConfig() *WorkspaceConfig {
|
|
return &WorkspaceConfig{
|
|
Version: 1,
|
|
PackagesDir: "./packages",
|
|
}
|
|
}
|
|
|
|
// LoadConfig tries to load workspace.yaml from the given directory's .core subfolder.
|
|
// Returns nil if no config file exists (caller should check for nil).
|
|
func LoadConfig(dir string) (*WorkspaceConfig, error) {
|
|
path := filepath.Join(dir, ".core", "workspace.yaml")
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
// Try parent directory
|
|
parent := filepath.Dir(dir)
|
|
if parent != dir {
|
|
return LoadConfig(parent)
|
|
}
|
|
// No workspace.yaml found anywhere - return nil to indicate no config
|
|
return nil, nil
|
|
}
|
|
return nil, fmt.Errorf("failed to read workspace config: %w", err)
|
|
}
|
|
|
|
config := DefaultConfig()
|
|
if err := yaml.Unmarshal(data, config); err != nil {
|
|
return nil, fmt.Errorf("failed to parse workspace config: %w", err)
|
|
}
|
|
|
|
if config.Version != 1 {
|
|
return nil, fmt.Errorf("unsupported workspace config version: %d", config.Version)
|
|
}
|
|
|
|
return config, nil
|
|
}
|
|
|
|
// SaveConfig saves the configuration to the given directory's .core/workspace.yaml.
|
|
func SaveConfig(dir string, config *WorkspaceConfig) error {
|
|
coreDir := filepath.Join(dir, ".core")
|
|
if err := os.MkdirAll(coreDir, 0755); err != nil {
|
|
return fmt.Errorf("failed to create .core directory: %w", err)
|
|
}
|
|
|
|
path := filepath.Join(coreDir, "workspace.yaml")
|
|
data, err := yaml.Marshal(config)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to marshal workspace config: %w", err)
|
|
}
|
|
|
|
if err := os.WriteFile(path, data, 0644); err != nil {
|
|
return fmt.Errorf("failed to write workspace config: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// FindWorkspaceRoot searches for the root directory containing .core/workspace.yaml.
|
|
func FindWorkspaceRoot() (string, error) {
|
|
dir, err := os.Getwd()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
for {
|
|
if _, err := os.Stat(filepath.Join(dir, ".core", "workspace.yaml")); err == nil {
|
|
return dir, nil
|
|
}
|
|
|
|
parent := filepath.Dir(dir)
|
|
if parent == dir {
|
|
break
|
|
}
|
|
dir = parent
|
|
}
|
|
|
|
return "", fmt.Errorf("not in a workspace")
|
|
}
|