* feat(store): flea-market upload guardrails + soft delete + JOIN-based admin queue
Adds an end-to-end guardrails pipeline for store uploads (manifest +
static-security + LLM review), persists blocked bundles for forensics,
introduces soft-delete (Archive) semantics, consolidates the legacy
/store/{id} surface into /marketplace/flea/{id}, and reworks the admin
queue so lifecycle filters read live entity visibility via LEFT JOIN
rather than a denormalized submission column.
Schema v29 → v35:
* v29 store_submissions table + store_entities.visibility_status
* v30 file_size, bundle_sha256, bundle_purged_at on submissions
* v31 reshape store_submissions (drop legacy unique on entity_id)
* v32 store_entities.archived_at/by + 'archived' visibility value
* v33 drop store_submissions.retry_count (unused)
* v34 ensure idx_store_submissions_entity exists post column-drop
* v35 broaden visibility_status enum + JOIN architecture cutover
Pipeline (src/store_guardrails/):
* Inline checks: manifest_check, static_scan, quality_check
* LLM review configurable haiku|sonnet|opus (default haiku)
* BackgroundTasks-driven async path with structured-output JSON
* Per-submitter daily quota (default 50)
* 30-day TTL purge job (POST /api/admin/run-blocked-purge)
* Bundle SHA256 + size persisted; sha256 survives purge for forensics
Visibility model:
* pending | approved | hidden | archived
* _enforce_visibility returns 404 (no leak) for non-owner non-admin
* Owner sees own non-approved entries via include_owner_id widening
* Install refused with 409 entity_not_approved when not approved
Soft-delete (DELETE /api/store/entities/{id}):
* Default = soft (visibility_status='archived'); existing installs
keep getting served the bundle so users don't lose the plugin
* ?hard=true admin-only: drops bundle + cascades user_store_installs
* Hard-delete preserves entity_id on submission as tombstone so
audit_log linkage survives for the activity timeline
Admin queue lifecycle (the JOIN refactor):
* Verdict (store_submissions.status) is immutable forensic record
* Lifecycle (store_entities.visibility_status) is live state
* /admin/store/submissions Archived chip translates to
`e.visibility_status='archived'` via LEFT JOIN — any path that
flips visibility surfaces in the queue immediately
* Detail page renders Status (verdict) and Entity lifecycle side by
side so admins see "approved at review, now archived" at a glance
URL consolidation:
* /store/{id} deleted (no redirect, stale bookmarks 404)
* /marketplace/flea/{id} is the canonical detail surface
* Three in-tree callers (upload-success, my-stack card, store
listing card) updated to point at the new URL
* Quarantine banner extracted to _quarantine_banner.html partial,
self-guarded, included from both flea detail templates
* Banner JS auto-refreshes when the verdict lands by polling
/api/marketplace/flea/{id}/detail (visibility_status +
submission_status — the latter is needed because blocked_llm
keeps the entity at visibility_status='pending')
Audit log resource format:
* runner.py emits prefixed `store_submission:{id}` (post-fix)
* Detail-page timeline query handles three patterns: prefixed
submission, helper-emitted `store_entity:{sub_id}`, and bare-id
legacy rows — all surface in the activity timeline
UX fixes:
* Owner sees Under review / Quarantined / Hidden banner with status
* Install button gray-disabled (not blue) when non-approved
* Owner cannot delete quarantined entries (403); admin can
* Admin queue: filter chips, sortable columns, paging, page-size
* Auto-refresh queue every 5s while pending rows are visible
* Store upload page file picker no longer opens twice (label →
input default action collided with explicit JS handler)
Tests: 168 passed across the guardrails suites (admin submissions,
store API, inline / LLM / purge guardrails, store repositories,
marketplace filter, schema version). New regression coverage
includes: archive surfaces via JOIN even when API path is bypassed;
deleted submission renders activity timeline (tombstone); flea
detail surfaces submission_status only for owner/admin; detail page
renders Entity lifecycle row; audit log resource format covers both
helper and runner paths.
* fix(store-guardrails): PR #233 follow-up — prompt injection, atomic PUT, BG race, schema, reaper, sort whitelist
Addresses 9 of the 23 findings from the PR #233 review (spec at
docs/superpowers/specs/2026-05-09-pr233-guardrails-fixes-spec.md).
Merge-gate items #1-#6 plus high-value mediums #7, #9-#12, #23.
Architectural items (#8 enum split, #14 factory) and pure
maintainability (#15-#22) deferred to follow-ups.
Security:
* #1 prompt injection — SYSTEM_PROMPT now passed via the SDK's
dedicated system= parameter; bundle wrapped in <bundle>...</bundle>
sentinels declared data-only by the system prompt; literal
sentinel strings in user content are escaped so an adversarial
README can't forge a close tag.
* #6 static scan honesty — module docstring + admin copy + docs
declare static scan as signal not gate; .md/.txt/.rst/.html/.json/
.yaml/.yml/.toml skipped to avoid false positives on prose.
AST mode for Python deferred (separate flag, FP comparison work).
Correctness:
* #2 PUT atomicity — bundles bake into plugin.staging-<rand>/
alongside live, atomic-rename on success; failed checks leave
live tree byte-for-byte intact.
* #3 BG-task race — set_visibility_if_pending guards verdict flips
to the (pending, hidden) review window; admin archives during
review survive; skipped flips audit-logged.
* #4 v35 NOT NULL/DEFAULT — schema v35→v36 re-applies them on
store_entities.visibility_status. CHECK constraint enforced
application-side (DuckDB ADD CHECK on existing column unsupported).
* #7 stuck-review reaper — reap_stuck_llm_reviews flips pending_llm
rows older than guardrails.stuck_review_grace_seconds (default
1800) to review_error. Scheduler runs every 15 min via new
/api/admin/run-reap-stuck-reviews. Set knob to 0 to disable.
* #9 quota counter — count_blocked_for_submitter_since now counts
blocked_inline + blocked_llm + review_error so a submitter
triggering only LLM-blocked verdicts is bounded.
* #10 missing risk_level — surfaces as review_error with
error='missing_risk_level' instead of silently defaulting to
'medium' (which looked like a model-decided block).
* #11 archived_at clear — set_visibility nulls archived_at +
archived_by when transitioning out of 'archived' so a future
read doesn't show stale archive forensics on an approved row.
Maintainability:
* #12 FSM doc comment — accurate insert/transition/lifecycle
description in src/db.py near store_submissions schema.
* #23 sort-key whitelist — admin queue rejects unknown sort keys
with 400 invalid_sort_key; substring-replace footgun removed.
Deferred (separate PRs):
* #5 quota race — proper fix requires asyncio.Lock spanning the
full pipeline; threading.Lock blocks event loop, DuckDB MVCC
doesn't help. API-level slowapi bounds worst case for now.
* #6 part 3 (AST static scan), #8 (enum split), #13 (import
bundle docs), #14 (factory consolidation), #15-#22 (maint).
Tests:
* New: tests/test_store_guardrails_prompt_injection.py (corpus +
trust-boundary invariants), tests/test_store_put_atomic.py,
tests/test_store_guardrails_reaper.py.
* Extended: test_store_guardrails_llm.py (system param, missing
risk_level, BG race), test_admin_store_submissions.py (quota
counter widening, sort whitelist 400), test_store_repositories.py
(un-archive metadata clear), test_db_schema_version.py (v36).
* Full suite: 3738 passed; 17 pre-existing baseline failures
unchanged (db migration tests, cli binary rename, catalog export,
user mgmt v5 backfill — confirmed by stash + rerun on clean tree).
98 lines
3.7 KiB
Python
98 lines
3.7 KiB
Python
"""Manifest & metadata validation for uploaded skill/agent/plugin bundles.
|
|
|
|
Runs inline (no LLM, no I/O beyond the extracted scratch dir). Verifies the
|
|
shape on disk matches the declared ``type`` and that required metadata is
|
|
present. Failures here block publication with an actionable detail string
|
|
the upload UI can render directly.
|
|
|
|
We deliberately keep this orthogonal to ``app/api/store.py``'s existing
|
|
``_validate_and_extract_metadata`` — that helper extracts the manifest
|
|
contents; this one validates them against per-type rules so the guardrail
|
|
record explains *why* a submission was rejected.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import re
|
|
from pathlib import Path
|
|
from typing import Any, Dict, List
|
|
|
|
|
|
# Semver, permissive. Pre-release / build-meta segments accepted (we don't
|
|
# enforce strict semver — operators surface the version as a label, not a
|
|
# precedence key). Reject empty + obvious garbage.
|
|
_SEMVER_RE = re.compile(
|
|
r"^v?\d+(\.\d+){0,2}([\-+][0-9A-Za-z.\-]+)?$"
|
|
)
|
|
|
|
|
|
def check(plugin_dir: Path, type_: str) -> Dict[str, Any]:
|
|
"""Validate the extracted bundle against per-type structural rules.
|
|
|
|
``plugin_dir`` is the *baked* plugin tree (post ``_bake_plugin_tree``),
|
|
not the raw extracted scratch — guardrails always see the final shape
|
|
that would land on disk.
|
|
|
|
Returns ``{"status": "pass"|"fail", "issues": [...]}``.
|
|
"""
|
|
issues: List[str] = []
|
|
|
|
if not plugin_dir.is_dir():
|
|
return {"status": "fail", "issues": ["plugin_dir_missing"]}
|
|
|
|
if type_ not in {"skill", "agent", "plugin"}:
|
|
return {"status": "fail", "issues": [f"unsupported_type:{type_}"]}
|
|
|
|
# Per-type required-shape rules. ``plugin_dir`` is the baked tree
|
|
# (post ``_bake_plugin_tree``):
|
|
# skill → plugin_dir/skills/<suffixed>/SKILL.md
|
|
# agent → plugin_dir/agents/<suffixed>.md
|
|
# plugin → plugin_dir/.claude-plugin/plugin.json
|
|
# We look anywhere under plugin_dir for the required file so this stays
|
|
# robust across small layout drifts and across legacy bundles uploaded
|
|
# before the bake conventions tightened.
|
|
if type_ == "skill":
|
|
skill_md_candidates = list(plugin_dir.rglob("SKILL.md")) + \
|
|
list(plugin_dir.rglob("skill.md"))
|
|
if not skill_md_candidates:
|
|
issues.append("missing_skill_md")
|
|
|
|
elif type_ == "plugin":
|
|
manifest_path = plugin_dir / ".claude-plugin" / "plugin.json"
|
|
if not manifest_path.is_file():
|
|
issues.append("missing_plugin_manifest")
|
|
else:
|
|
issues.extend(_validate_plugin_manifest(manifest_path))
|
|
|
|
elif type_ == "agent":
|
|
# Agents bake to plugin_dir/agents/*.md, but accept any .md anywhere
|
|
# under the tree so old single-file agent uploads still validate.
|
|
agent_candidates = list(plugin_dir.rglob("*.md"))
|
|
if not agent_candidates:
|
|
issues.append("missing_agent_md")
|
|
|
|
return {"status": "pass" if not issues else "fail", "issues": issues}
|
|
|
|
|
|
def _validate_plugin_manifest(path: Path) -> List[str]:
|
|
issues: List[str] = []
|
|
try:
|
|
data = json.loads(path.read_text(encoding="utf-8"))
|
|
except (OSError, json.JSONDecodeError):
|
|
return ["plugin_manifest_invalid_json"]
|
|
|
|
if not isinstance(data, dict):
|
|
return ["plugin_manifest_not_object"]
|
|
|
|
name = data.get("name")
|
|
if not name or not isinstance(name, str):
|
|
issues.append("plugin_manifest_missing_name")
|
|
elif not re.fullmatch(r"[a-zA-Z0-9_\-]{1,64}", name):
|
|
issues.append("plugin_manifest_invalid_name")
|
|
|
|
version = data.get("version")
|
|
if version is not None and isinstance(version, str):
|
|
if not _SEMVER_RE.fullmatch(version.strip()):
|
|
issues.append("plugin_manifest_invalid_version")
|
|
return issues
|