steve
d0bd3ec3d9
executus CI / test (push) Has been cancelled
All 3 cloud models converged on a real access-control bug; fixed it + the other genuine findings (the false-positives were dropped): Security (HIGH — all 3 models): - create_file_url skipped ValidateScope: a same-skill caller could mint a PUBLIC url for a file scoped to another user/run. Now runs ValidateScope (admin-aware), skipped only for the descendant-grant case — mirroring the read tools. Other real fixes: - ValidateScope hard-coded `false` at every call site (admin branch dead) -> pass inv.CallerIsAdmin (the executor sets it via the host AdminPolicy; still false/fail-closed when no admin). Stale "no admin flag" comment corrected. - create_file_url: ExpiresInSeconds clamped BEFORE the *time.Second multiply (huge values overflowed to a negative duration that slipped under the cap, minting already-expired tokens); swallowed json.Marshal error now returned. - RegisterMeta: build the default budget WITH the configured MaxPerRun (was NewInMemorySearchBudget(nil) -> hardcoded 10, ignoring MetaDeps.MaxPerRun). - classify: all-zero scores no longer return a false-positive top-1 winner; coerceClassifyScore uses strconv.ParseFloat (rejects trailing garbage like "50extra" that fmt.Sscanf silently accepted). - file_delete: honor the descendant grant (parent can clean up a worker's artifacts) — was the lone cross-skill-reject-outright file tool. - meta tools: input caps truncate at a UTF-8 rune boundary (truncateUTF8), not mid-rune. - think: removed the dead `var _ = fmt.Errorf` import-keeper; file_save default aligned to 16 MiB (matched RegisterStore). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
80 lines
2.6 KiB
Go
80 lines
2.6 KiB
Go
// file_delete removes a saved file by its file_id. Decrements the
|
|
// underlying blob's refcount in storage; the blob row is removed when
|
|
// refcount hits zero.
|
|
//
|
|
// Why scope is checked POST-fetch (mirrors file_get): file_id is the
|
|
// only key the caller has; we must read the row to know the scope.
|
|
package tools
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
|
|
"gitea.stevedudenhoeffer.com/steve/executus/tool"
|
|
)
|
|
|
|
type fileDeleteArgs struct {
|
|
FileID string `json:"file_id" description:"Opaque file ID returned by file_save or file_list."`
|
|
}
|
|
|
|
// NewFileDelete constructs the file_delete tool. storage nil → "not
|
|
// configured" at execute time.
|
|
func NewFileDelete(storage FileStorage) tool.Tool {
|
|
return tool.NewGatedTool[fileDeleteArgs](
|
|
"file_delete",
|
|
"Remove a saved file by file_id. Returns 'ok' on success or 'not_found' if no file matched.",
|
|
tool.Permission{
|
|
AuthoringRequirement: tool.RequirementAnyone,
|
|
OperatesOn: tool.ScopeCaller,
|
|
SafeForShare: true,
|
|
Categories: []string{"storage", "write"},
|
|
},
|
|
func(ctx context.Context, inv tool.Invocation, args fileDeleteArgs) (string, error) {
|
|
if storage == nil {
|
|
return "", fmt.Errorf("file_delete: not configured")
|
|
}
|
|
if args.FileID == "" {
|
|
return "", fmt.Errorf("file_delete: file_id required")
|
|
}
|
|
|
|
// Fetch first so we can validate scope before deleting. The
|
|
// extra read is acceptable for a write path that's not in
|
|
// the hot loop, and it preserves the cross-skill /
|
|
// cross-user safety story.
|
|
meta, _, err := storage.FileGet(ctx, args.FileID)
|
|
if err != nil {
|
|
if errors.Is(err, ErrFileNotFound) {
|
|
return "not_found", nil
|
|
}
|
|
return "", fmt.Errorf("file_delete: %w", err)
|
|
}
|
|
// Honor the descendant grant like the read tools do, so a parent
|
|
// orchestrator can clean up a worker's artifacts (gadfly flagged the
|
|
// asymmetry: delete previously rejected cross-skill outright).
|
|
grantedViaDescendant := false
|
|
if meta.SkillID != inv.SkillID {
|
|
if !descendantFileGrant(ctx, storage, inv, meta.SkillID) {
|
|
return "", fmt.Errorf("file_delete: file does not belong to this skill")
|
|
}
|
|
grantedViaDescendant = true
|
|
}
|
|
if !grantedViaDescendant {
|
|
if err := ValidateScope(inv, meta.Scope, inv.CallerIsAdmin); err != nil {
|
|
return "", fmt.Errorf("file_delete: %w", err)
|
|
}
|
|
}
|
|
|
|
if err := storage.FileDelete(ctx, args.FileID); err != nil {
|
|
if errors.Is(err, ErrFileNotFound) {
|
|
// Race: row was deleted between FileGet and
|
|
// FileDelete. Surface as a clean miss.
|
|
return "not_found", nil
|
|
}
|
|
return "", fmt.Errorf("file_delete: %w", err)
|
|
}
|
|
return "ok", nil
|
|
},
|
|
)
|
|
}
|