* 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>
165 lines
4.1 KiB
Go
165 lines
4.1 KiB
Go
package dev
|
|
|
|
import (
|
|
"bytes"
|
|
"go/ast"
|
|
"go/parser"
|
|
"go/token"
|
|
"os"
|
|
"path/filepath"
|
|
"text/template"
|
|
|
|
"github.com/host-uk/core/pkg/cli"
|
|
"github.com/host-uk/core/pkg/i18n"
|
|
"golang.org/x/text/cases"
|
|
"golang.org/x/text/language"
|
|
)
|
|
|
|
// addSyncCommand adds the 'sync' command to the given parent command.
|
|
func addSyncCommand(parent *cli.Command) {
|
|
syncCmd := &cli.Command{
|
|
Use: "sync",
|
|
Short: i18n.T("cmd.dev.sync.short"),
|
|
Long: i18n.T("cmd.dev.sync.long"),
|
|
RunE: func(cmd *cli.Command, args []string) error {
|
|
if err := runSync(); err != nil {
|
|
return cli.Wrap(err, i18n.Label("error"))
|
|
}
|
|
cli.Text(i18n.T("i18n.done.sync", "public APIs"))
|
|
return nil
|
|
},
|
|
}
|
|
|
|
parent.AddCommand(syncCmd)
|
|
}
|
|
|
|
type symbolInfo struct {
|
|
Name string
|
|
Kind string // "var", "func", "type", "const"
|
|
}
|
|
|
|
func runSync() error {
|
|
pkgDir := "pkg"
|
|
internalDirs, err := os.ReadDir(pkgDir)
|
|
if err != nil {
|
|
return cli.Wrap(err, "failed to read pkg directory")
|
|
}
|
|
|
|
for _, dir := range internalDirs {
|
|
if !dir.IsDir() || dir.Name() == "core" {
|
|
continue
|
|
}
|
|
|
|
serviceName := dir.Name()
|
|
internalFile := filepath.Join(pkgDir, serviceName, serviceName+".go")
|
|
publicDir := serviceName
|
|
publicFile := filepath.Join(publicDir, serviceName+".go")
|
|
|
|
if _, err := os.Stat(internalFile); os.IsNotExist(err) {
|
|
continue
|
|
}
|
|
|
|
symbols, err := getExportedSymbols(internalFile)
|
|
if err != nil {
|
|
return cli.Wrap(err, cli.Sprintf("error getting symbols for service '%s'", serviceName))
|
|
}
|
|
|
|
if err := generatePublicAPIFile(publicDir, publicFile, serviceName, symbols); err != nil {
|
|
return cli.Wrap(err, cli.Sprintf("error generating public API file for service '%s'", serviceName))
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func getExportedSymbols(path string) ([]symbolInfo, error) {
|
|
fset := token.NewFileSet()
|
|
node, err := parser.ParseFile(fset, path, nil, parser.ParseComments)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
var symbols []symbolInfo
|
|
for name, obj := range node.Scope.Objects {
|
|
if ast.IsExported(name) {
|
|
kind := "unknown"
|
|
switch obj.Kind {
|
|
case ast.Con:
|
|
kind = "const"
|
|
case ast.Var:
|
|
kind = "var"
|
|
case ast.Fun:
|
|
kind = "func"
|
|
case ast.Typ:
|
|
kind = "type"
|
|
}
|
|
if kind != "unknown" {
|
|
symbols = append(symbols, symbolInfo{Name: name, Kind: kind})
|
|
}
|
|
}
|
|
}
|
|
return symbols, nil
|
|
}
|
|
|
|
const publicAPITemplate = `// package {{.ServiceName}} provides the public API for the {{.ServiceName}} service.
|
|
package {{.ServiceName}}
|
|
|
|
import (
|
|
// Import the internal implementation with an alias.
|
|
impl "github.com/host-uk/core/{{.ServiceName}}"
|
|
|
|
// Import the core contracts to re-export the interface.
|
|
"github.com/host-uk/core/core"
|
|
)
|
|
|
|
{{range .Symbols}}
|
|
{{- if eq .Kind "type"}}
|
|
// {{.Name}} is the public type for the {{.Name}} service. It is a type alias
|
|
// to the underlying implementation, making it transparent to the user.
|
|
type {{.Name}} = impl.{{.Name}}
|
|
{{else if eq .Kind "const"}}
|
|
// {{.Name}} is a public constant that points to the real constant in the implementation package.
|
|
const {{.Name}} = impl.{{.Name}}
|
|
{{else if eq .Kind "var"}}
|
|
// {{.Name}} is a public variable that points to the real variable in the implementation package.
|
|
var {{.Name}} = impl.{{.Name}}
|
|
{{else if eq .Kind "func"}}
|
|
// {{.Name}} is a public function that points to the real function in the implementation package.
|
|
var {{.Name}} = impl.{{.Name}}
|
|
{{end}}
|
|
{{end}}
|
|
|
|
// {{.InterfaceName}} is the public interface for the {{.ServiceName}} service.
|
|
type {{.InterfaceName}} = core.{{.InterfaceName}}
|
|
`
|
|
|
|
func generatePublicAPIFile(dir, path, serviceName string, symbols []symbolInfo) error {
|
|
if err := os.MkdirAll(dir, os.ModePerm); err != nil {
|
|
return err
|
|
}
|
|
|
|
tmpl, err := template.New("publicAPI").Parse(publicAPITemplate)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
tcaser := cases.Title(language.English)
|
|
interfaceName := tcaser.String(serviceName)
|
|
|
|
data := struct {
|
|
ServiceName string
|
|
Symbols []symbolInfo
|
|
InterfaceName string
|
|
}{
|
|
ServiceName: serviceName,
|
|
Symbols: symbols,
|
|
InterfaceName: interfaceName,
|
|
}
|
|
|
|
var buf bytes.Buffer
|
|
if err := tmpl.Execute(&buf, data); err != nil {
|
|
return err
|
|
}
|
|
|
|
return os.WriteFile(path, buf.Bytes(), 0644)
|
|
}
|