* 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).
212 lines
9.3 KiB
Python
212 lines
9.3 KiB
Python
"""Repository tests for store_entities, user_store_installs, user_plugin_optouts."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import uuid
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture
|
|
def db_conn(tmp_path, monkeypatch):
|
|
monkeypatch.setenv("DATA_DIR", str(tmp_path))
|
|
from src.db import get_system_db
|
|
conn = get_system_db()
|
|
yield conn
|
|
conn.close()
|
|
|
|
|
|
def _make_user(conn, *, user_id: str, email: str) -> None:
|
|
from src.repositories.users import UserRepository
|
|
UserRepository(conn).create(id=user_id, email=email, name=email.split("@")[0])
|
|
|
|
|
|
def _create_entity(conn, *, owner_id: str, owner_username: str, name: str,
|
|
type_: str = "skill",
|
|
visibility_status: str = "approved") -> str:
|
|
"""Create an entity for repo-level tests.
|
|
|
|
Defaults to ``visibility_status='approved'`` so install/list assertions
|
|
don't have to thread the guardrail flow — the guardrail wiring lives
|
|
above the repo at ``app/api/store.py`` and has its own end-to-end tests.
|
|
"""
|
|
from src.repositories.store_entities import StoreEntitiesRepository
|
|
repo = StoreEntitiesRepository(conn)
|
|
eid = uuid.uuid4().hex
|
|
repo.create(
|
|
id=eid, owner_user_id=owner_id, owner_username=owner_username,
|
|
type=type_, name=name, description="desc", category=None,
|
|
version="abcd1234abcd1234", file_size=100,
|
|
visibility_status=visibility_status,
|
|
)
|
|
return eid
|
|
|
|
|
|
class TestStoreEntities:
|
|
def test_create_and_get(self, db_conn):
|
|
from src.repositories.store_entities import StoreEntitiesRepository
|
|
_make_user(db_conn, user_id="u1", email="u1@x")
|
|
eid = _create_entity(db_conn, owner_id="u1", owner_username="u1", name="my-skill")
|
|
e = StoreEntitiesRepository(db_conn).get(eid)
|
|
assert e is not None
|
|
assert e["name"] == "my-skill"
|
|
assert e["owner_username"] == "u1"
|
|
assert e["install_count"] == 0
|
|
assert e["doc_paths"] == []
|
|
|
|
def test_unique_owner_name(self, db_conn):
|
|
_make_user(db_conn, user_id="u1", email="u1@x")
|
|
_create_entity(db_conn, owner_id="u1", owner_username="u1", name="dup")
|
|
with pytest.raises(Exception):
|
|
_create_entity(db_conn, owner_id="u1", owner_username="u1", name="dup")
|
|
|
|
def test_different_owners_same_name_ok(self, db_conn):
|
|
_make_user(db_conn, user_id="u1", email="u1@x")
|
|
_make_user(db_conn, user_id="u2", email="u2@x")
|
|
_create_entity(db_conn, owner_id="u1", owner_username="u1", name="shared")
|
|
_create_entity(db_conn, owner_id="u2", owner_username="u2", name="shared")
|
|
|
|
def test_list_with_filters(self, db_conn):
|
|
from src.repositories.store_entities import StoreEntitiesRepository
|
|
_make_user(db_conn, user_id="u1", email="u1@x")
|
|
_create_entity(db_conn, owner_id="u1", owner_username="u1", name="alpha", type_="skill")
|
|
_create_entity(db_conn, owner_id="u1", owner_username="u1", name="beta", type_="agent")
|
|
_create_entity(db_conn, owner_id="u1", owner_username="u1", name="gamma", type_="plugin")
|
|
|
|
repo = StoreEntitiesRepository(db_conn)
|
|
items, total = repo.list(skip=0, limit=10)
|
|
assert total == 3
|
|
assert len(items) == 3
|
|
|
|
items, total = repo.list(skip=0, limit=10, type="skill")
|
|
assert total == 1 and items[0]["name"] == "alpha"
|
|
|
|
items, total = repo.list(skip=0, limit=10, search="bet")
|
|
assert total == 1 and items[0]["name"] == "beta"
|
|
|
|
def test_bump_install_count(self, db_conn):
|
|
from src.repositories.store_entities import StoreEntitiesRepository
|
|
_make_user(db_conn, user_id="u1", email="u1@x")
|
|
eid = _create_entity(db_conn, owner_id="u1", owner_username="u1", name="x")
|
|
repo = StoreEntitiesRepository(db_conn)
|
|
repo.bump_install_count(eid, 1)
|
|
repo.bump_install_count(eid, 1)
|
|
assert repo.get(eid)["install_count"] == 2
|
|
repo.bump_install_count(eid, -1)
|
|
assert repo.get(eid)["install_count"] == 1
|
|
# Floor at zero
|
|
repo.bump_install_count(eid, -10)
|
|
assert repo.get(eid)["install_count"] == 0
|
|
|
|
def test_set_visibility_clears_archive_metadata_on_un_archive(self, db_conn):
|
|
"""#11 — admin un-archives an archived entity. archived_at and
|
|
archived_by carried stale metadata pre-fix. set_visibility must
|
|
null both columns when transitioning OUT of 'archived'."""
|
|
from src.repositories.store_entities import StoreEntitiesRepository
|
|
_make_user(db_conn, user_id="u1", email="u1@x")
|
|
_make_user(db_conn, user_id="admin", email="admin@x")
|
|
eid = _create_entity(db_conn, owner_id="u1", owner_username="u1", name="x")
|
|
repo = StoreEntitiesRepository(db_conn)
|
|
repo.archive(eid, by_user_id="admin")
|
|
ent = repo.get(eid)
|
|
assert ent["visibility_status"] == "archived"
|
|
assert ent["archived_at"] is not None
|
|
assert ent["archived_by"] == "admin"
|
|
|
|
repo.set_visibility(eid, "approved")
|
|
ent = repo.get(eid)
|
|
assert ent["visibility_status"] == "approved"
|
|
assert ent["archived_at"] is None, "archived_at must reset on un-archive"
|
|
assert ent["archived_by"] is None, "archived_by must reset on un-archive"
|
|
|
|
|
|
class TestUserStoreInstalls:
|
|
def test_install_idempotent(self, db_conn):
|
|
from src.repositories.user_store_installs import UserStoreInstallsRepository
|
|
_make_user(db_conn, user_id="u1", email="u1@x")
|
|
_make_user(db_conn, user_id="u2", email="u2@x")
|
|
eid = _create_entity(db_conn, owner_id="u1", owner_username="u1", name="x")
|
|
repo = UserStoreInstallsRepository(db_conn)
|
|
assert repo.install("u2", eid) is True
|
|
assert repo.install("u2", eid) is False
|
|
assert repo.is_installed("u2", eid) is True
|
|
assert repo.installer_count(eid) == 1
|
|
|
|
def test_uninstall(self, db_conn):
|
|
from src.repositories.user_store_installs import UserStoreInstallsRepository
|
|
_make_user(db_conn, user_id="u1", email="u1@x")
|
|
_make_user(db_conn, user_id="u2", email="u2@x")
|
|
eid = _create_entity(db_conn, owner_id="u1", owner_username="u1", name="x")
|
|
repo = UserStoreInstallsRepository(db_conn)
|
|
repo.install("u2", eid)
|
|
assert repo.uninstall("u2", eid) is True
|
|
assert repo.uninstall("u2", eid) is False # already gone
|
|
|
|
def test_list_for_user_joins_entity(self, db_conn):
|
|
from src.repositories.user_store_installs import UserStoreInstallsRepository
|
|
_make_user(db_conn, user_id="u1", email="u1@x")
|
|
_make_user(db_conn, user_id="u2", email="u2@x")
|
|
eid = _create_entity(db_conn, owner_id="u1", owner_username="u1", name="zzz")
|
|
repo = UserStoreInstallsRepository(db_conn)
|
|
repo.install("u2", eid)
|
|
rows = repo.list_for_user("u2")
|
|
assert len(rows) == 1
|
|
assert rows[0]["name"] == "zzz"
|
|
assert rows[0]["owner_username"] == "u1"
|
|
|
|
|
|
class TestUserCuratedSubscriptions:
|
|
"""Same physical table (user_plugin_optouts) as the legacy opt-out repo,
|
|
but with v27+ Model B semantics: presence = subscribed.
|
|
"""
|
|
|
|
def test_subscribe_unsubscribe(self, db_conn):
|
|
from src.repositories.user_curated_subscriptions import (
|
|
UserCuratedSubscriptionsRepository,
|
|
)
|
|
_make_user(db_conn, user_id="u1", email="u1@x")
|
|
repo = UserCuratedSubscriptionsRepository(db_conn)
|
|
assert repo.subscribe("u1", "mkt", "p1") is True
|
|
assert repo.is_subscribed("u1", "mkt", "p1") is True
|
|
assert ("mkt", "p1") in repo.subscribed_set("u1")
|
|
assert repo.unsubscribe("u1", "mkt", "p1") is True
|
|
assert repo.is_subscribed("u1", "mkt", "p1") is False
|
|
assert repo.subscribed_set("u1") == set()
|
|
|
|
def test_subscribe_idempotent(self, db_conn):
|
|
from src.repositories.user_curated_subscriptions import (
|
|
UserCuratedSubscriptionsRepository,
|
|
)
|
|
_make_user(db_conn, user_id="u1", email="u1@x")
|
|
repo = UserCuratedSubscriptionsRepository(db_conn)
|
|
assert repo.subscribe("u1", "mkt", "p1") is True
|
|
assert repo.subscribe("u1", "mkt", "p1") is False # second call: no-op
|
|
assert len(repo.list_for_user("u1")) == 1
|
|
|
|
def test_delete_for_plugin_drops_all_users(self, db_conn):
|
|
from src.repositories.user_curated_subscriptions import (
|
|
UserCuratedSubscriptionsRepository,
|
|
)
|
|
_make_user(db_conn, user_id="u1", email="u1@x")
|
|
_make_user(db_conn, user_id="u2", email="u2@x")
|
|
repo = UserCuratedSubscriptionsRepository(db_conn)
|
|
repo.subscribe("u1", "mkt", "p1")
|
|
repo.subscribe("u2", "mkt", "p1")
|
|
repo.subscribe("u1", "mkt", "p2") # different plugin — survives
|
|
dropped = repo.delete_for_plugin("mkt", "p1")
|
|
assert dropped == 2
|
|
assert repo.subscribed_set("u1") == {("mkt", "p2")}
|
|
assert repo.subscribed_set("u2") == set()
|
|
|
|
def test_delete_for_marketplace(self, db_conn):
|
|
from src.repositories.user_curated_subscriptions import (
|
|
UserCuratedSubscriptionsRepository,
|
|
)
|
|
_make_user(db_conn, user_id="u1", email="u1@x")
|
|
repo = UserCuratedSubscriptionsRepository(db_conn)
|
|
repo.subscribe("u1", "mkt-a", "p1")
|
|
repo.subscribe("u1", "mkt-a", "p2")
|
|
repo.subscribe("u1", "mkt-b", "p1")
|
|
dropped = repo.delete_for_marketplace("mkt-a")
|
|
assert dropped == 2
|
|
assert repo.subscribed_set("u1") == {("mkt-b", "p1")}
|