mirror of
https://github.com/Twigpine/zero.git
synced 2026-11-09 18:08:31 -10:00
* feat(workspacetrust): add exact-match trust store for project config gating * feat(hooks): add ExcludeProject option to LoadConfig * feat(plugins): add ExcludeProject option to Load * feat(cli): gate project hooks and plugins behind workspace trust Trust check lives inside newHookDispatcherWithExtra and activatePlugins (fail-closed by construction); trustRoot is the original launch dir so a --worktree run inherits the source repo's trust. Callers OR the skip reports and emit one combined stderr notice. * feat(cli): add zero trust command (trust/list/remove) * fix(review): key spec-draft trust on the original launch dir; cover trust CLI edge branches Spec-draft runs (zero exec --use-spec --worktree) passed the reassigned worktree path as trustRoot, dropping a trusted repo's project hooks (fail-closed, but breaks worktree-inheritance). Thread the captured pre-worktree trustRoot into execSpecDraftRun. Add tests for the trust 'remove' too-many-args and --help branches, and a resolveTrust comment noting the per-chokepoint check must not be hoisted to callers. * test(cli): end-to-end trust-gate coverage through agent.Run and exec --worktree Drives the real agent loop with a fake tool-calling provider so a project beforeTool hook actually fires (or is gated away) through production code: gate blocks a tool call via agent.Run, and --worktree / --use-spec --worktree key trust on the original launch dir. All three are load-bearing (RED when the gate or the trustRoot threading regresses). * style(cli): gofmt struct alignment in exec_spec.go * fix(workspacetrust): compare stored trust entries literally, no symlink re-resolution External adversarial review (codex) found a false positive: IsTrusted re-normalized stored entries on every check (Abs+EvalSymlinks), so a trusted path later replaced by a symlink to attacker content re-resolved to the new target and matched. Stored entries are already canonical (normalized once at Trust time); compare them as literals and only normalize the incoming query. Add a regression test for the symlink-retarget case. * feat(mcp): gate project-scoped MCP servers behind workspace trust Closes the P0 an external adversarial review (codex) found: project ./.zero/config.json stdio MCP servers spawned before the hook/plugin gate, an ungated arbitrary-execution path that could also self-trust the workspace. Add ExcludeProject to config.ResolveMCP (skips the project layer) and thread a fail-closed trust check into every MCP spawn site (exec, TUI setup+refresh, mcp tools list, mcp check); reporting sites stay ungated. Verified the sole server-command exec (mcp/client.go) is reachable only through the now-gated RegisterTools paths. * test(cli): cover default-mode beforeTool firing through the trust gate Assert a project beforeTool hook fires in the default auto and ask permission modes (not only under unsafe), and is blocked when the workspace is untrusted, so the gate is verified in the mode a normal run actually uses. * docs(cli): note MCP servers in zero trust help text and doc comment The gate covers project hooks, plugins, and MCP servers, but the help string and runTrust doc comment listed only hooks and plugins. * test(cli): make workspace-trust tests portable on macOS and Windows setTrustConfigRoot set HOME on darwin, but config.UserConfigDir is XDG-first there (=$HOME/.config), so tests wrote trust.json and user hooks.json where the code never read them; set XDG_CONFIG_HOME on every non-Windows platform instead. writeMarkerHook shells out to /bin/sh, absent on Windows, so its trusted-case marker never appeared; skip it there like writeMarkerHookScript already does. TestRunTrustAddThenList compared `trust list` output (canonicalized via EvalSymlinks) against the raw cwd, which diverges on the Windows runner's 8.3 short names (RUNNER~1 -> runneradmin); compare the resolved path, and add TestRunTrustListShowsCanonicalPath to exercise that via a symlink on any platform. * feat(cli): surface the project MCP skip in the workspace-trust notice Project MCP servers were dropped silently in an untrusted workspace: the trust notice covered hooks and plugins but not MCP, and app.go discarded the resolveTrust error. registerMCPToolsForWorkspace now returns a trustSkip, gated on a new projectMCPConfigExists check plus the previously-dropped store-read error, and emitTrustNotice is variadic so the exec, spec-draft, interactive, and `mcp tools list` paths all fold in the MCP skip. The skip drives the notice only; the gate stays on resolveTrust/excludeProject, so a trusted workspace is unaffected and an untrusted one still fails closed. * fix(cli): print zero trust --help to stdout with a success exit zero trust -h/--help/help routed usage to stderr with the usage exit code, unlike every other subcommand (mcp, sandbox, skills, cron, ...) which prints help to stdout and returns success. Align it; the unknown-subcommand path still writes to stderr with the usage exit code. * fix(cli): gate oauth MCP login and surface mcp-check trust notice Two project-scoped MCP activation sites were left outside the workspace trust gate. zero mcp oauth login loaded a project-defined OAuth server from an untrusted workspace and ran the full discovery/registration/token-exchange flow against its configured URL. Gate resolveOAuthServer with resolveTrust so an untrusted clone's ./.zero/config.json OAuth server is dropped before login, and emit the same one-line trust notice the other spawn sites use. zero mcp check already gated the project layer but discarded the trust-check result and never emitted the notice, so a gated project server read as a bare "not configured". Emit the notice on the not-found branch. The three remaining ungated resolveMCPConfig(cwd, false) sites (backends doctor/snapshot and the extensions listing) are enumeration-only and stay ungated. * test(cli): adapt MCP startup-skip tests to two-arg resolveMCPConfig --------- Co-authored-by: Kevin Codex <[email protected]>
1040 lines
27 KiB
Go
1040 lines
27 KiB
Go
package hooks
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"path/filepath"
|
|
"regexp"
|
|
"sort"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
type Event string
|
|
type DiagnosticKind string
|
|
type ConfigSource string
|
|
type AuditStatus string
|
|
|
|
const (
|
|
EventBeforeTool Event = "beforeTool"
|
|
EventAfterTool Event = "afterTool"
|
|
EventSessionStart Event = "sessionStart"
|
|
EventSessionEnd Event = "sessionEnd"
|
|
EventSpecialistStart Event = "specialistStart"
|
|
EventSpecialistStop Event = "specialistStop"
|
|
)
|
|
|
|
const (
|
|
DiagnosticIO DiagnosticKind = "io"
|
|
DiagnosticJSON DiagnosticKind = "json"
|
|
DiagnosticSchema DiagnosticKind = "schema"
|
|
DiagnosticDuplicate DiagnosticKind = "duplicate"
|
|
)
|
|
|
|
const (
|
|
SourceUser ConfigSource = "user"
|
|
SourceProject ConfigSource = "project"
|
|
)
|
|
|
|
const (
|
|
AuditCompleted AuditStatus = "completed"
|
|
AuditError AuditStatus = "error"
|
|
AuditBlocked AuditStatus = "blocked"
|
|
)
|
|
|
|
type Command struct {
|
|
Command string `json:"command"`
|
|
Args []string `json:"args"`
|
|
}
|
|
|
|
type Definition struct {
|
|
ID string `json:"id"`
|
|
Name string `json:"name,omitempty"`
|
|
Description string `json:"description,omitempty"`
|
|
Event Event `json:"event"`
|
|
Matcher string `json:"matcher,omitempty"`
|
|
Command string `json:"command"`
|
|
Args []string `json:"args"`
|
|
Enabled bool `json:"enabled"`
|
|
}
|
|
|
|
type Config struct {
|
|
Enabled bool `json:"enabled"`
|
|
Hooks []Definition `json:"hooks"`
|
|
}
|
|
|
|
type Diagnostic struct {
|
|
Kind DiagnosticKind `json:"kind"`
|
|
Message string `json:"message"`
|
|
Source ConfigSource `json:"source,omitempty"`
|
|
Path string `json:"path,omitempty"`
|
|
HookID string `json:"hookId,omitempty"`
|
|
FieldPath string `json:"fieldPath,omitempty"`
|
|
}
|
|
|
|
type Paths struct {
|
|
UserConfigPath string `json:"userConfigPath"`
|
|
ProjectConfigPath string `json:"projectConfigPath"`
|
|
AuditPath string `json:"auditPath"`
|
|
}
|
|
|
|
type LoadResult struct {
|
|
Config Config `json:"config"`
|
|
Diagnostics []Diagnostic `json:"diagnostics"`
|
|
Paths Paths `json:"paths"`
|
|
}
|
|
|
|
type ResolvePathOptions struct {
|
|
Cwd string
|
|
Env map[string]string
|
|
}
|
|
|
|
type LoadOptions struct {
|
|
Cwd string
|
|
Env map[string]string
|
|
UserConfigPath string
|
|
ProjectConfigPath string
|
|
// ExcludeProject drops the project layer (./.zero/hooks.json) so only the
|
|
// user layer loads. Its zero value (false) preserves the user+project merge.
|
|
ExcludeProject bool
|
|
}
|
|
|
|
type StoreOptions struct {
|
|
ConfigPath string
|
|
}
|
|
|
|
type SelectInput struct {
|
|
Event Event
|
|
ToolName string
|
|
}
|
|
|
|
type AuditCommand = Command
|
|
|
|
type AuditResult struct {
|
|
ExitCode int `json:"exitCode"`
|
|
Stdout string `json:"stdout,omitempty"`
|
|
Stderr string `json:"stderr,omitempty"`
|
|
}
|
|
|
|
type AuditEvent struct {
|
|
Sequence int `json:"sequence"`
|
|
CreatedAt string `json:"createdAt"`
|
|
Type string `json:"type"`
|
|
HookID string `json:"hookId"`
|
|
Event Event `json:"event"`
|
|
Matcher string `json:"matcher,omitempty"`
|
|
ToolCallID string `json:"toolCallId,omitempty"`
|
|
Commands []AuditCommand `json:"commands,omitempty"`
|
|
Status AuditStatus `json:"status,omitempty"`
|
|
Results []AuditResult `json:"results,omitempty"`
|
|
DurationMs int `json:"durationMs,omitempty"`
|
|
}
|
|
|
|
type AppendStartedInput struct {
|
|
HookID string
|
|
Event Event
|
|
Matcher string
|
|
ToolCallID string
|
|
Commands []AuditCommand
|
|
}
|
|
|
|
type AppendCompletedInput struct {
|
|
HookID string
|
|
Event Event
|
|
Matcher string
|
|
ToolCallID string
|
|
Status AuditStatus
|
|
Results []AuditResult
|
|
DurationMs int
|
|
}
|
|
|
|
type AuditStoreOptions struct {
|
|
AuditPath string
|
|
Now func() time.Time
|
|
}
|
|
|
|
type manifestError struct {
|
|
fieldPath string
|
|
message string
|
|
}
|
|
|
|
func (err manifestError) Error() string {
|
|
if err.fieldPath == "" {
|
|
return err.message
|
|
}
|
|
return err.fieldPath + ": " + err.message
|
|
}
|
|
|
|
type hookLayer struct {
|
|
source ConfigSource
|
|
path string
|
|
config Config
|
|
enabledSet bool
|
|
hookEnabledSet map[string]bool
|
|
}
|
|
|
|
var (
|
|
hookIDPattern = regexp.MustCompile(`^[A-Za-z0-9][A-Za-z0-9._-]*$`)
|
|
storeLocksMu sync.Mutex
|
|
storeLocks = map[string]*sync.Mutex{}
|
|
)
|
|
|
|
func ResolvePaths(options ResolvePathOptions) (Paths, error) {
|
|
cwd, err := resolveCwd(options.Cwd)
|
|
if err != nil {
|
|
return Paths{}, err
|
|
}
|
|
|
|
home := strings.TrimSpace(firstNonEmpty(envValue(options.Env, "HOME"), envValue(options.Env, "USERPROFILE")))
|
|
if home == "" {
|
|
home, err = os.UserHomeDir()
|
|
if err != nil {
|
|
return Paths{}, fmt.Errorf("resolve user home: %w", err)
|
|
}
|
|
}
|
|
|
|
configHome := resolveEnvDir(options.Env, "XDG_CONFIG_HOME", filepath.Join(home, ".config"), cwd)
|
|
dataHome := resolveEnvDir(options.Env, "XDG_DATA_HOME", filepath.Join(home, ".local", "share"), cwd)
|
|
return Paths{
|
|
UserConfigPath: filepath.Join(configHome, "zero", "hooks.json"),
|
|
ProjectConfigPath: filepath.Join(cwd, ".zero", "hooks.json"),
|
|
AuditPath: filepath.Join(dataHome, "zero", "hooks", "audit.jsonl"),
|
|
}, nil
|
|
}
|
|
|
|
func LoadConfig(options LoadOptions) (LoadResult, error) {
|
|
paths, err := ResolvePaths(ResolvePathOptions{Cwd: options.Cwd, Env: options.Env})
|
|
if err != nil {
|
|
return LoadResult{}, err
|
|
}
|
|
userConfigPath := firstNonEmpty(options.UserConfigPath, paths.UserConfigPath)
|
|
projectConfigPath := firstNonEmpty(options.ProjectConfigPath, paths.ProjectConfigPath)
|
|
diagnostics := []Diagnostic{}
|
|
layers := []hookLayer{}
|
|
|
|
for _, candidate := range []struct {
|
|
source ConfigSource
|
|
path string
|
|
}{
|
|
{source: SourceUser, path: userConfigPath},
|
|
{source: SourceProject, path: projectConfigPath},
|
|
} {
|
|
if candidate.source == SourceProject && options.ExcludeProject {
|
|
continue
|
|
}
|
|
layer, ok := readLayer(candidate.source, candidate.path, &diagnostics)
|
|
if ok {
|
|
layers = append(layers, layer)
|
|
}
|
|
}
|
|
|
|
paths.UserConfigPath = userConfigPath
|
|
paths.ProjectConfigPath = projectConfigPath
|
|
return LoadResult{
|
|
Config: mergeLayers(layers, &diagnostics),
|
|
Diagnostics: diagnostics,
|
|
Paths: paths,
|
|
}, nil
|
|
}
|
|
|
|
func WriteConfig(path string, config Config) error {
|
|
normalized, err := normalizeConfig(map[string]any{
|
|
"enabled": config.Enabled,
|
|
"hooks": definitionsToRaw(config.Hooks),
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
resolved, err := filepath.Abs(path)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := os.MkdirAll(filepath.Dir(resolved), 0o700); err != nil {
|
|
return err
|
|
}
|
|
data, err := json.MarshalIndent(normalized, "", " ")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
tempPath := fmt.Sprintf("%s.tmp-%d-%d", resolved, os.Getpid(), time.Now().UnixNano())
|
|
if err := os.WriteFile(tempPath, append(data, '\n'), 0o600); err != nil {
|
|
return err
|
|
}
|
|
if err := os.Rename(tempPath, resolved); err != nil {
|
|
_ = os.Remove(tempPath)
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
type ConfigStore struct {
|
|
configPath string
|
|
}
|
|
|
|
func NewConfigStore(options StoreOptions) (*ConfigStore, error) {
|
|
path := options.ConfigPath
|
|
if strings.TrimSpace(path) == "" {
|
|
paths, err := ResolvePaths(ResolvePathOptions{})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
path = paths.ProjectConfigPath
|
|
}
|
|
resolved, err := filepath.Abs(path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &ConfigStore{configPath: resolved}, nil
|
|
}
|
|
|
|
func (store *ConfigStore) List() (Config, error) {
|
|
return readSingleConfig(store.configPath)
|
|
}
|
|
|
|
func (store *ConfigStore) Upsert(hook Definition) (Definition, error) {
|
|
lock := lockForPath(store.configPath)
|
|
lock.Lock()
|
|
defer lock.Unlock()
|
|
|
|
config, err := store.List()
|
|
if err != nil {
|
|
return Definition{}, err
|
|
}
|
|
raw := definitionToRaw(hook)
|
|
// Upsert treats the zero-value Enabled field as omitted so new hooks default
|
|
// to enabled. Disable persisted hooks explicitly with SetEnabled.
|
|
if !hook.Enabled {
|
|
delete(raw, "enabled")
|
|
}
|
|
normalized, err := normalizeDefinition(raw, "hooks.0")
|
|
if err != nil {
|
|
return Definition{}, err
|
|
}
|
|
next := make([]Definition, 0, len(config.Hooks)+1)
|
|
for _, existing := range config.Hooks {
|
|
if existing.ID != normalized.ID {
|
|
next = append(next, existing)
|
|
}
|
|
}
|
|
next = append(next, normalized)
|
|
sortDefinitions(next)
|
|
config.Hooks = next
|
|
if err := WriteConfig(store.configPath, config); err != nil {
|
|
return Definition{}, err
|
|
}
|
|
return normalized, nil
|
|
}
|
|
|
|
func (store *ConfigStore) Remove(hookID string) (bool, error) {
|
|
lock := lockForPath(store.configPath)
|
|
lock.Lock()
|
|
defer lock.Unlock()
|
|
|
|
config, err := store.List()
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
next := make([]Definition, 0, len(config.Hooks))
|
|
removed := false
|
|
for _, hook := range config.Hooks {
|
|
if hook.ID == hookID {
|
|
removed = true
|
|
continue
|
|
}
|
|
next = append(next, hook)
|
|
}
|
|
if !removed {
|
|
return false, nil
|
|
}
|
|
config.Hooks = next
|
|
return true, WriteConfig(store.configPath, config)
|
|
}
|
|
|
|
func (store *ConfigStore) SetEnabled(hookID string, enabled bool) (bool, error) {
|
|
lock := lockForPath(store.configPath)
|
|
lock.Lock()
|
|
defer lock.Unlock()
|
|
|
|
config, err := store.List()
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
changed := false
|
|
for index := range config.Hooks {
|
|
if config.Hooks[index].ID == hookID {
|
|
config.Hooks[index].Enabled = enabled
|
|
changed = true
|
|
}
|
|
}
|
|
if !changed {
|
|
return false, nil
|
|
}
|
|
return true, WriteConfig(store.configPath, config)
|
|
}
|
|
|
|
func Select(config Config, input SelectInput) []Definition {
|
|
if !config.Enabled {
|
|
return []Definition{}
|
|
}
|
|
selected := []Definition{}
|
|
for _, hook := range config.Hooks {
|
|
if !hook.Enabled || hook.Event != input.Event {
|
|
continue
|
|
}
|
|
if hook.Matcher == "" {
|
|
selected = append(selected, hook)
|
|
continue
|
|
}
|
|
if input.ToolName != "" && matchesHookMatcher(hook.Matcher, input.ToolName) {
|
|
selected = append(selected, hook)
|
|
}
|
|
}
|
|
return selected
|
|
}
|
|
|
|
func FormatList(config Config, diagnostics []Diagnostic) string {
|
|
state := "disabled"
|
|
if config.Enabled {
|
|
state = "enabled"
|
|
}
|
|
lines := []string{"Zero Hooks: " + state}
|
|
if len(config.Hooks) == 0 {
|
|
lines = append(lines, " No hooks configured.")
|
|
} else {
|
|
for _, hook := range config.Hooks {
|
|
matcher := ""
|
|
if hook.Matcher != "" {
|
|
matcher = " " + hook.Matcher
|
|
}
|
|
command := strings.Join(append([]string{hook.Command}, hook.Args...), " ")
|
|
hookState := "disabled"
|
|
if hook.Enabled {
|
|
hookState = "enabled"
|
|
}
|
|
lines = append(lines, fmt.Sprintf(" %s [%s%s] %s - %s", hook.ID, hook.Event, matcher, hookState, command))
|
|
}
|
|
}
|
|
if len(diagnostics) > 0 {
|
|
lines = append(lines, "Hook diagnostics:")
|
|
for _, diagnostic := range diagnostics {
|
|
lines = append(lines, fmt.Sprintf(" [%s] %s", diagnostic.Kind, diagnostic.Message))
|
|
}
|
|
}
|
|
return strings.Join(lines, "\n")
|
|
}
|
|
|
|
type AuditStore struct {
|
|
auditPath string
|
|
now func() time.Time
|
|
mu sync.Mutex
|
|
}
|
|
|
|
func NewAuditStore(options AuditStoreOptions) (*AuditStore, error) {
|
|
path := options.AuditPath
|
|
if strings.TrimSpace(path) == "" {
|
|
paths, err := ResolvePaths(ResolvePathOptions{})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
path = paths.AuditPath
|
|
}
|
|
resolved, err := filepath.Abs(path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
now := options.Now
|
|
if now == nil {
|
|
now = time.Now
|
|
}
|
|
return &AuditStore{auditPath: resolved, now: now}, nil
|
|
}
|
|
|
|
func (store *AuditStore) AppendStarted(input AppendStartedInput) (AuditEvent, error) {
|
|
return store.append(AuditEvent{
|
|
Type: "hook_execution_started",
|
|
HookID: input.HookID,
|
|
Event: input.Event,
|
|
Matcher: input.Matcher,
|
|
ToolCallID: input.ToolCallID,
|
|
Commands: input.Commands,
|
|
})
|
|
}
|
|
|
|
func (store *AuditStore) AppendCompleted(input AppendCompletedInput) (AuditEvent, error) {
|
|
return store.append(AuditEvent{
|
|
Type: "hook_execution_completed",
|
|
HookID: input.HookID,
|
|
Event: input.Event,
|
|
Matcher: input.Matcher,
|
|
ToolCallID: input.ToolCallID,
|
|
Status: input.Status,
|
|
Results: input.Results,
|
|
DurationMs: input.DurationMs,
|
|
})
|
|
}
|
|
|
|
// ReadEvents deliberately does not acquire store.mu. append holds store.mu while
|
|
// writing a single O_APPEND JSONL record, and lock-free readers may miss or skip
|
|
// an in-progress append while still avoiding deadlocks with append's read step.
|
|
func (store *AuditStore) ReadEvents() ([]AuditEvent, error) {
|
|
data, err := os.ReadFile(store.auditPath)
|
|
if err != nil {
|
|
if errors.Is(err, os.ErrNotExist) {
|
|
return []AuditEvent{}, nil
|
|
}
|
|
return nil, err
|
|
}
|
|
events := []AuditEvent{}
|
|
for _, line := range strings.Split(string(data), "\n") {
|
|
line = strings.TrimSpace(line)
|
|
if line == "" {
|
|
continue
|
|
}
|
|
var event AuditEvent
|
|
if err := json.Unmarshal([]byte(line), &event); err != nil {
|
|
continue
|
|
}
|
|
events = append(events, event)
|
|
}
|
|
return events, nil
|
|
}
|
|
|
|
func (store *AuditStore) append(event AuditEvent) (AuditEvent, error) {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
// Cross-process lock around the read-then-append. store.mu only serializes
|
|
// THIS process; the audit log is a shared global file, so without a
|
|
// cross-process lock two processes could both read sequence N via
|
|
// lastSequence() and both write N+1 (duplicate sequences). Held only for the
|
|
// millisecond read+append, mirroring the cron/oauth file locks.
|
|
unlock, err := store.lockAudit()
|
|
if err != nil {
|
|
return AuditEvent{}, err
|
|
}
|
|
defer unlock()
|
|
|
|
highest, err := store.lastSequence()
|
|
if err != nil {
|
|
return AuditEvent{}, err
|
|
}
|
|
event.Sequence = highest + 1
|
|
event.CreatedAt = store.now().UTC().Format(time.RFC3339Nano)
|
|
|
|
if err := os.MkdirAll(filepath.Dir(store.auditPath), 0o700); err != nil {
|
|
return AuditEvent{}, err
|
|
}
|
|
data, err := json.Marshal(event)
|
|
if err != nil {
|
|
return AuditEvent{}, err
|
|
}
|
|
file, err := os.OpenFile(store.auditPath, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0o600)
|
|
if err != nil {
|
|
return AuditEvent{}, err
|
|
}
|
|
if _, err := file.Write(append(data, '\n')); err != nil {
|
|
_ = file.Close()
|
|
return AuditEvent{}, err
|
|
}
|
|
if err := file.Close(); err != nil {
|
|
return AuditEvent{}, err
|
|
}
|
|
return event, nil
|
|
}
|
|
|
|
// lastSequence returns the Sequence of the last record in the append-only audit
|
|
// log (or 0 when empty/absent). It reads only the file's TAIL rather than the
|
|
// whole file, so append stays O(1) instead of O(n) per call (the previous code
|
|
// re-read and scanned every event on every append → O(n²) over a session). It
|
|
// reads fresh from disk each time so a concurrent process's prior appends are
|
|
// observed; the read-then-append is made atomic across processes by the caller's
|
|
// lockAudit — store.mu alone would not prevent a cross-process sequence collision.
|
|
func (store *AuditStore) lastSequence() (int, error) {
|
|
file, err := os.Open(store.auditPath)
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
return 0, nil
|
|
}
|
|
return 0, err
|
|
}
|
|
defer file.Close()
|
|
info, err := file.Stat()
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
size := info.Size()
|
|
if size == 0 {
|
|
return 0, nil
|
|
}
|
|
const tailWindow = 8 * 1024
|
|
start := size - tailWindow
|
|
if start < 0 {
|
|
start = 0
|
|
}
|
|
buf := make([]byte, size-start)
|
|
// ReadAt may return io.EOF with a short read if the file shrank between Stat
|
|
// and here; treat EOF as non-fatal and use only the bytes actually read.
|
|
n, rerr := file.ReadAt(buf, start)
|
|
if rerr != nil && !errors.Is(rerr, io.EOF) {
|
|
return 0, rerr
|
|
}
|
|
buf = buf[:n]
|
|
if len(buf) == 0 {
|
|
return 0, nil
|
|
}
|
|
text := strings.TrimRight(string(buf), "\r\n \t")
|
|
if text == "" {
|
|
return 0, nil
|
|
}
|
|
if idx := strings.LastIndexByte(text, '\n'); idx >= 0 {
|
|
text = strings.TrimSpace(text[idx+1:])
|
|
} else if start > 0 {
|
|
// The last record is longer than the tail window (rare) — fall back to a
|
|
// full scan so the sequence stays correct.
|
|
return store.lastSequenceFullScan()
|
|
}
|
|
if text == "" {
|
|
return 0, nil
|
|
}
|
|
var record AuditEvent
|
|
if err := json.Unmarshal([]byte(text), &record); err != nil {
|
|
return 0, err
|
|
}
|
|
return record.Sequence, nil
|
|
}
|
|
|
|
func (store *AuditStore) lastSequenceFullScan() (int, error) {
|
|
events, err := store.ReadEvents()
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
highest := 0
|
|
for _, existing := range events {
|
|
if existing.Sequence > highest {
|
|
highest = existing.Sequence
|
|
}
|
|
}
|
|
return highest, nil
|
|
}
|
|
|
|
func readLayer(source ConfigSource, path string, diagnostics *[]Diagnostic) (hookLayer, bool) {
|
|
resolved, err := filepath.Abs(path)
|
|
if err == nil {
|
|
path = resolved
|
|
}
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
if errors.Is(err, os.ErrNotExist) {
|
|
return hookLayer{}, false
|
|
}
|
|
*diagnostics = append(*diagnostics, Diagnostic{Kind: DiagnosticIO, Source: source, Path: path, Message: err.Error()})
|
|
return hookLayer{}, false
|
|
}
|
|
var raw any
|
|
if err := json.Unmarshal(data, &raw); err != nil {
|
|
*diagnostics = append(*diagnostics, Diagnostic{Kind: DiagnosticJSON, Source: source, Path: path, Message: err.Error()})
|
|
return hookLayer{}, false
|
|
}
|
|
enabledSet, hookEnabledSet := extractLayerEnabledMarkers(raw)
|
|
config, err := normalizeConfig(raw)
|
|
if err != nil {
|
|
*diagnostics = append(*diagnostics, toDiagnostic(err, source, path))
|
|
return hookLayer{}, false
|
|
}
|
|
return hookLayer{source: source, path: path, config: config, enabledSet: enabledSet, hookEnabledSet: hookEnabledSet}, true
|
|
}
|
|
|
|
func readSingleConfig(path string) (Config, error) {
|
|
diagnostics := []Diagnostic{}
|
|
layer, ok := readLayer(SourceProject, path, &diagnostics)
|
|
if len(diagnostics) > 0 {
|
|
diagnostic := diagnostics[0]
|
|
return Config{}, fmt.Errorf("invalid Zero hook config at %s: %s", diagnostic.Path, diagnostic.Message)
|
|
}
|
|
if !ok {
|
|
return Config{Enabled: true, Hooks: []Definition{}}, nil
|
|
}
|
|
return layer.config, nil
|
|
}
|
|
|
|
func mergeLayers(layers []hookLayer, diagnostics *[]Diagnostic) Config {
|
|
enabled := true
|
|
byID := map[string]Definition{}
|
|
sourceByID := map[string]hookLayer{}
|
|
for _, layer := range layers {
|
|
if layer.enabledSet {
|
|
enabled = layer.config.Enabled
|
|
}
|
|
for _, hook := range layer.config.Hooks {
|
|
if previous, ok := sourceByID[hook.ID]; ok {
|
|
*diagnostics = append(*diagnostics, Diagnostic{
|
|
Kind: DiagnosticDuplicate,
|
|
Source: layer.source,
|
|
Path: layer.path,
|
|
HookID: hook.ID,
|
|
Message: fmt.Sprintf("Hook %q from %s overrides %s hook at %s.", hook.ID, layer.source, previous.source, previous.path),
|
|
})
|
|
if !layer.hookEnabledSet[hook.ID] {
|
|
hook.Enabled = byID[hook.ID].Enabled
|
|
}
|
|
}
|
|
byID[hook.ID] = hook
|
|
sourceByID[hook.ID] = layer
|
|
}
|
|
}
|
|
hooks := make([]Definition, 0, len(byID))
|
|
for _, hook := range byID {
|
|
hooks = append(hooks, hook)
|
|
}
|
|
sortDefinitions(hooks)
|
|
return Config{Enabled: enabled, Hooks: hooks}
|
|
}
|
|
|
|
func extractLayerEnabledMarkers(raw any) (bool, map[string]bool) {
|
|
hookEnabledSet := map[string]bool{}
|
|
obj, ok := raw.(map[string]any)
|
|
if !ok {
|
|
return false, hookEnabledSet
|
|
}
|
|
_, enabledSet := obj["enabled"]
|
|
items, ok := obj["hooks"].([]any)
|
|
if !ok {
|
|
return enabledSet, hookEnabledSet
|
|
}
|
|
for _, item := range items {
|
|
hook, ok := item.(map[string]any)
|
|
if !ok {
|
|
continue
|
|
}
|
|
id, ok := hook["id"].(string)
|
|
if !ok {
|
|
continue
|
|
}
|
|
if _, ok := hook["enabled"]; ok {
|
|
hookEnabledSet[strings.TrimSpace(id)] = true
|
|
}
|
|
}
|
|
return enabledSet, hookEnabledSet
|
|
}
|
|
|
|
func normalizeConfig(raw any) (Config, error) {
|
|
if raw == nil {
|
|
raw = map[string]any{}
|
|
}
|
|
obj, ok := raw.(map[string]any)
|
|
if !ok {
|
|
return Config{}, manifestError{message: "Expected hooks config to be a JSON object."}
|
|
}
|
|
enabled := true
|
|
if rawEnabled, ok := obj["enabled"]; ok {
|
|
parsed, ok := rawEnabled.(bool)
|
|
if !ok {
|
|
return Config{}, manifestError{fieldPath: "enabled", message: "Expected a boolean."}
|
|
}
|
|
enabled = parsed
|
|
}
|
|
items, err := optionalArray(obj["hooks"], "hooks")
|
|
if err != nil {
|
|
return Config{}, err
|
|
}
|
|
definitions := make([]Definition, 0, len(items))
|
|
for index, item := range items {
|
|
definition, err := normalizeDefinition(item, fmt.Sprintf("hooks.%d", index))
|
|
if err != nil {
|
|
return Config{}, err
|
|
}
|
|
definitions = append(definitions, definition)
|
|
}
|
|
sortDefinitions(definitions)
|
|
return Config{Enabled: enabled, Hooks: definitions}, nil
|
|
}
|
|
|
|
func normalizeDefinition(raw any, field string) (Definition, error) {
|
|
obj, ok := raw.(map[string]any)
|
|
if !ok {
|
|
return Definition{}, manifestError{fieldPath: field, message: "Expected hook definition to be an object."}
|
|
}
|
|
id, err := requiredID(obj, field+".id")
|
|
if err != nil {
|
|
return Definition{}, err
|
|
}
|
|
name, err := optionalString(obj, field+".name")
|
|
if err != nil {
|
|
return Definition{}, err
|
|
}
|
|
description, err := optionalString(obj, field+".description")
|
|
if err != nil {
|
|
return Definition{}, err
|
|
}
|
|
event, err := parseEvent(obj["event"], field+".event")
|
|
if err != nil {
|
|
return Definition{}, err
|
|
}
|
|
matcher, err := optionalString(obj, field+".matcher")
|
|
if err != nil {
|
|
return Definition{}, err
|
|
}
|
|
if matcher != "" && !eventSupportsMatcher(event) {
|
|
return Definition{}, manifestError{fieldPath: field + ".matcher", message: "matcher is only supported for beforeTool and afterTool hooks."}
|
|
}
|
|
command, err := requiredString(obj, field+".command")
|
|
if err != nil {
|
|
return Definition{}, err
|
|
}
|
|
args, err := optionalStringArray(obj["args"], field+".args")
|
|
if err != nil {
|
|
return Definition{}, err
|
|
}
|
|
enabled := true
|
|
if rawEnabled, ok := obj["enabled"]; ok {
|
|
parsed, ok := rawEnabled.(bool)
|
|
if !ok {
|
|
return Definition{}, manifestError{fieldPath: field + ".enabled", message: "Expected a boolean."}
|
|
}
|
|
enabled = parsed
|
|
}
|
|
return Definition{ID: id, Name: name, Description: description, Event: event, Matcher: matcher, Command: command, Args: args, Enabled: enabled}, nil
|
|
}
|
|
|
|
func matchesHookMatcher(matcher string, toolName string) bool {
|
|
if matcher == "*" {
|
|
return true
|
|
}
|
|
if !strings.Contains(matcher, "*") {
|
|
return matcher == toolName
|
|
}
|
|
segments := strings.Split(matcher, "*")
|
|
cursor := 0
|
|
searchEnd := len(toolName)
|
|
if !strings.HasPrefix(matcher, "*") {
|
|
first := segments[0]
|
|
segments = segments[1:]
|
|
if !strings.HasPrefix(toolName, first) {
|
|
return false
|
|
}
|
|
cursor = len(first)
|
|
}
|
|
if !strings.HasSuffix(matcher, "*") {
|
|
last := segments[len(segments)-1]
|
|
segments = segments[:len(segments)-1]
|
|
if !strings.HasSuffix(toolName, last) {
|
|
return false
|
|
}
|
|
searchEnd = len(toolName) - len(last)
|
|
}
|
|
for _, segment := range segments {
|
|
if segment == "" {
|
|
continue
|
|
}
|
|
index := strings.Index(toolName[cursor:], segment)
|
|
if index < 0 {
|
|
return false
|
|
}
|
|
cursor += index + len(segment)
|
|
if cursor > searchEnd {
|
|
return false
|
|
}
|
|
}
|
|
return cursor <= searchEnd
|
|
}
|
|
|
|
func eventSupportsMatcher(event Event) bool {
|
|
return event == EventBeforeTool || event == EventAfterTool
|
|
}
|
|
|
|
func toDiagnostic(err error, source ConfigSource, path string) Diagnostic {
|
|
var manifestErr manifestError
|
|
if errors.As(err, &manifestErr) {
|
|
return Diagnostic{Kind: DiagnosticSchema, Source: source, Path: path, FieldPath: manifestErr.fieldPath, Message: manifestErr.message}
|
|
}
|
|
return Diagnostic{Kind: DiagnosticSchema, Source: source, Path: path, Message: err.Error()}
|
|
}
|
|
|
|
func requiredString(obj map[string]any, field string) (string, error) {
|
|
value, ok := obj[lastPathSegment(field)]
|
|
if !ok {
|
|
return "", manifestError{fieldPath: field, message: "Expected a non-empty string."}
|
|
}
|
|
text, ok := value.(string)
|
|
if !ok || strings.TrimSpace(text) == "" {
|
|
return "", manifestError{fieldPath: field, message: "Expected a non-empty string."}
|
|
}
|
|
return strings.TrimSpace(text), nil
|
|
}
|
|
|
|
func optionalString(obj map[string]any, field string) (string, error) {
|
|
value, ok := obj[lastPathSegment(field)]
|
|
if !ok || value == nil {
|
|
return "", nil
|
|
}
|
|
text, ok := value.(string)
|
|
if !ok || strings.TrimSpace(text) == "" {
|
|
return "", manifestError{fieldPath: field, message: "Expected a non-empty string."}
|
|
}
|
|
return strings.TrimSpace(text), nil
|
|
}
|
|
|
|
func requiredID(obj map[string]any, field string) (string, error) {
|
|
value, err := requiredString(obj, field)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
if !hookIDPattern.MatchString(value) {
|
|
return "", manifestError{fieldPath: field, message: "Use letters, numbers, dots, dashes, or underscores."}
|
|
}
|
|
return value, nil
|
|
}
|
|
|
|
// KnownEvents returns the hook events Zero recognizes, in dispatch order.
|
|
func KnownEvents() []Event {
|
|
return []Event{EventBeforeTool, EventAfterTool, EventSessionStart, EventSessionEnd, EventSpecialistStart, EventSpecialistStop}
|
|
}
|
|
|
|
// IsValidEvent reports whether event is one Zero recognizes.
|
|
func IsValidEvent(event Event) bool {
|
|
for _, known := range KnownEvents() {
|
|
if event == known {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func parseEvent(raw any, field string) (Event, error) {
|
|
text, ok := raw.(string)
|
|
if !ok || strings.TrimSpace(text) == "" {
|
|
return "", manifestError{fieldPath: field, message: "Expected a hook event."}
|
|
}
|
|
event := Event(strings.TrimSpace(text))
|
|
if !IsValidEvent(event) {
|
|
return "", manifestError{fieldPath: field, message: "Expected beforeTool, afterTool, sessionStart, sessionEnd, specialistStart, or specialistStop."}
|
|
}
|
|
return event, nil
|
|
}
|
|
|
|
func optionalArray(raw any, field string) ([]any, error) {
|
|
if raw == nil {
|
|
return []any{}, nil
|
|
}
|
|
items, ok := raw.([]any)
|
|
if !ok {
|
|
return nil, manifestError{fieldPath: field, message: "Expected an array."}
|
|
}
|
|
return items, nil
|
|
}
|
|
|
|
func optionalStringArray(raw any, field string) ([]string, error) {
|
|
if raw == nil {
|
|
return []string{}, nil
|
|
}
|
|
if values, ok := raw.([]string); ok {
|
|
return append([]string{}, values...), nil
|
|
}
|
|
items, ok := raw.([]any)
|
|
if !ok {
|
|
return nil, manifestError{fieldPath: field, message: "Expected an array."}
|
|
}
|
|
values := make([]string, 0, len(items))
|
|
for index, item := range items {
|
|
text, ok := item.(string)
|
|
if !ok {
|
|
return nil, manifestError{fieldPath: fmt.Sprintf("%s.%d", field, index), message: "Expected a string."}
|
|
}
|
|
values = append(values, text)
|
|
}
|
|
return values, nil
|
|
}
|
|
|
|
func definitionsToRaw(definitions []Definition) []any {
|
|
values := make([]any, 0, len(definitions))
|
|
for _, definition := range definitions {
|
|
values = append(values, definitionToRaw(definition))
|
|
}
|
|
return values
|
|
}
|
|
|
|
func definitionToRaw(definition Definition) map[string]any {
|
|
value := map[string]any{
|
|
"id": definition.ID,
|
|
"event": string(definition.Event),
|
|
"command": definition.Command,
|
|
"args": definition.Args,
|
|
"enabled": definition.Enabled,
|
|
}
|
|
if definition.Name != "" {
|
|
value["name"] = definition.Name
|
|
}
|
|
if definition.Description != "" {
|
|
value["description"] = definition.Description
|
|
}
|
|
if definition.Matcher != "" {
|
|
value["matcher"] = definition.Matcher
|
|
}
|
|
return value
|
|
}
|
|
|
|
func sortDefinitions(definitions []Definition) {
|
|
sort.Slice(definitions, func(left int, right int) bool {
|
|
return definitions[left].ID < definitions[right].ID
|
|
})
|
|
}
|
|
|
|
func lockForPath(path string) *sync.Mutex {
|
|
storeLocksMu.Lock()
|
|
defer storeLocksMu.Unlock()
|
|
lock := storeLocks[path]
|
|
if lock == nil {
|
|
lock = &sync.Mutex{}
|
|
storeLocks[path] = lock
|
|
}
|
|
return lock
|
|
}
|
|
|
|
func resolveEnvDir(env map[string]string, key string, fallback string, cwd string) string {
|
|
value := strings.TrimSpace(envValue(env, key))
|
|
if value == "" {
|
|
return fallback
|
|
}
|
|
if filepath.IsAbs(value) {
|
|
return filepath.Clean(value)
|
|
}
|
|
return filepath.Join(cwd, value)
|
|
}
|
|
|
|
func resolveCwd(cwd string) (string, error) {
|
|
if strings.TrimSpace(cwd) == "" {
|
|
return os.Getwd()
|
|
}
|
|
if filepath.IsAbs(cwd) {
|
|
return filepath.Clean(cwd), nil
|
|
}
|
|
return filepath.Abs(cwd)
|
|
}
|
|
|
|
func envValue(env map[string]string, key string) string {
|
|
if env != nil {
|
|
return env[key]
|
|
}
|
|
return os.Getenv(key)
|
|
}
|
|
|
|
func firstNonEmpty(values ...string) string {
|
|
for _, value := range values {
|
|
if strings.TrimSpace(value) != "" {
|
|
return value
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func lastPathSegment(field string) string {
|
|
if index := strings.LastIndex(field, "."); index >= 0 {
|
|
return field[index+1:]
|
|
}
|
|
return field
|
|
}
|