mirror of
https://github.com/BaaRai/ARTEX.git
synced 2026-11-19 06:30:54 +08:00
feat(intercept): target-gate schema, opt-in flag and approval requests (S3b 1.2-1.4)
Storage, flag and request path of the approval gate for asset targets. The
gate itself is not wired into the tool hook yet (steps 1.5 to 1.7): with this
change nothing is extracted, resolved or blocked, whatever the flag says.
Schema and store (1.2)
- tasks.target_gate, conversations.target_gate (default false).
- intercept_pending.target_key and a partial unique index: one open request
per scope (task or conversation) and host:port.
- target_pins (no foreign keys: a pin outlives its task, its conversation and
its request row) and target_gate_exemption_log. All DDL is idempotent; no
CHECK constraints; the cascade on intercept_pending.conversation_id stays.
- db/target_pins.go: pin lookup with port precedence, list, revoke,
find-or-create of a request, and ResolveTargetRequest, which settles the
row, supersedes the old pin and writes the new version in one transaction.
- Deleting a task or an archive stub revokes its pins and settles its open
target requests in the delete transaction. DeleteConversation and
DeleteConversations revoke the pins of the removed conversations in the
same transaction as the delete.
Opt-in flag (1.3)
- Per task through the create and metadata-patch paths, per conversation
through create and patch; exposed in the task DTO. A retest conversation
takes the flag of the finding's task, never its pins. A spawned task starts
with the gate off.
- The task flag is atomic and read on every call through TargetScope.Enabled.
TargetScope now carries the Interceptor that owns the gate.
Request, wait, decide (1.4)
- pendingManager keeps a list of waiters per request; resolve wakes all.
- RequestTargets: find-or-create per target, one card per request, wait on
channel, poll, context and wait bound. A plain request is never settled by
a call that leaves. A request merged with an ask is bound to its creating
call and a timeout never allows it.
- Decide records the approver (subject of the session token) and the remote
address for every human decision, classic asks included. On a target
request "allowed" pins the displayed addresses; that is the only writer of
pins.
- A request raised while the global egress proxy is set says the approval is
name-only and its pin is stored with name_only_effective.
- Routes: GET/POST .../target-pins and .../target-pins/{pid}/revoke under
/api/tasks/{id} and /api/conversations/{id}; decision_source=target filter.
- ValidateExemptionHost: an exemption written as an IP literal may be private
unicast, never loopback, link-local or metadata, unspecified or multicast.
This commit is contained in:
@@ -558,6 +558,8 @@ CREATE TRIGGER trg_tasks_upd BEFORE UPDATE ON tasks
|
||||
-- planner heartbeat trigger interval (seconds); backfills old databases. Default 300s (5min). See docs/planner-trigger-impl-plan.md
|
||||
ALTER TABLE tasks ADD COLUMN IF NOT EXISTS plan_heartbeat_seconds INTEGER NOT NULL DEFAULT 300;
|
||||
ALTER TABLE tasks ADD COLUMN IF NOT EXISTS plan_quiet_mode BOOLEAN NOT NULL DEFAULT true;
|
||||
-- Approval gate for asset targets, opt-in per task; backfills old databases. false (default) = no gate, behaviour unchanged.
|
||||
ALTER TABLE tasks ADD COLUMN IF NOT EXISTS target_gate BOOLEAN NOT NULL DEFAULT false;
|
||||
ALTER TABLE tasks ADD COLUMN IF NOT EXISTS llm_rotate BOOLEAN NOT NULL DEFAULT false;
|
||||
-- Concurrency-limit hold state; backfills old databases. true=queued due to the concurrency limit, auto-starts when a slot frees up.
|
||||
ALTER TABLE tasks ADD COLUMN IF NOT EXISTS queued BOOLEAN NOT NULL DEFAULT false;
|
||||
@@ -995,6 +997,8 @@ CREATE TABLE IF NOT EXISTS conversations (
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
);
|
||||
ALTER TABLE conversations ADD COLUMN IF NOT EXISTS pinned_at TIMESTAMPTZ;
|
||||
-- Approval gate for asset targets, opt-in per conversation (a chat has no task). false (default) = no gate.
|
||||
ALTER TABLE conversations ADD COLUMN IF NOT EXISTS target_gate BOOLEAN NOT NULL DEFAULT false;
|
||||
CREATE INDEX IF NOT EXISTS idx_conversations_llm_profile ON conversations(llm_profile_id) WHERE llm_profile_id IS NOT NULL;
|
||||
CREATE INDEX IF NOT EXISTS idx_conversations_pinned ON conversations(pinned_at DESC) WHERE pinned_at IS NOT NULL;
|
||||
DROP TRIGGER IF EXISTS trg_conversations_upd ON conversations;
|
||||
@@ -1119,6 +1123,55 @@ UPDATE intercept_pending SET decision_source='model'
|
||||
-- existed) | human | rule | model | system. No backfill: readers fall back to
|
||||
-- decision_source for legacy rows instead of rewriting history.
|
||||
ALTER TABLE intercept_pending ADD COLUMN IF NOT EXISTS decided_by TEXT NOT NULL DEFAULT '';
|
||||
-- Target approval requests. target_key = '<host>:<port>' of the asset target the row asks for;
|
||||
-- NULL = classic ask (and every row that predates the column). At most one open request per
|
||||
-- scope (task or conversation) and target: concurrent calls to one host share one row.
|
||||
ALTER TABLE intercept_pending ADD COLUMN IF NOT EXISTS target_key TEXT;
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS uq_intercept_pending_target
|
||||
ON intercept_pending (COALESCE(task_id,''), COALESCE(conversation_id,0), target_key)
|
||||
WHERE status = 'pending' AND target_key IS NOT NULL;
|
||||
|
||||
-- Target pins: host + port approved by a human for one task or one conversation, with the
|
||||
-- addresses shown at approval time. Written only by the decide endpoint. No foreign keys on
|
||||
-- task_id, conversation_id and intercept_id: a pin outlives its task, its conversation and its
|
||||
-- request row as history (revoked, never deleted). status and revoked_reason carry no CHECK
|
||||
-- (validated in Go, same convention as findings.status).
|
||||
CREATE TABLE IF NOT EXISTS target_pins (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
task_id BIGINT,
|
||||
conversation_id BIGINT,
|
||||
host TEXT NOT NULL, -- normalised name, IP literal or CIDR
|
||||
port INTEGER NOT NULL DEFAULT 0, -- 0 = port not declared: covers every port of the host
|
||||
version INTEGER NOT NULL DEFAULT 1,
|
||||
pinned_ips TEXT[] NOT NULL DEFAULT '{}', -- canonical, sorted
|
||||
resolver TEXT NOT NULL DEFAULT '',
|
||||
resolved_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
status TEXT NOT NULL DEFAULT 'active', -- active | superseded | revoked
|
||||
intercept_id BIGINT, -- the request row that carried the click
|
||||
decided_by TEXT NOT NULL DEFAULT '', -- approver: subject of the session token
|
||||
decided_from TEXT NOT NULL DEFAULT '', -- remote address of the click
|
||||
-- Approved while the upstream egress proxy was set: the proxy chooses the address, so the
|
||||
-- pin covers the name only and its addresses are not compared. Stays true if the proxy is
|
||||
-- removed later; enforcing addresses again takes a new approval.
|
||||
name_only_effective BOOLEAN NOT NULL DEFAULT false,
|
||||
revoked_at TIMESTAMPTZ,
|
||||
revoked_reason TEXT NOT NULL DEFAULT '', -- operator | task_deleted | conversation_deleted
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
);
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS uq_target_pins_active
|
||||
ON target_pins (COALESCE(task_id,0), COALESCE(conversation_id,0), host, port)
|
||||
WHERE status = 'active';
|
||||
CREATE INDEX IF NOT EXISTS idx_target_pins_scope ON target_pins (task_id, conversation_id, status);
|
||||
|
||||
-- Append-only history of the target-gate exemption list (settings key target_gate_exempt_hosts).
|
||||
CREATE TABLE IF NOT EXISTS target_gate_exemption_log (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
changed_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
changed_by TEXT NOT NULL DEFAULT '',
|
||||
before JSONB,
|
||||
after JSONB,
|
||||
digest TEXT NOT NULL DEFAULT ''
|
||||
);
|
||||
|
||||
-- =====================================================================
|
||||
-- L. Finding persistence
|
||||
|
||||
Reference in New Issue
Block a user