mirror of
https://github.com/BaaRai/ARTEX.git
synced 2026-11-19 22:50:55 +08:00
Compare commits
76
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
08544a652e | ||
|
|
c2ddd1c6ba | ||
|
|
a88bc26144 | ||
|
|
ce8c90c2dd | ||
|
|
b8ec69d6ab | ||
|
|
9b1fe50d66 | ||
|
|
fbcbe3ac04 | ||
|
|
53f764babf | ||
|
|
ae068f29cf | ||
|
|
eddc4ba339 | ||
|
|
b3c9375101 | ||
|
|
7d28638980 | ||
|
|
8f92caa042 | ||
|
|
16b04cfb48 | ||
|
|
432c882bca | ||
|
|
bf6feefbdf | ||
|
|
cdc39ed776 | ||
|
|
7bbb0267e4 | ||
|
|
05d320878b | ||
|
|
2aa89ab786 | ||
|
|
fa84c00202 | ||
|
|
3755e95504 | ||
|
|
65045efae6 | ||
|
|
8110735aa7 | ||
|
|
437c0ff03e | ||
|
|
8f3a9a8413 | ||
|
|
5a4af1b4da | ||
|
|
3546ea0fff | ||
|
|
f2666dbae2 | ||
|
|
b0e3851451 | ||
|
|
2352cfa7ed | ||
|
|
12211c467d | ||
|
|
389825a683 | ||
|
|
83a1d17800 | ||
|
|
2a9743eb9e | ||
|
|
48d6158ac2 | ||
|
|
d1431cfdcd | ||
|
|
3bbda778e6 | ||
|
|
23f95611c1 | ||
|
|
7b92b8c352 | ||
|
|
fde809dd0c | ||
|
|
d89cf781b7 | ||
|
|
b4b4ade5b4 | ||
|
|
92254a2835 | ||
|
|
203103360e | ||
|
|
20b278cf98 | ||
|
|
74c9c17626 | ||
|
|
b6b9284d3a | ||
|
|
7681bacb50 | ||
|
|
04964ac9c9 | ||
|
|
9b8ddf0610 | ||
|
|
864a60d48b | ||
|
|
230a99c2b9 | ||
|
|
230ba39dd5 | ||
|
|
9767a70205 | ||
|
|
366e14066f | ||
|
|
4c486e1c01 | ||
|
|
03e216d032 | ||
|
|
94be0148ce | ||
|
|
88aefa0fc3 | ||
|
|
51e2c603b9 | ||
|
|
a40781ae1f | ||
|
|
da7cc62d4e | ||
|
|
9355d83eea | ||
|
|
9b850a090c | ||
|
|
398a08814a | ||
|
|
c833130c28 | ||
|
|
3d44e9cd0d | ||
|
|
c0c568b31f | ||
|
|
ac5e714eb6 | ||
|
|
6568a8eb44 | ||
|
|
9a2a9e61ef | ||
|
|
6a0b79d34f | ||
|
|
729f935a21 | ||
|
|
da16b8d81a | ||
|
|
70d6833f35 |
@@ -71,7 +71,7 @@ jobs:
|
||||
ARTEX_PG_DSN: postgres://artex:testpass@localhost:5432/artextest_race?sslmode=disable
|
||||
|
||||
run: >-
|
||||
go test -race -p 1 ./agent ./cmd/artex ./config ./db ./evidence ./guard
|
||||
go test -race -p 1 ./agent ./archivestore ./cmd/artex ./config ./db ./evidence ./guard
|
||||
./intercept ./llmpool ./llmrec ./mcphttp ./notify ./server ./sidequestion
|
||||
./traffic ./traffic/rewrite
|
||||
|
||||
|
||||
@@ -25,6 +25,13 @@ All notable changes to this project are documented in this file. The format is b
|
||||
- **Release provenance**: release archives carry GitHub build provenance attestations and a CycloneDX SBOM (`gh attestation verify <zip> --repo BaaRai/ARTEX`); release notes are the matching `CHANGELOG.md` section (#219, #201).
|
||||
- **Capture-proxy rewrite rules, storage and API**: `GET`, `POST`, `PUT` and `DELETE /api/traffic/rewrite-rules` and `POST /api/traffic/rewrite-rules/{id}/toggle` manage rules that match a request or a response (method, host, URL, headers, body, status) and describe a rewrite (method, path and query, headers, body, status). Rules are validated on save, limited to 100 of which 50 enabled, created disabled, and stored in the new table `traffic_rewrite_rules` (migration `0005_traffic_rewrite_rules.sql`) with `matchers` and `actions` encrypted at rest. The value of an action marked `sensitive` is never returned, and an update sent without it keeps the stored one. The server compiles the enabled rules at startup and after every change and hands the snapshot to the proxy. The proxy applies them from the next entry. See `docs/traffic-rewrite-rules.md`.
|
||||
- **Capture-proxy rewrite rules applied**: the capture proxy applies enabled rules to each HTTP request before it is sent to the target and to each response before it reaches the client. Each action that ran is recorded in the new table `exchange_rewrites` in the same transaction as the exchange, `traffic_get` shows a `REWRITTEN` line, and `traffic_search` never finds a value a rule wrote. SSE status and headers are rewritten at the start of the stream. **WebSocket handshakes are not rewritten**: the capture library runs its hook after the upgrade, so the status and headers cannot be changed, and frames pass unchanged. **Responses of 5 MiB or more** are forwarded unchanged and not recorded in full, because the library does not call the response hook for them. Snapshots of original requests are capped at 1024 entries and 64 MiB. Replays go through the proxy, so the rules apply to them. Archives, a per-replay rule toggle, the web UI and the proof flag come later.
|
||||
- **Bulk finding status** (#298): select findings in the findings table and apply one disposition to all of them, up to 500 per call, in one transaction; each row still goes through the single-decision notification semantics and the change is mirrored onto its exploration node (#289).
|
||||
- **Traffic replay** (#266): replay a recorded request from the traffic detail with its method, URL, headers and stored body; replay is disabled when only the body preview is loaded.
|
||||
- **Finding proof strength in reports** (#268): the Markdown report and the export show each finding's proof strength next to its verification status.
|
||||
- **Opt-in Keenable web search backend** (#295): the search tool gains Keenable alongside Brave and Tavily; the key is stored encrypted and can be cleared independently.
|
||||
- **Durable activity outbox** (#300): activity rows that cannot be stored are written to the new `activity_outbox` table (migration `0006_activity_outbox.sql`) and replayed once on the next start. The server stops admitting new work before the drain, and a shutdown cancel leaves an in-flight intent claim running so the next start can reset it to open instead of recording it as done or blocked.
|
||||
- **LLM model search** (#284): the System → LLM model picker can search the model list, and the API-key field opts out of password-manager autofill.
|
||||
- **Finding report state** (#308): findings carry a `report_state` (`none`, `submitted`, `accepted`, `rejected`, `duplicate`) for what was sent to a bug bounty program, separate from the triage status; the bulk update accepts both fields, and restoring an older archive fills `none` (migration `0007_finding_report_state.sql`).
|
||||
|
||||
### Changed
|
||||
|
||||
@@ -33,15 +40,51 @@ All notable changes to this project are documented in this file. The format is b
|
||||
- **Untrusted-output boundary is now on by default**: Norma frames tool results for the worker, planner, chat and main agent unless `ARTEX_UNTRUSTED_BOUNDARY` is set to `0`, `false`, `off` or `no`. It was opt-in via `ARTEX_UNTRUSTED_BOUNDARY=1` in 0.6.0 (#166); the default flips here (#203).
|
||||
- **Versioned migrations**: the `db` package applies numbered `db/migrations/NNNN_slug.sql` files once, in order, under the schema advisory lock, and records a SHA-256 checksum in `schema_migrations`; missing, renamed, changed or out-of-order migrations fail closed (#226).
|
||||
- **Coverage graph performance**: the coverage graph batches its connector lookups (three queries instead of one per root and per company) and adds the partial index `idx_ts_icp`; on a task of about 3,000 assets the p50 dropped from 126 ms to 27 ms and the queries per call from 221 to 3 (#230).
|
||||
- **Request body bounds** (#305): JSON request bodies decode at most 32 MiB, every non-multipart body is capped, and an oversized body answers 413 instead of a generic bad request. `ReadTimeout` bounds how long headers and the body may take to arrive without cutting a handler that is already running.
|
||||
- **Chat attachments up to 512 MiB** (#252): the client, server, compose file and reverse-proxy sample agree on a 512 MiB combined multipart limit.
|
||||
- **MITM passthrough TTL** (#306): a host that cannot be intercepted is tunnelled for one minute, then interception is tried again; an expired mark counts as intercepted.
|
||||
- **Norma v0.4.11** (#294).
|
||||
- **CI**: the suite also runs on the latest Go release as an advisory job, the rewrite-rule engine runs under the race detector, and the gzip/compression fixtures no longer depend on the local Go version (#279, #278).
|
||||
- **Repository hygiene** (#275): `docs/` is no longer ignored, and contributing documents the 7-open-pull-request cap (#307).
|
||||
|
||||
### Fixed
|
||||
|
||||
- **Remote MCP response bound**: Streamable HTTP JSON-RPC bodies and SSE data payloads are refused above 8 MiB, so a remote MCP server cannot force an unbounded decode.
|
||||
- **LLM response capture bound**: each recorded provider attempt keeps at most 1 MiB, and a call keeps at most 8 attempts, so a large or retrying stream cannot grow the recorder without bound. The live stream is unchanged.
|
||||
- **Intercept audit ring**: `preToolUse` records allow only after intercept and the target gate decide, so a blocked call no longer leaves a leftover allow row in `Guard.Audit()`.
|
||||
- **DSN password redaction**: `config.Redact` now masks libpq `password=` keywords and `?password=` query values as well as URL userinfo, so a ping-failure log cannot print the database password.
|
||||
- **Asset DSL nesting**: `ParseDSL` refuses queries longer than 4 KiB or nested more than 32 parentheses deep, so a crafted `dsl` cannot grow the goroutine stack without bound.
|
||||
- **Retry-After overflow**: a 429/503 `Retry-After` of huge seconds no longer wraps `time.Duration` into a tiny delay. Values above `MaxDelay` are not retried.
|
||||
- **Conversation message pages**: `GET /api/conversations/{id}/messages` clamps `limit` (200 for history, 1000 for `?since=`), so a huge query cannot load the whole transcript in one response.
|
||||
- **Findings CSV formula cells**: `FindingsCSV` prefixes name, class, summary, task, and other text fields that start with `=`, `+`, `-`, `@`, tab, or CR so Excel/LibreOffice do not evaluate them as formulas when the export is opened.
|
||||
- **Asset service links**: the Services tab only uses an asset URL as `href` when it is `http:` or `https:`. `javascript:`, `data:`, and other schemes render as text.
|
||||
- **Chat session directories**: `ChatAgent.Chat` accepts only `[A-Za-z0-9_-]` session ids (at most 64 bytes) before joining them under `<workDir>/sessions`, so `..` and path separators cannot escape that directory.
|
||||
- **Change-password rate limit**: `POST /api/auth/change-password` uses the same limiter as login, keyed by client IP and by the session token, so a stolen session cannot guess the current password without backoff.
|
||||
- **Ingested traffic headers**: `RecordExternal` rejects a method that is not an HTTP token and header names or values that contain CR, LF, or NUL, matching Replay, so ingested exchanges cannot inject extra header lines into stored evidence.
|
||||
- **Browser MCP starts offline** (#329): the seeded `browser` MCP ran `npx @playwright/mcp`, which contacts the npm registry on every start even with the package installed globally, and Playwright MCP defaulted to a Chrome channel the image does not ship. It now runs the image's `playwright-mcp` binary with `--headless --browser chromium`. Existing databases that still have a stock `npx @playwright/mcp` row (including the common `-y` form) or a `playwright-mcp` row with no `--browser` are rewritten once; any other command or package is left alone. The image also installs the Chromium build `@playwright/mcp` and `@playwright/cli` expect, which is not the same build `playwright install` puts in the cache.
|
||||
- **CREATE DATABASE identifiers**: `ensureDatabase` now builds the statement with `pgx.Identifier`, which quotes the DSN database name and doubles any embedded quote, so the name cannot close the identifier. No database name PostgreSQL accepts is refused, so existing installs with a hyphen, a dot or non-ASCII characters keep starting.
|
||||
- **ask_operator image_path**: the screenshot path must resolve inside the task working directory (`<data>/tasks/<id>`). Absolute paths, `..` segments, and symlinks that leave that directory are refused, so the tool cannot copy an arbitrary server image into the operator transcript.
|
||||
- **insert_assets fail-closed**: when intercept or task allow/block rules cannot be loaded, `insert_assets` refuses the whole call instead of evaluating an empty rule set (which allowed every asset). The tool result does not include the underlying database error.
|
||||
- **BlobRange length no longer wraps int64**: `offset+length > size` overflowed when length was near MaxInt64, so the cap was skipped and `make([]byte, length)` could exhaust memory. The bound is now `length > size-offset`.
|
||||
- **PostgreSQL text[] literals escape backslashes**: `marshalStringArray` quoted double quotes but not backslashes, so a value ending in `\"` could close the current array element and inject another. It now doubles backslashes before quotes, matching `marshalJSONBArray`.
|
||||
- **Browser MCP env null no longer crashes startup**: a stored MCP `env` of JSON `null` unmarshaled into a nil map, and `syncBrowserMCPProxy` then assigned `NODE_EXTRA_CA_CERTS` when traffic capture was on, panicking the process on every start. `decodeStrMap` now always returns a writable map.
|
||||
- **Provider refusals reported as refusals**: a turn the provider's safety system declined (Anthropic `stop_reason: "refusal"`, OpenAI-compatible `finish_reason: "content_filter"`) has no text and no tool calls, so it ended as `completed` with "the model ended this turn normally", and the idle-turn rerun resent the same conversation up to the empty-response retry count, where it is expected to be refused again. The LLM recorder now hands each call's stop reason to the run (`llmrec.WithStopSink`, `agent.WithStopTracker`). After a refusal the idle-turn rerun is skipped, and the run summary says the provider refused the turn and the intent was not completed.
|
||||
- **LLM health badge on every task path**: `/system/llm/` read a breaker state that only the failover Pool wrote, so a profile used by an explicit task chain, by a bound agent with failover off, or as the global provider stayed "Healthy" through a real outage. Every task LLM attempt now records its outcome through the same policy the Pool uses, keyed by the profile that served it. The LLM recording page also explains an empty list when the `llm_record` toggle is off instead of looking broken.
|
||||
- **LLM health persistence** (#304): persisted breaker rows are applied in sequence at startup and written before the database closes, and a slow write no longer holds the registry lock while it runs.
|
||||
- **Skill visibility survives restarts**: turning a skill off now writes an explicit disabled row instead of deleting it, so the startup seed, which only inserts missing rows, can no longer bring the skill back. Skills that were turned off before this version have no row to keep, so they come back once after the upgrade and must be turned off again.
|
||||
- **Browser extension traffic capture**: CDP delivers `Network.responseReceived` response headers as an object, not an array of `{name, value}` records, so the extension threw on every response and never queued an exchange. It now accepts both shapes and lower-cases names before the body-capture gate, so captures work again and `content-type` correctly controls body capture.
|
||||
- **bbot on arm64**: the image now builds on arm64 hosts such as Apple Silicon. bbot's `gowitness` downloaded an x86-64 Chrome and `retirejs` an x86-64 Node, which can't run there, so the build failed. On arm64 the image uses Debian's `chromium` for gowitness and an arm64 Node for retirejs, and the build check now covers `retirejs` too. amd64 builds are unchanged.
|
||||
- **Auto-scope hygiene**: auto `task_scope` rows count for coverage and untested assets only under a declared root, and direct coverage counts anchored assets through fact anchors only; the scope is described as "coverage scope, not enforced" (#196).
|
||||
- **Enrich HTTP probe**: it now dials through `intercept.PinnedDialer`, so the target gate applies and a probe without a target scope is refused (#198).
|
||||
- **Agent hook data races**: the eight package-level hooks are synchronised, so a second wire-up no longer races tasks that already read them (#227).
|
||||
- **Coverage flag read failure** (#303): asset-coverage tools stay available when the coverage flag cannot be read, and a failed read no longer disables coverage for the task.
|
||||
- **RSI lesson correctness** (#287, #290): lessons are scoped from `task_scope`, UTF-8 is no longer split mid-character, caution lessons are looked up by cue, lesson evidence and every retest are retracted when a finding's disposition reverses, and extraction is skipped on a task with more than one company.
|
||||
- **Finding disposition mirror** (#289): finding triage is mirrored onto its exploration node, so the graph and the findings table agree.
|
||||
- **RSI lessons in the data envelope** (#288): lesson text reaches the planner and worker inside the same nonce-framed envelope as other target-derived content.
|
||||
- **Intent summaries framed** (#311): the intent summary on the worker-finished and finding lines, and the summaries in `graph_overview`, now reach the planner inside the nonce frame; the structured intent fields stay in the plain JSON, and the operator-typed deletion reason stays outside.
|
||||
- **LLM pool context window** (#286): the pool and side-question paths use the model's real context window instead of a default when computing compression thresholds.
|
||||
- **Sensitive rewrite values** (#273 follow-ups): a kept sensitive value is matched on action type, header name and regex, and a host change is refused while a stored sensitive value is kept.
|
||||
- **Triage bot context** (#274): the PR triage bot receives a directory map instead of a truncated file list.
|
||||
|
||||
### Security
|
||||
|
||||
|
||||
+2
-1
@@ -5,6 +5,7 @@
|
||||
- **At most 7 open pull requests per contributor.** The repository enforces this with GitHub's pull request creation limit, drafts included: when you reach it, close or merge one before opening another. Review is manual, one change at a time, so a larger batch makes the queue unmanageable and slows everyone down, including you. If you have more changes queued, open one issue that lists them and wait for the current ones to be reviewed.
|
||||
- **One focused change per PR.** If a change has independent parts, split it into a small number of PRs and say in each description what the other parts depend on.
|
||||
- **Describe the change.** State the problem, the behavior change and what you tested. A pull request with no description is a request for changes.
|
||||
- **Provider support stays generic.** Any OpenAI- or Anthropic-compatible endpoint works through a model profile; provider convenience goes in as a neutral preset (name and base URL) or a docs recipe, with no vendor logos, promotional codes, baked vendor endpoints, or vendor-specific environment variables. A new wire format needs a schema migration, a profile save/load test, and a live connection test.
|
||||
|
||||
## Issues
|
||||
|
||||
@@ -12,4 +13,4 @@
|
||||
|
||||
## Security
|
||||
|
||||
- Do not open a public issue for a vulnerability in ARTEX itself. Use the private advisory form in the repository's Security tab.
|
||||
- Do not open a public issue for a vulnerability in ARTEX itself. Follow the [private reporting instructions](SECURITY.md#reporting-a-vulnerability).
|
||||
|
||||
+13
-4
@@ -167,18 +167,27 @@ RUN set -eux; \
|
||||
! grep -qE "Installing|ERRR|CRITICAL" /tmp/bbot-dry.log || { cat /tmp/bbot-dry.log; exit 1; }
|
||||
|
||||
|
||||
# Preinstall Playwright MCP and CLI (globally) so no npx network download is needed at runtime.
|
||||
# @playwright/mcp: browser MCP runs directly via `npx @playwright/mcp` (installed globally, no -y/@latest needed).
|
||||
# Preinstall Playwright MCP and CLI (globally) so no network download is needed at runtime.
|
||||
# @playwright/mcp: the seeded browser MCP runs the playwright-mcp binary directly.
|
||||
# `npx @playwright/mcp` is not used: it queries the npm registry on every start even
|
||||
# with the package installed globally.
|
||||
# @playwright/cli: provides playwright-cli, verified with --help right after install.
|
||||
# Then install playwright (browser management) and preinstall chromium plus its system
|
||||
# dependencies via --with-deps, so MCP/CLI work on first start inside the container
|
||||
# without downloading browsers over the network. All three are pinned; upgrade deliberately.
|
||||
# dependencies via --with-deps. @playwright/mcp and @playwright/cli bundle their own
|
||||
# playwright-core, which expects a different Chromium build than
|
||||
# playwright@PLAYWRIGHT_VERSION installs, so that build is installed as well (second
|
||||
# install line); without it neither can launch a browser. All three packages are
|
||||
# pinned; upgrade deliberately.
|
||||
ARG PLAYWRIGHT_MCP_VERSION=0.0.83
|
||||
ARG PLAYWRIGHT_CLI_VERSION=0.1.22
|
||||
ARG PLAYWRIGHT_VERSION=1.64.1
|
||||
# playwright-core's exports map hides cli.js from require.resolve, so run the
|
||||
# binary npm links for @playwright/mcp instead: it is the copy MCP actually
|
||||
# loads, and it installs the Chromium revision that copy expects.
|
||||
RUN npm install -g "@playwright/mcp@${PLAYWRIGHT_MCP_VERSION}" "@playwright/cli@${PLAYWRIGHT_CLI_VERSION}" "playwright@${PLAYWRIGHT_VERSION}" \
|
||||
&& playwright-cli --help \
|
||||
&& playwright install --with-deps chromium \
|
||||
&& "$(npm root -g)/@playwright/mcp/node_modules/.bin/playwright-core" install chromium \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
WORKDIR /app
|
||||
# Binary compiled from source in the build stage above.
|
||||
|
||||
@@ -233,7 +233,11 @@ worker remains confined to the intent it claimed.
|
||||
</details>
|
||||
- **Verified findings**: findings carry a POE level, a verification status and a note; a finding is
|
||||
`verified` only when a bound proof/response and verbatim evidence quotes support it. Gzip/deflate
|
||||
bodies are decoded before the quote check.
|
||||
bodies are decoded before the quote check. The findings table supports bulk status updates, and
|
||||
the report and export show each finding's proof strength next to its status.
|
||||
- **Traffic replay**: open a captured exchange and replay the recorded request (method, URL,
|
||||
headers and stored body) from the traffic detail; replay stays disabled while only the body
|
||||
preview is loaded.
|
||||
- **Vulnerability retest loop**: a dedicated `retester` agent re-runs a finding with optional fixed
|
||||
version/conditions, records `Still reproducible / Fixed / Cannot confirm`, and can move the
|
||||
finding to `Fixed` automatically. Original evidence and reports are preserved.
|
||||
@@ -295,6 +299,9 @@ worker remains confined to the intent it claimed.
|
||||
for every call.
|
||||
- **MCP servers, skills, memory and a workspace**: extend the agent with remote tools and reusable
|
||||
prompt/playbook material.
|
||||
- **Web search**: the agent's search tool uses Brave, Tavily or the opt-in Keenable backend,
|
||||
configured in **System → Settings** with the key encrypted at rest; search can also egress
|
||||
through its own proxy.
|
||||
- **Single binary**: the Next.js UI is embedded with `go:embed`; PostgreSQL is the only external
|
||||
dependency.
|
||||
|
||||
|
||||
+9
-1
@@ -14,7 +14,7 @@ Notes:
|
||||
|
||||
**Do not open a public issue for a security vulnerability.**
|
||||
|
||||
Report through **GitHub Security Advisories**: **Security** tab → **Report a vulnerability** in the `BaaRai/ARTEX` repository. This is the only reporting channel.
|
||||
Sign in to GitHub and use the [private vulnerability report form](https://github.com/BaaRai/ARTEX/security/advisories/new). You can also reach it from the repository's **Security and quality** tab under **Advisories** → **Report a vulnerability**. This is the only reporting channel.
|
||||
|
||||
Please include:
|
||||
- A description of the vulnerability and its expected impact.
|
||||
@@ -35,6 +35,14 @@ ARTEX is an offensive-security tool. Test only against:
|
||||
|
||||
Testing, scanning, or exploiting third-party systems without explicit authorization is strictly prohibited. Reports that violate this principle may be closed without action.
|
||||
|
||||
## Trusted Inputs and Scope Enforcement
|
||||
|
||||
ARTEX trusts the scanner output file (`output.json`) that `ingest_bbot` reads. The `scope_distance` field carried on scope-relevant events is the scanner's own verdict and is ingested as-is: an event the scanner marks in scope (per its own `-s`/`--no-scope` configuration) is treated as in scope without being re-checked against ARTEX's rule set.
|
||||
|
||||
The enforced trust boundary for asset insertion is `insert_assets`, which runs every candidate through `EvaluateAssetGate`: block rules always apply, and a task allow-list is enforced when one is configured. A rejected candidate is returned as an `insertion forbidden` error for that asset and is never inserted, so it cannot reach task execution. `in_scope_not_asset` in the `ingest_bbot` result is a different count: in-scope events that are not asset types (findings and the like).
|
||||
|
||||
Accepted gap: when a task has no allow-list, there is no allow rule to apply (block rules still run), and any host carried on an in-scope event that is not blocked enters the graph as an asset. Operators who rely on the scanner's scope rules alone should configure an allow-list per task, or review `output.json` before feeding it to ARTEX. Cross-checking ingested events against ARTEX's own rule set would change what existing scanner configurations mean for those operators, so it is treated as a deliberate design question (see #317), not an accepted vulnerability.
|
||||
|
||||
## What to Expect
|
||||
|
||||
This is an open-source project maintained on a best-effort basis. We aim to acknowledge a report within about a week and keep you updated, but we cannot guarantee specific response or fix timeframes.
|
||||
|
||||
@@ -37,6 +37,9 @@ func captureRun(ctx context.Context, opts agentcore.Options, input string, emit
|
||||
func captureRunSession(ctx context.Context, s *agentcore.Session, input string, emit func(db.Activity)) (string, harness.TerminalReason, error) {
|
||||
ctx, auditTrace := intercept.WithTrace(ctx, input, approvalHistory(s.Messages()))
|
||||
defer auditTrace.Finish()
|
||||
// Observe each model call's stop reason, so a provider refusal is reported as
|
||||
// one (terminalText) and is not answered with an idle-turn rerun (steerHooks).
|
||||
ctx = WithStopTracker(ctx)
|
||||
var reason harness.TerminalReason
|
||||
rec := func(r db.Activity) {
|
||||
if r.Kind == "text" || r.Kind == "tool_result" {
|
||||
|
||||
@@ -2,8 +2,10 @@ package agent
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/Autumn-27/artex/db"
|
||||
@@ -98,6 +100,33 @@ func chatSystem(agentKey, dataDir, workDir string) string {
|
||||
// DefaultAssistantPrompt.
|
||||
type chatVars struct{ DataDir, Now string }
|
||||
|
||||
const maxChatSessionID = 64
|
||||
|
||||
// validChatSessionID is the session-directory name contract. Production uses
|
||||
// "conv-" plus a decimal id; tests use hyphenated suffixes. Path separators
|
||||
// and ".." are rejected so Join cannot leave <workDir>/sessions.
|
||||
func validChatSessionID(id string) bool {
|
||||
if id == "" || len(id) > maxChatSessionID {
|
||||
return false
|
||||
}
|
||||
for i := 0; i < len(id); i++ {
|
||||
c := id[i]
|
||||
switch {
|
||||
case c >= 'A' && c <= 'Z', c >= 'a' && c <= 'z', c >= '0' && c <= '9', c == '_', c == '-':
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func sessionDirInside(workDir, sessionWorkDir string) bool {
|
||||
base := filepath.Clean(filepath.Join(workDir, "sessions"))
|
||||
clean := filepath.Clean(sessionWorkDir)
|
||||
sep := string(os.PathSeparator)
|
||||
return clean == base || strings.HasPrefix(clean, base+sep)
|
||||
}
|
||||
|
||||
// Chat runs ONE turn of a conversation with the agent identified by agentKey,
|
||||
// resuming prior history keyed by sessionID. maxTurns is the per-turn agent step
|
||||
// budget (0 = unlimited). maxDuration is the wall-clock run budget per turn
|
||||
@@ -114,9 +143,15 @@ func (c *ChatAgent) Chat(ctx context.Context, agentKey, sessionID, message strin
|
||||
ws.Enabled = false
|
||||
}
|
||||
|
||||
if !validChatSessionID(sessionID) {
|
||||
return "", fmt.Errorf("invalid session id %q", sessionID)
|
||||
}
|
||||
// Per-session working directory: <workDir>/sessions/<sessionID>/
|
||||
// Isolates file writes across conversations, mirroring how workers use i<intentID>/.
|
||||
sessionWorkDir := filepath.Join(c.workDir, "sessions", sessionID)
|
||||
if !sessionDirInside(c.workDir, sessionWorkDir) {
|
||||
return "", fmt.Errorf("invalid session id %q", sessionID)
|
||||
}
|
||||
_ = os.MkdirAll(sessionWorkDir, 0o755)
|
||||
ctx = intercept.WithReviewWorkingDirectory(ctx, sessionWorkDir)
|
||||
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
package agent
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestValidChatSessionID(t *testing.T) {
|
||||
ok := []string{
|
||||
"conv-1",
|
||||
"conv-stable",
|
||||
"conv-hook-reach",
|
||||
"conv-987654",
|
||||
"conv-dial-probe",
|
||||
"conv-redirect-probe",
|
||||
"conv-new",
|
||||
"conv-broken",
|
||||
"conv-signed",
|
||||
"conv-" + strings.Repeat("9", 19),
|
||||
}
|
||||
for _, id := range ok {
|
||||
if !validChatSessionID(id) {
|
||||
t.Fatalf("%q rejected", id)
|
||||
}
|
||||
}
|
||||
bad := []string{
|
||||
"",
|
||||
".",
|
||||
"..",
|
||||
"../etc",
|
||||
"conv/../etc",
|
||||
`conv\windows`,
|
||||
"/etc/passwd",
|
||||
"conv-1/foo",
|
||||
"a.b",
|
||||
"conv 1",
|
||||
"conv:1",
|
||||
strings.Repeat("a", maxChatSessionID+1),
|
||||
}
|
||||
for _, id := range bad {
|
||||
if validChatSessionID(id) {
|
||||
t.Fatalf("%q accepted", id)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestChatRejectsUnsafeSessionID(t *testing.T) {
|
||||
p := &sessionProbe{}
|
||||
workDir := t.TempDir()
|
||||
c := NewChatAgent(p, "test-model", workDir, nil, 100000)
|
||||
for _, id := range []string{"..", "../etc", "conv/../etc", `..\windows`, "/etc/passwd", "conv-1/foo"} {
|
||||
if _, err := c.Chat(t.Context(), "assistant", id, "hello", 1, 0, false, nil); err == nil {
|
||||
t.Fatalf("%q accepted", id)
|
||||
}
|
||||
if n := len(p.seen()); n != 0 {
|
||||
t.Fatalf("provider called for %q: %d calls", id, n)
|
||||
}
|
||||
}
|
||||
entries, err := os.ReadDir(workDir)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(entries) != 0 {
|
||||
t.Fatalf("unsafe session id created %v under workDir", names(entries))
|
||||
}
|
||||
if _, err := os.Stat(filepath.Join(workDir, "etc")); !os.IsNotExist(err) {
|
||||
t.Fatalf("escaped path created: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func names(entries []os.DirEntry) []string {
|
||||
out := make([]string, len(entries))
|
||||
for i, e := range entries {
|
||||
out[i] = e.Name()
|
||||
}
|
||||
return out
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package agent
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"slices"
|
||||
)
|
||||
|
||||
// factAssetAnchors accepts the historical asset_ids spelling and its explicit
|
||||
// tested_asset_ids alias. Never union conflicting lists: that could attribute
|
||||
// a conclusion to assets the caller did not actually check.
|
||||
func (it factItem) factAssetAnchors() ([]int64, error) {
|
||||
assets, err := parseFactAssetIDs("asset_ids", it.AssetIDs)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
tested, err := parseFactAssetIDs("tested_asset_ids", it.TestedAssetIDs)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if it.AssetIDs != nil && it.TestedAssetIDs != nil && !slices.Equal(assets, tested) {
|
||||
return nil, fmt.Errorf("asset_ids and tested_asset_ids must contain the same asset IDs when both are provided; use one field or correct the conflicting lists")
|
||||
}
|
||||
if it.TestedAssetIDs != nil {
|
||||
return tested, nil
|
||||
}
|
||||
return assets, nil
|
||||
}
|
||||
|
||||
func parseFactAssetIDs(field string, raw []json.RawMessage) ([]int64, error) {
|
||||
ids := make([]int64, 0, len(raw))
|
||||
for i, value := range raw {
|
||||
id := pid(value)
|
||||
if id <= 0 {
|
||||
return nil, fmt.Errorf("%s[%d] must be a positive integer asset ID", field, i)
|
||||
}
|
||||
ids = append(ids, id)
|
||||
}
|
||||
slices.Sort(ids)
|
||||
return slices.Compact(ids), nil
|
||||
}
|
||||
@@ -0,0 +1,182 @@
|
||||
package agent
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"slices"
|
||||
"strconv"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/Autumn-27/artex/db"
|
||||
)
|
||||
|
||||
func TestRecordFactAssetAliases(t *testing.T) {
|
||||
d := testDB(t)
|
||||
defer d.Close()
|
||||
task, err := d.CreateTask("fact asset alias", "test", nil, 0, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer d.DeleteTask(task.ID)
|
||||
assets := d.Assets()
|
||||
first, err := assets.UpsertRootDomain(db.UpsertRootDomainReq{Domain: "fact-alias-one.example", TaskID: task.ID})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
second, err := assets.UpsertRootDomain(db.UpsertRootDomainReq{Domain: "fact-alias-two.example", TaskID: task.ID})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer assets.DeleteByIDs([]int64{first, second})
|
||||
store := d.Exploration(task.ExplorationID)
|
||||
tools := NewToolSet(store, "worker")
|
||||
check := func(t *testing.T, id int64, want []int64) {
|
||||
t.Helper()
|
||||
rows, err := d.Query("SELECT asset_id FROM exploration_anchors WHERE node_id=$1 ORDER BY asset_id", id)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer rows.Close()
|
||||
var got []int64
|
||||
for rows.Next() {
|
||||
var asset int64
|
||||
if err := rows.Scan(&asset); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
got = append(got, asset)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
slices.Sort(want)
|
||||
if !slices.Equal(got, want) {
|
||||
t.Fatalf("anchors = %v, want %v", got, want)
|
||||
}
|
||||
}
|
||||
for _, tc := range []struct{ name, fields string }{
|
||||
{"canonical", fmt.Sprintf(`"asset_ids":[%d,%d,%d]`, first, second, first)},
|
||||
{"alias", fmt.Sprintf(`"tested_asset_ids":[%d,%d]`, first, second)},
|
||||
{"equal sets", fmt.Sprintf(`"asset_ids":[%d,%d],"tested_asset_ids":[%d,%d,%d]`, first, second, second, first, first)},
|
||||
{"numeric strings", fmt.Sprintf(`"tested_asset_ids":["%d","%d"]`, first, second)},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
out := callGuardTool(t, tools.recordFact(), fmt.Sprintf(`{"summary":%q,%s}`, tc.name, tc.fields))
|
||||
if out.IsError {
|
||||
t.Fatal(out.Flatten())
|
||||
}
|
||||
id, err := strconv.ParseInt(strings.TrimPrefix(out.Flatten(), "fact recorded: "), 10, 64)
|
||||
if err != nil {
|
||||
t.Fatal(out.Flatten(), err)
|
||||
}
|
||||
check(t, id, []int64{first, second})
|
||||
})
|
||||
}
|
||||
before := tools.Writes().Facts
|
||||
for _, fields := range []string{
|
||||
fmt.Sprintf(`"asset_ids":[%d],"tested_asset_ids":[%d]`, first, second),
|
||||
fmt.Sprintf(`"asset_ids":[],"tested_asset_ids":[%d]`, first),
|
||||
fmt.Sprintf(`"tested_asset_ids":[%d,0]`, first),
|
||||
fmt.Sprintf(`"asset_ids":[%d,-1]`, first),
|
||||
`"tested_asset_ids":[null]`,
|
||||
`"tested_asset_ids":[1.5]`,
|
||||
`"tested_asset_ids":["invalid"]`,
|
||||
} {
|
||||
out := callGuardTool(t, tools.recordFact(), `{"summary":"invalid assets",`+fields+`}`)
|
||||
if !out.IsError || !strings.Contains(out.Flatten(), "asset_ids") {
|
||||
t.Fatalf("accepted %s: %q", fields, out.Flatten())
|
||||
}
|
||||
}
|
||||
if tools.Writes().Facts != before {
|
||||
t.Fatal("invalid asset lists wrote facts")
|
||||
}
|
||||
|
||||
out := callGuardTool(t, tools.recordFact(), fmt.Sprintf(`{"facts":[{"summary":"batch alias","tested_asset_ids":[%d]},{"summary":"batch conflict","asset_ids":[%d],"tested_asset_ids":[%d]},{"summary":"no inherited assets"}]}`, first, first, second))
|
||||
var batch struct {
|
||||
IDs []int64 `json:"ids"`
|
||||
Errors map[string]string `json:"errors"`
|
||||
}
|
||||
if err := json.Unmarshal([]byte(out.Flatten()), &batch); err != nil {
|
||||
t.Fatal(out.Flatten(), err)
|
||||
}
|
||||
if len(batch.IDs) != 3 || batch.IDs[0] <= 0 || batch.IDs[1] != 0 || batch.IDs[2] <= 0 || !strings.Contains(batch.Errors["1"], "same asset IDs") {
|
||||
t.Fatalf("batch: %s", out.Flatten())
|
||||
}
|
||||
check(t, batch.IDs[0], []int64{first})
|
||||
check(t, batch.IDs[2], nil)
|
||||
|
||||
before = tools.Writes().Facts
|
||||
malformed := callGuardTool(t, tools.recordFact(), fmt.Sprintf(`{"facts":[{"summary":"must not be saved"},{"summary":"bad list","tested_asset_ids":%d}]}`, first))
|
||||
if !malformed.IsError || tools.Writes().Facts != before {
|
||||
t.Fatal("malformed list caused a partial write", malformed.Flatten())
|
||||
}
|
||||
}
|
||||
|
||||
func TestRecordFactAssetAliasSchema(t *testing.T) {
|
||||
schema := NewToolSet(nil, "").recordFact().InputSchema()
|
||||
props := schema["properties"].(map[string]any)
|
||||
for _, name := range []string{"asset_ids", "tested_asset_ids"} {
|
||||
if props[name] == nil {
|
||||
t.Fatalf("single schema missing %s", name)
|
||||
}
|
||||
}
|
||||
item := props["facts"].(map[string]any)["items"].(map[string]any)
|
||||
itemProps, _ := item["properties"].(map[string]any)
|
||||
for _, name := range []string{"summary", "asset_ids", "tested_asset_ids"} {
|
||||
if itemProps[name] == nil {
|
||||
t.Fatalf("batch schema missing %s", name)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestRecordFactRejectsMissingAssets(t *testing.T) {
|
||||
d := testDB(t)
|
||||
defer d.Close()
|
||||
task, err := d.CreateTask("missing fact anchors", "test", nil, 0, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer d.DeleteTask(task.ID)
|
||||
assets := d.Assets()
|
||||
var ids []int64
|
||||
for _, name := range []string{"missing-fact-one.example", "missing-fact-two.example", "existing-fact.example"} {
|
||||
id, err := assets.UpsertRootDomain(db.UpsertRootDomainReq{Domain: name, TaskID: task.ID})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
ids = append(ids, id)
|
||||
}
|
||||
defer assets.DeleteByIDs(ids)
|
||||
if _, err := assets.DeleteByIDs(ids[:2]); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
tools := NewToolSet(d.Exploration(task.ExplorationID), "worker")
|
||||
var beforeFacts int
|
||||
if err := d.QueryRow("SELECT count(*) FROM exploration_nodes WHERE exploration_id=$1 AND kind='fact'", task.ExplorationID).Scan(&beforeFacts); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, field := range []string{"asset_ids", "tested_asset_ids"} {
|
||||
out := callGuardTool(t, tools.recordFact(), fmt.Sprintf(`{"summary":"missing anchors","%s":[%d,%d,%d]}`, field, ids[0], ids[1], ids[2]))
|
||||
if !out.IsError || !strings.Contains(out.Flatten(), "do not exist") ||
|
||||
!strings.Contains(out.Flatten(), strconv.FormatInt(ids[0], 10)) ||
|
||||
!strings.Contains(out.Flatten(), strconv.FormatInt(ids[1], 10)) ||
|
||||
strings.Contains(out.Flatten(), "23503") || strings.Contains(out.Flatten(), "foreign key") {
|
||||
t.Fatalf("missing assets did not produce an actionable error: %s", out.Flatten())
|
||||
}
|
||||
}
|
||||
var count int
|
||||
if err := d.QueryRow("SELECT count(*) FROM exploration_nodes WHERE exploration_id=$1 AND kind='fact'", task.ExplorationID).Scan(&count); err != nil || count != beforeFacts || tools.Writes().Facts != 0 {
|
||||
t.Fatalf("failed anchors left facts: count=%d err=%v", count, err)
|
||||
}
|
||||
out := callGuardTool(t, tools.recordFact(), fmt.Sprintf(`{"facts":[{"summary":"valid","asset_ids":[%d]},{"summary":"missing","tested_asset_ids":[%d]}]}`, ids[2], ids[0]))
|
||||
var batch struct {
|
||||
IDs []int64 `json:"ids"`
|
||||
Errors map[string]string `json:"errors"`
|
||||
}
|
||||
if err := json.Unmarshal([]byte(out.Flatten()), &batch); err != nil {
|
||||
t.Fatal(out.Flatten(), err)
|
||||
}
|
||||
if !out.IsError || len(batch.IDs) != 2 || batch.IDs[0] <= 0 || batch.IDs[1] != 0 || !strings.Contains(batch.Errors["1"], "do not exist") || tools.Writes().Facts != 1 {
|
||||
t.Fatal("missing asset batch handling:", out.Flatten())
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,160 @@
|
||||
package agent
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
// Match strings.TrimSpace, including Unicode whitespace, in the published schema.
|
||||
const factWhitespace = "\t\n\v\f\r \u0085\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000"
|
||||
|
||||
func factAssetIDSchema() map[string]any {
|
||||
return map[string]any{
|
||||
"type": []string{"integer", "string"}, "minimum": 1,
|
||||
"pattern": "^[" + factWhitespace + "]*\\+?0*[1-9][0-9]*[" + factWhitespace + "]*$",
|
||||
}
|
||||
}
|
||||
|
||||
func factItemSchema() map[string]any {
|
||||
schema := obj(map[string]any{
|
||||
"summary": str("Required on every fact: a non-empty one-sentence summary of this conclusion. Batch items do not inherit summary from the top level."),
|
||||
"intent_id": idp("The intent that produced this fact; only this field inherits from the top level in a batch."),
|
||||
"detail": str("Details of this fact, including all related observations."),
|
||||
"evidence": str("One line of key evidence: the command and the most proving output lines. Put longer output in detail."),
|
||||
"confidence": str("observed (seen directly in output) | inferred (inferred from phenomena). Label negative conclusions honestly."),
|
||||
"source": map[string]any{"type": "string", "enum": factSources, "description": "where the content came from: target_response | tool_output | third_party_intel | operator_input | inference (default when omitted)"},
|
||||
"asset_ids": map[string]any{"type": "array", "items": factAssetIDSchema(), "description": "Asset IDs explicitly involved in this fact. Use asset_ids as the canonical field; tested_asset_ids is accepted as an alias. If both are provided, they must name the same set. Do not infer IDs from the intent."},
|
||||
"tested_asset_ids": map[string]any{"type": "array", "items": factAssetIDSchema(), "description": "Compatibility alias for asset_ids, not an additional list. When both are provided their sets must match. Only include assets actually involved in this conclusion."},
|
||||
}, "summary")
|
||||
summary := schema["properties"].(map[string]any)["summary"].(map[string]any)
|
||||
summary["minLength"] = 1
|
||||
summary["pattern"] = "[^" + factWhitespace + "]"
|
||||
schema["additionalProperties"] = false
|
||||
return schema
|
||||
}
|
||||
|
||||
func recordFactSchema() map[string]any {
|
||||
props := factItemSchema()["properties"].(map[string]any)
|
||||
props["facts"] = map[string]any{
|
||||
"type": "array", "minItems": 1, "items": factItemSchema(),
|
||||
"description": "A non-empty batch of complete facts. Every item needs its own summary. Only intent_id inherits from the top level. Returned ids match item order; retry only failed indices.",
|
||||
}
|
||||
schema := obj(props)
|
||||
// Providers reject root-level anyOf. The handler enforces single/batch mode.
|
||||
schema["additionalProperties"] = false
|
||||
return schema
|
||||
}
|
||||
|
||||
// RepairRecordFactSchema restores the single/batch input contract in stored or
|
||||
// cached schemas, preserving annotations only on fields the handler accepts.
|
||||
func RepairRecordFactSchema(stored map[string]any) map[string]any {
|
||||
raw, _ := json.Marshal(stored)
|
||||
var out map[string]any
|
||||
_ = json.Unmarshal(raw, &out)
|
||||
if out == nil {
|
||||
out = map[string]any{}
|
||||
}
|
||||
mergeFactContract(out, recordFactSchema())
|
||||
// A batch requires summaries on its items, never a redundant top-level one.
|
||||
delete(out, "required")
|
||||
delete(out, "anyOf")
|
||||
canonical := recordFactSchema()["properties"].(map[string]any)
|
||||
props := out["properties"].(map[string]any)
|
||||
for name := range props {
|
||||
if _, known := canonical[name]; !known {
|
||||
delete(props, name)
|
||||
}
|
||||
}
|
||||
items := props["facts"].(map[string]any)["items"].(map[string]any)
|
||||
itemProps := items["properties"].(map[string]any)
|
||||
for name := range itemProps {
|
||||
if _, known := canonical[name]; !known || name == "facts" {
|
||||
delete(itemProps, name)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func mergeFactContract(dst, src map[string]any) {
|
||||
for key, value := range src {
|
||||
if key == "description" || key == "default" {
|
||||
if _, ok := dst[key]; ok {
|
||||
continue
|
||||
}
|
||||
}
|
||||
if child, ok := value.(map[string]any); ok {
|
||||
target, _ := dst[key].(map[string]any)
|
||||
if target == nil {
|
||||
target = map[string]any{}
|
||||
dst[key] = target
|
||||
}
|
||||
mergeFactContract(target, child)
|
||||
} else {
|
||||
dst[key] = value
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
type recordFactInput struct {
|
||||
Facts []factItem `json:"facts"`
|
||||
factItem
|
||||
}
|
||||
|
||||
// Validate exact field names before decoding: encoding/json otherwise treats
|
||||
// Summary, SUMMARY, etc. as aliases even with DisallowUnknownFields enabled.
|
||||
func decodeRecordFactInput(in json.RawMessage) (recordFactInput, bool, error) {
|
||||
var out recordFactInput
|
||||
fields, err := exactFactFields(in, true)
|
||||
if err != nil {
|
||||
return out, false, err
|
||||
}
|
||||
_, batch := fields["facts"]
|
||||
if batch {
|
||||
for name := range fields {
|
||||
if name != "intent_id" && name != "facts" {
|
||||
return out, true, fmt.Errorf("field %q is not allowed at the top level in batch mode; only intent_id and facts are accepted", name)
|
||||
}
|
||||
}
|
||||
var items []json.RawMessage
|
||||
if err := json.Unmarshal(fields["facts"], &items); err != nil {
|
||||
return out, true, fmt.Errorf("facts must be an array: %w", err)
|
||||
}
|
||||
if len(items) == 0 {
|
||||
return out, true, fmt.Errorf("facts must be a non-empty array of complete facts, each with its own summary")
|
||||
}
|
||||
for i, item := range items {
|
||||
if _, err := exactFactFields(item, false); err != nil {
|
||||
return out, true, fmt.Errorf("facts[%d]: %w", i, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
decoder := json.NewDecoder(bytes.NewReader(in))
|
||||
decoder.DisallowUnknownFields() // Also applies recursively to every factItem.
|
||||
if err := decoder.Decode(&out); err != nil {
|
||||
return out, batch, err
|
||||
}
|
||||
return out, batch, nil
|
||||
}
|
||||
|
||||
func exactFactFields(in json.RawMessage, topLevel bool) (map[string]json.RawMessage, error) {
|
||||
var fields map[string]json.RawMessage
|
||||
if err := json.Unmarshal(in, &fields); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if fields == nil {
|
||||
return nil, fmt.Errorf("record_fact input and each fact must be objects")
|
||||
}
|
||||
for name := range fields {
|
||||
switch name {
|
||||
case "summary", "detail", "evidence", "confidence", "source", "intent_id", "asset_ids", "tested_asset_ids":
|
||||
case "facts":
|
||||
if !topLevel {
|
||||
return nil, fmt.Errorf("unknown field %q", name)
|
||||
}
|
||||
default:
|
||||
return nil, fmt.Errorf("unknown field %q (field names are case-sensitive)", name)
|
||||
}
|
||||
}
|
||||
return fields, nil
|
||||
}
|
||||
@@ -0,0 +1,165 @@
|
||||
package agent
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"regexp"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
actool "github.com/Autumn-27/norma/tool"
|
||||
)
|
||||
|
||||
func TestRecordFactSummaryContract(t *testing.T) {
|
||||
tools := NewToolSet(guardTaskStore(t), "worker")
|
||||
tool := tools.recordFact()
|
||||
for _, input := range []string{
|
||||
`{}`, `null`, `[]`,
|
||||
`{"summary":""}`, `{"summary":" "}`,
|
||||
`{"summary":"must not substitute","facts":[]}`,
|
||||
`{"summary":"must not substitute","facts":null}`,
|
||||
`{"summary":"must not inherit","facts":[{"detail":"missing summary"}]}`,
|
||||
`{"facts":[{"summary":"must not save"},{"summary":42}]}`,
|
||||
} {
|
||||
out := callGuardTool(t, tool, input)
|
||||
if !out.IsError {
|
||||
t.Errorf("accepted %s: %s", input, out.Flatten())
|
||||
}
|
||||
}
|
||||
if tools.Writes().Facts != 0 {
|
||||
t.Fatal("invalid inputs wrote facts")
|
||||
}
|
||||
single := callGuardTool(t, tool, `{"summary":"valid single"}`)
|
||||
if single.IsError {
|
||||
t.Fatal(single.Flatten())
|
||||
}
|
||||
batch := callGuardTool(t, tool, `{"facts":[{"summary":"valid batch"},{"detail":"missing summary"}]}`)
|
||||
var result struct {
|
||||
IDs []int64 `json:"ids"`
|
||||
Errors map[string]string `json:"errors"`
|
||||
Retry string `json:"retry_instruction"`
|
||||
}
|
||||
if err := json.Unmarshal([]byte(batch.Flatten()), &result); err != nil {
|
||||
t.Fatal(batch.Flatten(), err)
|
||||
}
|
||||
if !batch.IsError || len(result.IDs) != 2 || result.IDs[0] <= 0 || result.IDs[1] != 0 ||
|
||||
!strings.Contains(result.Errors["1"], "summary") || result.Retry == "" || tools.Writes().Facts != 2 {
|
||||
t.Fatalf("partial failure is not actionable: %s", batch.Flatten())
|
||||
}
|
||||
}
|
||||
|
||||
func TestRecordFactStoredContractRepair(t *testing.T) {
|
||||
old := map[string]any{
|
||||
"type": "object", "required": []any{"summary"},
|
||||
"anyOf": []any{map[string]any{"required": []string{"summary"}}},
|
||||
"properties": map[string]any{
|
||||
"summary": map[string]any{"type": "string", "description": "operator summary"},
|
||||
"confidence": map[string]any{"type": "string", "default": "inferred"},
|
||||
"custom_field": map[string]any{"type": "string"},
|
||||
"facts": map[string]any{"type": "array", "items": map[string]any{"type": "object"}},
|
||||
},
|
||||
}
|
||||
base := NewToolSet(nil, "").recordFact()
|
||||
repaired := DecorateTool(base, "operator tool", old)
|
||||
schema := repaired.InputSchema()
|
||||
if _, required := schema["required"]; required {
|
||||
t.Fatal("batch still requires a top-level summary")
|
||||
}
|
||||
if _, exists := schema["anyOf"]; exists {
|
||||
t.Fatal("root anyOf reaches the provider")
|
||||
}
|
||||
props := schema["properties"].(map[string]any)
|
||||
item := props["facts"].(map[string]any)["items"].(map[string]any)
|
||||
required := item["required"].([]string)
|
||||
if len(required) != 1 || required[0] != "summary" || props["facts"].(map[string]any)["minItems"] != 1 {
|
||||
t.Fatal("batch must require a nonempty list with a summary per item")
|
||||
}
|
||||
if props["summary"].(map[string]any)["minLength"] != 1 ||
|
||||
item["properties"].(map[string]any)["summary"].(map[string]any)["minLength"] != 1 {
|
||||
t.Fatal("empty summaries permitted by schema")
|
||||
}
|
||||
if repaired.Description() != "operator tool" ||
|
||||
props["summary"].(map[string]any)["description"] != "operator summary" ||
|
||||
props["confidence"].(map[string]any)["default"] != "inferred" || props["custom_field"] != nil {
|
||||
t.Fatal("operator annotations lost")
|
||||
}
|
||||
if _, ok := old["properties"].(map[string]any)["tested_asset_ids"]; ok {
|
||||
t.Fatal("shared old schema mutated")
|
||||
}
|
||||
first, _ := json.Marshal(schema)
|
||||
second, _ := json.Marshal(DecorateTool(base, "", schema).InputSchema())
|
||||
if string(first) != string(second) {
|
||||
t.Fatal("repair is not idempotent")
|
||||
}
|
||||
var roundTrip map[string]any
|
||||
if err := json.Unmarshal(first, &roundTrip); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, input := range []string{`{"summary":"single"}`, `{"facts":[{"summary":"batch"}]}`} {
|
||||
if err := actool.ValidateInput(roundTrip, json.RawMessage(input)); err != nil {
|
||||
t.Fatalf("SDK rejects valid %s after catalog round trip: %v", input, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestRecordFactStrictFields(t *testing.T) {
|
||||
tools := NewToolSet(guardTaskStore(t), "worker")
|
||||
for _, tc := range []struct{ input, field string }{
|
||||
{`{"summary":"valid","typo":1}`, "typo"},
|
||||
{`{"Summary":"case alias"}`, "Summary"},
|
||||
{`{"summary":"valid","Facts":[]}`, "Facts"},
|
||||
{`{"facts":[{"summary":"first"},{"summary":"second","typo":1}]}`, "typo"},
|
||||
{`{"facts":[{"summary":"first"},{"Summary":"case alias"}]}`, "Summary"},
|
||||
{`{"facts":[{"summary":"first"},{"summary":"second","ASSET_IDS":[]}]}`, "ASSET_IDS"},
|
||||
{`{"facts":[{"summary":"nested","facts":[]}]}`, "facts"},
|
||||
{`{"summary":"ignored","facts":[{"summary":"batch"}]}`, "summary"},
|
||||
{`{"detail":"ignored","facts":[{"summary":"batch"}]}`, "detail"},
|
||||
{`{"evidence":"ignored","facts":[{"summary":"batch"}]}`, "evidence"},
|
||||
{`{"source":"inference","facts":[{"summary":"batch"}]}`, "source"},
|
||||
{`{"confidence":"inferred","facts":[{"summary":"batch"}]}`, "confidence"},
|
||||
{`{"asset_ids":[],"facts":[{"summary":"batch"}]}`, "asset_ids"},
|
||||
{`{"tested_asset_ids":[],"facts":[{"summary":"batch"}]}`, "tested_asset_ids"},
|
||||
} {
|
||||
out := callGuardTool(t, tools.recordFact(), tc.input)
|
||||
if !out.IsError || !strings.Contains(out.Flatten(), tc.field) {
|
||||
t.Errorf("input %s: want named rejection for %s, got %s", tc.input, tc.field, out.Flatten())
|
||||
}
|
||||
}
|
||||
if tools.Writes().Facts != 0 {
|
||||
t.Fatal("malformed fields caused partial writes")
|
||||
}
|
||||
for _, input := range []string{
|
||||
`{"facts":[null]}`, `{"facts":[[]]}`, `{"summary":"valid"} {"summary":"extra object"}`,
|
||||
} {
|
||||
if _, _, err := decodeRecordFactInput(json.RawMessage(input)); err == nil {
|
||||
t.Errorf("accepted %s", input)
|
||||
}
|
||||
}
|
||||
if _, batch, err := decodeRecordFactInput(json.RawMessage(`{"intent_id":1,"facts":[{"summary":"valid","intent_id":2}]}`)); err != nil || !batch {
|
||||
t.Fatalf("valid batch: %v %v", batch, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRecordFactSchemaMatchesStrings(t *testing.T) {
|
||||
props := recordFactSchema()["properties"].(map[string]any)
|
||||
summary := regexp.MustCompile(props["summary"].(map[string]any)["pattern"].(string))
|
||||
for _, value := range []string{"", " ", "\t\r\n", "\u00a0\u0085", "\u2003\u3000", "conclusion", " observed "} {
|
||||
if got, want := summary.MatchString(value), strings.TrimSpace(value) != ""; got != want {
|
||||
t.Errorf("summary %q: schema=%v runtime=%v", value, got, want)
|
||||
}
|
||||
}
|
||||
id := regexp.MustCompile(factAssetIDSchema()["pattern"].(string))
|
||||
for _, value := range []string{"1", "001", "+1", " +001 ", "\u200312\u3000", "", "0", "-1", "1.5", "a"} {
|
||||
raw, _ := json.Marshal(value)
|
||||
if got, want := id.MatchString(value), pid(raw) > 0; got != want {
|
||||
t.Errorf("asset ID %q: schema=%v runtime=%v", value, got, want)
|
||||
}
|
||||
}
|
||||
for _, input := range []string{
|
||||
`{"summary":"single","asset_ids":["1",2]}`,
|
||||
`{"facts":[{"summary":"batch","tested_asset_ids":["1",2]}]}`,
|
||||
} {
|
||||
if err := actool.ValidateInput(recordFactSchema(), json.RawMessage(input)); err != nil {
|
||||
t.Errorf("numeric-string compatibility rejected: %v", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package agent
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
@@ -449,3 +450,49 @@ func TestInsertAssetsRejectsHostnameIPPerItem(t *testing.T) {
|
||||
t.Fatalf("rejected hostname still stored in assets.ip (%d rows)", stored)
|
||||
}
|
||||
}
|
||||
|
||||
func TestInsertAssetsRuleLoadFailure(t *testing.T) {
|
||||
if out, refused := insertAssetsRuleLoadFailure(nil); refused || out.IsError {
|
||||
t.Fatalf("nil error must not refuse: refused=%v IsError=%v %q", refused, out.IsError, out.Flatten())
|
||||
}
|
||||
|
||||
out, refused := insertAssetsRuleLoadFailure(errors.New("sql: database is closed"))
|
||||
text := out.Flatten()
|
||||
if !refused || !out.IsError || !strings.Contains(text, "asset intercept rules are unavailable") {
|
||||
t.Fatalf("want fail-closed refusal, refused=%v IsError=%v %q", refused, out.IsError, text)
|
||||
}
|
||||
for _, leak := range []string{"sql:", "database is closed"} {
|
||||
if strings.Contains(text, leak) {
|
||||
t.Fatalf("tool result leaked the load error: %q", text)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestInsertAssetsRefusesWhenInterceptRulesUnavailable(t *testing.T) {
|
||||
d := testDB(t)
|
||||
ts := NewToolSet(nil, "")
|
||||
ts.SetAssetStore(d.Assets(), d.Companies())
|
||||
d.Close()
|
||||
|
||||
raw, err := json.Marshal(map[string]any{
|
||||
"assets": []any{
|
||||
map[string]any{"type": "ip", "ip": "203.0.113.50"},
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
res, err := ts.insertAssets().Call(context.Background(), raw, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("Call error: %v", err)
|
||||
}
|
||||
text := res.Flatten()
|
||||
if !res.IsError || !strings.Contains(text, "asset intercept rules are unavailable") {
|
||||
t.Fatalf("want fail-closed refusal, IsError=%v %q", res.IsError, text)
|
||||
}
|
||||
for _, leak := range []string{"sql:", "database is closed", "pq:", "connection"} {
|
||||
if strings.Contains(strings.ToLower(text), strings.ToLower(leak)) {
|
||||
t.Fatalf("tool result leaked the load error: %q", text)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
package agent
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync"
|
||||
|
||||
"github.com/Autumn-27/artex/llmrec"
|
||||
)
|
||||
|
||||
// IsRefusalStop reports whether a provider stop reason means the provider's
|
||||
// safety system declined the request rather than the model ending its turn.
|
||||
// Anthropic returns stop_reason "refusal" with an empty or partial message;
|
||||
// OpenAI-compatible endpoints return finish_reason "content_filter", which Norma
|
||||
// passes through unmapped.
|
||||
func IsRefusalStop(stopReason string) bool {
|
||||
return stopReason == "refusal" || stopReason == "content_filter"
|
||||
}
|
||||
|
||||
// stopTracker keeps the stop reason of the latest model call of one run. The
|
||||
// harness does not expose it: a refused turn has no text and no tool calls, so it
|
||||
// ends as ReasonCompleted, the same as a model that chose to stop.
|
||||
type stopTracker struct {
|
||||
mu sync.Mutex
|
||||
last string
|
||||
}
|
||||
|
||||
func (t *stopTracker) set(stopReason string) {
|
||||
t.mu.Lock()
|
||||
t.last = stopReason
|
||||
t.mu.Unlock()
|
||||
}
|
||||
|
||||
func (t *stopTracker) get() string {
|
||||
t.mu.Lock()
|
||||
defer t.mu.Unlock()
|
||||
return t.last
|
||||
}
|
||||
|
||||
type stopTrackerKey struct{}
|
||||
|
||||
// WithStopTracker attaches a fresh stop tracker to ctx and subscribes it to the
|
||||
// LLM recorder's stop sink, so every model call made under the returned context
|
||||
// updates it. captureRunSession installs one per run; a nested run gets its own.
|
||||
func WithStopTracker(ctx context.Context) context.Context {
|
||||
t := &stopTracker{}
|
||||
ctx = context.WithValue(ctx, stopTrackerKey{}, t)
|
||||
return llmrec.WithStopSink(ctx, t.set)
|
||||
}
|
||||
|
||||
// LastStopReason returns the stop reason of the latest model call made under ctx
|
||||
// by the run that owns it, or "" when none was observed.
|
||||
func LastStopReason(ctx context.Context) string {
|
||||
if t, _ := ctx.Value(stopTrackerKey{}).(*stopTracker); t != nil {
|
||||
return t.get()
|
||||
}
|
||||
return ""
|
||||
}
|
||||
@@ -0,0 +1,113 @@
|
||||
package agent
|
||||
|
||||
import (
|
||||
"context"
|
||||
"iter"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/Autumn-27/artex/llmrec"
|
||||
"github.com/Autumn-27/norma/harness"
|
||||
"github.com/Autumn-27/norma/llm"
|
||||
)
|
||||
|
||||
// stopProvider ends every streamed call with the given stop reason and no content,
|
||||
// the shape of a provider refusal before any output.
|
||||
type stopProvider struct{ stop string }
|
||||
|
||||
func (p stopProvider) Stream(context.Context, llm.CompletionRequest) iter.Seq2[llm.StreamEvent, error] {
|
||||
return func(yield func(llm.StreamEvent, error) bool) {
|
||||
if !yield(llm.StreamEvent{Type: llm.SEMessageStart, Usage: llm.Usage{InputTokens: 41}}, nil) {
|
||||
return
|
||||
}
|
||||
if !yield(llm.StreamEvent{Type: llm.SEMessageDelta, StopReason: p.stop}, nil) {
|
||||
return
|
||||
}
|
||||
yield(llm.StreamEvent{Type: llm.SEMessageStop}, nil)
|
||||
}
|
||||
}
|
||||
|
||||
func (p stopProvider) Complete(context.Context, llm.CompletionRequest) (llm.Message, string, llm.Usage, error) {
|
||||
return llm.Message{Role: llm.RoleAssistant}, p.stop, llm.Usage{InputTokens: 41}, nil
|
||||
}
|
||||
|
||||
// streamUnder runs one recorded streaming call with the given stop reason under ctx.
|
||||
func streamUnder(t *testing.T, ctx context.Context, stop string) {
|
||||
t.Helper()
|
||||
rec := llmrec.Wrap(stopProvider{stop: stop}, nil, "model", "profile", "", "", func() bool { return false })
|
||||
for _, err := range rec.Stream(ctx, llm.CompletionRequest{}) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsRefusalStop(t *testing.T) {
|
||||
for stop, want := range map[string]bool{
|
||||
"refusal": true, "content_filter": true,
|
||||
"end_turn": false, "tool_use": false, "max_tokens": false, "stop": false, "": false,
|
||||
} {
|
||||
if got := IsRefusalStop(stop); got != want {
|
||||
t.Errorf("IsRefusalStop(%q) = %v, want %v", stop, got, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The tracker installed per run is fed by the LLM recorder, and each run sees only
|
||||
// its own calls.
|
||||
func TestStopTrackerFedByRecorder(t *testing.T) {
|
||||
ctx := WithStopTracker(context.Background())
|
||||
if got := LastStopReason(ctx); got != "" {
|
||||
t.Fatalf("fresh tracker reports %q", got)
|
||||
}
|
||||
streamUnder(t, ctx, "refusal")
|
||||
if got := LastStopReason(ctx); got != "refusal" {
|
||||
t.Fatalf("LastStopReason = %q, want refusal", got)
|
||||
}
|
||||
// A later call overwrites it: the tracker describes the latest call only.
|
||||
streamUnder(t, ctx, "end_turn")
|
||||
if got := LastStopReason(ctx); got != "end_turn" {
|
||||
t.Fatalf("LastStopReason = %q, want end_turn", got)
|
||||
}
|
||||
// A nested run gets its own tracker and does not leak into the outer one.
|
||||
inner := WithStopTracker(ctx)
|
||||
streamUnder(t, inner, "content_filter")
|
||||
if LastStopReason(inner) != "content_filter" || LastStopReason(ctx) != "end_turn" {
|
||||
t.Fatalf("nested tracker leaked: inner=%q outer=%q", LastStopReason(inner), LastStopReason(ctx))
|
||||
}
|
||||
if got := LastStopReason(context.Background()); got != "" {
|
||||
t.Fatalf("context without a tracker reports %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTerminalTextNamesProviderRefusal(t *testing.T) {
|
||||
trace := &runTrace{startedAt: time.Now()}
|
||||
for _, stop := range []string{"refusal", "content_filter"} {
|
||||
ctx := WithStopTracker(context.Background())
|
||||
streamUnder(t, ctx, stop)
|
||||
summary, detail := terminalText(ctx, &harness.Terminal{Reason: harness.ReasonCompleted}, trace)
|
||||
if !strings.Contains(summary, "provider refusal (stop_reason "+stop+")") || strings.Contains(summary, "ended this turn normally") {
|
||||
t.Fatalf("%s: summary does not name the refusal: %q", stop, summary)
|
||||
}
|
||||
if !strings.Contains(detail, "stop_reason `"+stop+"`") || !strings.Contains(detail, "was not completed") {
|
||||
t.Fatalf("%s: detail does not explain the refusal:\n%s", stop, detail)
|
||||
}
|
||||
}
|
||||
|
||||
// Control: an ordinary end of turn keeps the completed wording.
|
||||
ctx := WithStopTracker(context.Background())
|
||||
streamUnder(t, ctx, "end_turn")
|
||||
summary, _ := terminalText(ctx, &harness.Terminal{Reason: harness.ReasonCompleted}, trace)
|
||||
if !strings.Contains(summary, "terminal state completed") || strings.Contains(summary, "refusal") {
|
||||
t.Fatalf("ordinary end of turn misreported: %q", summary)
|
||||
}
|
||||
|
||||
// A refusal stop only relabels a completed run; other terminal states keep theirs.
|
||||
ctx = WithStopTracker(context.Background())
|
||||
streamUnder(t, ctx, "refusal")
|
||||
summary, _ = terminalText(ctx, &harness.Terminal{Reason: harness.ReasonMaxTurns}, trace)
|
||||
if !strings.Contains(summary, "run budget cap") {
|
||||
t.Fatalf("max_turns relabelled by a refusal stop: %q", summary)
|
||||
}
|
||||
}
|
||||
+14
-1
@@ -44,6 +44,9 @@ var reasonHint = map[harness.TerminalReason]string{
|
||||
harness.ReasonAbortedTools: "the run was cancelled during tool execution",
|
||||
}
|
||||
|
||||
// refusalHint explains a turn the provider declined (see IsRefusalStop).
|
||||
const refusalHint = "the provider's safety system declined this request, so the model produced no output; the intent was not completed, and resending the same request unchanged is expected to be refused again. With LLM Recording on, the raw response carries the provider's stop details"
|
||||
|
||||
// terminalText renders a terminal event with no final text into a compact summary
|
||||
// and a Markdown detail block.
|
||||
func terminalText(ctx context.Context, term *harness.Terminal, tr *runTrace) (string, string) {
|
||||
@@ -54,6 +57,10 @@ func terminalText(ctx context.Context, term *harness.Terminal, tr *runTrace) (st
|
||||
if reason == "" && ctx.Err() != nil {
|
||||
aborted = true
|
||||
}
|
||||
// A provider refusal has no text and no tool calls, so the harness ends it as
|
||||
// ReasonCompleted. Only the recorded stop reason tells the two apart.
|
||||
stop := LastStopReason(ctx)
|
||||
refused := reason == harness.ReasonCompleted && IsRefusalStop(stop)
|
||||
|
||||
var sum string
|
||||
if aborted {
|
||||
@@ -71,6 +78,8 @@ func terminalText(ctx context.Context, term *harness.Terminal, tr *runTrace) (st
|
||||
sum = "(run interrupted: " + short + "; stopped during " + stage + progressSuffix(term, tr) + ", unfinished)"
|
||||
} else if reason == harness.ReasonMaxTurns || reason == harness.ReasonTimeout {
|
||||
sum = "(run budget cap reached (" + string(reason) + "); wrap-up wrote back facts" + progressSuffix(term, tr) + "; no text summary this run)"
|
||||
} else if refused {
|
||||
sum = "(no text summary; provider refusal (stop_reason " + stop + "): " + firstLine(refusalHint, 80) + ")"
|
||||
} else {
|
||||
hint := terminalReasonHint(reason)
|
||||
sum = "(no text summary; terminal state " + terminalReasonLabel(reason) + ": " + firstLine(hint, 80) + ")"
|
||||
@@ -80,7 +89,11 @@ func terminalText(ctx context.Context, term *harness.Terminal, tr *runTrace) (st
|
||||
b.WriteString(sum)
|
||||
b.WriteString("\n\n")
|
||||
displayReason := terminalReasonLabel(reason)
|
||||
fmt.Fprintf(&b, "- **Terminal state**: `%s` - %s\n", displayReason, terminalReasonHint(reason))
|
||||
if refused {
|
||||
fmt.Fprintf(&b, "- **Terminal state**: `%s`, but the last model call ended with stop_reason `%s` - %s\n", displayReason, stop, refusalHint)
|
||||
} else {
|
||||
fmt.Fprintf(&b, "- **Terminal state**: `%s` - %s\n", displayReason, terminalReasonHint(reason))
|
||||
}
|
||||
if aborted {
|
||||
code, _, why, ok := AbortReason(ctx)
|
||||
if ok {
|
||||
|
||||
@@ -162,6 +162,9 @@ func DecorateTool(t actool.CoreTool, desc string, schema map[string]any) actool.
|
||||
if len(schema) == 0 {
|
||||
schema = t.InputSchema()
|
||||
}
|
||||
if t.Name() == "record_fact" {
|
||||
schema = RepairRecordFactSchema(schema)
|
||||
}
|
||||
return &overriddenTool{CoreTool: t, desc: desc, schema: schema}
|
||||
}
|
||||
|
||||
|
||||
+22
-25
@@ -1495,13 +1495,14 @@ func (t *ToolSet) addFinding() actool.CoreTool {
|
||||
// must NOT be stuffed into the asset graph via upsert_asset.
|
||||
// factItem is one fact of a record_fact batch/single call.
|
||||
type factItem struct {
|
||||
Summary string `json:"summary"`
|
||||
Detail string `json:"detail"`
|
||||
Evidence string `json:"evidence"` // one line of key evidence (command + key output lines) supporting the conclusion, for later verification
|
||||
Confidence string `json:"confidence"` // observed (seen directly) | inferred (inferred from phenomena)
|
||||
Source string `json:"source"` // where the content came from, one of factSources; empty = inference
|
||||
IntentID json.RawMessage `json:"intent_id"`
|
||||
AssetIDs []json.RawMessage `json:"asset_ids"`
|
||||
Summary string `json:"summary"`
|
||||
Detail string `json:"detail"`
|
||||
Evidence string `json:"evidence"` // one line of key evidence (command + key output lines) supporting the conclusion, for later verification
|
||||
Confidence string `json:"confidence"` // observed (seen directly) | inferred (inferred from phenomena)
|
||||
Source string `json:"source"` // where the content came from, one of factSources; empty = inference
|
||||
IntentID json.RawMessage `json:"intent_id"`
|
||||
AssetIDs []json.RawMessage `json:"asset_ids"`
|
||||
TestedAssetIDs []json.RawMessage `json:"tested_asset_ids"`
|
||||
}
|
||||
|
||||
// Fact sources (#124, F4): where a fact's content came from, as declared by the
|
||||
@@ -1537,12 +1538,16 @@ func normalizeFactSource(s string) (string, error) {
|
||||
// intent_id).
|
||||
func (t *ToolSet) recordOneFact(it factItem, defaultIntent int64) (int64, error) {
|
||||
if strings.TrimSpace(it.Summary) == "" {
|
||||
return 0, fmt.Errorf("summary must not be empty")
|
||||
return 0, fmt.Errorf("summary must not be empty: every fact, including each batch item, requires its own one-sentence summary")
|
||||
}
|
||||
source, err := normalizeFactSource(it.Source)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
anchors, err := it.factAssetAnchors()
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
payload := map[string]any{"summary": it.Summary, "source": source}
|
||||
if it.Detail != "" {
|
||||
payload["detail"] = it.Detail
|
||||
@@ -1564,7 +1569,7 @@ func (t *ToolSet) recordOneFact(it factItem, defaultIntent int64) (int64, error)
|
||||
}
|
||||
}
|
||||
// a fact is its OWN node kind (distinct from a vuln finding).
|
||||
id, err := t.ts.AddNode(db.KindFact, payload, 5, "confirmed", t.worker, pidList(it.AssetIDs))
|
||||
id, err := t.ts.AddNode(db.KindFact, payload, 5, "confirmed", t.worker, anchors)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
@@ -1584,23 +1589,12 @@ func (t *ToolSet) recordFact() actool.CoreTool {
|
||||
" · confidence = observed (seen directly in output) | inferred (inferred from phenomena).\n"+
|
||||
" · source = where the content came from: target_response (content the target itself returned: page bodies, headers, error messages, banners, even when a tool fetched it) | tool_output (a tool's own result about the target: port states, scanner verdicts, status codes, timings) | third_party_intel (OSINT, CVE databases, public reports) | operator_input (given by the human operator) | inference (your own reasoning; the default when omitted). Any other value is refused.\n"+
|
||||
" · **Negative conclusions** (not injectable / port closed / no entry found, etc.) state only \"observation + tentative reading\" — state what you actually saw; whether to abandon the direction is for the planner to decide globally; always provide evidence, mark inferred when the means weren't exhausted or the evidence is weak (including probed only once, looks-like), and mark observed only when truly exhausted and directly seen.",
|
||||
obj(map[string]any{
|
||||
"facts": map[string]any{"type": "array", "description": "[use when there are several distinct conclusions] array of facts; element fields same as the top-level fields below (summary/detail/evidence/confidence/source/intent_id/asset_ids); omitting intent_id falls back to the top-level intent_id. The returned ids match this array in length and order.", "items": map[string]any{"type": "object"}},
|
||||
"summary": str("a [one-sentence summary] of this exploration's conclusion (a condensation of detail)"),
|
||||
"intent_id": idp("the id of the intent that produced this fact (the intent you claimed; the default for each item in batch mode)"),
|
||||
"detail": str("details related to this fact: write all of this exploration's observations here"),
|
||||
"evidence": str("[one line] of key evidence: the command + the one or two most proving output lines. Keep it brief; don't paste large output blocks (details go in detail)."),
|
||||
"confidence": str("observed (seen directly in output) | inferred (inferred from phenomena). Always label negative conclusions honestly."),
|
||||
"source": map[string]any{"type": "string", "enum": factSources, "description": "where the content came from: target_response | tool_output | third_party_intel | operator_input | inference (default when omitted)"},
|
||||
"asset_ids": map[string]any{"type": "array", "items": map[string]any{"type": "integer"}, "description": "related asset ids (optional, 0/1/many): which assets this fact involves"},
|
||||
}),
|
||||
recordFactSchema(),
|
||||
func(_ context.Context, in json.RawMessage) (actool.Result, error) {
|
||||
var a struct {
|
||||
Facts []factItem `json:"facts"`
|
||||
factItem // single mode + batch default intent_id
|
||||
a, batch, err := decodeRecordFactInput(in)
|
||||
if err != nil {
|
||||
return actool.Errorf("invalid record_fact input: " + err.Error() + "; no facts were written"), nil
|
||||
}
|
||||
_ = json.Unmarshal(in, &a)
|
||||
batch := len(a.Facts) > 0
|
||||
items := a.Facts
|
||||
if !batch {
|
||||
items = []factItem{a.factItem}
|
||||
@@ -1627,8 +1621,11 @@ func (t *ToolSet) recordFact() actool.CoreTool {
|
||||
out := map[string]any{"ids": ids}
|
||||
if len(errs) > 0 {
|
||||
out["errors"] = errs
|
||||
out["retry_instruction"] = "Retry only failed indices with complete facts, including summary. Successful indices were already saved; do not retry them."
|
||||
}
|
||||
return jsonResult(out)
|
||||
result, err := jsonResult(out)
|
||||
result.IsError = len(errs) > 0
|
||||
return result, err
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
+22
-6
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"net"
|
||||
"net/url"
|
||||
"strconv"
|
||||
@@ -121,6 +122,17 @@ type assetInputItem struct {
|
||||
Params []map[string]any `json:"params"`
|
||||
}
|
||||
|
||||
// insertAssetsRuleLoadFailure refuses the whole insert_assets call when
|
||||
// intercept rules cannot be loaded. The underlying error stays in the process
|
||||
// log so the model never sees a driver string.
|
||||
func insertAssetsRuleLoadFailure(err error) (actool.Result, bool) {
|
||||
if err == nil {
|
||||
return actool.Result{}, false
|
||||
}
|
||||
log.Printf("[insert_assets] intercept rules unavailable: %v", err)
|
||||
return actool.Errorf("asset intercept rules are unavailable; insertion refused"), true
|
||||
}
|
||||
|
||||
// insertAssets is the unified insert_assets agent tool.
|
||||
func (t *ToolSet) insertAssets() actool.CoreTool {
|
||||
return writeTool(
|
||||
@@ -233,16 +245,20 @@ func (t *ToolSet) insertAssets() actool.CoreTool {
|
||||
var results []result
|
||||
var errs []errEntry
|
||||
|
||||
// Asset gate rules are loaded once; on read failure the check is skipped
|
||||
// (insertion not blocked).
|
||||
// Interception rules = global ∪ task-level block; allow rules = task-level allow.
|
||||
blockRules, _ := t.as.ListAssetInterceptRules()
|
||||
// Fail closed: a rule-load error must not evaluate as an empty set (allow all).
|
||||
blockRules, err := t.as.ListAssetInterceptRules()
|
||||
if out, refused := insertAssetsRuleLoadFailure(err); refused {
|
||||
return out, nil
|
||||
}
|
||||
var allowRules []db.AssetInterceptRule
|
||||
if t.taskID > 0 {
|
||||
if tb, ta, err := t.as.TaskInterceptRulesSplit(t.taskID); err == nil {
|
||||
blockRules = append(blockRules, tb...)
|
||||
allowRules = ta
|
||||
tb, ta, err := t.as.TaskInterceptRulesSplit(t.taskID)
|
||||
if out, refused := insertAssetsRuleLoadFailure(err); refused {
|
||||
return out, nil
|
||||
}
|
||||
blockRules = append(blockRules, tb...)
|
||||
allowRules = ta
|
||||
}
|
||||
|
||||
for i, item := range a.Assets {
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
package archivestore
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestArchiveStorageEnvironment(t *testing.T) {
|
||||
for _, key := range []string{
|
||||
"ARTEX_ARCHIVE_STORAGE", "ARTEX_ARCHIVE_S3_ENDPOINT", "ARTEX_ARCHIVE_S3_REGION",
|
||||
"ARTEX_ARCHIVE_S3_BUCKET", "ARTEX_ARCHIVE_S3_PREFIX", "ARTEX_ARCHIVE_S3_ACCESS_KEY_ID",
|
||||
"ARTEX_ARCHIVE_S3_SECRET_ACCESS_KEY", "ARTEX_ARCHIVE_S3_PATH_STYLE",
|
||||
"ARTEX_ARCHIVE_S3_SESSION_TOKEN", "ARTEX_ARCHIVE_S3_SSE", "ARTEX_ARCHIVE_S3_KMS_KEY_ID",
|
||||
} {
|
||||
t.Setenv(key, "")
|
||||
}
|
||||
for _, backend := range []string{"", "local"} {
|
||||
t.Setenv("ARTEX_ARCHIVE_STORAGE", backend)
|
||||
if store, err := FromEnv(); err != nil || store != nil {
|
||||
t.Fatalf("local default: %v %v", store, err)
|
||||
}
|
||||
}
|
||||
for _, backend := range []string{"unknown", "s3"} {
|
||||
t.Setenv("ARTEX_ARCHIVE_STORAGE", backend)
|
||||
if _, err := FromEnv(); err == nil {
|
||||
t.Fatalf("%q silently fell back to local", backend)
|
||||
}
|
||||
}
|
||||
t.Setenv("ARTEX_ARCHIVE_S3_ENDPOINT", "http://127.0.0.1:9000")
|
||||
t.Setenv("ARTEX_ARCHIVE_S3_BUCKET", "test-bucket")
|
||||
t.Setenv("ARTEX_ARCHIVE_S3_ACCESS_KEY_ID", "test-key")
|
||||
t.Setenv("ARTEX_ARCHIVE_S3_SECRET_ACCESS_KEY", "test-secret")
|
||||
t.Setenv("ARTEX_ARCHIVE_S3_PATH_STYLE", "true")
|
||||
store, err := FromEnv()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if uri := store.URI(1, 2, "checksum"); uri != "s3://test-bucket/artex/tasks/task-1-2-checksum.tar.zst" {
|
||||
t.Fatal("unexpected default object location", uri)
|
||||
}
|
||||
t.Setenv("ARTEX_ARCHIVE_S3_SECRET_ACCESS_KEY", "")
|
||||
if _, err := FromEnv(); err == nil {
|
||||
t.Fatal("missing credentials accepted")
|
||||
}
|
||||
}
|
||||
|
||||
func TestArchiveEndpointValidation(t *testing.T) {
|
||||
config := Config{Bucket: "test", AccessKey: "test-key", SecretKey: "test-secret"}
|
||||
for _, endpoint := range []string{"https://objects.example.test", "http://127.0.0.1:9000", "http://127.0.0.2:9000", "http://[::1]:9000", "http://localhost:9000"} {
|
||||
config.Endpoint = endpoint
|
||||
if _, err := New(config); err != nil {
|
||||
t.Errorf("rejected %s: %v", endpoint, err)
|
||||
}
|
||||
}
|
||||
for _, endpoint := range []string{"http://objects.example.test", "https://user:test-secret@objects.example.test", "https://objects.example.test/bucket", "https://objects.example.test?token=test-secret", "https://objects.example.test#fragment"} {
|
||||
config.Endpoint = endpoint
|
||||
if _, err := New(config); err == nil {
|
||||
t.Error("accepted endpoint with non-loopback HTTP, credentials, path, query or fragment")
|
||||
} else if strings.Contains(err.Error(), "test-secret") {
|
||||
t.Fatal("configuration error disclosed a secret")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestArchiveEncryptionConfiguration(t *testing.T) {
|
||||
c := Config{Endpoint: "https://objects.example.test", Bucket: "test", AccessKey: "test", SecretKey: "test"}
|
||||
for _, mode := range []string{"none", "invalid"} {
|
||||
c.SSE = mode
|
||||
if _, err := New(c); err == nil {
|
||||
t.Fatal("unencrypted/invalid mode accepted")
|
||||
}
|
||||
}
|
||||
c.SSE = "AES256"
|
||||
c.KMSKeyID = "alias/archive"
|
||||
if _, err := New(c); err == nil {
|
||||
t.Fatal("KMS key accepted with SSE-S3")
|
||||
}
|
||||
c.SSE = "aws:kms"
|
||||
for _, key := range []string{"alias/archive", "bare-key-id", "arn:aws:kms:us-east-1:123456789012:alias/archive"} {
|
||||
c.KMSKeyID = key
|
||||
if _, err := New(c); err == nil {
|
||||
t.Fatalf("accepted noncanonical KMS key %q", key)
|
||||
}
|
||||
}
|
||||
c.KMSKeyID = "arn:aws:kms:us-east-1:123456789012:key/test-key"
|
||||
if _, err := New(c); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
package archivestore
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func isolateAWSCredentials(t *testing.T) {
|
||||
t.Helper()
|
||||
for _, key := range []string{
|
||||
"AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "AWS_PROFILE", "AWS_DEFAULT_PROFILE",
|
||||
"AWS_ROLE_ARN", "AWS_ROLE_SESSION_NAME", "AWS_WEB_IDENTITY_TOKEN_FILE",
|
||||
"AWS_CONTAINER_CREDENTIALS_RELATIVE_URI", "AWS_CONTAINER_CREDENTIALS_FULL_URI",
|
||||
"AWS_CONTAINER_AUTHORIZATION_TOKEN", "AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE",
|
||||
"AWS_EC2_METADATA_SERVICE_ENDPOINT", "AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE",
|
||||
} {
|
||||
t.Setenv(key, "")
|
||||
}
|
||||
dir := t.TempDir()
|
||||
t.Setenv("AWS_SHARED_CREDENTIALS_FILE", filepath.Join(dir, "credentials"))
|
||||
t.Setenv("AWS_CONFIG_FILE", filepath.Join(dir, "config"))
|
||||
t.Setenv("AWS_EC2_METADATA_DISABLED", "true")
|
||||
}
|
||||
|
||||
func TestArchiveCredentialChain(t *testing.T) {
|
||||
config := Config{Endpoint: "https://objects.example.test", Bucket: "test"}
|
||||
for _, mode := range []string{"explicit-session", "environment", "shared-profile", "ecs", "imds"} {
|
||||
t.Run(mode, func(t *testing.T) {
|
||||
isolateAWSCredentials(t)
|
||||
c := config
|
||||
switch mode {
|
||||
case "explicit-session":
|
||||
t.Setenv("AWS_ACCESS_KEY_ID", "other-key")
|
||||
t.Setenv("AWS_SECRET_ACCESS_KEY", "other-secret")
|
||||
c.AccessKey, c.SecretKey, c.SessionToken = "fixture-key", "fixture-secret", "fixture-session"
|
||||
case "environment":
|
||||
t.Setenv("AWS_ACCESS_KEY_ID", "fixture-key")
|
||||
t.Setenv("AWS_SECRET_ACCESS_KEY", "fixture-secret")
|
||||
t.Setenv("AWS_SESSION_TOKEN", "fixture-session")
|
||||
case "shared-profile":
|
||||
t.Setenv("AWS_PROFILE", "archive")
|
||||
data := `[archive]
|
||||
aws_access_key_id=fixture-key
|
||||
aws_secret_access_key=fixture-secret
|
||||
aws_session_token=fixture-session
|
||||
`
|
||||
if err := os.WriteFile(os.Getenv("AWS_SHARED_CREDENTIALS_FILE"), []byte(data), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
case "ecs", "imds":
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if mode == "imds" {
|
||||
switch r.URL.Path {
|
||||
case "/latest/api/token":
|
||||
if r.Method != "PUT" {
|
||||
t.Error("IMDS did not use token request")
|
||||
}
|
||||
w.Header().Set("X-aws-ec2-metadata-token-ttl-seconds", "21600")
|
||||
fmt.Fprint(w, "fixture-imds-token")
|
||||
return
|
||||
case "/latest/meta-data/iam/security-credentials/":
|
||||
if r.Header.Get("X-aws-ec2-metadata-token") != "fixture-imds-token" {
|
||||
t.Error("missing IMDSv2 token")
|
||||
}
|
||||
fmt.Fprint(w, "archive-role")
|
||||
return
|
||||
case "/latest/meta-data/iam/security-credentials/archive-role":
|
||||
if r.Header.Get("X-aws-ec2-metadata-token") != "fixture-imds-token" {
|
||||
t.Error("missing IMDSv2 token")
|
||||
}
|
||||
default:
|
||||
t.Errorf("unexpected IMDS request %s", r.URL.Path)
|
||||
w.WriteHeader(404)
|
||||
return
|
||||
}
|
||||
} else if r.Header.Get("Authorization") != "fixture-container-token" {
|
||||
t.Error("missing ECS authorization token")
|
||||
}
|
||||
_ = json.NewEncoder(w).Encode(map[string]any{
|
||||
"Code": "Success", "AccessKeyId": "fixture-key", "SecretAccessKey": "fixture-secret",
|
||||
"Token": "fixture-session", "Expiration": time.Now().Add(time.Hour).UTC().Format(time.RFC3339),
|
||||
})
|
||||
}))
|
||||
defer srv.Close()
|
||||
if mode == "imds" {
|
||||
t.Setenv("AWS_EC2_METADATA_DISABLED", "false")
|
||||
t.Setenv("AWS_EC2_METADATA_V1_DISABLED", "true")
|
||||
t.Setenv("AWS_EC2_METADATA_SERVICE_ENDPOINT", srv.URL)
|
||||
} else {
|
||||
t.Setenv("AWS_CONTAINER_CREDENTIALS_FULL_URI", srv.URL+"/credentials")
|
||||
t.Setenv("AWS_CONTAINER_AUTHORIZATION_TOKEN", "fixture-container-token")
|
||||
}
|
||||
}
|
||||
store, err := New(c)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
|
||||
defer cancel()
|
||||
credentials, err := store.client.Options().Credentials.Retrieve(ctx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if credentials.AccessKeyID != "fixture-key" || credentials.SecretAccessKey != "fixture-secret" || credentials.SessionToken != "fixture-session" {
|
||||
t.Fatal("wrong credential provider or session token")
|
||||
}
|
||||
if (mode == "imds" || mode == "ecs") && !credentials.CanExpire {
|
||||
t.Fatal("role credentials must remain refreshable")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestArchiveIncompleteCredentialOverride(t *testing.T) {
|
||||
isolateAWSCredentials(t)
|
||||
t.Setenv("AWS_ACCESS_KEY_ID", "valid-ambient-key")
|
||||
t.Setenv("AWS_SECRET_ACCESS_KEY", "valid-ambient-secret")
|
||||
for _, c := range []Config{{AccessKey: "private-value"}, {SecretKey: "private-value"}, {SessionToken: "private-value"}} {
|
||||
c.Endpoint, c.Bucket = "https://objects.example.test", "test"
|
||||
if _, err := New(c); err == nil || strings.Contains(err.Error(), "private-value") {
|
||||
t.Fatalf("partial override must fail without disclosing credentials: %v", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,372 @@
|
||||
// Package archivestore stores immutable cold-task packages in S3-compatible storage.
|
||||
package archivestore
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"path"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/aws/aws-sdk-go-v2/aws"
|
||||
"github.com/aws/aws-sdk-go-v2/aws/arn"
|
||||
"github.com/aws/aws-sdk-go-v2/aws/retry"
|
||||
awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http"
|
||||
awsconfig "github.com/aws/aws-sdk-go-v2/config"
|
||||
"github.com/aws/aws-sdk-go-v2/credentials"
|
||||
"github.com/aws/aws-sdk-go-v2/feature/s3/manager"
|
||||
"github.com/aws/aws-sdk-go-v2/service/s3"
|
||||
"github.com/aws/aws-sdk-go-v2/service/s3/types"
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
Endpoint, Region, Bucket, Prefix, AccessKey, SecretKey string
|
||||
PathStyle bool
|
||||
SessionToken, SSE, KMSKeyID string
|
||||
}
|
||||
|
||||
type Store struct {
|
||||
client *s3.Client
|
||||
bucket, prefix string
|
||||
encryption types.ServerSideEncryption
|
||||
kmsKeyID string
|
||||
}
|
||||
|
||||
// FromEnv returns nil for the default local backend. A configured but invalid
|
||||
// backend is an error, never a silent fallback to the machine's local disk.
|
||||
func FromEnv() (*Store, error) {
|
||||
switch os.Getenv("ARTEX_ARCHIVE_STORAGE") {
|
||||
case "", "local":
|
||||
return nil, nil
|
||||
case "s3":
|
||||
return New(Config{
|
||||
Endpoint: os.Getenv("ARTEX_ARCHIVE_S3_ENDPOINT"), Region: os.Getenv("ARTEX_ARCHIVE_S3_REGION"),
|
||||
Bucket: os.Getenv("ARTEX_ARCHIVE_S3_BUCKET"), Prefix: os.Getenv("ARTEX_ARCHIVE_S3_PREFIX"),
|
||||
AccessKey: os.Getenv("ARTEX_ARCHIVE_S3_ACCESS_KEY_ID"), SecretKey: os.Getenv("ARTEX_ARCHIVE_S3_SECRET_ACCESS_KEY"),
|
||||
PathStyle: os.Getenv("ARTEX_ARCHIVE_S3_PATH_STYLE") == "true",
|
||||
SessionToken: os.Getenv("ARTEX_ARCHIVE_S3_SESSION_TOKEN"),
|
||||
SSE: os.Getenv("ARTEX_ARCHIVE_S3_SSE"), KMSKeyID: os.Getenv("ARTEX_ARCHIVE_S3_KMS_KEY_ID"),
|
||||
})
|
||||
default:
|
||||
return nil, errors.New("ARTEX_ARCHIVE_STORAGE must be local or s3")
|
||||
}
|
||||
}
|
||||
|
||||
func New(c Config) (*Store, error) {
|
||||
u, err := url.Parse(c.Endpoint)
|
||||
loopback := false
|
||||
if err == nil {
|
||||
loopback = u.Hostname() == "localhost"
|
||||
if ip := net.ParseIP(u.Hostname()); ip != nil {
|
||||
loopback = ip.IsLoopback()
|
||||
}
|
||||
}
|
||||
if err != nil || u.Host == "" || u.User != nil || u.RawQuery != "" || u.Fragment != "" || (u.Path != "" && u.Path != "/") ||
|
||||
(u.Scheme != "https" && !(u.Scheme == "http" && loopback)) {
|
||||
return nil, errors.New("archive S3 endpoint must be an HTTPS origin (HTTP allowed only on loopback)")
|
||||
}
|
||||
c.Prefix = strings.Trim(c.Prefix, "/")
|
||||
if c.Prefix == "" {
|
||||
c.Prefix = "artex/tasks"
|
||||
}
|
||||
if path.Clean(c.Prefix) != c.Prefix || strings.Contains(c.Prefix, "..") || strings.ContainsAny(c.Prefix, "\\?#") {
|
||||
return nil, errors.New("invalid archive S3 prefix")
|
||||
}
|
||||
if c.Bucket == "" || strings.ContainsAny(c.Bucket, "/\\:@?# ") {
|
||||
return nil, errors.New("a valid archive S3 bucket is required")
|
||||
}
|
||||
explicitCredentials := c.AccessKey != "" || c.SecretKey != "" || c.SessionToken != ""
|
||||
if explicitCredentials && (c.AccessKey == "" || c.SecretKey == "") {
|
||||
return nil, errors.New("archive S3 access key and secret key must both be set when overriding AWS credentials")
|
||||
}
|
||||
if c.SSE == "" {
|
||||
c.SSE = "AES256"
|
||||
}
|
||||
if c.SSE != "AES256" && c.SSE != "aws:kms" {
|
||||
return nil, errors.New("archive S3 SSE must be AES256 or aws:kms; encryption cannot be disabled")
|
||||
}
|
||||
if c.KMSKeyID != "" && c.SSE != "aws:kms" {
|
||||
return nil, errors.New("archive S3 KMS key requires SSE=aws:kms")
|
||||
}
|
||||
if c.KMSKeyID != "" {
|
||||
key, err := arn.Parse(c.KMSKeyID)
|
||||
if err != nil || key.Service != "kms" || key.Region == "" || key.AccountID == "" ||
|
||||
!strings.HasPrefix(key.Resource, "key/") || len(key.Resource) <= len("key/") {
|
||||
return nil, errors.New("archive S3 KMS key must be a full key ARN, not an alias or bare key ID")
|
||||
}
|
||||
}
|
||||
if c.Region == "" {
|
||||
c.Region = "us-east-1"
|
||||
}
|
||||
// Load shared AWS settings (including custom CAs) for both credential modes.
|
||||
httpClient := awshttp.NewBuildableClient().WithTransportOptions(func(t *http.Transport) {
|
||||
t.ResponseHeaderTimeout = 60 * time.Second
|
||||
})
|
||||
options := []func(*awsconfig.LoadOptions) error{
|
||||
awsconfig.WithRegion(c.Region), awsconfig.WithHTTPClient(httpClient),
|
||||
}
|
||||
if explicitCredentials {
|
||||
options = append(options, awsconfig.WithCredentialsProvider(
|
||||
credentials.NewStaticCredentialsProvider(c.AccessKey, c.SecretKey, c.SessionToken)))
|
||||
}
|
||||
cfg, err := awsconfig.LoadDefaultConfig(context.Background(), options...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("load archive S3 AWS configuration: %w", err)
|
||||
}
|
||||
// The SDK's default client still follows 307/308. Use its CA-configured
|
||||
// transport, but never redirect a signed archive request to another origin.
|
||||
configuredClient := cfg.HTTPClient.(*awshttp.BuildableClient)
|
||||
cfg.HTTPClient = &http.Client{
|
||||
Transport: configuredClient.GetTransport(), Timeout: configuredClient.GetTimeout(),
|
||||
CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse },
|
||||
}
|
||||
client := s3.NewFromConfig(cfg, func(o *s3.Options) {
|
||||
o.BaseEndpoint = aws.String(c.Endpoint)
|
||||
o.UsePathStyle = c.PathStyle
|
||||
o.RequestChecksumCalculation = aws.RequestChecksumCalculationWhenRequired
|
||||
o.ResponseChecksumValidation = aws.ResponseChecksumValidationWhenRequired
|
||||
})
|
||||
return &Store{client: client, bucket: c.Bucket, prefix: c.Prefix + "/",
|
||||
encryption: types.ServerSideEncryption(c.SSE), kmsKeyID: c.KMSKeyID}, nil
|
||||
}
|
||||
|
||||
func (s *Store) URI(taskID, archiveID int64, checksum string) string {
|
||||
return "s3://" + s.bucket + "/" + s.prefix + fmt.Sprintf("task-%d-%d-%s.tar.zst", taskID, archiveID, checksum)
|
||||
}
|
||||
|
||||
func (s *Store) key(uri string) (string, error) {
|
||||
if s == nil {
|
||||
return "", errors.New("S3 archive storage is not configured")
|
||||
}
|
||||
u, err := url.Parse(uri)
|
||||
if err != nil || u.Scheme != "s3" || u.Host != s.bucket || u.User != nil || u.RawQuery != "" || u.Fragment != "" {
|
||||
return "", errors.New("archive object is outside the configured bucket")
|
||||
}
|
||||
key := strings.TrimPrefix(u.Path, "/")
|
||||
if !strings.HasPrefix(key, s.prefix) || len(key) <= len(s.prefix) || path.Clean(key) != key || strings.Contains(key, "\\") {
|
||||
return "", errors.New("archive object is outside the configured prefix")
|
||||
}
|
||||
return key, nil
|
||||
}
|
||||
|
||||
func (s *Store) Validate(uri string) error { _, err := s.key(uri); return err }
|
||||
|
||||
// Upload verifies the entire uploaded object by reading it back, including
|
||||
// multipart uploads whose ETag is not a checksum. Callers retain source data
|
||||
// until verification succeeds and PostgreSQL commits the remote location.
|
||||
func (s *Store) Upload(ctx context.Context, uri, filename, checksum string) error {
|
||||
key, err := s.key(uri)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if decoded, err := hex.DecodeString(checksum); err != nil || len(decoded) != sha256.Size {
|
||||
return errors.New("invalid archive SHA-256")
|
||||
}
|
||||
f, err := os.Open(filename)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer f.Close()
|
||||
info, err := f.Stat()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
uploader := manager.NewUploader(s.client, func(u *manager.Uploader) {
|
||||
u.PartSize = 8 << 20
|
||||
u.Concurrency = 2
|
||||
u.LeavePartsOnError = true // Abort below with a fresh, bounded cleanup context.
|
||||
u.RequestChecksumCalculation = aws.RequestChecksumCalculationWhenRequired
|
||||
})
|
||||
input := &s3.PutObjectInput{
|
||||
Bucket: aws.String(s.bucket), Key: aws.String(key), Body: f,
|
||||
ContentType: aws.String("application/zstd"), Metadata: map[string]string{"sha256": checksum},
|
||||
ServerSideEncryption: s.encryption,
|
||||
}
|
||||
if s.kmsKeyID != "" {
|
||||
input.SSEKMSKeyId = aws.String(s.kmsKeyID)
|
||||
}
|
||||
result, err := uploader.Upload(ctx, input)
|
||||
if err != nil {
|
||||
uploadErr := fmt.Errorf("upload archive: %w", err)
|
||||
var multipart manager.MultiUploadFailure
|
||||
if errors.As(err, &multipart) {
|
||||
cleanupCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)
|
||||
defer cancel()
|
||||
_, cleanupErr := s.client.AbortMultipartUpload(cleanupCtx, &s3.AbortMultipartUploadInput{
|
||||
Bucket: aws.String(s.bucket), Key: aws.String(key), UploadId: aws.String(multipart.UploadID()),
|
||||
})
|
||||
if cleanupErr != nil {
|
||||
return errors.Join(uploadErr, fmt.Errorf("abort archive multipart upload: %w", cleanupErr))
|
||||
}
|
||||
}
|
||||
return uploadErr
|
||||
}
|
||||
if err := s.readVerified(ctx, key, io.Discard, checksum, info.Size(), true); err != nil {
|
||||
cleanupCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)
|
||||
defer cancel()
|
||||
// Versioned buckets require deleting the version just uploaded; an
|
||||
// unversioned DELETE would only hide it behind a delete marker.
|
||||
_, cleanupErr := s.client.DeleteObject(cleanupCtx, &s3.DeleteObjectInput{
|
||||
Bucket: aws.String(s.bucket), Key: aws.String(key), VersionId: result.VersionID,
|
||||
})
|
||||
if cleanupErr != nil {
|
||||
return errors.Join(err, fmt.Errorf("delete unverified archive: %w", cleanupErr))
|
||||
}
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Store) readVerified(ctx context.Context, key string, out io.Writer, checksum string, expectedSize int64, requireEncryption bool) error {
|
||||
if decoded, err := hex.DecodeString(checksum); err != nil || len(decoded) != sha256.Size {
|
||||
return errors.New("invalid archive SHA-256")
|
||||
}
|
||||
if expectedSize < 0 {
|
||||
return errors.New("invalid archive size")
|
||||
}
|
||||
object, err := s.client.HeadObject(ctx, &s3.HeadObjectInput{Bucket: aws.String(s.bucket), Key: aws.String(key)})
|
||||
if err != nil {
|
||||
return fmt.Errorf("inspect archive: %w", err)
|
||||
}
|
||||
if requireEncryption && (object.ServerSideEncryption != s.encryption ||
|
||||
(s.encryption == types.ServerSideEncryptionAwsKms && (aws.ToString(object.SSEKMSKeyId) == "" ||
|
||||
(s.kmsKeyID != "" && aws.ToString(object.SSEKMSKeyId) != s.kmsKeyID)))) {
|
||||
return errors.New("remote archive did not confirm the requested server-side encryption; source data retained")
|
||||
}
|
||||
if object.ContentLength == nil || *object.ContentLength != expectedSize || aws.ToString(object.ETag) == "" {
|
||||
return errors.New("remote archive size mismatch or missing ETag; source data retained")
|
||||
}
|
||||
// Commit only complete, validated chunks to the output and hash. A broken
|
||||
// connection can then retry its chunk without duplicating bytes or restarting
|
||||
// a multi-gigabyte read. IfMatch pins every request to the same object.
|
||||
h := sha256.New()
|
||||
for offset := int64(0); offset < expectedSize; {
|
||||
end := offset + min(archiveReadChunkSize, expectedSize-offset) - 1
|
||||
data, err := s.readArchiveChunk(ctx, key, aws.ToString(object.ETag), offset, end, expectedSize)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
n, err := out.Write(data)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if n != len(data) {
|
||||
return io.ErrShortWrite
|
||||
}
|
||||
_, _ = h.Write(data)
|
||||
offset += int64(len(data))
|
||||
}
|
||||
if !strings.EqualFold(hex.EncodeToString(h.Sum(nil)), checksum) {
|
||||
return errors.New("remote archive size or SHA-256 mismatch; source data retained")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
const (
|
||||
archiveReadChunkSize = int64(8 << 20)
|
||||
archiveReadAttempts = 5
|
||||
)
|
||||
|
||||
func (s *Store) readArchiveChunk(ctx context.Context, key, etag string, start, end, total int64) ([]byte, error) {
|
||||
var lastErr error
|
||||
for attempt := 0; attempt < archiveReadAttempts; attempt++ {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if attempt > 0 {
|
||||
timer := time.NewTimer((250 * time.Millisecond) << (attempt - 1))
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
timer.Stop()
|
||||
return nil, ctx.Err()
|
||||
case <-timer.C:
|
||||
}
|
||||
}
|
||||
data, retry, err := s.readArchiveChunkOnce(ctx, key, etag, start, end, total)
|
||||
if err == nil {
|
||||
return data, nil
|
||||
}
|
||||
if !retry {
|
||||
return nil, err
|
||||
}
|
||||
lastErr = err
|
||||
}
|
||||
return nil, fmt.Errorf("read archive bytes %d-%d after %d attempts: %w", start, end, archiveReadAttempts, lastErr)
|
||||
}
|
||||
|
||||
func (s *Store) readArchiveChunkOnce(ctx context.Context, key, etag string, start, end, total int64) ([]byte, bool, error) {
|
||||
requestCtx, cancel := context.WithTimeout(ctx, 2*time.Minute)
|
||||
defer cancel()
|
||||
object, err := s.client.GetObject(requestCtx, &s3.GetObjectInput{
|
||||
Bucket: aws.String(s.bucket), Key: aws.String(key), IfMatch: aws.String(etag),
|
||||
Range: aws.String(fmt.Sprintf("bytes=%d-%d", start, end)),
|
||||
}, func(o *s3.Options) {
|
||||
// This loop owns both HTTP and interrupted-body retries: at most five
|
||||
// wire requests per chunk, rather than five times the SDK's attempts.
|
||||
o.RetryMaxAttempts = 1
|
||||
})
|
||||
if err != nil {
|
||||
var networkError net.Error
|
||||
var responseError *awshttp.ResponseError
|
||||
throttled := errors.As(err, &responseError) && responseError.HTTPStatusCode() == http.StatusTooManyRequests
|
||||
shouldRetry := throttled || retry.NewStandard().IsErrorRetryable(err) || errors.As(err, &networkError) || errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) || errors.Is(err, context.DeadlineExceeded)
|
||||
return nil, shouldRetry, fmt.Errorf("read archive range: %w", err)
|
||||
}
|
||||
defer object.Body.Close()
|
||||
want := end - start + 1
|
||||
if aws.ToString(object.ETag) != etag || aws.ToString(object.ContentRange) != fmt.Sprintf("bytes %d-%d/%d", start, end, total) || object.ContentLength == nil || *object.ContentLength != want {
|
||||
return nil, false, errors.New("remote archive changed or returned an invalid byte range; source data retained")
|
||||
}
|
||||
data, err := io.ReadAll(io.LimitReader(object.Body, want+1))
|
||||
if err != nil {
|
||||
return nil, true, err
|
||||
}
|
||||
if int64(len(data)) < want {
|
||||
return nil, true, io.ErrUnexpectedEOF
|
||||
}
|
||||
if int64(len(data)) != want {
|
||||
return nil, false, errors.New("remote archive range exceeds its declared size")
|
||||
}
|
||||
return data, false, nil
|
||||
}
|
||||
|
||||
func (s *Store) Download(ctx context.Context, uri, filename, checksum string, size int64) (err error) {
|
||||
key, err := s.key(uri)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if size <= 0 {
|
||||
return errors.New("invalid archive size")
|
||||
}
|
||||
f, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0o600)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer func() {
|
||||
err = errors.Join(err, f.Close())
|
||||
if err != nil {
|
||||
_ = os.Remove(filename)
|
||||
}
|
||||
}()
|
||||
if err = s.readVerified(ctx, key, f, checksum, size, false); err != nil {
|
||||
return err
|
||||
}
|
||||
return f.Sync()
|
||||
}
|
||||
|
||||
func (s *Store) Delete(ctx context.Context, uri string) error {
|
||||
key, err := s.key(uri)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = s.client.DeleteObject(ctx, &s3.DeleteObjectInput{Bucket: aws.String(s.bucket), Key: aws.String(key)})
|
||||
return err
|
||||
}
|
||||
@@ -0,0 +1,420 @@
|
||||
package archivestore
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestS3RoundTripAndIntegrity(t *testing.T) {
|
||||
for _, sse := range []string{"AES256", "aws:kms"} {
|
||||
kms := ""
|
||||
if sse == "aws:kms" {
|
||||
kms = "arn:aws:kms:us-east-1:123456789012:key/test-key"
|
||||
}
|
||||
for _, size := range []int{1024, 10 << 20} {
|
||||
t.Run(sse+"/"+strconv.Itoa(size), func(t *testing.T) {
|
||||
var mu sync.Mutex
|
||||
var object []byte
|
||||
parts := map[int][]byte{}
|
||||
corrupt, multipart := false, false
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
q := r.URL.Query()
|
||||
if (r.Method == "PUT" && !q.Has("partNumber")) || (r.Method == "POST" && q.Has("uploads")) {
|
||||
if r.Header.Get("X-Amz-Server-Side-Encryption") != sse || r.Header.Get("X-Amz-Server-Side-Encryption-Aws-Kms-Key-Id") != kms {
|
||||
t.Error("upload did not explicitly request the configured encryption")
|
||||
}
|
||||
}
|
||||
if r.Method == "HEAD" {
|
||||
if r.Header.Get("X-Amz-Server-Side-Encryption") != "" {
|
||||
t.Error("encryption write header leaked into HEAD")
|
||||
}
|
||||
w.Header().Set("X-Amz-Server-Side-Encryption", sse)
|
||||
if kms != "" {
|
||||
w.Header().Set("X-Amz-Server-Side-Encryption-Aws-Kms-Key-Id", kms)
|
||||
}
|
||||
}
|
||||
w.Header().Set("ETag", `"test-etag"`)
|
||||
switch {
|
||||
case r.Method == "POST" && q.Has("uploads"):
|
||||
multipart = true
|
||||
fmt.Fprint(w, `<InitiateMultipartUploadResult><UploadId>test-upload</UploadId></InitiateMultipartUploadResult>`)
|
||||
case r.Method == "PUT" && q.Has("partNumber"):
|
||||
n, _ := strconv.Atoi(q.Get("partNumber"))
|
||||
parts[n], _ = io.ReadAll(r.Body)
|
||||
case r.Method == "POST" && q.Has("uploadId"):
|
||||
for i := 1; i <= len(parts); i++ {
|
||||
object = append(object, parts[i]...)
|
||||
}
|
||||
fmt.Fprint(w, `<CompleteMultipartUploadResult><ETag>test-etag</ETag></CompleteMultipartUploadResult>`)
|
||||
case r.Method == "PUT":
|
||||
object, _ = io.ReadAll(r.Body)
|
||||
case r.Method == "HEAD":
|
||||
w.Header().Set("Content-Length", strconv.Itoa(len(object)))
|
||||
case r.Method == "GET":
|
||||
data := object
|
||||
if corrupt {
|
||||
data = bytes.Clone(object)
|
||||
data[0] ^= 0xff
|
||||
}
|
||||
serveArchiveRange(t, w, r, data)
|
||||
case r.Method == "DELETE":
|
||||
object = nil
|
||||
w.WriteHeader(204)
|
||||
default:
|
||||
t.Errorf("unexpected request %s %s", r.Method, r.URL)
|
||||
w.WriteHeader(400)
|
||||
}
|
||||
}))
|
||||
defer srv.Close()
|
||||
store, err := New(Config{Endpoint: srv.URL, Bucket: "test-bucket", Prefix: "test/tasks", AccessKey: "test", SecretKey: "test", PathStyle: true, SSE: sse, KMSKeyID: kms})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
data := bytes.Repeat([]byte{0x42}, size)
|
||||
h := sha256.Sum256(data)
|
||||
checksum := hex.EncodeToString(h[:])
|
||||
root := t.TempDir()
|
||||
source := filepath.Join(root, "source")
|
||||
if err := os.WriteFile(source, data, 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
uri := store.URI(1, 2, checksum)
|
||||
ctx := context.Background()
|
||||
if err := store.Upload(ctx, uri, source, checksum); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if multipart != (size > 8<<20) {
|
||||
t.Fatalf("multipart=%v size=%d", multipart, size)
|
||||
}
|
||||
dest := filepath.Join(root, "download")
|
||||
if err := store.Download(ctx, uri, dest, checksum, int64(size)); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
got, _ := os.ReadFile(dest)
|
||||
if !bytes.Equal(got, data) {
|
||||
t.Fatal("download differs")
|
||||
}
|
||||
mu.Lock()
|
||||
corrupt = true
|
||||
mu.Unlock()
|
||||
bad := filepath.Join(root, "bad")
|
||||
if err := store.Download(ctx, uri, bad, checksum, int64(size)); err == nil {
|
||||
t.Fatal("accepted corrupt object")
|
||||
}
|
||||
if _, err := os.Stat(bad); !os.IsNotExist(err) {
|
||||
t.Fatal("left corrupt download")
|
||||
}
|
||||
if err := store.Upload(ctx, uri, source, checksum); err == nil {
|
||||
t.Fatal("upload accepted failed readback")
|
||||
}
|
||||
if err := store.Delete(ctx, uri); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func serveArchiveRange(t *testing.T, w http.ResponseWriter, r *http.Request, data []byte) {
|
||||
t.Helper()
|
||||
var start, end int64
|
||||
if n, err := fmt.Sscanf(r.Header.Get("Range"), "bytes=%d-%d", &start, &end); err != nil || n != 2 || start < 0 || end < start || end >= int64(len(data)) {
|
||||
t.Errorf("invalid range %q", r.Header.Get("Range"))
|
||||
w.WriteHeader(http.StatusRequestedRangeNotSatisfiable)
|
||||
return
|
||||
}
|
||||
if r.Header.Get("If-Match") != `"test-etag"` {
|
||||
t.Errorf("missing object version condition: %q", r.Header.Get("If-Match"))
|
||||
w.WriteHeader(http.StatusPreconditionFailed)
|
||||
return
|
||||
}
|
||||
w.Header().Set("ETag", `"test-etag"`)
|
||||
w.Header().Set("Content-Length", strconv.FormatInt(end-start+1, 10))
|
||||
w.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", start, end, len(data)))
|
||||
w.WriteHeader(http.StatusPartialContent)
|
||||
_, _ = w.Write(data[start : end+1])
|
||||
}
|
||||
|
||||
func TestS3ReadbackRetriesInterruptedRange(t *testing.T) {
|
||||
data := append(bytes.Repeat([]byte{0x42}, int(archiveReadChunkSize)), bytes.Repeat([]byte{0x73}, 1024)...)
|
||||
var mu sync.Mutex
|
||||
var ranges []string
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
w.Header().Set("ETag", `"test-etag"`)
|
||||
if r.Method == "HEAD" {
|
||||
w.Header().Set("Content-Length", strconv.Itoa(len(data)))
|
||||
return
|
||||
}
|
||||
ranges = append(ranges, r.Header.Get("Range"))
|
||||
if len(ranges) == 2 {
|
||||
w.Header().Set("Content-Length", strconv.FormatInt(int64(len(data))-archiveReadChunkSize, 10))
|
||||
w.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", archiveReadChunkSize, len(data)-1, len(data)))
|
||||
w.WriteHeader(http.StatusPartialContent)
|
||||
_, _ = w.Write(data[archiveReadChunkSize : archiveReadChunkSize+128]) // Close during a later chunk.
|
||||
return
|
||||
}
|
||||
serveArchiveRange(t, w, r, data)
|
||||
}))
|
||||
defer srv.Close()
|
||||
store := testRangeStore(t, srv.URL)
|
||||
h := sha256.Sum256(data)
|
||||
checksum := hex.EncodeToString(h[:])
|
||||
dest := filepath.Join(t.TempDir(), "archive")
|
||||
if err := store.Download(context.Background(), store.URI(1, 2, checksum), dest, checksum, int64(len(data))); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
got, err := os.ReadFile(dest)
|
||||
if err != nil || !bytes.Equal(got, data) {
|
||||
t.Fatalf("retried download differs: %v", err)
|
||||
}
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
if len(ranges) != 3 || ranges[1] != ranges[2] || ranges[0] != fmt.Sprintf("bytes=0-%d", archiveReadChunkSize-1) || ranges[2] != fmt.Sprintf("bytes=%d-%d", archiveReadChunkSize, len(data)-1) {
|
||||
t.Fatalf("retry did not stay within the interrupted range: %v", ranges)
|
||||
}
|
||||
}
|
||||
|
||||
func testRangeStore(t *testing.T, endpoint string) *Store {
|
||||
t.Helper()
|
||||
s, err := New(Config{Endpoint: endpoint, Bucket: "test-bucket", Prefix: "test/tasks", AccessKey: "test", SecretKey: "test", PathStyle: true})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
func TestS3ReadbackRejectsInvalidRangesAndExhaustedRetries(t *testing.T) {
|
||||
for _, mode := range []string{"ignored-range", "changed-etag", "changed-object", "truncated"} {
|
||||
t.Run(mode, func(t *testing.T) {
|
||||
data := bytes.Repeat([]byte{0x42}, 1024)
|
||||
var mu sync.Mutex
|
||||
gets := 0
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
w.Header().Set("ETag", `"test-etag"`)
|
||||
if r.Method == "HEAD" {
|
||||
w.Header().Set("Content-Length", strconv.Itoa(len(data)))
|
||||
return
|
||||
}
|
||||
gets++
|
||||
if mode == "changed-object" {
|
||||
w.WriteHeader(http.StatusPreconditionFailed)
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Length", strconv.Itoa(len(data)))
|
||||
if mode == "ignored-range" {
|
||||
_, _ = w.Write(data)
|
||||
return
|
||||
}
|
||||
if mode == "changed-etag" {
|
||||
w.Header().Set("ETag", `"different-object"`)
|
||||
}
|
||||
w.Header().Set("Content-Range", fmt.Sprintf("bytes 0-%d/%d", len(data)-1, len(data)))
|
||||
w.WriteHeader(http.StatusPartialContent)
|
||||
if mode == "truncated" {
|
||||
_, _ = w.Write(data[:128])
|
||||
} else {
|
||||
_, _ = w.Write(data)
|
||||
}
|
||||
}))
|
||||
defer srv.Close()
|
||||
store := testRangeStore(t, srv.URL)
|
||||
h := sha256.Sum256(data)
|
||||
checksum := hex.EncodeToString(h[:])
|
||||
dest := filepath.Join(t.TempDir(), "archive")
|
||||
if err := store.Download(context.Background(), store.URI(1, 2, checksum), dest, checksum, int64(len(data))); err == nil {
|
||||
t.Fatal("accepted invalid or incomplete readback")
|
||||
}
|
||||
if _, err := os.Stat(dest); !os.IsNotExist(err) {
|
||||
t.Fatal("left a failed download on disk")
|
||||
}
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
want := 1
|
||||
if mode == "truncated" {
|
||||
want = archiveReadAttempts
|
||||
}
|
||||
if gets != want {
|
||||
t.Fatalf("GET count %d, want %d", gets, want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
type failedArchiveWriter struct{ err error }
|
||||
|
||||
func (w failedArchiveWriter) Write([]byte) (int, error) { return 0, w.err }
|
||||
|
||||
func TestS3ReadbackPropagatesOutputFailure(t *testing.T) {
|
||||
data := []byte("test archive")
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("ETag", `"test-etag"`)
|
||||
if r.Method == "HEAD" {
|
||||
w.Header().Set("Content-Length", strconv.Itoa(len(data)))
|
||||
return
|
||||
}
|
||||
serveArchiveRange(t, w, r, data)
|
||||
}))
|
||||
defer srv.Close()
|
||||
store := testRangeStore(t, srv.URL)
|
||||
h := sha256.Sum256(data)
|
||||
outputError := errors.New("output disk full")
|
||||
err := store.readVerified(context.Background(), "test/tasks/archive", failedArchiveWriter{outputError}, hex.EncodeToString(h[:]), int64(len(data)), false)
|
||||
if !errors.Is(err, outputError) {
|
||||
t.Fatalf("lost output error: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestS3ReadbackStopsOnCancellation(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
data := bytes.Repeat([]byte{0x42}, 1024)
|
||||
gets := make(chan struct{}, archiveReadAttempts+1)
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("ETag", `"test-etag"`)
|
||||
w.Header().Set("Content-Length", strconv.Itoa(len(data)))
|
||||
if r.Method == "HEAD" {
|
||||
return
|
||||
}
|
||||
gets <- struct{}{}
|
||||
w.Header().Set("Content-Range", fmt.Sprintf("bytes 0-%d/%d", len(data)-1, len(data)))
|
||||
w.WriteHeader(http.StatusPartialContent)
|
||||
_, _ = w.Write(data[:128])
|
||||
w.(http.Flusher).Flush()
|
||||
cancel()
|
||||
}))
|
||||
defer srv.Close()
|
||||
store := testRangeStore(t, srv.URL)
|
||||
h := sha256.Sum256(data)
|
||||
checksum := hex.EncodeToString(h[:])
|
||||
dest := filepath.Join(t.TempDir(), "archive")
|
||||
err := store.Download(ctx, store.URI(1, 2, checksum), dest, checksum, int64(len(data)))
|
||||
if !errors.Is(err, context.Canceled) || len(gets) != 1 {
|
||||
t.Fatalf("cancellation was not honored: error=%v GETs=%d", err, len(gets))
|
||||
}
|
||||
if _, err := os.Stat(dest); !os.IsNotExist(err) {
|
||||
t.Fatal("left a cancelled download on disk")
|
||||
}
|
||||
}
|
||||
|
||||
func TestS3RejectsForeignLocations(t *testing.T) {
|
||||
s, err := New(Config{Endpoint: "https://sfo3.digitaloceanspaces.com", Bucket: "allowed", Prefix: "archives/tasks", AccessKey: "test", SecretKey: "test"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, uri := range []string{"s3://other/archives/tasks/a", "s3://allowed/archives/other/a", "s3://allowed/archives/tasks/../a", "s3://allowed/archives/tasks/%2e%2e/a", "s3://allowed/archives/tasks/a?secret=x", "s3://user@allowed/archives/tasks/a", "file:///etc/passwd"} {
|
||||
if err := s.Validate(uri); err == nil {
|
||||
t.Errorf("accepted %s", uri)
|
||||
}
|
||||
}
|
||||
var absent *Store
|
||||
if absent.Validate("s3://allowed/archives/tasks/a") == nil {
|
||||
t.Fatal("missing config accepted")
|
||||
}
|
||||
}
|
||||
|
||||
func TestS3UploadRejectsUnconfirmedEncryption(t *testing.T) {
|
||||
for _, mode := range []string{"missing", "different", "kms-without-key"} {
|
||||
t.Run(mode, func(t *testing.T) {
|
||||
data := []byte("private archive")
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
switch r.Method {
|
||||
case "PUT":
|
||||
_, _ = io.Copy(io.Discard, r.Body)
|
||||
case "DELETE":
|
||||
w.WriteHeader(204)
|
||||
case "HEAD":
|
||||
w.Header().Set("ETag", `"test-etag"`)
|
||||
w.Header().Set("Content-Length", strconv.Itoa(len(data)))
|
||||
if mode != "missing" {
|
||||
w.Header().Set("X-Amz-Server-Side-Encryption", "aws:kms")
|
||||
}
|
||||
default:
|
||||
t.Errorf("content must not be accepted before encryption confirmation: %s", r.Method)
|
||||
w.WriteHeader(400)
|
||||
}
|
||||
}))
|
||||
defer srv.Close()
|
||||
c := Config{Endpoint: srv.URL, Bucket: "test", Prefix: "tasks", AccessKey: "test", SecretKey: "test", PathStyle: true}
|
||||
if mode == "kms-without-key" {
|
||||
c.SSE = "aws:kms"
|
||||
}
|
||||
store, err := New(c)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
filename := filepath.Join(t.TempDir(), "source")
|
||||
if err := os.WriteFile(filename, data, 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
sum := sha256.Sum256(data)
|
||||
checksum := hex.EncodeToString(sum[:])
|
||||
if err := store.Upload(context.Background(), store.URI(1, 2, checksum), filename, checksum); err == nil || !strings.Contains(err.Error(), "encryption") {
|
||||
t.Fatalf("unconfirmed encryption accepted: %v", err)
|
||||
}
|
||||
if got, err := os.ReadFile(filename); err != nil || !bytes.Equal(got, data) {
|
||||
t.Fatal("source was not retained", err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestS3MultipartFailureAbortsUpload(t *testing.T) {
|
||||
var aborted atomic.Bool
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
q := r.URL.Query()
|
||||
switch {
|
||||
case r.Method == "POST" && q.Has("uploads"):
|
||||
if r.Header.Get("X-Amz-Server-Side-Encryption") != "AES256" {
|
||||
t.Error("multipart encryption missing")
|
||||
}
|
||||
fmt.Fprint(w, `<InitiateMultipartUploadResult><UploadId>failed-upload</UploadId></InitiateMultipartUploadResult>`)
|
||||
case r.Method == "PUT" && q.Has("partNumber"):
|
||||
_, _ = io.Copy(io.Discard, r.Body)
|
||||
w.WriteHeader(403)
|
||||
case r.Method == "DELETE" && q.Get("uploadId") == "failed-upload":
|
||||
aborted.Store(true)
|
||||
w.WriteHeader(204)
|
||||
default:
|
||||
t.Errorf("unexpected failed-upload request: %s", r.Method)
|
||||
w.WriteHeader(400)
|
||||
}
|
||||
}))
|
||||
defer srv.Close()
|
||||
store := testRangeStore(t, srv.URL)
|
||||
data := bytes.Repeat([]byte("x"), 9<<20)
|
||||
checksum := sha256.Sum256(data)
|
||||
sum := hex.EncodeToString(checksum[:])
|
||||
filename := filepath.Join(t.TempDir(), "source")
|
||||
if err := os.WriteFile(filename, data, 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := store.Upload(context.Background(), store.URI(1, 2, sum), filename, sum); err == nil {
|
||||
t.Fatal("failed part accepted")
|
||||
}
|
||||
if !aborted.Load() {
|
||||
t.Fatal("failed multipart upload was not aborted")
|
||||
}
|
||||
if info, err := os.Stat(filename); err != nil || info.Size() != int64(len(data)) {
|
||||
t.Fatal("source was not retained", err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,231 @@
|
||||
package archivestore
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"encoding/pem"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func archiveSource(t *testing.T, data []byte) (string, string) {
|
||||
t.Helper()
|
||||
filename := filepath.Join(t.TempDir(), "source")
|
||||
if err := os.WriteFile(filename, data, 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
sum := sha256.Sum256(data)
|
||||
return filename, hex.EncodeToString(sum[:])
|
||||
}
|
||||
|
||||
func TestS3VerificationFailureCleansUploadedVersion(t *testing.T) {
|
||||
for _, failure := range []string{"wrong-kms", "checksum", "cancelled", "delete-denied"} {
|
||||
t.Run(failure, func(t *testing.T) {
|
||||
data := []byte("private archive")
|
||||
source, checksum := archiveSource(t, data)
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
var present, deleted atomic.Bool
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
switch r.Method {
|
||||
case "PUT":
|
||||
_, _ = io.Copy(io.Discard, r.Body)
|
||||
present.Store(true)
|
||||
w.Header().Set("X-Amz-Version-Id", "uploaded-version")
|
||||
case "HEAD":
|
||||
w.Header().Set("ETag", `"test-etag"`)
|
||||
w.Header().Set("Content-Length", strconv.Itoa(len(data)))
|
||||
w.Header().Set("X-Amz-Server-Side-Encryption", "aws:kms")
|
||||
kms := "arn:aws:kms:us-east-1:123456789012:key/expected"
|
||||
if failure == "wrong-kms" {
|
||||
kms = "arn:aws:kms:us-east-1:123456789012:key/different"
|
||||
}
|
||||
w.Header().Set("X-Amz-Server-Side-Encryption-Aws-Kms-Key-Id", kms)
|
||||
if failure == "cancelled" {
|
||||
cancel()
|
||||
}
|
||||
case "GET":
|
||||
corrupt := bytes.Clone(data)
|
||||
corrupt[0] ^= 0xff
|
||||
serveArchiveRange(t, w, r, corrupt)
|
||||
case "DELETE":
|
||||
if r.URL.Query().Get("versionId") != "uploaded-version" {
|
||||
t.Error("cleanup did not target uploaded version")
|
||||
}
|
||||
deleted.Store(true)
|
||||
if failure == "delete-denied" {
|
||||
w.WriteHeader(403)
|
||||
return
|
||||
}
|
||||
present.Store(false)
|
||||
w.WriteHeader(204)
|
||||
default:
|
||||
t.Errorf("unexpected request %s", r.Method)
|
||||
w.WriteHeader(400)
|
||||
}
|
||||
}))
|
||||
defer srv.Close()
|
||||
store, err := New(Config{Endpoint: srv.URL, Bucket: "test", AccessKey: "test", SecretKey: "test", PathStyle: true,
|
||||
SSE: "aws:kms", KMSKeyID: "arn:aws:kms:us-east-1:123456789012:key/expected"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
err = store.Upload(ctx, store.URI(1, 2, checksum), source, checksum)
|
||||
if err == nil {
|
||||
t.Fatal("accepted failed verification")
|
||||
}
|
||||
if failure == "wrong-kms" && !strings.Contains(err.Error(), "encryption") {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if failure == "cancelled" && !errors.Is(err, context.Canceled) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if failure == "delete-denied" && (!strings.Contains(err.Error(), "SHA-256") || !strings.Contains(err.Error(), "delete unverified archive")) {
|
||||
t.Fatalf("verification and cleanup errors must both survive: %v", err)
|
||||
}
|
||||
if !deleted.Load() || present.Load() != (failure == "delete-denied") {
|
||||
t.Fatal("unverified object cleanup was not attempted/completed")
|
||||
}
|
||||
if got, readErr := os.ReadFile(source); readErr != nil || !bytes.Equal(got, data) {
|
||||
t.Fatal("source changed", readErr)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestS3CancelledMultipartAbortsWithFreshContext(t *testing.T) {
|
||||
for _, denyAbort := range []bool{false, true} {
|
||||
t.Run(strconv.FormatBool(denyAbort), func(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
var aborted atomic.Bool
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
q := r.URL.Query()
|
||||
switch {
|
||||
case r.Method == "POST" && q.Has("uploads"):
|
||||
fmt.Fprint(w, `<InitiateMultipartUploadResult><UploadId>cancelled-upload</UploadId></InitiateMultipartUploadResult>`)
|
||||
case r.Method == "PUT" && q.Has("partNumber"):
|
||||
cancel()
|
||||
_, _ = io.Copy(io.Discard, r.Body)
|
||||
w.WriteHeader(403)
|
||||
case r.Method == "DELETE" && q.Get("uploadId") == "cancelled-upload":
|
||||
aborted.Store(true)
|
||||
if denyAbort {
|
||||
w.WriteHeader(403)
|
||||
} else {
|
||||
w.WriteHeader(204)
|
||||
}
|
||||
default:
|
||||
t.Errorf("unexpected request %s", r.Method)
|
||||
w.WriteHeader(400)
|
||||
}
|
||||
}))
|
||||
defer srv.Close()
|
||||
data := bytes.Repeat([]byte("x"), 9<<20)
|
||||
source, sum := archiveSource(t, data)
|
||||
store := testRangeStore(t, srv.URL)
|
||||
err := store.Upload(ctx, store.URI(1, 2, sum), source, sum)
|
||||
if !errors.Is(err, context.Canceled) || !aborted.Load() {
|
||||
t.Fatalf("cancelled upload not aborted: %v", err)
|
||||
}
|
||||
if denyAbort && !strings.Contains(err.Error(), "abort archive multipart upload") {
|
||||
t.Fatalf("cleanup failure lost: %v", err)
|
||||
}
|
||||
if got, readErr := os.ReadFile(source); readErr != nil || !bytes.Equal(got, data) {
|
||||
t.Fatal("source changed", readErr)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestS3SignedRequestsNeverFollowRedirects(t *testing.T) {
|
||||
var reached atomic.Int32
|
||||
target := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { reached.Add(1); w.WriteHeader(204) }))
|
||||
defer target.Close()
|
||||
for _, status := range []int{301, 302, 303, 307, 308} {
|
||||
t.Run(strconv.Itoa(status), func(t *testing.T) {
|
||||
origin := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Header.Get("Authorization") == "" || r.Header.Get("X-Amz-Security-Token") != "fixture-session" {
|
||||
t.Error("fixture request must be signed with session credentials")
|
||||
}
|
||||
w.Header().Set("Location", target.URL+"/redirected")
|
||||
w.WriteHeader(status)
|
||||
}))
|
||||
defer origin.Close()
|
||||
store, err := New(Config{Endpoint: origin.URL, Bucket: "test", AccessKey: "test", SecretKey: "test", SessionToken: "fixture-session", PathStyle: true})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := store.Delete(context.Background(), store.URI(1, 2, "test")); err == nil {
|
||||
t.Fatal("redirect accepted")
|
||||
}
|
||||
if reached.Load() != 0 {
|
||||
t.Fatal("signed request followed redirect")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestS3CustomCABundleForBothCredentialModes(t *testing.T) {
|
||||
srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(204) }))
|
||||
defer srv.Close()
|
||||
for _, explicit := range []bool{false, true} {
|
||||
t.Run(strconv.FormatBool(explicit), func(t *testing.T) {
|
||||
isolateAWSCredentials(t)
|
||||
ca := filepath.Join(t.TempDir(), "ca.pem")
|
||||
if err := os.WriteFile(ca, pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: srv.Certificate().Raw}), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Setenv("AWS_CA_BUNDLE", ca)
|
||||
c := Config{Endpoint: srv.URL, Bucket: "test", PathStyle: true}
|
||||
if explicit {
|
||||
c.AccessKey, c.SecretKey = "fixture", "fixture"
|
||||
} else {
|
||||
t.Setenv("AWS_ACCESS_KEY_ID", "fixture")
|
||||
t.Setenv("AWS_SECRET_ACCESS_KEY", "fixture")
|
||||
}
|
||||
store, err := New(c)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := store.Delete(context.Background(), store.URI(1, 2, "test")); err != nil {
|
||||
t.Fatalf("configured CA not used: %v", err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestS3RangeRetriesHaveOneWireAttemptEach(t *testing.T) {
|
||||
for _, status := range []int{403, 429, 503} {
|
||||
t.Run(strconv.Itoa(status), func(t *testing.T) {
|
||||
var gets atomic.Int32
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
gets.Add(1)
|
||||
w.WriteHeader(status)
|
||||
}))
|
||||
defer srv.Close()
|
||||
store := testRangeStore(t, srv.URL)
|
||||
if _, err := store.readArchiveChunk(context.Background(), "key", `"etag"`, 0, 9, 10); err == nil {
|
||||
t.Fatal("failed request accepted")
|
||||
}
|
||||
want := int32(archiveReadAttempts)
|
||||
if status == 403 {
|
||||
want = 1
|
||||
}
|
||||
if got := gets.Load(); got != want {
|
||||
t.Fatalf("wire requests=%d want=%d", got, want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
// artex-archive-check tests the configured object store without touching tasks.
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"time"
|
||||
|
||||
"github.com/Autumn-27/artex/archivestore"
|
||||
)
|
||||
|
||||
func main() {
|
||||
if err := check(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func check() error {
|
||||
s, err := archivestore.FromEnv()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if s == nil {
|
||||
return fmt.Errorf("S3 archive storage is not configured")
|
||||
}
|
||||
dir, err := os.MkdirTemp("", "artex-archive-check-")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer os.RemoveAll(dir)
|
||||
data := []byte("ARTEX object storage connectivity check " + time.Now().UTC().Format(time.RFC3339Nano))
|
||||
h := sha256.Sum256(data)
|
||||
checksum := hex.EncodeToString(h[:])
|
||||
uri := s.URI(0, time.Now().UnixNano(), checksum)
|
||||
file := filepath.Join(dir, "check")
|
||||
if err := os.WriteFile(file, data, 0600); err != nil {
|
||||
return err
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
|
||||
defer cancel()
|
||||
defer func() {
|
||||
cleanup, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
||||
defer cancel()
|
||||
if err := s.Delete(cleanup, uri); err != nil {
|
||||
log.Printf("test object cleanup failed for %s: %v", uri, err)
|
||||
}
|
||||
}()
|
||||
if err := s.Upload(ctx, uri, file, checksum); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := s.Download(ctx, uri, filepath.Join(dir, "download"), checksum, int64(len(data))); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := s.Delete(ctx, uri); err != nil {
|
||||
return err
|
||||
}
|
||||
fmt.Println("S3 upload, full SHA-256 verification, download and delete passed")
|
||||
return nil
|
||||
}
|
||||
+22
-7
@@ -10,6 +10,7 @@ import (
|
||||
"net/url"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
@@ -209,16 +210,30 @@ func (d Database) buildDSN() string {
|
||||
return u.String()
|
||||
}
|
||||
|
||||
// String is a redacted view of the resolved DSN (password masked) for logging.
|
||||
// libpqPassword matches a libpq keyword DSN password field, including quoted
|
||||
// values. pgx accepts this form as well as the URL form.
|
||||
var libpqPassword = regexp.MustCompile(`(?i)\b(password)\s*=\s*(?:'[^']*'|"[^"]*"|\S*)`)
|
||||
|
||||
// Redact is a log-safe view of a PostgreSQL DSN. It masks URL userinfo
|
||||
// passwords, `?password=` query values, and libpq `password=` keywords.
|
||||
// Unrecognised input still runs the keyword mask so a parse failure cannot
|
||||
// print the secret.
|
||||
func Redact(dsn string) string {
|
||||
u, err := url.Parse(dsn)
|
||||
if err != nil {
|
||||
if dsn == "" {
|
||||
return dsn
|
||||
}
|
||||
if u.User != nil {
|
||||
if _, hasPw := u.User.Password(); hasPw {
|
||||
u.User = url.UserPassword(u.User.Username(), "****")
|
||||
if u, err := url.Parse(dsn); err == nil && (u.Scheme == "postgres" || u.Scheme == "postgresql") {
|
||||
if u.User != nil {
|
||||
if _, hasPw := u.User.Password(); hasPw {
|
||||
u.User = url.UserPassword(u.User.Username(), "****")
|
||||
}
|
||||
}
|
||||
q := u.Query()
|
||||
if q.Has("password") {
|
||||
q.Set("password", "****")
|
||||
u.RawQuery = q.Encode()
|
||||
}
|
||||
return u.String()
|
||||
}
|
||||
return fmt.Sprintf("%s", u.String())
|
||||
return libpqPassword.ReplaceAllString(dsn, `${1}=****`)
|
||||
}
|
||||
|
||||
@@ -44,6 +44,22 @@ func TestPostgresDSNPrecedence(t *testing.T) {
|
||||
|
||||
// A config file that exists but is not valid JSON must fail loudly, not run with
|
||||
// defaults (or report "no database config") as if the file were absent.
|
||||
func TestRedactMasksEveryDSNPasswordForm(t *testing.T) {
|
||||
cases := []struct{ in, secret string }{
|
||||
{"postgres://u:secret@localhost:5432/d?sslmode=require", "secret"},
|
||||
{"postgresql://localhost/d?password=secret&sslmode=require", "secret"},
|
||||
{"host=localhost user=u password=secret dbname=d", "secret"},
|
||||
{"host=localhost password='p a ss' dbname=d", "p a ss"},
|
||||
{"not a dsn password=stillsecret", "stillsecret"},
|
||||
}
|
||||
for _, c := range cases {
|
||||
got := Redact(c.in)
|
||||
if strings.Contains(got, c.secret) {
|
||||
t.Errorf("Redact(%q)=%q still contains %q", c.in, got, c.secret)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMalformedConfigIsAnError(t *testing.T) {
|
||||
cfgPath := filepath.Join(t.TempDir(), "config.json")
|
||||
// What install.sh used to write for a password containing a double quote.
|
||||
|
||||
@@ -136,9 +136,15 @@ func tokenize(s string) ([]tok, error) {
|
||||
// and_expr = atom (AND atom)*
|
||||
// atom = FIELD | BARE | '(' expr ')'
|
||||
|
||||
const (
|
||||
dslMaxLen = 4096
|
||||
dslMaxDepth = 32
|
||||
)
|
||||
|
||||
type dslParser struct {
|
||||
tokens []tok
|
||||
pos int
|
||||
depth int
|
||||
}
|
||||
|
||||
func (p *dslParser) peek() tok {
|
||||
@@ -201,8 +207,13 @@ func (p *dslParser) parseAtom() (*astNode, error) {
|
||||
p.consume()
|
||||
return leafNode(*t.expr), nil
|
||||
case tkLP:
|
||||
if p.depth >= dslMaxDepth {
|
||||
return nil, fmt.Errorf("DSL syntax error: nested parentheses too deep")
|
||||
}
|
||||
p.depth++
|
||||
p.consume()
|
||||
node, err := p.parseOr()
|
||||
p.depth--
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -234,6 +245,9 @@ func ParseDSL(s string) (*astNode, error) {
|
||||
if strings.TrimSpace(s) == "" {
|
||||
return nil, nil
|
||||
}
|
||||
if len(s) > dslMaxLen {
|
||||
return nil, fmt.Errorf("DSL query is too long")
|
||||
}
|
||||
tokens, err := tokenize(s)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestParseDSLRejectsDeepNesting(t *testing.T) {
|
||||
deep := strings.Repeat("(", dslMaxDepth+1) + "a" + strings.Repeat(")", dslMaxDepth+1)
|
||||
if _, err := ParseDSL(deep); err == nil {
|
||||
t.Fatal("deep nesting accepted")
|
||||
}
|
||||
ok := strings.Repeat("(", dslMaxDepth) + "a" + strings.Repeat(")", dslMaxDepth)
|
||||
if _, err := ParseDSL(ok); err != nil {
|
||||
t.Fatalf("depth %d refused: %v", dslMaxDepth, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseDSLRejectsOversize(t *testing.T) {
|
||||
if _, err := ParseDSL(strings.Repeat("a", dslMaxLen+1)); err == nil {
|
||||
t.Fatal("oversize query accepted")
|
||||
}
|
||||
}
|
||||
+3
-1
@@ -221,7 +221,9 @@ func marshalStringArray(items []string) string {
|
||||
}
|
||||
escaped := make([]string, len(items))
|
||||
for i, s := range items {
|
||||
escaped[i] = `"` + strings.ReplaceAll(s, `"`, `\"`) + `"`
|
||||
s = strings.ReplaceAll(s, `\`, `\\`)
|
||||
s = strings.ReplaceAll(s, `"`, `\"`)
|
||||
escaped[i] = `"` + s + `"`
|
||||
}
|
||||
return "{" + strings.Join(escaped, ",") + "}"
|
||||
}
|
||||
|
||||
@@ -879,6 +879,17 @@ func TestMarshalStringArray(t *testing.T) {
|
||||
if got2 != "{}" {
|
||||
t.Errorf("empty: %q", got2)
|
||||
}
|
||||
|
||||
quoted := marshalStringArray([]string{`say "hi"`, `a\b`})
|
||||
if quoted != `{"say \"hi\"","a\\b"}` {
|
||||
t.Errorf("escape: %q", quoted)
|
||||
}
|
||||
|
||||
// A backslash before a quote must not close the element and inject another.
|
||||
injected := marshalStringArray([]string{`x\",evil,\"y`})
|
||||
if strings.Contains(injected, `","evil`) {
|
||||
t.Errorf("backslash-quote split the array: %q", injected)
|
||||
}
|
||||
}
|
||||
|
||||
// =====================================================================
|
||||
|
||||
@@ -0,0 +1,131 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
)
|
||||
|
||||
const (
|
||||
browserMCPName = "browser"
|
||||
browserMCPCommand = "playwright-mcp"
|
||||
browserMCPDirectBinSetting = "browser_mcp_direct_bin_v1"
|
||||
)
|
||||
|
||||
// browserMCPSeedArgs is the JSON args array for a fresh browser MCP row.
|
||||
// --headless: the image has no display.
|
||||
// --browser chromium: Playwright MCP defaults to the "chrome" channel at
|
||||
// /opt/google/chrome, which the image does not ship.
|
||||
const browserMCPSeedArgs = `["--headless","--browser","chromium"]`
|
||||
|
||||
// npxMetaFlags are npx switches that do not take a value and that still leave
|
||||
// the following argument as the package spec. `-y` is the form the UI mock
|
||||
// used; `--` is a common separator. Flags that take a value (`-p`, `--package`)
|
||||
// are treated as a custom invocation and left alone.
|
||||
var npxMetaFlags = map[string]bool{
|
||||
"-y": true,
|
||||
"--yes": true,
|
||||
"--": true,
|
||||
"-q": true,
|
||||
"--quiet": true,
|
||||
}
|
||||
|
||||
func playwrightMCPPackageIndex(args []string) (int, bool) {
|
||||
for i := 0; i < len(args); i++ {
|
||||
a := args[i]
|
||||
if npxMetaFlags[a] {
|
||||
continue
|
||||
}
|
||||
if a == "@playwright/mcp" || strings.HasPrefix(a, "@playwright/mcp@") {
|
||||
return i, true
|
||||
}
|
||||
return 0, false
|
||||
}
|
||||
return 0, false
|
||||
}
|
||||
|
||||
// rewriteStockNpxBrowserMCP converts `npx [@meta...] @playwright/mcp [...]` to
|
||||
// the image's global playwright-mcp binary. ok is false when the row is not
|
||||
// that invocation (the operator changed the command or the package).
|
||||
func rewriteStockNpxBrowserMCP(command string, args []string) (string, []string, bool) {
|
||||
if command != "npx" {
|
||||
return command, args, false
|
||||
}
|
||||
idx, ok := playwrightMCPPackageIndex(args)
|
||||
if !ok {
|
||||
return command, args, false
|
||||
}
|
||||
rest := append([]string{}, args[idx+1:]...)
|
||||
if !hasCLIFlag(rest, "--headless") {
|
||||
rest = append(rest, "--headless")
|
||||
}
|
||||
if !hasCLIFlag(rest, "--browser") {
|
||||
rest = append(rest, "--browser", "chromium")
|
||||
}
|
||||
return browserMCPCommand, rest, true
|
||||
}
|
||||
|
||||
// rewriteBrowserMCPRow is the one-time row rewrite: stock npx @playwright/mcp
|
||||
// becomes playwright-mcp, and a playwright-mcp row that still has no --browser
|
||||
// (the MCP defaults to a Chrome channel the image does not ship) gets
|
||||
// --browser chromium. Any other command or package is left alone.
|
||||
func rewriteBrowserMCPRow(command string, args []string) (string, []string, bool) {
|
||||
cmd, out, ok := rewriteStockNpxBrowserMCP(command, args)
|
||||
if !ok {
|
||||
cmd, out = command, append([]string{}, args...)
|
||||
}
|
||||
if cmd == browserMCPCommand && !hasCLIFlag(out, "--browser") {
|
||||
out = append(out, "--browser", "chromium")
|
||||
ok = true
|
||||
}
|
||||
return cmd, out, ok
|
||||
}
|
||||
|
||||
func hasCLIFlag(args []string, flag string) bool {
|
||||
eq := flag + "="
|
||||
for _, a := range args {
|
||||
if a == flag || strings.HasPrefix(a, eq) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// migrateStockBrowserMCP rewrites a leftover stock `npx @playwright/mcp` browser
|
||||
// MCP row once, and adds `--browser chromium` to a playwright-mcp row that
|
||||
// still has none. Gated by a settings flag so an operator who later puts npx
|
||||
// back is not rewritten on the next start. Any other command or package is
|
||||
// left as-is.
|
||||
func (d *DB) migrateStockBrowserMCP() error {
|
||||
if v, _, _ := d.GetSetting(browserMCPDirectBinSetting); v == "done" {
|
||||
return nil
|
||||
}
|
||||
var command string
|
||||
var argsRaw []byte
|
||||
err := d.QueryRow(`SELECT COALESCE(command,''), args FROM mcp_servers WHERE name=$1`, browserMCPName).Scan(&command, &argsRaw)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return d.SetSetting(browserMCPDirectBinSetting, "done")
|
||||
}
|
||||
if err != nil {
|
||||
return fmt.Errorf("read browser mcp: %w", err)
|
||||
}
|
||||
var args []string
|
||||
if len(argsRaw) > 0 {
|
||||
if err := json.Unmarshal(argsRaw, &args); err != nil {
|
||||
return d.SetSetting(browserMCPDirectBinSetting, "done")
|
||||
}
|
||||
}
|
||||
newCommand, newArgs, ok := rewriteBrowserMCPRow(command, args)
|
||||
if ok {
|
||||
raw, err := json.Marshal(newArgs)
|
||||
if err != nil {
|
||||
return fmt.Errorf("encode browser mcp args: %w", err)
|
||||
}
|
||||
if _, err := d.Exec(`UPDATE mcp_servers SET command=$1, args=$2 WHERE name=$3`, newCommand, string(raw), browserMCPName); err != nil {
|
||||
return fmt.Errorf("update browser mcp: %w", err)
|
||||
}
|
||||
}
|
||||
return d.SetSetting(browserMCPDirectBinSetting, "done")
|
||||
}
|
||||
@@ -0,0 +1,292 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"slices"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestRewriteStockNpxBrowserMCP(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
command string
|
||||
args []string
|
||||
wantOK bool
|
||||
wantCommand string
|
||||
wantArgs []string
|
||||
}{
|
||||
{
|
||||
name: "stock seed",
|
||||
command: "npx",
|
||||
args: []string{"@playwright/mcp", "--headless"},
|
||||
wantOK: true,
|
||||
wantCommand: "playwright-mcp",
|
||||
wantArgs: []string{"--headless", "--browser", "chromium"},
|
||||
},
|
||||
{
|
||||
name: "package only",
|
||||
command: "npx",
|
||||
args: []string{"@playwright/mcp"},
|
||||
wantOK: true,
|
||||
wantCommand: "playwright-mcp",
|
||||
wantArgs: []string{"--headless", "--browser", "chromium"},
|
||||
},
|
||||
{
|
||||
name: "pinned package version",
|
||||
command: "npx",
|
||||
args: []string{"@playwright/mcp@0.0.83", "--headless"},
|
||||
wantOK: true,
|
||||
wantCommand: "playwright-mcp",
|
||||
wantArgs: []string{"--headless", "--browser", "chromium"},
|
||||
},
|
||||
{
|
||||
name: "capture proxy args kept",
|
||||
command: "npx",
|
||||
args: []string{"@playwright/mcp", "--headless", "--proxy-server", "http://127.0.0.1:8788"},
|
||||
wantOK: true,
|
||||
wantCommand: "playwright-mcp",
|
||||
wantArgs: []string{"--headless", "--proxy-server", "http://127.0.0.1:8788", "--browser", "chromium"},
|
||||
},
|
||||
{
|
||||
name: "existing --browser kept",
|
||||
command: "npx",
|
||||
args: []string{"@playwright/mcp", "--headless", "--browser", "firefox"},
|
||||
wantOK: true,
|
||||
wantCommand: "playwright-mcp",
|
||||
wantArgs: []string{"--headless", "--browser", "firefox"},
|
||||
},
|
||||
{
|
||||
name: "equals-form --browser kept",
|
||||
command: "npx",
|
||||
args: []string{"@playwright/mcp", "--browser=chrome"},
|
||||
wantOK: true,
|
||||
wantCommand: "playwright-mcp",
|
||||
wantArgs: []string{"--browser=chrome", "--headless"},
|
||||
},
|
||||
{
|
||||
name: "npx -y",
|
||||
command: "npx",
|
||||
args: []string{"-y", "@playwright/mcp", "--headless"},
|
||||
wantOK: true,
|
||||
wantCommand: "playwright-mcp",
|
||||
wantArgs: []string{"--headless", "--browser", "chromium"},
|
||||
},
|
||||
{
|
||||
name: "npx --yes -- separator",
|
||||
command: "npx",
|
||||
args: []string{"--yes", "--", "@playwright/mcp"},
|
||||
wantOK: true,
|
||||
wantCommand: "playwright-mcp",
|
||||
wantArgs: []string{"--headless", "--browser", "chromium"},
|
||||
},
|
||||
{
|
||||
name: "already playwright-mcp",
|
||||
command: "playwright-mcp",
|
||||
args: []string{"--headless"},
|
||||
},
|
||||
{
|
||||
name: "npx -p is a custom invocation",
|
||||
command: "npx",
|
||||
args: []string{"-p", "@playwright/mcp", "playwright-mcp", "--headless"},
|
||||
},
|
||||
{
|
||||
name: "different package",
|
||||
command: "npx",
|
||||
args: []string{"@modelcontextprotocol/server-github"},
|
||||
},
|
||||
{
|
||||
name: "empty args",
|
||||
command: "npx",
|
||||
},
|
||||
{
|
||||
name: "empty command",
|
||||
},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
gotCommand, gotArgs, ok := rewriteStockNpxBrowserMCP(tc.command, tc.args)
|
||||
if ok != tc.wantOK {
|
||||
t.Fatalf("ok=%v, want %v", ok, tc.wantOK)
|
||||
}
|
||||
if !tc.wantOK {
|
||||
if gotCommand != tc.command || !slices.Equal(gotArgs, tc.args) {
|
||||
t.Fatalf("unchanged: got %q %q", gotCommand, gotArgs)
|
||||
}
|
||||
return
|
||||
}
|
||||
if gotCommand != tc.wantCommand {
|
||||
t.Fatalf("command=%q, want %q", gotCommand, tc.wantCommand)
|
||||
}
|
||||
if !slices.Equal(gotArgs, tc.wantArgs) {
|
||||
t.Fatalf("args=%q, want %q", gotArgs, tc.wantArgs)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestRewriteBrowserMCPRow(t *testing.T) {
|
||||
cmd, args, ok := rewriteBrowserMCPRow("playwright-mcp", []string{"--headless"})
|
||||
if !ok || cmd != browserMCPCommand || !slices.Equal(args, []string{"--headless", "--browser", "chromium"}) {
|
||||
t.Fatalf("missing --browser: ok=%v %q %q", ok, cmd, args)
|
||||
}
|
||||
|
||||
cmd, args, ok = rewriteBrowserMCPRow("playwright-mcp", []string{"--headless", "--browser", "firefox"})
|
||||
if ok {
|
||||
t.Fatalf("existing --browser rewritten: %q %q", cmd, args)
|
||||
}
|
||||
|
||||
cmd, args, ok = rewriteBrowserMCPRow("npx", []string{"-y", "@playwright/mcp", "--headless"})
|
||||
if !ok || cmd != browserMCPCommand || !slices.Equal(args, []string{"--headless", "--browser", "chromium"}) {
|
||||
t.Fatalf("npx -y: ok=%v %q %q", ok, cmd, args)
|
||||
}
|
||||
|
||||
in := []string{"--headless"}
|
||||
orig := slices.Clone(in)
|
||||
_, out, ok := rewriteBrowserMCPRow("playwright-mcp", in)
|
||||
if !ok {
|
||||
t.Fatal("expected rewrite")
|
||||
}
|
||||
out[0] = "mutated"
|
||||
if !slices.Equal(in, orig) {
|
||||
t.Fatalf("input mutated: %q", in)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRewriteStockNpxBrowserMCPDoesNotAliasInput(t *testing.T) {
|
||||
in := []string{"@playwright/mcp", "--headless"}
|
||||
orig := slices.Clone(in)
|
||||
_, out, ok := rewriteStockNpxBrowserMCP("npx", in)
|
||||
if !ok {
|
||||
t.Fatal("expected rewrite")
|
||||
}
|
||||
out[0] = "mutated"
|
||||
if !slices.Equal(in, orig) {
|
||||
t.Fatalf("input mutated: %q", in)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSeedAndMigrateBrowserMCP(t *testing.T) {
|
||||
d, err := Open(testDSN(t))
|
||||
if err != nil {
|
||||
t.Skipf("postgres unavailable (%v) — skipping", err)
|
||||
}
|
||||
|
||||
origCmd, _, origRaw := readBrowserMCP(t, d)
|
||||
origSetting, origHad, err := d.GetSetting(browserMCPDirectBinSetting)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() {
|
||||
_, err := d.Exec(`UPDATE mcp_servers SET command=$1, args=$2 WHERE name=$3`, origCmd, origRaw, browserMCPName)
|
||||
cleanupErr(t, "restore browser mcp", err)
|
||||
if origHad {
|
||||
cleanupErr(t, "restore setting", d.SetSetting(browserMCPDirectBinSetting, origSetting))
|
||||
} else {
|
||||
cleanupExec(t, d, `DELETE FROM settings WHERE key=$1`, browserMCPDirectBinSetting)
|
||||
}
|
||||
d.Close()
|
||||
})
|
||||
|
||||
t.Run("stock npx rewritten once", func(t *testing.T) {
|
||||
putBrowserMCP(t, d, "npx", []string{"@playwright/mcp", "--headless"})
|
||||
cleanupExec(t, d, `DELETE FROM settings WHERE key=$1`, browserMCPDirectBinSetting)
|
||||
if err := d.seedBuiltins(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
cmd, args, _ := readBrowserMCP(t, d)
|
||||
if cmd != browserMCPCommand || !slices.Equal(args, []string{"--headless", "--browser", "chromium"}) {
|
||||
t.Fatalf("got %q %q", cmd, args)
|
||||
}
|
||||
putBrowserMCP(t, d, "npx", []string{"@playwright/mcp", "--headless"})
|
||||
if err := d.seedBuiltins(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
cmd, args, _ = readBrowserMCP(t, d)
|
||||
if cmd != "npx" || !slices.Equal(args, []string{"@playwright/mcp", "--headless"}) {
|
||||
t.Fatalf("second pass clobbered: %q %q", cmd, args)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("npx -y rewritten", func(t *testing.T) {
|
||||
putBrowserMCP(t, d, "npx", []string{"-y", "@playwright/mcp", "--headless"})
|
||||
cleanupExec(t, d, `DELETE FROM settings WHERE key=$1`, browserMCPDirectBinSetting)
|
||||
if err := d.seedBuiltins(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
cmd, args, _ := readBrowserMCP(t, d)
|
||||
if cmd != browserMCPCommand || !slices.Equal(args, []string{"--headless", "--browser", "chromium"}) {
|
||||
t.Fatalf("got %q %q", cmd, args)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("playwright-mcp missing --browser", func(t *testing.T) {
|
||||
putBrowserMCP(t, d, "playwright-mcp", []string{"--headless"})
|
||||
cleanupExec(t, d, `DELETE FROM settings WHERE key=$1`, browserMCPDirectBinSetting)
|
||||
if err := d.seedBuiltins(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
cmd, args, _ := readBrowserMCP(t, d)
|
||||
if cmd != browserMCPCommand || !slices.Equal(args, []string{"--headless", "--browser", "chromium"}) {
|
||||
t.Fatalf("got %q %q", cmd, args)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("custom package left alone", func(t *testing.T) {
|
||||
custom := []string{"@modelcontextprotocol/server-github"}
|
||||
putBrowserMCP(t, d, "npx", custom)
|
||||
cleanupExec(t, d, `DELETE FROM settings WHERE key=$1`, browserMCPDirectBinSetting)
|
||||
if err := d.seedBuiltins(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
cmd, args, _ := readBrowserMCP(t, d)
|
||||
if cmd != "npx" || !slices.Equal(args, custom) {
|
||||
t.Fatalf("custom row rewritten: %q %q", cmd, args)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("proxy args preserved", func(t *testing.T) {
|
||||
putBrowserMCP(t, d, "npx", []string{"@playwright/mcp", "--headless", "--proxy-server", "http://127.0.0.1:8788"})
|
||||
cleanupExec(t, d, `DELETE FROM settings WHERE key=$1`, browserMCPDirectBinSetting)
|
||||
if err := d.seedBuiltins(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
cmd, args, _ := readBrowserMCP(t, d)
|
||||
want := []string{"--headless", "--proxy-server", "http://127.0.0.1:8788", "--browser", "chromium"}
|
||||
if cmd != browserMCPCommand || !slices.Equal(args, want) {
|
||||
t.Fatalf("got %q %q", cmd, args)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func putBrowserMCP(t *testing.T, d *DB, command string, args []string) {
|
||||
t.Helper()
|
||||
raw, err := json.Marshal(args)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
res, err := d.Exec(`UPDATE mcp_servers SET command=$1, args=$2 WHERE name=$3`, command, string(raw), browserMCPName)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
n, err := res.RowsAffected()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if n != 1 {
|
||||
t.Fatalf("update browser mcp: %d rows", n)
|
||||
}
|
||||
}
|
||||
|
||||
func readBrowserMCP(t *testing.T, d *DB) (command string, args []string, raw []byte) {
|
||||
t.Helper()
|
||||
err := d.QueryRow(`SELECT COALESCE(command,''), args FROM mcp_servers WHERE name=$1`, browserMCPName).Scan(&command, &raw)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(raw) > 0 {
|
||||
if err := json.Unmarshal(raw, &args); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
@@ -25,6 +25,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/Autumn-27/artex/config"
|
||||
"github.com/jackc/pgx/v5"
|
||||
"github.com/jackc/pgx/v5/pgconn"
|
||||
_ "github.com/jackc/pgx/v5/stdlib" // pgx database/sql driver ("pgx")
|
||||
)
|
||||
@@ -156,13 +157,21 @@ func ensureDatabase(dsn string) error {
|
||||
var exists bool
|
||||
_ = admin.QueryRow(`SELECT true FROM pg_database WHERE datname=$1`, dbName).Scan(&exists)
|
||||
if !exists {
|
||||
if _, err := admin.Exec(`CREATE DATABASE "` + dbName + `"`); err != nil {
|
||||
if _, err := admin.Exec(createDatabaseSQL(dbName)); err != nil {
|
||||
return fmt.Errorf("create database %q: %w", dbName, err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// createDatabaseSQL builds the CREATE DATABASE statement for a DSN-supplied
|
||||
// database name. pgx.Identifier quotes it and doubles any embedded quote, so
|
||||
// the name cannot close the identifier, and names PostgreSQL accepts but a
|
||||
// restrictive allowlist would reject (hyphens, dots, non-ASCII) keep working.
|
||||
func createDatabaseSQL(name string) string {
|
||||
return "CREATE DATABASE " + pgx.Identifier{name}.Sanitize()
|
||||
}
|
||||
|
||||
// Open connects, applies the schema (idempotent) and the embedded versioned
|
||||
// migrations, and seeds builtin rows.
|
||||
func Open(dsn string) (*DB, error) {
|
||||
@@ -317,13 +326,21 @@ ON CONFLICT (agent_id, var_name) DO UPDATE
|
||||
// the recording proxy + CA at runtime (server.Manager.syncBrowserMCPProxy).
|
||||
// Insert only if absent so we never clobber user edits (args/env/enabled/
|
||||
// visibility) on restart.
|
||||
// Launched through the installed playwright-mcp binary, not `npx
|
||||
// @playwright/mcp`: npx asks the npm registry on every start, even with the
|
||||
// package installed globally, so the version that runs is the registry's.
|
||||
// --browser chromium: the default is the "chrome" channel (Google Chrome),
|
||||
// which the image does not have; it ships Playwright's Chromium.
|
||||
if _, err := d.Exec(`
|
||||
INSERT INTO mcp_servers(name, transport, command, args, env, enabled)
|
||||
VALUES ('browser', 'stdio', 'npx', $1, '{}', false)
|
||||
VALUES ('browser', 'stdio', $1, $2, '{}', false)
|
||||
ON CONFLICT (name) DO NOTHING`,
|
||||
`["@playwright/mcp","--headless"]`); err != nil {
|
||||
browserMCPCommand, browserMCPSeedArgs); err != nil {
|
||||
return fmt.Errorf("seed browser mcp: %w", err)
|
||||
}
|
||||
if err := d.migrateStockBrowserMCP(); err != nil {
|
||||
return fmt.Errorf("migrate browser mcp: %w", err)
|
||||
}
|
||||
// NOTE: the placeholder ScopeSentry data-source MCP (empty URL + empty X-API-Key,
|
||||
// disabled) is seeded directly in schema.sql §F so a raw `psql < schema.sql` init
|
||||
// also gets it. schema.sql is Exec'd on every startup, so it stays idempotent.
|
||||
|
||||
@@ -51,6 +51,24 @@ func TestApplySchemaRetriesOnlyDeadlocks(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateDatabaseSQLQuotesName(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
want string
|
||||
}{
|
||||
{"artex", `CREATE DATABASE "artex"`},
|
||||
{"artex-db", `CREATE DATABASE "artex-db"`},
|
||||
{"café", `CREATE DATABASE "café"`},
|
||||
{`artex"`, `CREATE DATABASE "artex"""`},
|
||||
{`x"; DROP TABLE y; --`, `CREATE DATABASE "x""; DROP TABLE y; --"`},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
if got := createDatabaseSQL(tt.name); got != tt.want {
|
||||
t.Errorf("createDatabaseSQL(%q)=%q, want %q", tt.name, got, tt.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// testDSN returns the configured DSN, skipping the test when neither the env var
|
||||
// nor a config file supplies one (DSN no longer has a built-in default).
|
||||
func testDSN(t *testing.T) string {
|
||||
|
||||
@@ -230,6 +230,13 @@ func (s *ExplorationStore) AddNode(kind string, payload map[string]any, priority
|
||||
return 0, err
|
||||
}
|
||||
defer tx.Rollback()
|
||||
// Validate fact anchors before creating a node. Key-share locks retain the
|
||||
// checked assets through commit, closing the check/insert deletion race.
|
||||
if kind == KindFact && len(anchors) > 0 {
|
||||
if err := checkFactAnchorAssets(tx, anchors); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
}
|
||||
var id int64
|
||||
if err := tx.QueryRow(`
|
||||
INSERT INTO exploration_nodes(exploration_id, kind, payload, priority, state, origin)
|
||||
@@ -245,6 +252,40 @@ VALUES ($1, $2, $3, $4, $5, $6) RETURNING id`,
|
||||
return id, tx.Commit()
|
||||
}
|
||||
|
||||
func checkFactAnchorAssets(tx *sql.Tx, ids []int64) error {
|
||||
rows, err := tx.Query("SELECT id FROM assets WHERE id = ANY($1::bigint[]) ORDER BY id FOR KEY SHARE", ids)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
found := make(map[int64]bool, len(ids))
|
||||
for rows.Next() {
|
||||
var id int64
|
||||
if err := rows.Scan(&id); err != nil {
|
||||
rows.Close()
|
||||
return err
|
||||
}
|
||||
found[id] = true
|
||||
}
|
||||
err = rows.Err()
|
||||
closeErr := rows.Close()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if closeErr != nil {
|
||||
return closeErr
|
||||
}
|
||||
var missing []int64
|
||||
for _, id := range ids {
|
||||
if !found[id] {
|
||||
missing = append(missing, id)
|
||||
}
|
||||
}
|
||||
if len(missing) != 0 {
|
||||
return fmt.Errorf("asset IDs do not exist: %v; use existing IDs or register the assets first", missing)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// AddIntent is a convenience: an open intent.
|
||||
func (s *ExplorationStore) AddIntent(payload map[string]any, priority int, anchors []int64, origin string) (int64, error) {
|
||||
if origin == "" {
|
||||
|
||||
+102
-7
@@ -31,6 +31,7 @@ type DBFinding struct {
|
||||
Worker string
|
||||
AssetIDs []int64
|
||||
Status string
|
||||
ReportState string // none / submitted / accepted / rejected / duplicate; separate from Status
|
||||
PoELevel int // proof-of-exploitation level 0-4 (S1); 0 = none declared
|
||||
VerificationStatus string // verified / unverified / blocked / not_assessed / false_positive
|
||||
VerificationNote string // why the status was reached; empty when verified
|
||||
@@ -65,6 +66,27 @@ func ValidFindingStatus(s string) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
// Finding report stages (findings.report_state). A workflow stage after triage,
|
||||
// not a verdict: a finding can be confirmed and submitted at the same time.
|
||||
// RSI lesson extraction still reads findings.status.
|
||||
const (
|
||||
FindingReportNone = "none"
|
||||
FindingReportSubmitted = "submitted"
|
||||
FindingReportAccepted = "accepted"
|
||||
FindingReportRejected = "rejected"
|
||||
FindingReportDuplicate = "duplicate"
|
||||
)
|
||||
|
||||
// ValidFindingReportState reports whether s is a known report stage.
|
||||
func ValidFindingReportState(s string) bool {
|
||||
switch s {
|
||||
case FindingReportNone, FindingReportSubmitted, FindingReportAccepted,
|
||||
FindingReportRejected, FindingReportDuplicate:
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// Finding severity levels (findings.severity).
|
||||
const (
|
||||
SeverityCritical = "critical" // Critical
|
||||
@@ -109,7 +131,7 @@ func (d *DB) AddFinding(taskID, nodeID int64, vulnclass, name, severity, summary
|
||||
// findingSelectCols is the column list (with task_description join) every finding
|
||||
// list query selects, so scanFinding stays in sync across callers.
|
||||
const findingSelectCols = `f.id, f.task_id, f.node_id, f.vulnclass, COALESCE(f.name, ''), f.severity, f.summary,
|
||||
f.evidence, f.worker, f.asset_ids, COALESCE(f.status, 'pending'), f.created_at,
|
||||
f.evidence, f.worker, f.asset_ids, COALESCE(f.status, 'pending'), COALESCE(f.report_state, 'none'), f.created_at,
|
||||
COALESCE(t.description, '') AS task_description, f.evidence_version, f.report_evidence_version,
|
||||
f.poe_level, COALESCE(f.verification_status, 'unverified'), COALESCE(f.verification_note, ''),
|
||||
f.counterevidence, f.confidence_rationale,
|
||||
@@ -126,7 +148,7 @@ func scanFindings(rows interface {
|
||||
f := &DBFinding{}
|
||||
var aidsJSON string
|
||||
if err := rows.Scan(&f.ID, &f.TaskID, &f.NodeID, &f.VulnClass, &f.Name, &f.Severity,
|
||||
&f.Summary, &f.Evidence, &f.Worker, &aidsJSON, &f.Status, &f.CreatedAt, &f.TaskDescription, &f.EvidenceVersion, &f.ReportEvidenceVersion, &f.PoELevel, &f.VerificationStatus, &f.VerificationNote, &f.Counterevidence, &f.ConfidenceRationale, &f.TrafficCount); err != nil {
|
||||
&f.Summary, &f.Evidence, &f.Worker, &aidsJSON, &f.Status, &f.ReportState, &f.CreatedAt, &f.TaskDescription, &f.EvidenceVersion, &f.ReportEvidenceVersion, &f.PoELevel, &f.VerificationStatus, &f.VerificationNote, &f.Counterevidence, &f.ConfidenceRationale, &f.TrafficCount); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_ = json.Unmarshal([]byte(aidsJSON), &f.AssetIDs)
|
||||
@@ -160,6 +182,7 @@ func (d *DB) ListFindings(limit int) ([]*DBFinding, error) {
|
||||
type FindingFilter struct {
|
||||
Severity string // high | medium | low
|
||||
Status string // pending | false_positive | ignored | resolved
|
||||
ReportState string // none | submitted | accepted | rejected | duplicate
|
||||
VerificationStatus string // verified | unverified | blocked | not_assessed | false_positive
|
||||
VulnClass string
|
||||
TaskID string // task id (in string form; empty/invalid = do not filter by task)
|
||||
@@ -197,6 +220,7 @@ func (f FindingFilter) where() (string, []any) {
|
||||
}
|
||||
add("severity", f.Severity)
|
||||
add("status", f.Status)
|
||||
add("report_state", f.ReportState)
|
||||
add("verification_status", f.VerificationStatus)
|
||||
add("vulnclass", f.VulnClass)
|
||||
// task_id is a bigint column, compared as an integer (it cannot go through
|
||||
@@ -528,7 +552,7 @@ func (d *DB) ListFindingsForExport(f FindingFilter, ids []int64) ([]*DBFinding,
|
||||
f := &DBFinding{}
|
||||
var aidsJSON string
|
||||
if err := rows.Scan(&f.ID, &f.TaskID, &f.NodeID, &f.VulnClass, &f.Name, &f.Severity,
|
||||
&f.Summary, &f.Evidence, &f.Worker, &aidsJSON, &f.Status, &f.CreatedAt,
|
||||
&f.Summary, &f.Evidence, &f.Worker, &aidsJSON, &f.Status, &f.ReportState, &f.CreatedAt,
|
||||
&f.TaskDescription, &f.EvidenceVersion, &f.ReportEvidenceVersion, &f.PoELevel, &f.VerificationStatus, &f.VerificationNote, &f.Counterevidence, &f.ConfidenceRationale, &f.TrafficCount, &f.Report); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -544,6 +568,8 @@ func (d *DB) ListFindingsForExport(f FindingFilter, ids []int64) ([]*DBFinding,
|
||||
type FindingStats struct {
|
||||
Total int `json:"total"`
|
||||
Pending int `json:"pending"`
|
||||
Submitted int `json:"submitted"`
|
||||
Accepted int `json:"accepted"`
|
||||
Critical int `json:"critical"`
|
||||
High int `json:"high"`
|
||||
Medium int `json:"medium"`
|
||||
@@ -563,18 +589,20 @@ type FindingTaskOption struct {
|
||||
Count int `json:"count"`
|
||||
}
|
||||
|
||||
// FindingStats returns whole-table counts (by severity + pending) and the sorted
|
||||
// set of distinct vuln classes.
|
||||
// FindingStats returns whole-table counts (by severity, pending, and report
|
||||
// stage) and the sorted set of distinct vuln classes.
|
||||
func (d *DB) FindingStats() (*FindingStats, error) {
|
||||
st := &FindingStats{VulnClasses: []string{}, Tasks: []FindingTaskOption{}}
|
||||
err := d.QueryRow(`SELECT
|
||||
COUNT(*),
|
||||
COUNT(*) FILTER (WHERE status = 'pending'),
|
||||
COUNT(*) FILTER (WHERE report_state = 'submitted'),
|
||||
COUNT(*) FILTER (WHERE report_state = 'accepted'),
|
||||
COUNT(*) FILTER (WHERE severity = 'critical'),
|
||||
COUNT(*) FILTER (WHERE severity = 'high'),
|
||||
COUNT(*) FILTER (WHERE severity = 'medium'),
|
||||
COUNT(*) FILTER (WHERE severity = 'low')
|
||||
FROM findings`).Scan(&st.Total, &st.Pending, &st.Critical, &st.High, &st.Medium, &st.Low)
|
||||
FROM findings`).Scan(&st.Total, &st.Pending, &st.Submitted, &st.Accepted, &st.Critical, &st.High, &st.Medium, &st.Low)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -629,6 +657,8 @@ func (d *DB) FindingStats() (*FindingStats, error) {
|
||||
cold := aggregate.FindingStats
|
||||
st.Total += cold.Total
|
||||
st.Pending += cold.Pending
|
||||
st.Submitted += cold.Submitted
|
||||
st.Accepted += cold.Accepted
|
||||
st.Critical += cold.Critical
|
||||
st.High += cold.High
|
||||
st.Medium += cold.Medium
|
||||
@@ -658,7 +688,7 @@ func (d *DB) GetFinding(id int64) (*DBFinding, error) {
|
||||
LEFT JOIN tasks t ON f.task_id = t.id
|
||||
WHERE f.id = $1`, id).Scan(
|
||||
&f.ID, &f.TaskID, &f.NodeID, &f.VulnClass, &f.Name, &f.Severity,
|
||||
&f.Summary, &f.Evidence, &f.Worker, &aidsJSON, &f.Status, &f.CreatedAt,
|
||||
&f.Summary, &f.Evidence, &f.Worker, &aidsJSON, &f.Status, &f.ReportState, &f.CreatedAt,
|
||||
&f.TaskDescription, &f.EvidenceVersion, &f.ReportEvidenceVersion, &f.PoELevel, &f.VerificationStatus, &f.VerificationNote, &f.Counterevidence, &f.ConfidenceRationale, &f.TrafficCount, &f.Report)
|
||||
if err == sql.ErrNoRows {
|
||||
return nil, nil
|
||||
@@ -723,6 +753,71 @@ func (d *DB) SetFindingStatus(id int64, status string) (int64, error) {
|
||||
return d.setFindingCol(id, "status", "status", status)
|
||||
}
|
||||
|
||||
// SetFindingReportState updates one finding's report stage and mirrors it onto
|
||||
// the originating exploration node's payload under "report_state". It does not
|
||||
// register a status-change notification: report_state is a workflow stage, not
|
||||
// a triage verdict. Returns rows affected.
|
||||
func (d *DB) SetFindingReportState(id int64, state string) (int64, error) {
|
||||
return d.setFindingCol(id, "report_state", "report_state", state)
|
||||
}
|
||||
|
||||
// FindingReportStateBatchResult is one id's outcome in a bulk report-stage update.
|
||||
type FindingReportStateBatchResult struct {
|
||||
ID int64 `json:"id"`
|
||||
From string `json:"from,omitempty"`
|
||||
Found bool `json:"found"`
|
||||
Changed bool `json:"changed"`
|
||||
}
|
||||
|
||||
// SetFindingReportStates updates several findings to the same report stage in
|
||||
// one transaction. Unknown ids come back as found=false instead of hiding the
|
||||
// others; a database error rolls the whole batch back. No notification event
|
||||
// is written — status-change pushes stay on findings.status.
|
||||
func (d *DB) SetFindingReportStates(ctx context.Context, ids []int64, state string) ([]FindingReportStateBatchResult, error) {
|
||||
out := make([]FindingReportStateBatchResult, 0, len(ids))
|
||||
err := d.WithEvidenceTx(ctx, func(tx *sql.Tx) error {
|
||||
for _, id := range ids {
|
||||
from, found, changed, err := setFindingReportStateTx(ctx, tx, id, state)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
out = append(out, FindingReportStateBatchResult{ID: id, From: from, Found: found, Changed: changed})
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func setFindingReportStateTx(ctx context.Context, tx *sql.Tx, id int64, state string) (from string, found bool, changed bool, err error) {
|
||||
var nodeID sql.NullInt64
|
||||
scanErr := tx.QueryRowContext(ctx, `SELECT COALESCE(report_state,'none'), node_id
|
||||
FROM findings WHERE id=$1 FOR UPDATE`, id).Scan(&from, &nodeID)
|
||||
if scanErr == sql.ErrNoRows {
|
||||
return "", false, false, nil
|
||||
}
|
||||
if scanErr != nil {
|
||||
return "", false, false, scanErr
|
||||
}
|
||||
found = true
|
||||
if from == state {
|
||||
return from, true, false, nil
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, `UPDATE findings SET report_state=$2 WHERE id=$1`, id, state); err != nil {
|
||||
return from, true, false, err
|
||||
}
|
||||
if nodeID.Valid {
|
||||
if _, err := tx.ExecContext(ctx, `UPDATE exploration_nodes
|
||||
SET payload = jsonb_set(payload, '{report_state}', to_jsonb($1::text))
|
||||
WHERE id = $2`, state, nodeID.Int64); err != nil {
|
||||
return from, true, false, err
|
||||
}
|
||||
}
|
||||
return from, true, true, nil
|
||||
}
|
||||
|
||||
// SetFindingReportByNodeID sets the Markdown report on the standalone finding row
|
||||
// whose node_id matches — report_finding returns that node id, so an agent tool
|
||||
// can address the finding it just created. Returns rows affected (0 when no row).
|
||||
|
||||
@@ -13,6 +13,25 @@ import (
|
||||
|
||||
// TestDeleteFinding verifies that deleting a finding removes both the findings
|
||||
// row and its originating exploration node (kind='finding').
|
||||
func TestValidFindingReportState(t *testing.T) {
|
||||
for _, s := range []string{
|
||||
FindingReportNone, FindingReportSubmitted, FindingReportAccepted,
|
||||
FindingReportRejected, FindingReportDuplicate,
|
||||
} {
|
||||
if !ValidFindingReportState(s) {
|
||||
t.Fatalf("%q should be valid", s)
|
||||
}
|
||||
}
|
||||
for _, s := range []string{"", "confirmed", "pending", "SUBMITTED", "submitted "} {
|
||||
if ValidFindingReportState(s) {
|
||||
t.Fatalf("%q should be invalid", s)
|
||||
}
|
||||
}
|
||||
if ValidFindingStatus(FindingReportSubmitted) {
|
||||
t.Fatal("submitted must not be a triage status")
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeleteFinding(t *testing.T) {
|
||||
d, err := Open(testDSN(t))
|
||||
if err != nil {
|
||||
@@ -122,6 +141,115 @@ func TestSetFindingStatusMirrorsNodePayload(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestFindingReportState(t *testing.T) {
|
||||
d, err := Open(testDSN(t))
|
||||
if err != nil {
|
||||
t.Skipf("postgres unavailable (%v) — skipping", err)
|
||||
}
|
||||
defer d.Close()
|
||||
|
||||
tk, err := d.CreateTask("finding report state", "goal", nil, 0, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer d.DeleteTask(tk.ID)
|
||||
|
||||
es := d.Exploration(tk.ExplorationID)
|
||||
nodeID, err := es.AddNode(KindFinding, map[string]any{"summary": "x", "severity": "high"}, 5, "confirmed", "worker", nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
fid, err := d.AddFinding(tk.ID, nodeID, "XSS", "reflected XSS", "high", "summary", "poc", "worker", nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
second, err := d.AddFinding(tk.ID, 0, "XSS", "other", "low", "summary", "poc", "worker", nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { d.Exec(`DELETE FROM notification_events WHERE finding_id IN ($1,$2)`, fid, second) })
|
||||
|
||||
one, err := d.GetFinding(fid)
|
||||
if err != nil || one == nil || one.ReportState != FindingReportNone {
|
||||
t.Fatalf("new finding report_state: %+v err=%v", one, err)
|
||||
}
|
||||
|
||||
n, err := d.SetFindingReportState(fid, FindingReportSubmitted)
|
||||
if err != nil || n != 1 {
|
||||
t.Fatalf("SetFindingReportState: n=%d err=%v", n, err)
|
||||
}
|
||||
one, _ = d.GetFinding(fid)
|
||||
if one.ReportState != FindingReportSubmitted {
|
||||
t.Fatalf("report_state=%q", one.ReportState)
|
||||
}
|
||||
if one.Status != FindingPending {
|
||||
t.Fatalf("triage status changed: %q", one.Status)
|
||||
}
|
||||
|
||||
var payload []byte
|
||||
if err := d.QueryRow(`SELECT payload FROM exploration_nodes WHERE id=$1`, nodeID).Scan(&payload); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var p map[string]any
|
||||
if err := json.Unmarshal(payload, &p); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if p["report_state"] != FindingReportSubmitted {
|
||||
t.Fatalf("payload report_state=%v", p["report_state"])
|
||||
}
|
||||
|
||||
listed, total, err := d.ListFindingsPage(FindingFilter{TaskID: fmt.Sprintf("%d", tk.ID), ReportState: FindingReportSubmitted}, 1, 20)
|
||||
if err != nil || total != 1 || len(listed) != 1 || listed[0].ID != fid {
|
||||
t.Fatalf("filter submitted: total=%d listed=%d err=%v", total, len(listed), err)
|
||||
}
|
||||
|
||||
st, err := d.FindingStats()
|
||||
if err != nil || st.Submitted < 1 {
|
||||
t.Fatalf("stats submitted undercount: %+v err=%v", st, err)
|
||||
}
|
||||
|
||||
const missingID = int64(999999999)
|
||||
results, err := d.SetFindingReportStates(context.Background(), []int64{fid, second, missingID}, FindingReportAccepted)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(results) != 3 {
|
||||
t.Fatalf("want 3 results, got %d", len(results))
|
||||
}
|
||||
if !results[0].Found || !results[0].Changed || results[0].From != FindingReportSubmitted {
|
||||
t.Fatalf("first: %+v", results[0])
|
||||
}
|
||||
if !results[1].Found || !results[1].Changed || results[1].From != FindingReportNone {
|
||||
t.Fatalf("second: %+v", results[1])
|
||||
}
|
||||
if results[2].Found || results[2].Changed {
|
||||
t.Fatalf("missing: %+v", results[2])
|
||||
}
|
||||
|
||||
again, err := d.SetFindingReportStates(context.Background(), []int64{fid}, FindingReportAccepted)
|
||||
if err != nil || len(again) != 1 || again[0].Changed {
|
||||
t.Fatalf("noop batch: %v %v", again, err)
|
||||
}
|
||||
|
||||
var events int
|
||||
if err := d.QueryRow(`SELECT count(*) FROM notification_events WHERE finding_id IN ($1,$2)`, fid, second).Scan(&events); err != nil || events != 0 {
|
||||
t.Fatalf("report_state must not write notification_events: %d (%v)", events, err)
|
||||
}
|
||||
|
||||
one, _ = d.GetFinding(fid)
|
||||
if one.Status != FindingPending {
|
||||
t.Fatalf("bulk report_state mutated triage: %q", one.Status)
|
||||
}
|
||||
if one.ReportState != FindingReportAccepted {
|
||||
t.Fatalf("bulk report_state=%q", one.ReportState)
|
||||
}
|
||||
|
||||
st, err = d.FindingStats()
|
||||
if err != nil || st.Accepted < 2 {
|
||||
t.Fatalf("stats accepted undercount: %+v err=%v", st, err)
|
||||
}
|
||||
}
|
||||
|
||||
// TestFindingsPageAndStats exercises ListFindingsPage (filter/sort/paging) and
|
||||
// FindingStats against the live dev PG. It tags its rows with a unique vulnclass
|
||||
// so assertions are isolated from any pre-existing data, and cleans up after.
|
||||
@@ -226,6 +354,9 @@ func TestFindingsPageAndStats(t *testing.T) {
|
||||
if one == nil || one.ID != ids[0] || one.Severity != "critical" || one.Name != "Critical Vulnerability Title" {
|
||||
t.Fatalf("GetFinding mismatch: %+v", one)
|
||||
}
|
||||
if one.ReportState != FindingReportNone {
|
||||
t.Fatalf("new finding report_state should be none, got %q", one.ReportState)
|
||||
}
|
||||
if one.Report != "" {
|
||||
t.Fatalf("new finding report should be empty, got %q", one.Report)
|
||||
}
|
||||
|
||||
+2
-2
@@ -137,9 +137,9 @@ func assertEmbeddedApplied(t *testing.T, d *DB) []appliedMigration {
|
||||
version int
|
||||
name string
|
||||
}{{1, llmRecordsMigration}, {2, llmUsageMigration}, {3, "0003_task_scope_icp_index.sql"}, {4, "0004_llm_usage_ts_index.sql"},
|
||||
{5, "0005_traffic_rewrite_rules.sql"}, {6, "0006_activity_outbox.sql"}}
|
||||
{5, "0005_traffic_rewrite_rules.sql"}, {6, "0006_activity_outbox.sql"}, {7, "0007_finding_report_state.sql"}}
|
||||
if len(applied) != len(want) {
|
||||
t.Fatalf("schema_migrations = %+v, want versions 1 to 6", applied)
|
||||
t.Fatalf("schema_migrations = %+v, want versions 1 to 7", applied)
|
||||
}
|
||||
for i, w := range want {
|
||||
content, err := fs.ReadFile(migrationsFS(), w.name)
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
-- Report stage on findings, separate from triage status. Existing rows stay
|
||||
-- 'none'. Values are validated server-side (no CHECK): none / submitted /
|
||||
-- accepted / rejected / duplicate. RSI lessons still read findings.status.
|
||||
ALTER TABLE findings ADD COLUMN IF NOT EXISTS report_state TEXT NOT NULL DEFAULT 'none';
|
||||
CREATE INDEX IF NOT EXISTS idx_findings_report_state ON findings (report_state, created_at DESC);
|
||||
@@ -1256,6 +1256,11 @@ ALTER TABLE findings ADD COLUMN IF NOT EXISTS verification_note TEXT NOT NULL DE
|
||||
-- tested and did not work; confidence_rationale is why the conclusion holds.
|
||||
ALTER TABLE findings ADD COLUMN IF NOT EXISTS counterevidence TEXT NOT NULL DEFAULT '';
|
||||
ALTER TABLE findings ADD COLUMN IF NOT EXISTS confidence_rationale TEXT NOT NULL DEFAULT '';
|
||||
-- Report stage after triage (none / submitted / accepted / rejected / duplicate).
|
||||
-- Separate from status so a finding can be confirmed and submitted at once; RSI
|
||||
-- lessons still read status. Server whitelist, no CHECK (same as status).
|
||||
ALTER TABLE findings ADD COLUMN IF NOT EXISTS report_state TEXT NOT NULL DEFAULT 'none';
|
||||
CREATE INDEX IF NOT EXISTS idx_findings_report_state ON findings (report_state, created_at DESC);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS traffic_evidence_snapshots (
|
||||
id TEXT PRIMARY KEY,
|
||||
|
||||
@@ -770,6 +770,8 @@ FROM skill_usage WHERE (task_id=$1 OR exploration_id=$2) AND NOT found GROUP BY
|
||||
{"findings", `SELECT COALESCE(jsonb_object_agg(name,n),'{}'::jsonb) FROM (SELECT COALESCE(NULLIF(severity,''),'unknown') name,count(*) n FROM findings WHERE task_id=$1 GROUP BY severity) x`, []any{taskID}},
|
||||
{"finding_stats", `SELECT jsonb_build_object(
|
||||
'total',count(*),'pending',count(*) FILTER (WHERE status='pending'),
|
||||
'submitted',count(*) FILTER (WHERE report_state='submitted'),
|
||||
'accepted',count(*) FILTER (WHERE report_state='accepted'),
|
||||
'critical',count(*) FILTER (WHERE severity='critical'),'high',count(*) FILTER (WHERE severity='high'),
|
||||
'medium',count(*) FILTER (WHERE severity='medium'),'low',count(*) FILTER (WHERE severity='low'),
|
||||
'vulnclasses',COALESCE(jsonb_agg(DISTINCT vulnclass) FILTER (WHERE vulnclass<>''),'[]'::jsonb))
|
||||
|
||||
+32
-20
@@ -361,28 +361,40 @@ func rowExists(tx *sql.Tx, table string, id int64) bool {
|
||||
return exists
|
||||
}
|
||||
|
||||
func insertArchiveRows(tx *sql.Tx, table string, raw json.RawMessage) error {
|
||||
// json_populate_recordset inserts NULL for absent columns, bypassing SQL
|
||||
// defaults. Preserve compatibility with v3 archives predating side memory.
|
||||
if (table == "side_question_sessions" || table == "side_question_requests") && len(raw) > 0 {
|
||||
var rows []map[string]json.RawMessage
|
||||
if err := json.Unmarshal(raw, &rows); err != nil {
|
||||
return err
|
||||
}
|
||||
field := "memory"
|
||||
if table == "side_question_requests" {
|
||||
field = "context_info"
|
||||
}
|
||||
for _, row := range rows {
|
||||
// archiveDefaults are the columns that did not exist when older archives were
|
||||
// written. json_populate_recordset inserts NULL for an absent key, bypassing the
|
||||
// SQL default, and a NOT NULL column then rejects the whole restore.
|
||||
var archiveDefaults = map[string]map[string]string{
|
||||
"side_question_sessions": {"memory": `{}`},
|
||||
"side_question_requests": {"context_info": `{}`},
|
||||
"findings": {"report_state": `"none"`},
|
||||
}
|
||||
|
||||
// fillArchiveDefaults restores the default of a column an older archive
|
||||
// predates, so a restore keeps working across schema additions.
|
||||
func fillArchiveDefaults(table string, raw json.RawMessage) (json.RawMessage, error) {
|
||||
defaults, ok := archiveDefaults[table]
|
||||
if !ok || len(raw) == 0 {
|
||||
return raw, nil
|
||||
}
|
||||
var rows []map[string]json.RawMessage
|
||||
if err := json.Unmarshal(raw, &rows); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, row := range rows {
|
||||
for field, def := range defaults {
|
||||
if len(row[field]) == 0 || string(row[field]) == "null" {
|
||||
row[field] = json.RawMessage(`{}`)
|
||||
row[field] = json.RawMessage(def)
|
||||
}
|
||||
}
|
||||
var err error
|
||||
raw, err = json.Marshal(rows)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return json.Marshal(rows)
|
||||
}
|
||||
|
||||
func insertArchiveRows(tx *sql.Tx, table string, raw json.RawMessage) error {
|
||||
raw, err := fillArchiveDefaults(table, raw)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
allowed := map[string]bool{
|
||||
"exploration_nodes": true, "exploration_edges": true, "exploration_anchors": true,
|
||||
@@ -396,7 +408,7 @@ func insertArchiveRows(tx *sql.Tx, table string, raw json.RawMessage) error {
|
||||
if rawRowCount(raw) == 0 {
|
||||
return nil
|
||||
}
|
||||
_, err := tx.Exec(`INSERT INTO `+table+` SELECT * FROM json_populate_recordset(NULL::`+table+`,$1::json)`, string(raw))
|
||||
_, err = tx.Exec(`INSERT INTO `+table+` SELECT * FROM json_populate_recordset(NULL::`+table+`,$1::json)`, string(raw))
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
@@ -486,3 +486,34 @@ func assertArchiveGlobalStats(t *testing.T, d *DB, profileName, skillName, toolN
|
||||
t.Fatalf("archive finding class %q missing", vulnclass)
|
||||
}
|
||||
}
|
||||
|
||||
// An archive written before report_state existed restores with the column's
|
||||
// default instead of failing on the NOT NULL constraint.
|
||||
func TestFillArchiveDefaults(t *testing.T) {
|
||||
raw := json.RawMessage(`[{"id":1,"summary":"old"},{"id":2,"report_state":null},{"id":3,"report_state":"submitted"}]`)
|
||||
out, err := fillArchiveDefaults("findings", raw)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var rows []map[string]json.RawMessage
|
||||
if err := json.Unmarshal(out, &rows); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
want := []string{`"none"`, `"none"`, `"submitted"`}
|
||||
for i, row := range rows {
|
||||
if string(row["report_state"]) != want[i] {
|
||||
t.Fatalf("row %d report_state=%s, want %s", i, row["report_state"], want[i])
|
||||
}
|
||||
}
|
||||
|
||||
// Side memory keeps its own default, and other tables pass through.
|
||||
out, err = fillArchiveDefaults("side_question_sessions", json.RawMessage(`[{"id":1}]`))
|
||||
if err != nil || !strings.Contains(string(out), `"memory":{}`) {
|
||||
t.Fatalf("side memory default missing: %s err=%v", out, err)
|
||||
}
|
||||
in := json.RawMessage(`[{"id":1}]`)
|
||||
out, err = fillArchiveDefaults("activity", in)
|
||||
if err != nil || string(out) != string(in) {
|
||||
t.Fatalf("activity changed: %s err=%v", out, err)
|
||||
}
|
||||
}
|
||||
|
||||
+9
-2
@@ -250,8 +250,15 @@ func (g *Governor) reserve(h *hostState) time.Duration {
|
||||
// asks for more than MaxDelay.
|
||||
func (g *Governor) backoff(h http.Header, attempt int) (d time.Duration, ok bool) {
|
||||
v := strings.TrimSpace(h.Get("Retry-After"))
|
||||
if n, err := strconv.Atoi(v); err == nil && n >= 0 {
|
||||
return time.Duration(n) * time.Second, time.Duration(n)*time.Second <= g.p.MaxDelay
|
||||
if n, err := strconv.ParseInt(v, 10, 64); err == nil && n >= 0 {
|
||||
maxSec := int64(g.p.MaxDelay / time.Second)
|
||||
if maxSec < 0 {
|
||||
maxSec = 0
|
||||
}
|
||||
if n > maxSec {
|
||||
return 0, false
|
||||
}
|
||||
return time.Duration(n) * time.Second, true
|
||||
}
|
||||
if t, err := http.ParseTime(v); err == nil {
|
||||
return max(time.Until(t), 0), time.Until(t) <= g.p.MaxDelay
|
||||
|
||||
@@ -145,6 +145,10 @@ func TestBackoff(t *testing.T) {
|
||||
if d, ok := g.backoff(h, 0); !ok || d <= 0 || d > 2*time.Second {
|
||||
t.Fatalf("HTTP-date Retry-After: %s, %v", d, ok)
|
||||
}
|
||||
// A huge second count used to wrap Duration and look like an immediate retry.
|
||||
if d, ok := g.backoff(http.Header{"Retry-After": {"9223372036854775807"}}, 0); ok || d != 0 {
|
||||
t.Fatalf("overflow Retry-After: %s %v, want refuse", d, ok)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDedupeAndCache(t *testing.T) {
|
||||
|
||||
@@ -4,6 +4,11 @@ go 1.26.10
|
||||
|
||||
require (
|
||||
github.com/Autumn-27/norma v0.4.11
|
||||
github.com/aws/aws-sdk-go-v2 v1.47.5
|
||||
github.com/aws/aws-sdk-go-v2/config v1.33.13
|
||||
github.com/aws/aws-sdk-go-v2/credentials v1.20.13
|
||||
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.23.19
|
||||
github.com/aws/aws-sdk-go-v2/service/s3 v1.114.6
|
||||
github.com/golang-jwt/jwt/v5 v5.3.1
|
||||
github.com/google/uuid v1.6.0
|
||||
github.com/gorilla/websocket v1.5.3
|
||||
@@ -22,6 +27,20 @@ require (
|
||||
require (
|
||||
github.com/andybalholm/brotli v1.2.1 // indirect
|
||||
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.25 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.20.5 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.8 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.8 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.8 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.23 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.11.9 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.8 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.20.8 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/service/signin v1.12.1 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/service/sso v1.39.1 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.44.1 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/service/sts v1.51.6 // indirect
|
||||
github.com/aws/smithy-go v1.28.7 // indirect
|
||||
github.com/aymerick/douceur v0.2.0 // indirect
|
||||
github.com/creack/pty v1.1.24 // indirect
|
||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||
|
||||
@@ -4,6 +4,44 @@ github.com/andybalholm/brotli v1.2.1 h1:R+f5xP285VArJDRgowrfb9DqL18yVK0gKAW/F+eT
|
||||
github.com/andybalholm/brotli v1.2.1/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
|
||||
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
|
||||
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
|
||||
github.com/aws/aws-sdk-go-v2 v1.47.5 h1:5yA+A+BiXbDq1ZLbYwPViwhEGDMdR0MEhL8Jh2LnLS4=
|
||||
github.com/aws/aws-sdk-go-v2 v1.47.5/go.mod h1:iNIkogrRvFwm+1OQIUOP2lPBtlXZboOIUWiCa+pHEMw=
|
||||
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.25 h1:MW0Iql1SOTgQPj8mCxrU/eH/K/AIDWi08ItOsXaWRLU=
|
||||
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.25/go.mod h1:+ucVYmHYB3JqVueY0E1RHahdXAnKQbIHqybSbvOUbOM=
|
||||
github.com/aws/aws-sdk-go-v2/config v1.33.13 h1:u52x6ISQOx172tpwM0VRxhJzEsTJYpMcEYUGM2A1wrw=
|
||||
github.com/aws/aws-sdk-go-v2/config v1.33.13/go.mod h1:/ixtz6XPHb42zekjQ0LqD9XjTpTysNWhIGwufY1OzI4=
|
||||
github.com/aws/aws-sdk-go-v2/credentials v1.20.13 h1:j4z41OtspmQ3ftQycaDunJ26b69a9SHfaSVUPqgRv8k=
|
||||
github.com/aws/aws-sdk-go-v2/credentials v1.20.13/go.mod h1:SgPA1oS3b+dlMxZb618jDmGNscpXSCaxz15igS52OlE=
|
||||
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.20.5 h1:iXjy2SFhGYNB1jWZBhQqq8HbhsbPF23w+/zbMvPXsTg=
|
||||
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.20.5/go.mod h1:k0RUiBnyXU0AXRJ9tJmY2jQke6XUIX2PNVnWtvgaPtc=
|
||||
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.23.19 h1:+JWfo9Mkg5HWwDwnpRPu7WNiiyEmiQRTaNSFsZ/1KIY=
|
||||
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.23.19/go.mod h1:l4/tI+TfymypMqq2oRCkhMAB7Gi7nlt5JaoUUz+cUbI=
|
||||
github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.8 h1:gzIWc3DTPfPbWKrQnmL6BV6WD7NPD1htxzgdk/bQ/Z4=
|
||||
github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.8/go.mod h1:vvUA5cDAZWGo4R14FZPZfXfJCmgsafOWEq78Kg0D+ug=
|
||||
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.8 h1:PWv+vG8aCLS8qd+HPdYhK7Vees90aKHWFFQ1AGYD/8E=
|
||||
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.8/go.mod h1:xxPZEpflYHJA12366ZGyq66z9dHPCoeCIu99Jck+MPw=
|
||||
github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.8 h1:WOp5De9iWdEHDPh2Kb0tBP3vGBm/dVAuRGh4a4tqduo=
|
||||
github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.8/go.mod h1:z8W8YgfhbWl62XqcTtK+CxPrE+iHGRVUOtrrbIOp7ZY=
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.23 h1:MCIR6iZaCKO4UE0hUvoWWLI6JVjppopV64JfAJaMjng=
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.23/go.mod h1:pphWFS+z0MmIPivj8c/6bATd1Z+Av7Ust75DPdEFsPA=
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.11.9 h1:GACgECI422Xt5n4Pojr3O0aocPv8lfH4PJe2Aon5Wv8=
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.11.9/go.mod h1:lPfnRkHpn1qWZJLbVEw10rIqSuCee1pNQTyGkUjAYh8=
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.8 h1:+PMpWlJYOn2tm7sm6OZ/ZLd4jStl17T7wjNapd1Rczs=
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.8/go.mod h1:cnG3xZLGQL4c/bt8pjdzlFtZsW7epBBuNS04a5xMjdo=
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.20.8 h1:RS1Wt+K0r4X0ci9Vf4JYTUfHzsQihYA2LgGJeEneKpk=
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.20.8/go.mod h1:adMnTy5kyoUW86jhXnGSVc/mvMQI4GZd1qYWMeaS8M8=
|
||||
github.com/aws/aws-sdk-go-v2/service/s3 v1.114.6 h1:to7+Vr3rLkpYRwVKJ5QRriI0eE306vrVN/6TnVHgxvY=
|
||||
github.com/aws/aws-sdk-go-v2/service/s3 v1.114.6/go.mod h1:Jc89ASa2k7HMAskj3bSnt8bf+k+p2IApzkoXnEjkgUw=
|
||||
github.com/aws/aws-sdk-go-v2/service/signin v1.12.1 h1:WZLC+k/CZx11kZGQDqu9mpA8yhiXGX2I//jhuJE1FDo=
|
||||
github.com/aws/aws-sdk-go-v2/service/signin v1.12.1/go.mod h1:wxAk0D2oVBSjuXEIzvcKxTZfM90zticdAbh/VD42L0Y=
|
||||
github.com/aws/aws-sdk-go-v2/service/sso v1.39.1 h1:4VB/dnDo7pmXSLQMszSoBzWndENuc7mzwTpD6lQn77A=
|
||||
github.com/aws/aws-sdk-go-v2/service/sso v1.39.1/go.mod h1:UGsEYgWz4Gi+46vDQ5zkFLqUgJziyOE2SXjZjgmfmHc=
|
||||
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.44.1 h1:w8yui2ZqdHmGwVBDGvazoIvKw/DnLENBLkYnN8q8iqo=
|
||||
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.44.1/go.mod h1:gJSdIY6YUzDvqQLcMtPVZgBRHrFwzHryvpE8Igzbxps=
|
||||
github.com/aws/aws-sdk-go-v2/service/sts v1.51.6 h1:BVjKrtRUtSYKztBCCfE1oAB+d3ViKcW2cKZfserOqMQ=
|
||||
github.com/aws/aws-sdk-go-v2/service/sts v1.51.6/go.mod h1:eSukFLeLkPMm+1OxDR+F0joauZdyBkF47Ow7MqjZiJw=
|
||||
github.com/aws/smithy-go v1.28.7 h1:h/n1SHrwVtaDYLz8mR1/Kq4Xh4RaFbFW7bOYckg9mfE=
|
||||
github.com/aws/smithy-go v1.28.7/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
|
||||
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
|
||||
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
|
||||
github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
|
||||
|
||||
+27
-18
@@ -82,31 +82,40 @@ func (g *Guard) setGate(ic *intercept.Interceptor) {
|
||||
func (g *Guard) Hooks() *hook.Registry { return g.reg }
|
||||
|
||||
func (g *Guard) preToolUse(ctx context.Context, ev hook.Event) hook.Result {
|
||||
cmd := toolAuditCommand(ev)
|
||||
res := g.applyIntercept(ctx, ev, cmd)
|
||||
if g.targetOnly {
|
||||
// Not recorded: the audit ring is for the gated worker and chat calls.
|
||||
return g.applyIntercept(ctx, ev)
|
||||
// Not recorded on a pass: the audit ring is for the gated worker and chat
|
||||
// calls. A block still writes through block().
|
||||
return res
|
||||
}
|
||||
// Extract the shell-command surface for the audit log: Bash + the interactive-shell
|
||||
// tools (shell_open's command, shell_send's text). Destructive/exfil gating is no
|
||||
// longer hard-coded here — it now lives in the DB intercept rules, evaluated by
|
||||
// applyIntercept below. Other tools record an empty command.
|
||||
var cmd string
|
||||
// Record the final decision only. An allow written before applyIntercept
|
||||
// stayed in the ring when the call was later blocked, so Audit() showed a
|
||||
// call as allowed that never ran.
|
||||
if res.Decision != "block" {
|
||||
g.record(ev.ToolName, "allow", "", cmd)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// toolAuditCommand is the shell-command surface for the audit log: Bash and
|
||||
// shell_open's command, shell_send's text. Other tools record an empty command.
|
||||
func toolAuditCommand(ev hook.Event) string {
|
||||
switch ev.ToolName {
|
||||
case "Bash", "shell_open":
|
||||
var in struct {
|
||||
Command string `json:"command"`
|
||||
}
|
||||
_ = json.Unmarshal(ev.Input, &in)
|
||||
cmd = in.Command
|
||||
return in.Command
|
||||
case "shell_send":
|
||||
var in struct {
|
||||
Text string `json:"text"`
|
||||
}
|
||||
_ = json.Unmarshal(ev.Input, &in)
|
||||
cmd = in.Text
|
||||
return in.Text
|
||||
}
|
||||
g.record(ev.ToolName, "allow", "", cmd)
|
||||
return g.applyIntercept(ctx, ev)
|
||||
return ""
|
||||
}
|
||||
|
||||
// targetGate is the approval gate for asset targets, as the guard uses it.
|
||||
@@ -138,7 +147,7 @@ func (g *Guard) gateScope(ctx context.Context) (intercept.TargetScope, bool) {
|
||||
// is on: a deny blocks first, before any target request exists; an allow by a
|
||||
// rule or by the judge does not satisfy the gate; an ask and an unpinned target
|
||||
// share one approval request.
|
||||
func (g *Guard) applyIntercept(ctx context.Context, ev hook.Event) hook.Result {
|
||||
func (g *Guard) applyIntercept(ctx context.Context, ev hook.Event, cmd string) hook.Result {
|
||||
if g.targetOnly && g.interceptor != nil {
|
||||
// The planner and the main agent run Bash too (#124, F11): the built-in
|
||||
// deny rules apply to them, before the target gate. User rules and the
|
||||
@@ -146,7 +155,7 @@ func (g *Guard) applyIntercept(ctx context.Context, ev hook.Event) hook.Result {
|
||||
if dec, ok := g.interceptor.MatchBuiltin(ev.ToolName, ev.Input); ok {
|
||||
ctx = intercept.WithCall(ctx, ev.ToolName, ev.Input)
|
||||
g.interceptor.Log(ctx, intercept.ConvIDFromContext(ctx), dec, ev.ToolName, ev.Input, "denied")
|
||||
return g.block(ev.ToolName, systemBlockMessage(dec.Message), "")
|
||||
return g.block(ev.ToolName, systemBlockMessage(dec.Message), cmd)
|
||||
}
|
||||
}
|
||||
scope, gated := g.gateScope(ctx)
|
||||
@@ -168,13 +177,13 @@ func (g *Guard) applyIntercept(ctx context.Context, ev hook.Event) hook.Result {
|
||||
if dec.Action == "deny" {
|
||||
// Note: a deny hit does not block for approval; it directly logs a denied entry (visible on the history / task interception pages).
|
||||
g.interceptor.Log(ctx, intercept.ConvIDFromContext(ctx), dec, ev.ToolName, ev.Input, "denied")
|
||||
return g.block(ev.ToolName, systemBlockMessage(dec.Message), "")
|
||||
return g.block(ev.ToolName, systemBlockMessage(dec.Message), cmd)
|
||||
}
|
||||
var unpinned []intercept.TargetRequest
|
||||
if gated {
|
||||
var res intercept.TargetResult
|
||||
if unpinned, res = g.gate.CheckTargets(ctx, scope, ev.ToolName, ev.Input); res.Code != "" {
|
||||
return g.block(ev.ToolName, TargetBlockMessage(res), "")
|
||||
return g.block(ev.ToolName, TargetBlockMessage(res), cmd)
|
||||
}
|
||||
}
|
||||
var ask *intercept.Decision
|
||||
@@ -187,14 +196,14 @@ func (g *Guard) applyIntercept(ctx context.Context, ev hook.Event) hook.Result {
|
||||
// immediately without creating a pending record — avoids orphaned DB entries
|
||||
// and makes execOne complete fast, reducing the race against drainSynthetic.
|
||||
if ctx.Err() != nil {
|
||||
return g.block(ev.ToolName, systemBlockMessage("work cancelled; platform safety controls blocked execution"), "")
|
||||
return g.block(ev.ToolName, systemBlockMessage("work cancelled; platform safety controls blocked execution"), cmd)
|
||||
}
|
||||
ask = &dec
|
||||
}
|
||||
if len(unpinned) > 0 {
|
||||
res, merged := g.requestTargets(ctx, scope, ev, unpinned, ask)
|
||||
if res.Code != "" {
|
||||
return g.block(ev.ToolName, TargetBlockMessage(res), "")
|
||||
return g.block(ev.ToolName, TargetBlockMessage(res), cmd)
|
||||
}
|
||||
if merged {
|
||||
// The approval of the target request answered the ask as well.
|
||||
@@ -204,7 +213,7 @@ func (g *Guard) applyIntercept(ctx context.Context, ev hook.Event) hook.Result {
|
||||
if ask != nil {
|
||||
convID := intercept.ConvIDFromContext(ctx)
|
||||
if !g.interceptor.HandleAsk(ctx, convID, dec, ev.ToolName, ev.Input) {
|
||||
return g.block(ev.ToolName, systemBlockMessage("manual approval not granted (user rejected or approval timed out)"), "")
|
||||
return g.block(ev.ToolName, systemBlockMessage("manual approval not granted (user rejected or approval timed out)"), cmd)
|
||||
}
|
||||
}
|
||||
return hook.Result{}
|
||||
|
||||
@@ -41,6 +41,34 @@ func TestPreToolUsePassthrough(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// A deny must not leave a prior allow row in the audit ring.
|
||||
func TestPreToolUseAuditIsFinalDecision(t *testing.T) {
|
||||
ic := intercept.New(nil)
|
||||
ic.SetRulesForTest([]db.InterceptRule{{
|
||||
ID: 1, Name: "deny nmap", Enabled: true, Priority: 10,
|
||||
MatchTarget: "tool_input", MatchType: "string", Action: "deny",
|
||||
Pattern: "nmap", Message: "no nmap",
|
||||
}})
|
||||
g := NewWithInterceptor(ic)
|
||||
input, _ := json.Marshal(map[string]string{"command": "nmap -sV x"})
|
||||
block, _, _ := g.Hooks().PreToolUse(context.Background(), "Bash", input)
|
||||
if !block {
|
||||
t.Fatal("expected block")
|
||||
}
|
||||
audit := g.Audit()
|
||||
if len(audit) != 1 || audit[0].Action != "block" || audit[0].Tool != "Bash" {
|
||||
t.Fatalf("audit=%+v, want a single block", audit)
|
||||
}
|
||||
if audit[0].Command != "nmap -sV x" {
|
||||
t.Fatalf("block command=%q, want the denied command", audit[0].Command)
|
||||
}
|
||||
for _, e := range audit {
|
||||
if e.Action == "allow" {
|
||||
t.Fatalf("blocked call still has an allow row: %+v", audit)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The target-only guard (planner, main agent) runs the built-in deny rules and
|
||||
// the target gate: no user intercept rule, no fallback judge, no audit-ring entry
|
||||
// for a call that passes (in production the built-in rules come from the store,
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
package llmpool
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
@@ -159,6 +160,47 @@ func (r *Registry) Trip(id int64, errMsg string, hard bool) (tripped bool) {
|
||||
return tripped
|
||||
}
|
||||
|
||||
// RecordCall applies the failover health policy to one provider call. The Pool
|
||||
// calls it for every member attempt, and a caller that runs a provider directly
|
||||
// (a task whose selection bypasses the Pool) calls it too, so a profile's state
|
||||
// does not depend on which path the request took.
|
||||
//
|
||||
// stream tells a streaming call from an atomic one; committed says whether any
|
||||
// event already reached the caller (streaming only). The rules are the ones the
|
||||
// Pool applies:
|
||||
//
|
||||
// - a completed call (err == nil) clears the state with Pass;
|
||||
// - a failure that does not trigger failover (context cancellation, a
|
||||
// deterministic 4xx) is ignored on a stream, and clears the state on an
|
||||
// atomic call, matching Complete's non-failover path;
|
||||
// - a failover-eligible stream failure trips only before the first event:
|
||||
// after that the caller already has output and the state is left alone;
|
||||
// - a failover-eligible atomic failure trips.
|
||||
//
|
||||
// id 0 is a no-op (no profile to key, e.g. an environment-only configuration).
|
||||
// It returns whether this call opened the breaker, and the shortened error
|
||||
// stored with it.
|
||||
func (r *Registry) RecordCall(ctx context.Context, id int64, stream, committed bool, err error) (tripped bool, errMsg string) {
|
||||
if id == 0 {
|
||||
return false, ""
|
||||
}
|
||||
if err == nil {
|
||||
r.Pass(id)
|
||||
return false, ""
|
||||
}
|
||||
if !shouldFailover(ctx, err) {
|
||||
if !stream {
|
||||
r.Pass(id)
|
||||
}
|
||||
return false, ""
|
||||
}
|
||||
if stream && committed {
|
||||
return false, ""
|
||||
}
|
||||
msg := trimErr(err)
|
||||
return r.Trip(id, msg, isHardFailure(err)), msg
|
||||
}
|
||||
|
||||
// Reset clears one profile's state — the UI's "Recover now" action.
|
||||
func (r *Registry) Reset(id int64) {
|
||||
r.mu.Lock()
|
||||
|
||||
@@ -0,0 +1,119 @@
|
||||
package llmpool
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/Autumn-27/norma/llm"
|
||||
)
|
||||
|
||||
// RecordCall is the policy a provider call applies when no Pool wraps it. A
|
||||
// completed call clears the state; a failover-eligible failure trips; a
|
||||
// non-failover failure neither trips nor, on a stream, clears.
|
||||
func TestRecordCallPolicy(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
soft := fmt.Errorf("openai: status 500: down")
|
||||
bad := fmt.Errorf("openai: status 400: bad request")
|
||||
seed := func(t *testing.T) *Registry {
|
||||
t.Helper()
|
||||
reg := NewRegistry(nil, nil)
|
||||
reg.RecordCall(ctx, 7, false, false, soft)
|
||||
if st := reg.Get(7); st.Fails != 1 || st.Trips != 0 {
|
||||
t.Fatalf("seed state=%+v, want one soft failure", st)
|
||||
}
|
||||
return reg
|
||||
}
|
||||
|
||||
t.Run("success clears", func(t *testing.T) {
|
||||
reg := seed(t)
|
||||
reg.RecordCall(ctx, 7, false, false, nil)
|
||||
if st := reg.Get(7); st.Fails != 0 || st.Trips != 0 || st.Open() {
|
||||
t.Fatalf("state=%+v after a success, want clean", st)
|
||||
}
|
||||
})
|
||||
t.Run("atomic non-failover clears", func(t *testing.T) {
|
||||
reg := seed(t)
|
||||
reg.RecordCall(ctx, 7, false, false, bad)
|
||||
if st := reg.Get(7); st.Fails != 0 || st.Trips != 0 {
|
||||
t.Fatalf("state=%+v after an atomic 400, want clean (Pool.Complete policy)", st)
|
||||
}
|
||||
})
|
||||
t.Run("stream non-failover keeps", func(t *testing.T) {
|
||||
reg := seed(t)
|
||||
reg.RecordCall(ctx, 7, true, false, bad)
|
||||
if st := reg.Get(7); st.Fails != 1 || st.Trips != 0 {
|
||||
t.Fatalf("state=%+v after a stream 400, want the failure kept", st)
|
||||
}
|
||||
})
|
||||
t.Run("stream cancel keeps", func(t *testing.T) {
|
||||
reg := seed(t)
|
||||
reg.RecordCall(ctx, 7, true, false, context.Canceled)
|
||||
if st := reg.Get(7); st.Fails != 1 || st.Trips != 0 {
|
||||
t.Fatalf("state=%+v after a cancel, want the failure kept", st)
|
||||
}
|
||||
})
|
||||
t.Run("committed stream failure keeps", func(t *testing.T) {
|
||||
reg := seed(t)
|
||||
reg.RecordCall(ctx, 7, true, true, soft)
|
||||
if st := reg.Get(7); st.Fails != 1 || st.Trips != 0 {
|
||||
t.Fatalf("state=%+v after a committed failure, want it ignored", st)
|
||||
}
|
||||
})
|
||||
t.Run("pre-commit stream failure counts", func(t *testing.T) {
|
||||
reg := NewRegistry(nil, nil)
|
||||
reg.RecordCall(ctx, 7, true, false, soft)
|
||||
if st := reg.Get(7); st.Fails != 1 || st.Trips != 0 || st.Open() {
|
||||
t.Fatalf("state=%+v, want one soft failure", st)
|
||||
}
|
||||
})
|
||||
t.Run("hard failure trips at once", func(t *testing.T) {
|
||||
reg := NewRegistry(nil, nil)
|
||||
reg.RecordCall(ctx, 7, false, false, fmt.Errorf("openai: status 401: bad key"))
|
||||
if st := reg.Get(7); st.Trips != 1 || !st.Open() {
|
||||
t.Fatalf("state=%+v, want an open breaker after one hard failure", st)
|
||||
}
|
||||
})
|
||||
t.Run("profile 0 is a no-op", func(t *testing.T) {
|
||||
reg := NewRegistry(nil, nil)
|
||||
reg.RecordCall(ctx, 0, false, false, soft)
|
||||
if n := len(reg.Snapshot()); n != 0 {
|
||||
t.Fatalf("%d states recorded for profile 0", n)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// The Pool feeds the same policy: a failure before the first event counts on
|
||||
// the member that failed, a failure after output reached the caller does not,
|
||||
// because the Pool neither fails over nor blames the profile in that case.
|
||||
func TestPoolFeedsRecordCallPolicy(t *testing.T) {
|
||||
t.Run("pre-commit failure counts", func(t *testing.T) {
|
||||
a := &fakeProv{name: "a", errs: []error{fmt.Errorf("status 500: down")}}
|
||||
reg := NewRegistry(nil, nil)
|
||||
p := New([]*Member{member(1, "a", 10, a), member(2, "b", 5, okProv("b", "full"))}, reg)
|
||||
if _, err := drain(p.Stream(context.Background(), llm.CompletionRequest{})); err != nil {
|
||||
t.Fatalf("stream error: %v", err)
|
||||
}
|
||||
if st := reg.Get(1); st.Fails != 1 || st.Trips != 0 {
|
||||
t.Fatalf("state=%+v after a pre-commit failure, want one soft failure", st)
|
||||
}
|
||||
if st := reg.Get(2); st.Fails != 0 || st.Trips != 0 {
|
||||
t.Fatalf("state=%+v on the backup member, want clean", st)
|
||||
}
|
||||
})
|
||||
t.Run("committed failure is ignored", func(t *testing.T) {
|
||||
a := &fakeProv{
|
||||
name: "a",
|
||||
events: [][]llm.StreamEvent{{{Type: llm.SETextDelta, Text: "partial"}}},
|
||||
errs: []error{fmt.Errorf("status 500: mid-stream drop")},
|
||||
}
|
||||
reg := NewRegistry(nil, nil)
|
||||
p := New([]*Member{member(1, "a", 10, a), member(2, "b", 5, okProv("b", "full"))}, reg)
|
||||
if _, err := drain(p.Stream(context.Background(), llm.CompletionRequest{})); err == nil {
|
||||
t.Fatal("mid-stream error should surface")
|
||||
}
|
||||
if st := reg.Get(1); st.Fails != 0 || st.Trips != 0 {
|
||||
t.Fatalf("state=%+v after a committed failure, want clean", st)
|
||||
}
|
||||
})
|
||||
}
|
||||
+15
-11
@@ -10,6 +10,7 @@ import (
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync/atomic"
|
||||
"unicode/utf8"
|
||||
|
||||
"github.com/Autumn-27/norma/llm"
|
||||
)
|
||||
@@ -100,13 +101,12 @@ func (p *Pool) Stream(ctx context.Context, req llm.CompletionRequest) iter.Seq2[
|
||||
}
|
||||
}
|
||||
if failed == nil {
|
||||
p.health.Pass(m.ID) // completed (or failed in a non-failover way)
|
||||
p.health.RecordCall(ctx, m.ID, true, false, nil) // completed: Pass
|
||||
return
|
||||
}
|
||||
lastErr = failed
|
||||
hard := isHardFailure(failed)
|
||||
if p.health.Trip(m.ID, trimErr(failed), hard) {
|
||||
log.Printf("[llmpool] profile %q(%s) breaker tripped: %s", m.Name, m.Model, trimErr(failed))
|
||||
if tripped, msg := p.health.RecordCall(ctx, m.ID, true, false, failed); tripped {
|
||||
log.Printf("[llmpool] profile %q(%s) breaker tripped: %s", m.Name, m.Model, msg)
|
||||
}
|
||||
if i+1 < len(order) {
|
||||
n := order[i+1]
|
||||
@@ -133,19 +133,19 @@ func (p *Pool) Complete(ctx context.Context, req llm.CompletionRequest) (llm.Mes
|
||||
for i, m := range order {
|
||||
msg, sr, usage, err := m.Prov.Complete(ctx, req)
|
||||
if err == nil {
|
||||
p.health.Pass(m.ID)
|
||||
p.health.RecordCall(ctx, m.ID, false, false, nil) // Pass
|
||||
return msg, sr, usage, nil
|
||||
}
|
||||
if !shouldFailover(ctx, err) {
|
||||
// Non-failover error (e.g. ctx cancel, deterministic 4xx): surface as-is
|
||||
// without tripping health, matching Stream's non-failover path.
|
||||
p.health.Pass(m.ID)
|
||||
// without tripping health. RecordCall clears the state on an atomic
|
||||
// call, matching the historical Pass here.
|
||||
p.health.RecordCall(ctx, m.ID, false, false, err)
|
||||
return llm.Message{}, "", llm.Usage{}, err
|
||||
}
|
||||
lastErr = err
|
||||
hard := isHardFailure(err)
|
||||
if p.health.Trip(m.ID, trimErr(err), hard) {
|
||||
log.Printf("[llmpool] profile %q(%s) breaker tripped: %s", m.Name, m.Model, trimErr(err))
|
||||
if tripped, msg := p.health.RecordCall(ctx, m.ID, false, false, err); tripped {
|
||||
log.Printf("[llmpool] profile %q(%s) breaker tripped: %s", m.Name, m.Model, msg)
|
||||
}
|
||||
if i+1 < len(order) {
|
||||
n := order[i+1]
|
||||
@@ -263,7 +263,11 @@ func isHardFailure(err error) bool {
|
||||
func trimErr(err error) string {
|
||||
s := strings.TrimSpace(strings.ReplaceAll(err.Error(), "\n", " "))
|
||||
if len(s) > 300 {
|
||||
s = s[:300] + "…"
|
||||
cut := 300
|
||||
for cut > 0 && !utf8.RuneStart(s[cut]) {
|
||||
cut--
|
||||
}
|
||||
s = s[:cut] + "…"
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
"unicode/utf8"
|
||||
|
||||
"github.com/Autumn-27/norma/llm"
|
||||
)
|
||||
@@ -368,3 +369,16 @@ func TestExpiredWindowIsClosed(t *testing.T) {
|
||||
t.Fatal("expired window should read as closed")
|
||||
}
|
||||
}
|
||||
|
||||
// A provider error body in Chinese is cut at 300 bytes; the cut must not split
|
||||
// a rune, or the breaker's last_error is rejected by PostgreSQL as invalid UTF-8.
|
||||
func TestTrimErrKeepsValidUTF8(t *testing.T) {
|
||||
err := errors.New("openai: status 503: " + strings.Repeat("服务暂时不可用,请稍后重试。", 10))
|
||||
got := trimErr(err)
|
||||
if !utf8.ValidString(got) {
|
||||
t.Fatalf("trimErr returned invalid UTF-8: %q", got)
|
||||
}
|
||||
if !strings.HasSuffix(got, "…") || len(got) > 300+len("…") {
|
||||
t.Fatalf("trimErr = %q (%d bytes), want at most 300 bytes plus …", got, len(got))
|
||||
}
|
||||
}
|
||||
|
||||
+23
-2
@@ -35,8 +35,17 @@ type Capture struct {
|
||||
type attempt struct {
|
||||
status int
|
||||
body strings.Builder
|
||||
full bool // true once body hit maxAttemptBody; further reads are not stored
|
||||
}
|
||||
|
||||
// maxAttemptBody is the captured size of one HTTP attempt. The stream still
|
||||
// reaches the caller in full; only the in-memory mirror stops.
|
||||
const maxAttemptBody = 1 << 20 // 1 MiB
|
||||
|
||||
// maxCaptureAttempts is how many HTTP attempts one Capture keeps. Further
|
||||
// attempts pass through unread into the mirror.
|
||||
const maxCaptureAttempts = 8
|
||||
|
||||
// NewCapture returns a context carrying a fresh Capture, plus the Capture itself.
|
||||
func NewCapture(ctx context.Context) (context.Context, *Capture) {
|
||||
c := &Capture{}
|
||||
@@ -74,8 +83,12 @@ func (c *Capture) TeeResponse(status int, rc io.ReadCloser) io.ReadCloser {
|
||||
if c == nil || rc == nil {
|
||||
return rc
|
||||
}
|
||||
a := &attempt{status: status}
|
||||
c.mu.Lock()
|
||||
if len(c.attempts) >= maxCaptureAttempts {
|
||||
c.mu.Unlock()
|
||||
return rc
|
||||
}
|
||||
a := &attempt{status: status}
|
||||
c.attempts = append(c.attempts, a)
|
||||
c.mu.Unlock()
|
||||
return &teeBody{rc: rc, c: c, a: a}
|
||||
@@ -153,7 +166,15 @@ func (t *teeBody) Read(p []byte) (int, error) {
|
||||
n, err := t.rc.Read(p)
|
||||
if n > 0 {
|
||||
t.c.mu.Lock()
|
||||
t.a.body.Write(p[:n])
|
||||
if !t.a.full {
|
||||
remain := maxAttemptBody - t.a.body.Len()
|
||||
if n > remain {
|
||||
t.a.body.Write(p[:remain])
|
||||
t.a.full = true
|
||||
} else {
|
||||
t.a.body.Write(p[:n])
|
||||
}
|
||||
}
|
||||
t.c.mu.Unlock()
|
||||
}
|
||||
return n, err
|
||||
|
||||
@@ -95,6 +95,30 @@ func TestCaptureRetriedAttemptsAreAllKept(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestCaptureCapsAttemptBodyAndCount(t *testing.T) {
|
||||
_, c := NewCapture(context.Background())
|
||||
payload := strings.Repeat("a", maxAttemptBody+4096)
|
||||
body := c.TeeResponse(200, io.NopCloser(strings.NewReader(payload)))
|
||||
got, err := io.ReadAll(body)
|
||||
if err != nil {
|
||||
t.Fatalf("read: %v", err)
|
||||
}
|
||||
if len(got) != len(payload) {
|
||||
t.Fatalf("tee truncated the caller stream: %d want %d", len(got), len(payload))
|
||||
}
|
||||
if n := len(c.RawResponse()); n != maxAttemptBody {
|
||||
t.Fatalf("captured %d bytes, want cap %d", n, maxAttemptBody)
|
||||
}
|
||||
|
||||
for i := 1; i < maxCaptureAttempts+3; i++ {
|
||||
rc := c.TeeResponse(200, io.NopCloser(strings.NewReader("x")))
|
||||
_, _ = io.ReadAll(rc)
|
||||
}
|
||||
if n := len(c.Attempts()); n != maxCaptureAttempts {
|
||||
t.Fatalf("attempts %d, want %d", n, maxCaptureAttempts)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCaptureEmptyWhenNoHTTPHappened(t *testing.T) {
|
||||
_, c := NewCapture(context.Background())
|
||||
if c.RawRequest() != "" || c.RawResponse() != "" {
|
||||
|
||||
@@ -69,6 +69,26 @@ func WithUsageSink(ctx context.Context, sink func(llm.Usage)) context.Context {
|
||||
return context.WithValue(ctx, usageSinkContextKey{}, sink)
|
||||
}
|
||||
|
||||
type stopSinkContextKey struct{}
|
||||
|
||||
// WithStopSink attaches a callback that receives the stop reason of every call
|
||||
// made under ctx that completes normally, once per call, after the provider's
|
||||
// last event ("" when the provider reported none). The harness keeps the stop
|
||||
// reason only long enough to decide whether a turn used tools, so a host that
|
||||
// must tell a provider refusal (Anthropic stop_reason "refusal", or
|
||||
// finish_reason "content_filter" on OpenAI-compatible endpoints) from an
|
||||
// ordinary end of turn observes it here.
|
||||
func WithStopSink(ctx context.Context, sink func(stopReason string)) context.Context {
|
||||
return context.WithValue(ctx, stopSinkContextKey{}, sink)
|
||||
}
|
||||
|
||||
// reportStop hands stopReason to the ctx stop sink, if one is attached.
|
||||
func reportStop(ctx context.Context, stopReason string) {
|
||||
if sink, _ := ctx.Value(stopSinkContextKey{}).(func(string)); sink != nil {
|
||||
sink(stopReason)
|
||||
}
|
||||
}
|
||||
|
||||
// Recorder wraps an llm.Provider and records every completion call.
|
||||
type Recorder struct {
|
||||
inner llm.Provider
|
||||
@@ -223,6 +243,7 @@ func (r *Recorder) Stream(ctx context.Context, req llm.CompletionRequest) iter.S
|
||||
}
|
||||
|
||||
// Stream completed normally.
|
||||
reportStop(ctx, stopReason)
|
||||
finish(streamErr)
|
||||
}
|
||||
}
|
||||
@@ -254,6 +275,8 @@ func (r *Recorder) Complete(ctx context.Context, req llm.CompletionRequest) (llm
|
||||
status := "ok"
|
||||
if err != nil {
|
||||
status = "error"
|
||||
} else {
|
||||
reportStop(ctx, stopReason)
|
||||
}
|
||||
r.recordUsage(ctx, taskID, expID, worker, usage, int(time.Since(start).Milliseconds()), status)
|
||||
if recordBodies {
|
||||
|
||||
@@ -94,6 +94,48 @@ func TestUsageSinkSeesMeteredCalls(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// The stop sink sees the final stop reason of each call that completes, which the
|
||||
// harness otherwise drops: a refusal is an empty, tool-less turn like any other.
|
||||
func TestStopSinkSeesFinalStopReason(t *testing.T) {
|
||||
var got []string
|
||||
ctx := WithStopSink(context.Background(), func(stop string) { got = append(got, stop) })
|
||||
recorder := Wrap(refusalStreamProvider{}, nil, "model", "profile", "", "", func() bool { return false })
|
||||
for _, err := range recorder.Stream(ctx, llm.CompletionRequest{}) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
if _, _, _, err := recorder.Complete(ctx, llm.CompletionRequest{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(got) != 2 || got[0] != "refusal" || got[1] != "stop" {
|
||||
t.Fatalf("sink saw %q, want [refusal stop]", got)
|
||||
}
|
||||
// Without a sink on the context nothing is reported and nothing breaks.
|
||||
for _, err := range recorder.Stream(context.Background(), llm.CompletionRequest{}) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// refusalStreamProvider streams what Anthropic sends for a refusal before any
|
||||
// output: message_start, then message_delta with stop_reason "refusal" and no
|
||||
// content blocks at all.
|
||||
type refusalStreamProvider struct{ completeProvider }
|
||||
|
||||
func (refusalStreamProvider) Stream(context.Context, llm.CompletionRequest) iter.Seq2[llm.StreamEvent, error] {
|
||||
return func(yield func(llm.StreamEvent, error) bool) {
|
||||
if !yield(llm.StreamEvent{Type: llm.SEMessageStart, Usage: llm.Usage{InputTokens: 41}}, nil) {
|
||||
return
|
||||
}
|
||||
if !yield(llm.StreamEvent{Type: llm.SEMessageDelta, StopReason: "refusal", Usage: llm.Usage{InputTokens: 41}}, nil) {
|
||||
return
|
||||
}
|
||||
yield(llm.StreamEvent{Type: llm.SEMessageStop}, nil)
|
||||
}
|
||||
}
|
||||
|
||||
type meteredStreamProvider struct{ completeProvider }
|
||||
|
||||
func (meteredStreamProvider) Stream(context.Context, llm.CompletionRequest) iter.Seq2[llm.StreamEvent, error] {
|
||||
|
||||
+27
-3
@@ -31,6 +31,10 @@ import (
|
||||
const protocolVersion = "2025-11-25"
|
||||
const legacySSEProtocolVersion = "2024-11-05"
|
||||
|
||||
// mcpMaxRPCBytes is the largest JSON-RPC response (JSON body or SSE data
|
||||
// payload) the client will buffer. A remote MCP server is untrusted.
|
||||
const mcpMaxRPCBytes = 8 << 20
|
||||
|
||||
// ToolName mirrors mcp.ToolName so remote tools share the mcp__server__tool scheme.
|
||||
func ToolName(server, name string) string { return "mcp__" + server + "__" + name }
|
||||
|
||||
@@ -352,10 +356,14 @@ func (c *Client) wrap(rt remoteTool) actool.CoreTool {
|
||||
if err := json.Unmarshal(raw, &res); err != nil {
|
||||
return actool.Errorf("Error: bad MCP response: " + err.Error()), nil
|
||||
}
|
||||
var text string
|
||||
var b strings.Builder
|
||||
for _, blk := range res.Content {
|
||||
text += blk.Text
|
||||
b.WriteString(blk.Text)
|
||||
if b.Len() > mcpMaxRPCBytes {
|
||||
break
|
||||
}
|
||||
}
|
||||
text := b.String()
|
||||
// Consistent with built-in/custom tools: oversized output goes through Capture —
|
||||
// truncated at the session's MaxOutputChars (default 30000), and when
|
||||
// ToolOutputDir is configured the full output spills to disk leaving only the
|
||||
@@ -510,8 +518,21 @@ func (c *Client) roundTrip(ctx context.Context, body rpcRequest, expectResp bool
|
||||
if strings.HasPrefix(resp.Header.Get("Content-Type"), "text/event-stream") {
|
||||
return parseSSE(resp.Body, body.ID)
|
||||
}
|
||||
return decodeRPC(resp.Body)
|
||||
}
|
||||
|
||||
// decodeRPC reads one JSON-RPC response, refusing a body larger than
|
||||
// mcpMaxRPCBytes so a remote server cannot force an unbounded allocation.
|
||||
func decodeRPC(r io.Reader) (*rpcResponse, error) {
|
||||
data, err := io.ReadAll(io.LimitReader(r, mcpMaxRPCBytes+1))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("mcp: read json response: %w", err)
|
||||
}
|
||||
if len(data) > mcpMaxRPCBytes {
|
||||
return nil, fmt.Errorf("mcp: json response exceeds %d bytes", mcpMaxRPCBytes)
|
||||
}
|
||||
var out rpcResponse
|
||||
if err := json.NewDecoder(resp.Body).Decode(&out); err != nil {
|
||||
if err := json.Unmarshal(data, &out); err != nil {
|
||||
return nil, fmt.Errorf("mcp: decode json response: %w", err)
|
||||
}
|
||||
return &out, nil
|
||||
@@ -602,6 +623,9 @@ func parseSSE(r io.Reader, wantID int) (*rpcResponse, error) {
|
||||
}
|
||||
if strings.HasPrefix(line, "data:") {
|
||||
dataBuf.WriteString(strings.TrimSpace(line[len("data:"):]))
|
||||
if dataBuf.Len() > mcpMaxRPCBytes {
|
||||
return nil, fmt.Errorf("mcp: sse payload exceeds %d bytes", mcpMaxRPCBytes)
|
||||
}
|
||||
}
|
||||
}
|
||||
if resp, ok := flush(); ok {
|
||||
|
||||
@@ -6,6 +6,7 @@ import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
@@ -233,3 +234,28 @@ func TestStreamableClientVersionRejectionForms(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestDecodeRPCCapsBody(t *testing.T) {
|
||||
ok := `{"jsonrpc":"2.0","id":1,"result":{}}`
|
||||
got, err := decodeRPC(strings.NewReader(ok))
|
||||
if err != nil || got == nil || got.ID != 1 {
|
||||
t.Fatalf("small body: got=%+v err=%v", got, err)
|
||||
}
|
||||
if _, err := decodeRPC(strings.NewReader(strings.Repeat("x", mcpMaxRPCBytes+1))); err == nil {
|
||||
t.Fatal("oversize body must fail")
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseSSECapsPayload(t *testing.T) {
|
||||
chunk := strings.Repeat("a", 64*1024)
|
||||
var b strings.Builder
|
||||
for b.Len() <= mcpMaxRPCBytes {
|
||||
b.WriteString("data: ")
|
||||
b.WriteString(chunk)
|
||||
b.WriteByte('\n')
|
||||
}
|
||||
b.WriteByte('\n')
|
||||
if _, err := parseSSE(strings.NewReader(b.String()), 1); err == nil {
|
||||
t.Fatal("oversize SSE payload must fail")
|
||||
}
|
||||
}
|
||||
|
||||
+28
-10
@@ -70,6 +70,7 @@ func FindingsMarkdown(fs []*db.DBFinding, generatedAt time.Time) string {
|
||||
fmt.Fprintf(&b, "- **Class**: %s\n", f.VulnClass)
|
||||
}
|
||||
fmt.Fprintf(&b, "- **Status**: %s\n", nz(f.Status, "pending"))
|
||||
fmt.Fprintf(&b, "- **Report stage**: %s\n", nz(f.ReportState, "none"))
|
||||
if desc := strings.TrimSpace(f.TaskDescription); desc != "" {
|
||||
fmt.Fprintf(&b, "- **Task**: %s\n", desc)
|
||||
}
|
||||
@@ -99,6 +100,7 @@ func SingleFindingMarkdown(f *db.DBFinding, generatedAt time.Time) string {
|
||||
}
|
||||
fmt.Fprintf(&b, "- **Severity**: %s\n", nz(f.Severity, "info"))
|
||||
fmt.Fprintf(&b, "- **Status**: %s\n", nz(f.Status, "pending"))
|
||||
fmt.Fprintf(&b, "- **Report stage**: %s\n", nz(f.ReportState, "none"))
|
||||
if desc := strings.TrimSpace(f.TaskDescription); desc != "" {
|
||||
fmt.Fprintf(&b, "- **Task**: %s\n", desc)
|
||||
}
|
||||
@@ -134,7 +136,7 @@ func FindingFilename(f *db.DBFinding) string {
|
||||
// Defensive: strip one more path layer to rule out zip slip.
|
||||
name = path.Base(name)
|
||||
if len(name) > 120 {
|
||||
name = name[:120]
|
||||
name = strings.ToValidUTF8(name[:120], "")
|
||||
}
|
||||
return name + ".md"
|
||||
}
|
||||
@@ -148,24 +150,40 @@ func FindingsCSV(fs []*db.DBFinding) []byte {
|
||||
var buf bytes.Buffer
|
||||
buf.WriteString("\xEF\xBB\xBF") // UTF-8 BOM
|
||||
w := csv.NewWriter(&buf)
|
||||
_ = w.Write([]string{"ID", "Name", "Class", "Severity", "Status", "Task", "Found At", "Summary", "Traffic Evidence Count", "Traffic Evidence IDs"})
|
||||
_ = w.Write([]string{"ID", "Name", "Class", "Severity", "Status", "Report Stage", "Task", "Found At", "Summary", "Traffic Evidence Count", "Traffic Evidence IDs"})
|
||||
for _, f := range items {
|
||||
_ = w.Write([]string{
|
||||
fmt.Sprintf("%d", f.ID),
|
||||
findingTitle(f),
|
||||
f.VulnClass,
|
||||
nz(f.Severity, "info"),
|
||||
nz(f.Status, "pending"),
|
||||
f.TaskDescription,
|
||||
f.CreatedAt.Format("2006-01-02 15:04:05"),
|
||||
strings.TrimSpace(f.Summary),
|
||||
fmt.Sprint(len(f.TrafficBindings)), findingTrafficIDs(f),
|
||||
csvCell(findingTitle(f)),
|
||||
csvCell(f.VulnClass),
|
||||
csvCell(nz(f.Severity, "info")),
|
||||
csvCell(nz(f.Status, "pending")),
|
||||
csvCell(nz(f.ReportState, "none")),
|
||||
csvCell(f.TaskDescription),
|
||||
csvCell(f.CreatedAt.Format("2006-01-02 15:04:05")),
|
||||
csvCell(strings.TrimSpace(f.Summary)),
|
||||
fmt.Sprint(len(f.TrafficBindings)),
|
||||
csvCell(findingTrafficIDs(f)),
|
||||
})
|
||||
}
|
||||
w.Flush()
|
||||
return buf.Bytes()
|
||||
}
|
||||
|
||||
// csvCell prefixes cells that spreadsheet apps treat as formulas. encoding/csv
|
||||
// only quotes delimiters; Excel/LibreOffice still evaluate a leading
|
||||
// '=', '+', '-', '@', tab, or CR when the file is opened.
|
||||
func csvCell(s string) string {
|
||||
if s == "" {
|
||||
return s
|
||||
}
|
||||
switch s[0] {
|
||||
case '=', '+', '-', '@', '\t', '\r':
|
||||
return "'" + s
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
func findingTrafficIDs(f *db.DBFinding) string {
|
||||
ids := make([]string, 0, len(f.TrafficBindings))
|
||||
for _, b := range f.TrafficBindings {
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package report
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/csv"
|
||||
"fmt"
|
||||
"strings"
|
||||
"testing"
|
||||
@@ -314,3 +316,42 @@ func TestFindingsExportsCarryQuality(t *testing.T) {
|
||||
t.Errorf("export lost the binding count entirely\n%s", md)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFindingsCSVNeutralizesFormulas(t *testing.T) {
|
||||
out := FindingsCSV([]*db.DBFinding{{
|
||||
ID: 7,
|
||||
Name: `=HYPERLINK("http://evil.example/x","x")`,
|
||||
VulnClass: "+cmd",
|
||||
Severity: "high",
|
||||
Status: "pending",
|
||||
ReportState: "none",
|
||||
TaskDescription: "@SUM(1+1)",
|
||||
CreatedAt: time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC),
|
||||
Summary: "-2+3",
|
||||
}})
|
||||
if !bytes.HasPrefix(out, []byte("\xEF\xBB\xBF")) {
|
||||
t.Fatal("CSV lost the UTF-8 BOM")
|
||||
}
|
||||
records, err := csv.NewReader(bytes.NewReader(out[3:])).ReadAll()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(records) != 2 {
|
||||
t.Fatalf("rows=%d, want header+1", len(records))
|
||||
}
|
||||
row := records[1]
|
||||
want := map[int]string{
|
||||
1: `'=HYPERLINK("http://evil.example/x","x")`,
|
||||
2: `'+cmd`,
|
||||
6: `'@SUM(1+1)`,
|
||||
8: `'-2+3`,
|
||||
}
|
||||
for i, prefix := range want {
|
||||
if row[i] != prefix {
|
||||
t.Errorf("col %d = %q, want %q", i, row[i], prefix)
|
||||
}
|
||||
}
|
||||
if strings.HasPrefix(row[3], "'") {
|
||||
t.Errorf("plain severity %q should not be prefixed", row[3])
|
||||
}
|
||||
}
|
||||
|
||||
+47
-10
@@ -37,7 +37,7 @@ func (s *Server) toolAskOperator() actool.CoreTool {
|
||||
},
|
||||
"image_path": map[string]any{
|
||||
"type": "string",
|
||||
"description": "Optional path to a screenshot (png/jpg/jpeg/webp/gif, max 10MB), e.g. the browser_take_screenshot output. It is copied into the task uploads and shown to the operator.",
|
||||
"description": "Optional path to a screenshot (png/jpg/jpeg/webp/gif, max 10MB) under this task's working directory, e.g. the browser_take_screenshot output. It is copied into the task uploads and shown to the operator.",
|
||||
},
|
||||
},
|
||||
"required": []any{"question"},
|
||||
@@ -156,6 +156,38 @@ func askOperatorActivity(text string, att []chatAttachment, derived []string) db
|
||||
return a
|
||||
}
|
||||
|
||||
// resolveAskOperatorImage maps image_path onto a regular file inside taskDir.
|
||||
// Relative paths are resolved from the task working directory (the worker CWD).
|
||||
// ".." segments, paths that EvalSymlinks outside taskDir, and non-images are refused.
|
||||
func resolveAskOperatorImage(taskDir, src string) (string, error) {
|
||||
src = strings.TrimSpace(src)
|
||||
ext := strings.ToLower(filepath.Ext(src))
|
||||
if !askOperatorImageExt[ext] {
|
||||
return "", fmt.Errorf("image_path must be a png/jpg/jpeg/webp/gif file, got %q", filepath.Base(src))
|
||||
}
|
||||
for _, el := range strings.Split(filepath.ToSlash(src), "/") {
|
||||
if el == ".." {
|
||||
return "", fmt.Errorf("image_path must stay inside the task working directory")
|
||||
}
|
||||
}
|
||||
if !filepath.IsAbs(src) {
|
||||
src = filepath.Join(taskDir, src)
|
||||
}
|
||||
realRoot, err := filepath.EvalSymlinks(taskDir)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("image not readable")
|
||||
}
|
||||
real, err := filepath.EvalSymlinks(src)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("image not readable")
|
||||
}
|
||||
rel, err := filepath.Rel(realRoot, real)
|
||||
if err != nil || rel == ".." || strings.HasPrefix(rel, ".."+string(filepath.Separator)) {
|
||||
return "", fmt.Errorf("image_path must stay inside the task working directory")
|
||||
}
|
||||
return real, nil
|
||||
}
|
||||
|
||||
// stageAskOperatorImage copies the referenced image into the task's uploads dir
|
||||
// (the same place chat uploads land, so the transcript attachment card resolves)
|
||||
// and returns the attachment descriptor. Empty src returns no attachment.
|
||||
@@ -164,25 +196,30 @@ func stageAskOperatorImage(dataDir, taskID, src string) ([]chatAttachment, error
|
||||
if src == "" {
|
||||
return nil, nil
|
||||
}
|
||||
ext := strings.ToLower(filepath.Ext(src))
|
||||
if !askOperatorImageExt[ext] {
|
||||
return nil, fmt.Errorf("image_path must be a png/jpg/jpeg/webp/gif file, got %q", filepath.Base(src))
|
||||
}
|
||||
st, err := os.Stat(src)
|
||||
taskDir := filepath.Join(dataDir, "tasks", taskID)
|
||||
resolved, err := resolveAskOperatorImage(taskDir, src)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("image not readable: %v", err)
|
||||
return nil, err
|
||||
}
|
||||
st, err := os.Stat(resolved)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("image not readable")
|
||||
}
|
||||
if !st.Mode().IsRegular() {
|
||||
return nil, fmt.Errorf("image_path must be a regular file")
|
||||
}
|
||||
if st.Size() > askOperatorMaxImage {
|
||||
return nil, fmt.Errorf("image too large (%s, max 10MB)", humanBytes(st.Size()))
|
||||
}
|
||||
dir := filepath.Join(dataDir, "tasks", taskID, "uploads")
|
||||
dir := filepath.Join(taskDir, "uploads")
|
||||
if err := os.MkdirAll(dir, 0o755); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
ext := strings.ToLower(filepath.Ext(resolved))
|
||||
name := fmt.Sprintf("ask-operator-%d%s", time.Now().Unix(), ext)
|
||||
in, err := os.Open(src)
|
||||
in, err := os.Open(resolved)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return nil, fmt.Errorf("image not readable")
|
||||
}
|
||||
defer in.Close()
|
||||
out, err := os.Create(filepath.Join(dir, name))
|
||||
|
||||
@@ -12,7 +12,11 @@ import (
|
||||
|
||||
func TestStageAskOperatorImage(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
src := filepath.Join(dir, "shot.png")
|
||||
taskDir := filepath.Join(dir, "tasks", "7")
|
||||
if err := os.MkdirAll(taskDir, 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
src := filepath.Join(taskDir, "shot.png")
|
||||
if err := os.WriteFile(src, []byte("fakepng"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -23,31 +27,67 @@ func TestStageAskOperatorImage(t *testing.T) {
|
||||
t.Fatalf("empty src: att=%v err=%v", att, err)
|
||||
}
|
||||
|
||||
// valid image -> copied under the task uploads, descriptor matches the chat format
|
||||
att, err = stageAskOperatorImage(dir, "7", src)
|
||||
// relative path from the task working directory (worker CWD)
|
||||
att, err = stageAskOperatorImage(dir, "7", "shot.png")
|
||||
if err != nil || len(att) != 1 {
|
||||
t.Fatalf("valid src: att=%v err=%v", att, err)
|
||||
}
|
||||
if !strings.HasPrefix(att[0].Path, "uploads/ask-operator-") || !strings.HasSuffix(att[0].Path, ".png") {
|
||||
t.Fatalf("unexpected attachment path %q", att[0].Path)
|
||||
}
|
||||
if _, err := os.Stat(filepath.Join(dir, "tasks", "7", "uploads", att[0].Name)); err != nil {
|
||||
if _, err := os.Stat(filepath.Join(taskDir, "uploads", att[0].Name)); err != nil {
|
||||
t.Fatalf("copy missing: %v", err)
|
||||
}
|
||||
|
||||
// absolute path still accepted when it stays inside the task dir
|
||||
att, err = stageAskOperatorImage(dir, "7", src)
|
||||
if err != nil || len(att) != 1 {
|
||||
t.Fatalf("absolute inside task dir: att=%v err=%v", att, err)
|
||||
}
|
||||
|
||||
// wrong extension rejected
|
||||
bad := filepath.Join(dir, "payload.exe")
|
||||
bad := filepath.Join(taskDir, "payload.exe")
|
||||
if err := os.WriteFile(bad, []byte("x"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := stageAskOperatorImage(dir, "7", bad); err == nil || !strings.Contains(err.Error(), "png/jpg") {
|
||||
if _, err := stageAskOperatorImage(dir, "7", "payload.exe"); err == nil || !strings.Contains(err.Error(), "png/jpg") {
|
||||
t.Fatalf("expected extension rejection, got %v", err)
|
||||
}
|
||||
|
||||
// missing file rejected
|
||||
if _, err := stageAskOperatorImage(dir, "7", filepath.Join(dir, "nope.png")); err == nil {
|
||||
if _, err := stageAskOperatorImage(dir, "7", "nope.png"); err == nil {
|
||||
t.Fatal("expected missing-file rejection")
|
||||
}
|
||||
|
||||
outside := filepath.Join(dir, "outside.png")
|
||||
if err := os.WriteFile(outside, []byte("x"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := stageAskOperatorImage(dir, "7", filepath.Join("..", "..", "outside.png")); err == nil {
|
||||
t.Fatal("expected .. rejection")
|
||||
}
|
||||
if _, err := stageAskOperatorImage(dir, "7", outside); err == nil {
|
||||
t.Fatal("expected outside-path rejection")
|
||||
}
|
||||
|
||||
otherDir := filepath.Join(dir, "tasks", "8")
|
||||
if err := os.MkdirAll(otherDir, 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
other := filepath.Join(otherDir, "shot.png")
|
||||
if err := os.WriteFile(other, []byte("x"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := stageAskOperatorImage(dir, "7", other); err == nil {
|
||||
t.Fatal("expected other-task rejection")
|
||||
}
|
||||
|
||||
link := filepath.Join(taskDir, "link.png")
|
||||
if err := os.Symlink(outside, link); err != nil {
|
||||
t.Logf("symlink test skipped: %v", err)
|
||||
} else if _, err := stageAskOperatorImage(dir, "7", "link.png"); err == nil {
|
||||
t.Fatal("expected symlink-out rejection")
|
||||
}
|
||||
}
|
||||
|
||||
// The emitted activity must carry the {text, attachments} Detail shape the
|
||||
|
||||
+31
-2
@@ -35,6 +35,8 @@ const (
|
||||
// length, so passwords set under the old 8-character minimum still log in.
|
||||
minPasswordRunes = 12
|
||||
maxPasswordBytes = 72
|
||||
|
||||
pwdLimitTokenPrefix = "tok:"
|
||||
)
|
||||
|
||||
// errDataSourceUnavailable is the uniform reply when a password-related read fails.
|
||||
@@ -281,11 +283,11 @@ func extractToken(r *http.Request) string {
|
||||
}
|
||||
|
||||
// requireAuth wraps h with JWT validation.
|
||||
// /api/auth/* and /api/health are exempt.
|
||||
// /api/auth/*, /api/health and /api/ready are exempt.
|
||||
func (s *Server) requireAuth(h http.Handler) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
p := r.URL.Path
|
||||
if strings.HasPrefix(p, "/api/auth/") || p == "/api/health" {
|
||||
if strings.HasPrefix(p, "/api/auth/") || p == "/api/health" || p == "/api/ready" {
|
||||
h.ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
@@ -479,6 +481,12 @@ func (s *Server) authChangePassword(w http.ResponseWriter, r *http.Request) {
|
||||
writeErr(w, 401, "Unauthorized")
|
||||
return
|
||||
}
|
||||
if wait := s.passwordChangeWait(r); wait > 0 {
|
||||
secs := int((wait + time.Second - 1) / time.Second)
|
||||
w.Header().Set("Retry-After", strconv.Itoa(secs))
|
||||
writeErr(w, 429, fmt.Sprintf("Too many password change attempts, try again in %d seconds", secs))
|
||||
return
|
||||
}
|
||||
var req struct {
|
||||
OldPassword string `json:"old_password"`
|
||||
NewPassword string `json:"new_password"`
|
||||
@@ -520,10 +528,31 @@ func (s *Server) authChangePassword(w http.ResponseWriter, r *http.Request) {
|
||||
writeErr(w, 500, "Save failed: "+err.Error())
|
||||
return
|
||||
}
|
||||
s.passwordChangeReset(r)
|
||||
s.applyPasswordVersion(version)
|
||||
writeJSON(w, 200, map[string]any{"ok": true})
|
||||
}
|
||||
|
||||
// passwordChangeWait records one authenticated change-password attempt against
|
||||
// the client IP and the session token. Either bucket can block; rotating the
|
||||
// source address with a stolen token still hits the token bucket.
|
||||
func (s *Server) passwordChangeWait(r *http.Request) time.Duration {
|
||||
if s.pwdLimit == nil {
|
||||
return 0
|
||||
}
|
||||
ip := clientIP(r, s.trustedProxies)
|
||||
tok := pwdLimitTokenPrefix + extractToken(r)
|
||||
return max(s.pwdLimit.allow(ip), s.pwdLimit.allow(tok))
|
||||
}
|
||||
|
||||
func (s *Server) passwordChangeReset(r *http.Request) {
|
||||
if s.pwdLimit == nil {
|
||||
return
|
||||
}
|
||||
s.pwdLimit.reset(clientIP(r, s.trustedProxies))
|
||||
s.pwdLimit.reset(pwdLimitTokenPrefix + extractToken(r))
|
||||
}
|
||||
|
||||
// POST /api/auth/login — validates username/password and returns a JWT.
|
||||
func (s *Server) authLogin(w http.ResponseWriter, r *http.Request) {
|
||||
pg := s.pg(w)
|
||||
|
||||
@@ -59,6 +59,7 @@ func TestChangePasswordRevokesOldTokenAndKeepsItWhenSaveFails(t *testing.T) {
|
||||
m: m,
|
||||
jwtKey: []byte("0123456789abcdef0123456789abcdef"),
|
||||
loginLimit: newLoginLimiter(time.Now),
|
||||
pwdLimit: newLoginLimiter(time.Now),
|
||||
authHashKey: fmt.Sprintf("test.password_hash.%d", stamp),
|
||||
authVersionKey: fmt.Sprintf("test.password_version.%d", stamp),
|
||||
}
|
||||
@@ -153,7 +154,7 @@ func TestUnreadablePasswordVersionRejectsSessions(t *testing.T) {
|
||||
}
|
||||
defer m.Close()
|
||||
key := []byte("0123456789abcdef0123456789abcdef")
|
||||
s := &Server{m: m, jwtKey: key, loginLimit: newLoginLimiter(time.Now)}
|
||||
s := &Server{m: m, jwtKey: key, loginLimit: newLoginLimiter(time.Now), pwdLimit: newLoginLimiter(time.Now)}
|
||||
s.authVersionKey = fmt.Sprintf("test.password_version.%d", time.Now().UnixNano())
|
||||
tok, err := signJWTVersion(key, 1)
|
||||
if err != nil {
|
||||
@@ -194,6 +195,7 @@ func TestLoginRereadsPasswordVersionWhenUnreadable(t *testing.T) {
|
||||
m: m,
|
||||
jwtKey: []byte("0123456789abcdef0123456789abcdef"),
|
||||
loginLimit: newLoginLimiter(time.Now),
|
||||
pwdLimit: newLoginLimiter(time.Now),
|
||||
authHashKey: fmt.Sprintf("test.password_hash.%d", stamp),
|
||||
authVersionKey: fmt.Sprintf("test.password_version.%d", stamp),
|
||||
}
|
||||
|
||||
@@ -32,3 +32,37 @@ func TestBulkFindingStatusValidation(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestNormalizeFindingIDs(t *testing.T) {
|
||||
got := normalizeFindingIDs([]int64{0, -1, 2, 2, 3, 4}, 2)
|
||||
if len(got) != 2 || got[0] != 2 || got[1] != 3 {
|
||||
t.Fatalf("got %v, want [2 3]", got)
|
||||
}
|
||||
if got := normalizeFindingIDs(nil, 500); len(got) != 0 {
|
||||
t.Fatalf("empty input: %v", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestBulkFindingReportStateValidation(t *testing.T) {
|
||||
s := &Server{m: &Manager{}}
|
||||
cases := []struct {
|
||||
name string
|
||||
body string
|
||||
want int
|
||||
}{
|
||||
{"bad json", `{`, http.StatusBadRequest},
|
||||
{"unknown state", `{"ids":[1],"report_state":"confirmed"}`, http.StatusBadRequest},
|
||||
{"empty ids", `{"ids":[],"report_state":"submitted"}`, http.StatusBadRequest},
|
||||
{"non-positive ids", `{"ids":[0,-3],"report_state":"submitted"}`, http.StatusBadRequest},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
rec := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodPost, "/api/exploration/findings/bulk-report-state", strings.NewReader(tc.body))
|
||||
s.bulkPatchFindingReportState(rec, req)
|
||||
if rec.Code != tc.want {
|
||||
t.Fatalf("status %d, want %d: %s", rec.Code, tc.want, rec.Body.String())
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,210 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
const changePasswordOK = "correct-horse-1"
|
||||
|
||||
func changePasswordRequest(remote, token string) *http.Request {
|
||||
r := httptest.NewRequest("POST", "/api/auth/change-password", nil)
|
||||
r.RemoteAddr = remote
|
||||
r.Header.Set("Authorization", "Bearer "+token)
|
||||
return r
|
||||
}
|
||||
|
||||
func TestPasswordChangeWaitBlocksByIPAndToken(t *testing.T) {
|
||||
clk := newFakeClock()
|
||||
s := &Server{pwdLimit: newLoginLimiter(clk.now)}
|
||||
const tok = "stolen-session"
|
||||
for i := 0; i < loginMaxAttempts; i++ {
|
||||
if wait := s.passwordChangeWait(changePasswordRequest("192.0.2.50:40000", tok)); wait != 0 {
|
||||
t.Fatalf("attempt %d blocked after %v", i+1, wait)
|
||||
}
|
||||
}
|
||||
if wait := s.passwordChangeWait(changePasswordRequest("192.0.2.50:40000", tok)); wait <= 0 {
|
||||
t.Fatal("same IP and token not blocked")
|
||||
}
|
||||
|
||||
s = &Server{pwdLimit: newLoginLimiter(clk.now)}
|
||||
for i := 0; i < loginMaxAttempts; i++ {
|
||||
remote := fmt.Sprintf("198.51.100.%d:40000", i+1)
|
||||
if wait := s.passwordChangeWait(changePasswordRequest(remote, tok)); wait != 0 {
|
||||
t.Fatalf("rotated IP attempt %d blocked after %v", i+1, wait)
|
||||
}
|
||||
}
|
||||
if wait := s.passwordChangeWait(changePasswordRequest("203.0.113.9:40000", tok)); wait <= 0 {
|
||||
t.Fatal("stolen token still allowed after rotating the client IP")
|
||||
}
|
||||
|
||||
s = &Server{pwdLimit: newLoginLimiter(clk.now)}
|
||||
for i := 0; i < loginMaxAttempts; i++ {
|
||||
if wait := s.passwordChangeWait(changePasswordRequest("192.0.2.51:40000", tok)); wait != 0 {
|
||||
t.Fatalf("fill attempt %d blocked after %v", i+1, wait)
|
||||
}
|
||||
}
|
||||
s.passwordChangeReset(changePasswordRequest("192.0.2.51:40000", tok))
|
||||
if wait := s.passwordChangeWait(changePasswordRequest("192.0.2.51:40000", tok)); wait != 0 {
|
||||
t.Fatalf("after reset blocked after %v", wait)
|
||||
}
|
||||
}
|
||||
|
||||
func changePasswordServer(t *testing.T, clk *fakeClock) (*Server, string, func(remote, old, neu string) *httptest.ResponseRecorder) {
|
||||
t.Helper()
|
||||
m, err := NewManager(t.TempDir(), "")
|
||||
if err != nil {
|
||||
t.Skipf("postgres unavailable (%v)", err)
|
||||
}
|
||||
t.Cleanup(func() { m.Close() })
|
||||
|
||||
stamp := time.Now().UnixNano()
|
||||
s := &Server{
|
||||
m: m,
|
||||
jwtKey: []byte("0123456789abcdef0123456789abcdef"),
|
||||
loginLimit: newLoginLimiter(clk.now),
|
||||
pwdLimit: newLoginLimiter(clk.now),
|
||||
authHashKey: fmt.Sprintf("test.password_hash.%d", stamp),
|
||||
authVersionKey: fmt.Sprintf("test.password_version.%d", stamp),
|
||||
}
|
||||
t.Cleanup(func() {
|
||||
_, _ = m.pg.Exec(`DELETE FROM settings WHERE key=$1 OR key=$2`, s.authHashKey, s.authVersionKey)
|
||||
})
|
||||
hash, err := bcrypt.GenerateFromPassword([]byte(changePasswordOK), bcrypt.MinCost)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := m.pg.SetSetting(s.passwordHashKey(), string(hash)); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
s.applyPasswordVersion(0)
|
||||
tok, err := signJWTVersion(s.jwtKey, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
post := func(remote, old, neu string) *httptest.ResponseRecorder {
|
||||
body := fmt.Sprintf(`{"old_password":%q,"new_password":%q}`, old, neu)
|
||||
r := httptest.NewRequest("POST", "/api/auth/change-password", strings.NewReader(body))
|
||||
r.RemoteAddr = remote
|
||||
r.Header.Set("Authorization", "Bearer "+tok)
|
||||
w := httptest.NewRecorder()
|
||||
s.authChangePassword(w, r)
|
||||
return w
|
||||
}
|
||||
return s, tok, post
|
||||
}
|
||||
|
||||
func TestChangePasswordRateLimitReturns429WithRetryAfter(t *testing.T) {
|
||||
clk := newFakeClock()
|
||||
_, _, post := changePasswordServer(t, clk)
|
||||
const ip = "192.0.2.40:40000"
|
||||
for i := 0; i < loginMaxAttempts; i++ {
|
||||
if w := post(ip, "wrong-password-xx", "correct-horse-9"); w.Code != 401 {
|
||||
t.Fatalf("attempt %d: status=%d want 401; body=%s", i+1, w.Code, w.Body.String())
|
||||
}
|
||||
}
|
||||
w := post(ip, changePasswordOK, "correct-horse-9")
|
||||
if w.Code != 429 {
|
||||
t.Fatalf("status=%d want 429; body=%s", w.Code, w.Body.String())
|
||||
}
|
||||
if got := w.Header().Get("Retry-After"); got != "60" {
|
||||
t.Fatalf("Retry-After=%q want 60", got)
|
||||
}
|
||||
var body struct {
|
||||
Error string `json:"error"`
|
||||
}
|
||||
if err := json.Unmarshal(w.Body.Bytes(), &body); err != nil || body.Error == "" {
|
||||
t.Fatalf("want a JSON error body, got %s (err=%v)", w.Body.String(), err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestChangePasswordRateLimitFollowsStolenTokenAcrossIPs(t *testing.T) {
|
||||
clk := newFakeClock()
|
||||
_, _, post := changePasswordServer(t, clk)
|
||||
for i := 0; i < loginMaxAttempts; i++ {
|
||||
remote := fmt.Sprintf("198.51.100.%d:40000", i+1)
|
||||
if w := post(remote, "wrong-password-xx", "correct-horse-9"); w.Code != 401 {
|
||||
t.Fatalf("attempt %d from %s: status=%d want 401; body=%s", i+1, remote, w.Code, w.Body.String())
|
||||
}
|
||||
}
|
||||
if w := post("203.0.113.9:40000", changePasswordOK, "correct-horse-9"); w.Code != 429 {
|
||||
t.Fatalf("rotated IP: status=%d want 429; body=%s", w.Code, w.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestChangePasswordSuccessResetsCounter(t *testing.T) {
|
||||
clk := newFakeClock()
|
||||
s, tok, post := changePasswordServer(t, clk)
|
||||
const ip = "192.0.2.41:40000"
|
||||
for i := 0; i < loginMaxAttempts-1; i++ {
|
||||
if w := post(ip, "wrong-password-xx", "correct-horse-9"); w.Code != 401 {
|
||||
t.Fatalf("attempt %d: status=%d want 401; body=%s", i+1, w.Code, w.Body.String())
|
||||
}
|
||||
}
|
||||
if w := post(ip, changePasswordOK, "correct-horse-2"); w.Code != 200 {
|
||||
t.Fatalf("status=%d want 200; body=%s", w.Code, w.Body.String())
|
||||
}
|
||||
if s.sessionOK(tok) {
|
||||
t.Fatal("token from before the password change is still accepted")
|
||||
}
|
||||
|
||||
w := httptest.NewRecorder()
|
||||
login := httptest.NewRequest("POST", "/api/auth/login", strings.NewReader(`{"username":"ARTEX","password":"correct-horse-2"}`))
|
||||
login.RemoteAddr = ip
|
||||
s.authLogin(w, login)
|
||||
if w.Code != 200 {
|
||||
t.Fatalf("login after change: status=%d body=%s", w.Code, w.Body.String())
|
||||
}
|
||||
var issued struct {
|
||||
Token string `json:"token"`
|
||||
}
|
||||
if err := json.Unmarshal(w.Body.Bytes(), &issued); err != nil || issued.Token == "" {
|
||||
t.Fatalf("login token: %v body=%s", err, w.Body.String())
|
||||
}
|
||||
|
||||
post2 := func(old, neu string) *httptest.ResponseRecorder {
|
||||
body := fmt.Sprintf(`{"old_password":%q,"new_password":%q}`, old, neu)
|
||||
r := httptest.NewRequest("POST", "/api/auth/change-password", strings.NewReader(body))
|
||||
r.RemoteAddr = ip
|
||||
r.Header.Set("Authorization", "Bearer "+issued.Token)
|
||||
rec := httptest.NewRecorder()
|
||||
s.authChangePassword(rec, r)
|
||||
return rec
|
||||
}
|
||||
for i := 0; i < loginMaxAttempts; i++ {
|
||||
if w := post2("wrong-password-xx", "correct-horse-9"); w.Code != 401 {
|
||||
t.Fatalf("after reset attempt %d: status=%d want 401; body=%s", i+1, w.Code, w.Body.String())
|
||||
}
|
||||
}
|
||||
if w := post2("wrong-password-xx", "correct-horse-9"); w.Code != 429 {
|
||||
t.Fatalf("after reset: status=%d want 429; body=%s", w.Code, w.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestChangePasswordUnauthenticatedDoesNotCount(t *testing.T) {
|
||||
clk := newFakeClock()
|
||||
s, _, post := changePasswordServer(t, clk)
|
||||
const ip = "192.0.2.42:40000"
|
||||
body := `{"old_password":"wrong-password-xx","new_password":"correct-horse-9"}`
|
||||
for i := 0; i < loginMaxAttempts+1; i++ {
|
||||
r := httptest.NewRequest("POST", "/api/auth/change-password", strings.NewReader(body))
|
||||
r.RemoteAddr = ip
|
||||
r.Header.Set("Authorization", "Bearer not-a-token")
|
||||
w := httptest.NewRecorder()
|
||||
s.authChangePassword(w, r)
|
||||
if w.Code != 401 {
|
||||
t.Fatalf("unauthenticated attempt %d: status=%d want 401; body=%s", i+1, w.Code, w.Body.String())
|
||||
}
|
||||
}
|
||||
if w := post(ip, "wrong-password-xx", "correct-horse-9"); w.Code != 401 {
|
||||
t.Fatalf("counted unauthenticated attempts: status=%d body=%s", w.Code, w.Body.String())
|
||||
}
|
||||
}
|
||||
+17
-4
@@ -311,16 +311,16 @@ func (s *Server) pgConversationMessages(w http.ResponseWriter, r *http.Request)
|
||||
return
|
||||
}
|
||||
q := r.URL.Query()
|
||||
limit := atoiDefault(q.Get("limit"), 200)
|
||||
s.chatMu.Lock()
|
||||
running := s.chatBusy[s.convBusyKey(c.ID)]
|
||||
s.chatMu.Unlock()
|
||||
|
||||
// Incremental tail: ?since=N returns steps after id N (ASC) — used by the live
|
||||
// poll and the post-send fetch. A generous cap so a burst is never dropped.
|
||||
// poll and the post-send fetch. Capped so a huge limit cannot materialise the
|
||||
// whole transcript in one response.
|
||||
if sv := q.Get("since"); sv != "" {
|
||||
since, _ := strconv.ParseInt(sv, 10, 64)
|
||||
items, cursor, err := pg.ConvActivityList(c.ID, since, max(limit, 1000))
|
||||
items, cursor, err := pg.ConvActivityList(c.ID, since, 1000)
|
||||
if err != nil {
|
||||
writeErr(w, 500, err.Error())
|
||||
return
|
||||
@@ -333,7 +333,7 @@ func (s *Server) pgConversationMessages(w http.ResponseWriter, r *http.Request)
|
||||
// the page of older steps ending before id N. hasMore lets the client stop
|
||||
// loading earlier history once the top of the thread is reached.
|
||||
before, _ := strconv.ParseInt(q.Get("before"), 10, 64)
|
||||
items, hasMore, err := pg.ConvActivityPage(c.ID, before, limit)
|
||||
items, hasMore, err := pg.ConvActivityPage(c.ID, before, convMessageLimit(q.Get("limit"), 200, 200))
|
||||
if err != nil {
|
||||
writeErr(w, 500, err.Error())
|
||||
return
|
||||
@@ -345,6 +345,19 @@ func (s *Server) pgConversationMessages(w http.ResponseWriter, r *http.Request)
|
||||
writeJSON(w, 200, map[string]any{"items": activityDTOs(items), "cursor": cursor, "running": running, "hasMore": hasMore})
|
||||
}
|
||||
|
||||
// convMessageLimit clamps a page size. Missing or invalid values use def; the
|
||||
// result is at most cap so a huge query cannot materialise the whole transcript.
|
||||
func convMessageLimit(raw string, maxN, def int) int {
|
||||
n := atoiDefault(raw, def)
|
||||
if n < 1 {
|
||||
n = def
|
||||
}
|
||||
if n > maxN {
|
||||
n = maxN
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
// pgConversationMsgDetail lazily returns one step's full detail blob.
|
||||
func (s *Server) pgConversationMsgDetail(w http.ResponseWriter, r *http.Request) {
|
||||
pg, c, ok := s.convByID(w, r)
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package server
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestConvMessageLimit(t *testing.T) {
|
||||
if got := convMessageLimit("", 200, 200); got != 200 {
|
||||
t.Fatalf("default: %d", got)
|
||||
}
|
||||
if got := convMessageLimit("50", 200, 200); got != 50 {
|
||||
t.Fatalf("50: %d", got)
|
||||
}
|
||||
if got := convMessageLimit("2147483646", 200, 200); got != 200 {
|
||||
t.Fatalf("huge history: %d", got)
|
||||
}
|
||||
if got := convMessageLimit("2147483646", 1000, 1000); got != 1000 {
|
||||
t.Fatalf("huge since: %d", got)
|
||||
}
|
||||
if got := convMessageLimit("-1", 200, 200); got != 200 {
|
||||
t.Fatalf("negative: %d", got)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestDecodeStrMapJSONNull(t *testing.T) {
|
||||
m := decodeStrMap(json.RawMessage("null"))
|
||||
if m == nil {
|
||||
t.Fatal("JSON null must decode to an empty map, not nil")
|
||||
}
|
||||
m["NODE_EXTRA_CA_CERTS"] = "/tmp/ca.pem"
|
||||
if m["NODE_EXTRA_CA_CERTS"] != "/tmp/ca.pem" {
|
||||
t.Fatal("decoded map must be writable")
|
||||
}
|
||||
|
||||
empty := decodeStrMap(nil)
|
||||
if empty == nil {
|
||||
t.Fatal("empty input must decode to an empty map")
|
||||
}
|
||||
|
||||
got := decodeStrMap(json.RawMessage(`{"FOO":"bar"}`))
|
||||
if got["FOO"] != "bar" {
|
||||
t.Fatalf("got %#v", got)
|
||||
}
|
||||
|
||||
invalid := decodeStrMap(json.RawMessage(`["not","an","object"]`))
|
||||
if invalid == nil {
|
||||
t.Fatal("invalid JSON must decode to an empty map")
|
||||
}
|
||||
}
|
||||
+23
-17
@@ -327,15 +327,16 @@ type FindingDTO struct {
|
||||
Counterevidence string `json:"counterevidence,omitempty"` // what was tested and did not work; optional
|
||||
ConfidenceRationale string `json:"confidence_rationale,omitempty"` // why the conclusion holds; optional
|
||||
|
||||
ID string `json:"id"`
|
||||
FindingID string `json:"finding_id,omitempty"` // standalone findings-table id — the handle for status updates
|
||||
VulnClass string `json:"vulnclass"`
|
||||
Name string `json:"name,omitempty"` // vulnerability name; the frontend falls back to displaying vulnclass when empty
|
||||
Severity string `json:"severity"` // critical | high | medium | low
|
||||
Status string `json:"status"` // pending | in_progress | confirmed | resolved | fixed | false_positive | ignored | duplicate | risk_accepted
|
||||
Summary string `json:"summary"`
|
||||
Evidence string `json:"evidence"`
|
||||
Report string `json:"report,omitempty"` // detailed report (Markdown); returned only by the detail endpoint, empty in lists
|
||||
ID string `json:"id"`
|
||||
FindingID string `json:"finding_id,omitempty"` // standalone findings-table id — the handle for status updates
|
||||
VulnClass string `json:"vulnclass"`
|
||||
Name string `json:"name,omitempty"` // vulnerability name; the frontend falls back to displaying vulnclass when empty
|
||||
Severity string `json:"severity"` // critical | high | medium | low
|
||||
Status string `json:"status"` // pending | in_progress | confirmed | resolved | fixed | false_positive | ignored | duplicate | risk_accepted
|
||||
ReportState string `json:"report_state"` // none | submitted | accepted | rejected | duplicate; workflow stage, not a triage verdict
|
||||
Summary string `json:"summary"`
|
||||
Evidence string `json:"evidence"`
|
||||
Report string `json:"report,omitempty"` // detailed report (Markdown); returned only by the detail endpoint, empty in lists
|
||||
|
||||
IntentID string `json:"intent_id,omitempty"`
|
||||
ParamID string `json:"param_id,omitempty"`
|
||||
@@ -461,6 +462,10 @@ func findingFromDB(f *db.DBFinding, assets map[int64]*db.Asset) FindingDTO {
|
||||
if status == "" {
|
||||
status = db.FindingPending
|
||||
}
|
||||
reportState := f.ReportState
|
||||
if reportState == "" {
|
||||
reportState = db.FindingReportNone
|
||||
}
|
||||
d := FindingDTO{
|
||||
ID: i64s(f.ID),
|
||||
FindingID: i64s(f.ID),
|
||||
@@ -468,14 +473,15 @@ func findingFromDB(f *db.DBFinding, assets map[int64]*db.Asset) FindingDTO {
|
||||
ReportStale: f.Report != "" && f.EvidenceVersion != f.ReportEvidenceVersion, TrafficBindings: f.TrafficBindings,
|
||||
PoELevel: f.PoELevel, VerificationStatus: f.VerificationStatus, VerificationNote: f.VerificationNote,
|
||||
Counterevidence: f.Counterevidence, ConfidenceRationale: f.ConfidenceRationale,
|
||||
VulnClass: f.VulnClass,
|
||||
Name: f.Name,
|
||||
Severity: f.Severity,
|
||||
Status: status,
|
||||
Summary: f.Summary,
|
||||
Evidence: f.Evidence,
|
||||
Report: f.Report,
|
||||
TS: rfc3339(f.CreatedAt),
|
||||
VulnClass: f.VulnClass,
|
||||
Name: f.Name,
|
||||
Severity: f.Severity,
|
||||
Status: status,
|
||||
ReportState: reportState,
|
||||
Summary: f.Summary,
|
||||
Evidence: f.Evidence,
|
||||
Report: f.Report,
|
||||
TS: rfc3339(f.CreatedAt),
|
||||
}
|
||||
d.Assets = findingAssetDTOs(f.AssetIDs, assets)
|
||||
if f.TaskID != nil {
|
||||
|
||||
@@ -672,6 +672,14 @@ func (h steerHooks) Stop(ctx context.Context, messages []llm.Message) (bool, []s
|
||||
if prevent || len(blocking) > 0 || h.nudges == nil || h.limit <= 0 || !isThinkingOnlyTurn(messages) {
|
||||
return prevent, blocking, msg
|
||||
}
|
||||
// A refused turn is empty as well, but there the provider declined the request;
|
||||
// the model did not think and forget to act. A rerun resends the same
|
||||
// conversation and is refused again, so let the run end and be reported as a
|
||||
// refusal (terminalText) instead.
|
||||
if stop := agent.LastStopReason(ctx); agent.IsRefusalStop(stop) {
|
||||
log.Printf("[work %s] provider refused the turn (stop_reason=%s), not injecting an idle-turn rerun", h.label, stop)
|
||||
return prevent, blocking, msg
|
||||
}
|
||||
n := h.nudges.Add(1)
|
||||
if n > int64(h.limit) {
|
||||
log.Printf("[work %s] idle turns (thinking only, no body text, no tools) reached the rerun cap %d, letting it finish", h.label, h.limit)
|
||||
|
||||
@@ -2,12 +2,71 @@ package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"iter"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
|
||||
"github.com/Autumn-27/artex/agent"
|
||||
"github.com/Autumn-27/artex/llmrec"
|
||||
"github.com/Autumn-27/norma/llm"
|
||||
)
|
||||
|
||||
// stopReasonProvider ends a streamed call with the given stop reason and no
|
||||
// content, the shape of a provider refusal before any output.
|
||||
type stopReasonProvider struct{ stop string }
|
||||
|
||||
func (p stopReasonProvider) Stream(context.Context, llm.CompletionRequest) iter.Seq2[llm.StreamEvent, error] {
|
||||
return func(yield func(llm.StreamEvent, error) bool) {
|
||||
if !yield(llm.StreamEvent{Type: llm.SEMessageStart, Usage: llm.Usage{InputTokens: 41}}, nil) {
|
||||
return
|
||||
}
|
||||
if !yield(llm.StreamEvent{Type: llm.SEMessageDelta, StopReason: p.stop}, nil) {
|
||||
return
|
||||
}
|
||||
yield(llm.StreamEvent{Type: llm.SEMessageStop}, nil)
|
||||
}
|
||||
}
|
||||
|
||||
func (p stopReasonProvider) Complete(context.Context, llm.CompletionRequest) (llm.Message, string, llm.Usage, error) {
|
||||
return llm.Message{Role: llm.RoleAssistant}, p.stop, llm.Usage{}, nil
|
||||
}
|
||||
|
||||
// runCtxAfter returns a run context whose latest recorded model call ended with stop.
|
||||
func runCtxAfter(t *testing.T, stop string) context.Context {
|
||||
t.Helper()
|
||||
ctx := agent.WithStopTracker(context.Background())
|
||||
rec := llmrec.Wrap(stopReasonProvider{stop: stop}, nil, "model", "profile", "", "", func() bool { return false })
|
||||
for _, err := range rec.Stream(ctx, llm.CompletionRequest{}) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
return ctx
|
||||
}
|
||||
|
||||
// A provider refusal leaves an assistant turn with no text and no tools, the same
|
||||
// shape as an idle turn, but rerunning it only sends the same conversation to be
|
||||
// refused again.
|
||||
func TestSteerHooksStopDoesNotRerunProviderRefusal(t *testing.T) {
|
||||
refused := []llm.Message{llm.UserText("start"), {Role: llm.RoleAssistant}}
|
||||
for _, stop := range []string{"refusal", "content_filter"} {
|
||||
h := steerHooks{nudges: &atomic.Int64{}, limit: defaultEmptyTurnNudges, label: "worker-1 · #1"}
|
||||
prevent, blocking, _ := h.Stop(runCtxAfter(t, stop), refused)
|
||||
if prevent || blocking != nil {
|
||||
t.Fatalf("%s: refusal was rerun: prevent=%v blocking=%v", stop, prevent, blocking)
|
||||
}
|
||||
if n := h.nudges.Load(); n != 0 {
|
||||
t.Fatalf("%s: refusal consumed the idle-turn quota: %d", stop, n)
|
||||
}
|
||||
}
|
||||
|
||||
// Control: the same empty turn after an ordinary end of turn is still nudged.
|
||||
h := steerHooks{nudges: &atomic.Int64{}, limit: defaultEmptyTurnNudges, label: "worker-1 · #1"}
|
||||
if _, blocking, _ := h.Stop(runCtxAfter(t, "end_turn"), refused); len(blocking) != 1 || blocking[0] != emptyTurnNudge {
|
||||
t.Fatalf("idle turn after end_turn not nudged: %v", blocking)
|
||||
}
|
||||
}
|
||||
|
||||
// Identifying and nudging empty turns (thinking only, no text, no tools); see steerHooks.Stop.
|
||||
|
||||
func assistantThinking(text string) llm.Message {
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"log"
|
||||
|
||||
"github.com/Autumn-27/artex/agent"
|
||||
)
|
||||
|
||||
// SeedTool only inserts new rows. Repair existing built-ins too, while keeping
|
||||
// descriptions, bindings, enabled/deferred flags and parameter annotations.
|
||||
func (s *Server) seedFactInputSchema() {
|
||||
row, err := s.m.pg.GetTool("record_fact")
|
||||
if err != nil {
|
||||
log.Printf("[facts] read record_fact schema: %v", err)
|
||||
return
|
||||
}
|
||||
if row == nil || !row.System || row.Kind != "builtin" {
|
||||
return
|
||||
}
|
||||
var schema map[string]any
|
||||
if err := json.Unmarshal(row.Schema, &schema); err != nil {
|
||||
log.Printf("[facts] decode record_fact schema: %v", err)
|
||||
return
|
||||
}
|
||||
raw, err := json.Marshal(agent.RepairRecordFactSchema(schema))
|
||||
if err != nil {
|
||||
log.Printf("[facts] encode record_fact schema: %v", err)
|
||||
return
|
||||
}
|
||||
// Compare-and-swap preserves concurrent operator edits; JSONB equality
|
||||
// avoids changing updated_at again on every startup.
|
||||
if _, err := s.m.pg.Exec(`UPDATE tools SET schema=$2::jsonb, updated_at=now()
|
||||
WHERE key='record_fact' AND system AND kind='builtin'
|
||||
AND schema=$1::jsonb AND schema IS DISTINCT FROM $2::jsonb`, string(row.Schema), string(raw)); err != nil {
|
||||
log.Printf("[facts] repair record_fact schema: %v", err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,106 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/Autumn-27/artex/agent"
|
||||
actool "github.com/Autumn-27/norma/tool"
|
||||
)
|
||||
|
||||
func TestRecordFactInputSchemaUpgrade(t *testing.T) {
|
||||
skipWithoutDSN(t)
|
||||
m, err := NewManager(t.TempDir(), "")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { m.Close() })
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
cancel()
|
||||
s := New(ctx, m, t.TempDir(), t.TempDir(), t.TempDir())
|
||||
t.Cleanup(func() { agent.SetToolResolve(nil) })
|
||||
pg := m.pg
|
||||
old, err := pg.GetTool("record_fact")
|
||||
if err != nil || old == nil {
|
||||
t.Fatal("missing record_fact", err)
|
||||
}
|
||||
bindings, _ := json.Marshal(old.Agents)
|
||||
t.Cleanup(func() { pg.UpdateTool(old.Key, old.Description, old.Schema, bindings, old.Enabled) })
|
||||
legacy := map[string]any{
|
||||
"type": "object", "required": []string{"summary"},
|
||||
"anyOf": []any{map[string]any{"required": []string{"summary"}}},
|
||||
"properties": map[string]any{
|
||||
"summary": map[string]any{"type": "string", "description": "operator summary"},
|
||||
"confidence": map[string]any{"type": "string", "default": "inferred"},
|
||||
"custom": map[string]any{"type": "string"},
|
||||
"facts": map[string]any{"type": "array", "items": map[string]any{"type": "object"}},
|
||||
},
|
||||
}
|
||||
raw, _ := json.Marshal(legacy)
|
||||
if err := pg.UpdateTool("record_fact", "operator tool", raw, bindings, old.Enabled); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
check := func(schema map[string]any) {
|
||||
t.Helper()
|
||||
if _, ok := schema["required"]; ok {
|
||||
t.Fatal("top-level summary still required for batches")
|
||||
}
|
||||
if _, ok := schema["anyOf"]; ok {
|
||||
t.Fatal("root anyOf still present")
|
||||
}
|
||||
if schema["additionalProperties"] != false {
|
||||
t.Fatal("unknown fields allowed")
|
||||
}
|
||||
props := schema["properties"].(map[string]any)
|
||||
items := props["facts"].(map[string]any)["items"].(map[string]any)
|
||||
itemProps := items["properties"].(map[string]any)
|
||||
if props["tested_asset_ids"] == nil || itemProps["tested_asset_ids"] == nil || itemProps["summary"] == nil {
|
||||
t.Fatal("repaired schema missing alias or batch summary")
|
||||
}
|
||||
if props["summary"].(map[string]any)["description"] != "operator summary" ||
|
||||
props["confidence"].(map[string]any)["default"] != "inferred" || props["custom"] != nil {
|
||||
t.Fatal("operator annotations lost")
|
||||
}
|
||||
if err := actool.ValidateInput(schema, json.RawMessage(`{"facts":[{"summary":"complete batch item"}]}`)); err != nil {
|
||||
t.Fatal("valid batch rejected", err)
|
||||
}
|
||||
}
|
||||
// Runtime repair protects cached or edited rows even before startup migration.
|
||||
tools := agent.ToolResolve()(context.Background(), "worker", agent.NewToolSet(nil, "").WorkerTools())
|
||||
found := false
|
||||
for _, tool := range tools {
|
||||
if tool.Name() == "record_fact" {
|
||||
check(tool.InputSchema())
|
||||
found = true
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Fatal("record_fact not resolved")
|
||||
}
|
||||
s.seedFactInputSchema()
|
||||
repaired, err := pg.GetTool("record_fact")
|
||||
if err != nil || repaired == nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var schema map[string]any
|
||||
if err := json.Unmarshal(repaired.Schema, &schema); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
check(schema)
|
||||
if repaired.Description != "operator tool" || repaired.Enabled != old.Enabled {
|
||||
t.Fatal("operator tool settings changed")
|
||||
}
|
||||
var before, after time.Time
|
||||
if err := pg.QueryRow("SELECT updated_at FROM tools WHERE key='record_fact'").Scan(&before); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
s.seedFactInputSchema()
|
||||
if err := pg.QueryRow("SELECT updated_at FROM tools WHERE key='record_fact'").Scan(&after); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !before.Equal(after) {
|
||||
t.Fatal("second migration changed the row")
|
||||
}
|
||||
}
|
||||
@@ -47,8 +47,8 @@ func TestRecordFactSourceSchemaUpgrade(t *testing.T) {
|
||||
if err := pg.UpdateTool("record_fact", "operator description", custom, bindings, true); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if src := resolvedRecordFactProps(t)["source"]; src != nil {
|
||||
t.Fatalf("precondition: stored schema should not expose source yet: %v", src)
|
||||
if src := resolvedRecordFactProps(t)["source"]; src == nil {
|
||||
t.Fatal("runtime contract repair must expose source even before startup migration")
|
||||
}
|
||||
|
||||
snapshot := func() (string, string, time.Time) {
|
||||
|
||||
@@ -26,6 +26,17 @@ func TestFindingDTOReasoningFields(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestFindingDTOReportState(t *testing.T) {
|
||||
raw, _ := json.Marshal(findingFromDB(&db.DBFinding{ID: 1}, nil))
|
||||
if !strings.Contains(string(raw), `"report_state":"none"`) {
|
||||
t.Fatalf("empty report_state should serialize as none: %s", raw)
|
||||
}
|
||||
d := findingFromDB(&db.DBFinding{ID: 2, ReportState: db.FindingReportSubmitted}, nil)
|
||||
if d.ReportState != db.FindingReportSubmitted {
|
||||
t.Fatalf("report_state lost: %q", d.ReportState)
|
||||
}
|
||||
}
|
||||
|
||||
// PG: the detail endpoint returns the stored fields, and the report_finding
|
||||
// schema upgrade adds both properties to an existing (customized) row without
|
||||
// overwriting it.
|
||||
|
||||
@@ -14,6 +14,7 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
"unicode/utf8"
|
||||
|
||||
"github.com/Autumn-27/artex/agent"
|
||||
"github.com/Autumn-27/artex/db"
|
||||
@@ -480,3 +481,19 @@ func TestFindingTrafficUTF8SegmentsAndInheritedWrites(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestFindingsZipLongNonASCIINameStaysUTF8(t *testing.T) {
|
||||
f := &db.DBFinding{ID: 7, Severity: "high", Name: strings.Repeat("跨站脚本", 12)}
|
||||
var buf bytes.Buffer
|
||||
if err := writeFindingsEvidenceZip(&buf, []*db.DBFinding{f}, t.TempDir(), time.Now()); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
archive, err := zip.NewReader(bytes.NewReader(buf.Bytes()), int64(buf.Len()))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
entry := archive.File[0]
|
||||
if entry.NonUTF8 || !utf8.ValidString(entry.Name) || !strings.HasPrefix(entry.Name, "high_跨站脚本") || !strings.HasSuffix(entry.Name, ".md") {
|
||||
t.Fatalf("entry name %q (NonUTF8=%v)", entry.Name, entry.NonUTF8)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,6 +31,7 @@ func findingFilterFromQuery(q url.Values) db.FindingFilter {
|
||||
return db.FindingFilter{
|
||||
Severity: normFilter(q.Get("severity")),
|
||||
Status: normFilter(q.Get("status")),
|
||||
ReportState: normFilter(q.Get("report_state")),
|
||||
VerificationStatus: normFilter(q.Get("verification_status")),
|
||||
VulnClass: normFilter(q.Get("vulnclass")),
|
||||
// task_id (independent of the task param, which switches to the per-task-node branch): filters the global table by task.
|
||||
|
||||
@@ -36,7 +36,7 @@ func loginServer(t *testing.T, clk *fakeClock) (*Server, func(remote, password s
|
||||
}
|
||||
return string(hash), true, nil
|
||||
}
|
||||
s := &Server{jwtKey: []byte("0123456789abcdef0123456789abcdef"), loginLimit: newLoginLimiter(clk.now)}
|
||||
s := &Server{jwtKey: []byte("0123456789abcdef0123456789abcdef"), loginLimit: newLoginLimiter(clk.now), pwdLimit: newLoginLimiter(clk.now)}
|
||||
post := func(remote, password string, hdr map[string]string) *httptest.ResponseRecorder {
|
||||
body := fmt.Sprintf(`{"username":"ARTEX","password":%q}`, password)
|
||||
r := httptest.NewRequest("POST", "/api/auth/login", strings.NewReader(body))
|
||||
|
||||
+6
-2
@@ -782,8 +782,12 @@ func decodeStrSlice(raw json.RawMessage) []string {
|
||||
|
||||
func decodeStrMap(raw json.RawMessage) map[string]string {
|
||||
out := map[string]string{}
|
||||
if len(raw) > 0 {
|
||||
_ = json.Unmarshal(raw, &out)
|
||||
if len(raw) == 0 {
|
||||
return out
|
||||
}
|
||||
if err := json.Unmarshal(raw, &out); err != nil || out == nil {
|
||||
// JSON null unmarshals into a nil map. Callers write env["k"]=v.
|
||||
return map[string]string{}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"slices"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestStripProxyArgsLeavesBrowserMCPFlags(t *testing.T) {
|
||||
in := []string{"--headless", "--browser", "chromium", "--proxy-server", "http://127.0.0.1:8788"}
|
||||
got := stripProxyArgs(in)
|
||||
want := []string{"--headless", "--browser", "chromium"}
|
||||
if !slices.Equal(got, want) {
|
||||
t.Fatalf("got %q, want %q", got, want)
|
||||
}
|
||||
if in[3] != "--proxy-server" {
|
||||
t.Fatal("input mutated")
|
||||
}
|
||||
|
||||
equals := []string{"--headless", "--proxy-server=http://127.0.0.1:8788", "--browser", "chromium"}
|
||||
got = stripProxyArgs(equals)
|
||||
if !slices.Equal(got, want) {
|
||||
t.Fatalf("equals form: got %q, want %q", got, want)
|
||||
}
|
||||
}
|
||||
@@ -72,7 +72,7 @@ func (s *Server) discoverAndCacheMCP(ctx context.Context, m *db.MCPServer) error
|
||||
|
||||
// discoverEmptyMCPsOnStartup fills the tool cache for any enabled MCP that has none
|
||||
// yet (notably the seeded browser MCP on first run). Runs sequentially in one
|
||||
// goroutine so we never spawn many stdio servers (npx) at once, and never blocks
|
||||
// goroutine so we never spawn many stdio servers at once, and never blocks
|
||||
// startup. Best-effort: a failure leaves the cache empty to retry next start.
|
||||
func (s *Server) discoverEmptyMCPsOnStartup() {
|
||||
servers, err := s.m.pg.ListMCP()
|
||||
|
||||
@@ -571,6 +571,7 @@ func (s *Server) seedOrchestrationTools() {
|
||||
s.seedFindingWorkflowTools()
|
||||
s.seedFindingVerificationSchema() // S1: poe_level / evidence_quotes on update_finding_report, added once per DB
|
||||
s.seedFindingEvidenceSchema() // optional counterevidence / confidence_rationale on report_finding, added once per DB
|
||||
s.seedFactInputSchema() // restore record_fact single/batch contracts
|
||||
s.seedFactSourceSchema() // source enum on record_fact, added once per DB
|
||||
s.seedTaskScopeDescription() // add_task_scope: "coverage scope, not enforced" replaces the authorization-boundary text
|
||||
// Note: pentest's default tool bindings need no migration — BuiltinToolSeeds already seeds
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"net/http"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
const (
|
||||
readyCacheTTL = time.Second
|
||||
readyPingTimeout = time.Second
|
||||
)
|
||||
|
||||
var errNoPostgres = errors.New("PostgreSQL is not configured")
|
||||
|
||||
type readyCache struct {
|
||||
mu sync.Mutex
|
||||
checked time.Time
|
||||
ready bool
|
||||
pending chan struct{}
|
||||
}
|
||||
|
||||
func (c *readyCache) check(ctx context.Context, ping func(context.Context) error) bool {
|
||||
if ctx.Err() != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
c.mu.Lock()
|
||||
if !c.checked.IsZero() && time.Since(c.checked) < readyCacheTTL {
|
||||
ready := c.ready
|
||||
c.mu.Unlock()
|
||||
return ready
|
||||
}
|
||||
if done := c.pending; done != nil {
|
||||
c.mu.Unlock()
|
||||
select {
|
||||
case <-done:
|
||||
c.mu.Lock()
|
||||
ready := c.ready
|
||||
c.mu.Unlock()
|
||||
return ready
|
||||
case <-ctx.Done():
|
||||
return false
|
||||
}
|
||||
}
|
||||
done := make(chan struct{})
|
||||
c.pending = done
|
||||
c.mu.Unlock()
|
||||
|
||||
pingCtx, cancel := context.WithTimeout(context.Background(), readyPingTimeout)
|
||||
err := ping(pingCtx)
|
||||
cancel()
|
||||
|
||||
c.mu.Lock()
|
||||
c.ready = err == nil
|
||||
c.checked = time.Now()
|
||||
c.pending = nil
|
||||
close(done)
|
||||
ready := c.ready
|
||||
c.mu.Unlock()
|
||||
return ready
|
||||
}
|
||||
|
||||
// ready reports PostgreSQL reachability without exposing connection details.
|
||||
// Its cached ping is bounded to one second and never runs application work.
|
||||
func (s *Server) ready(w http.ResponseWriter, r *http.Request) {
|
||||
ready := s.readyPG.check(r.Context(), func(ctx context.Context) error {
|
||||
if s.m == nil || s.m.pg == nil {
|
||||
return errNoPostgres
|
||||
}
|
||||
return s.m.pg.PingContext(ctx)
|
||||
})
|
||||
status := http.StatusServiceUnavailable
|
||||
if ready {
|
||||
status = http.StatusOK
|
||||
}
|
||||
writeJSON(w, status, map[string]bool{"ready": ready})
|
||||
}
|
||||
@@ -0,0 +1,236 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"database/sql/driver"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/Autumn-27/artex/db"
|
||||
)
|
||||
|
||||
type readyTestConnector struct {
|
||||
ping func(context.Context) error
|
||||
}
|
||||
|
||||
func (c readyTestConnector) Connect(context.Context) (driver.Conn, error) {
|
||||
return readyTestConn{ping: c.ping}, nil
|
||||
}
|
||||
|
||||
func (c readyTestConnector) Driver() driver.Driver { return readyTestDriver{} }
|
||||
|
||||
type readyTestDriver struct{}
|
||||
|
||||
func (readyTestDriver) Open(string) (driver.Conn, error) {
|
||||
return nil, errors.New("ready test driver must be opened through its connector")
|
||||
}
|
||||
|
||||
type readyTestConn struct {
|
||||
ping func(context.Context) error
|
||||
}
|
||||
|
||||
func (readyTestConn) Prepare(string) (driver.Stmt, error) {
|
||||
return nil, errors.New("not supported")
|
||||
}
|
||||
func (readyTestConn) Close() error { return nil }
|
||||
func (readyTestConn) Begin() (driver.Tx, error) { return nil, errors.New("not supported") }
|
||||
func (c readyTestConn) Ping(ctx context.Context) error {
|
||||
return c.ping(ctx)
|
||||
}
|
||||
|
||||
func newReadyServer(t *testing.T, ping func(context.Context) error) (*Server, *sql.DB) {
|
||||
t.Helper()
|
||||
sqlDB := sql.OpenDB(readyTestConnector{ping: ping})
|
||||
t.Cleanup(func() { _ = sqlDB.Close() })
|
||||
return &Server{m: &Manager{pg: &db.DB{DB: sqlDB}}}, sqlDB
|
||||
}
|
||||
|
||||
func readyRequest(h http.Handler, method, path string) *httptest.ResponseRecorder {
|
||||
rec := httptest.NewRecorder()
|
||||
h.ServeHTTP(rec, httptest.NewRequest(method, path, nil))
|
||||
return rec
|
||||
}
|
||||
|
||||
func assertReadyResponse(t *testing.T, rec *httptest.ResponseRecorder, status int, ready bool) {
|
||||
t.Helper()
|
||||
if rec.Code != status {
|
||||
t.Fatalf("status = %d, want %d; body=%s", rec.Code, status, rec.Body.String())
|
||||
}
|
||||
var body map[string]bool
|
||||
if err := json.Unmarshal(rec.Body.Bytes(), &body); err != nil {
|
||||
t.Fatalf("decode body %q: %v", rec.Body.String(), err)
|
||||
}
|
||||
if len(body) != 1 || body["ready"] != ready {
|
||||
t.Fatalf("body = %s, want only ready:%t", rec.Body.String(), ready)
|
||||
}
|
||||
}
|
||||
|
||||
func TestReadyRouteAvailabilityAndCompatibility(t *testing.T) {
|
||||
var calls atomic.Int32
|
||||
s, _ := newReadyServer(t, func(context.Context) error {
|
||||
calls.Add(1)
|
||||
return nil
|
||||
})
|
||||
h := s.Handler()
|
||||
|
||||
assertReadyResponse(t, readyRequest(h, http.MethodGet, "/api/ready"), http.StatusOK, true)
|
||||
if got := readyRequest(h, http.MethodGet, "/api/health"); got.Code != http.StatusOK || strings.TrimSpace(got.Body.String()) != `{"ok":true}` {
|
||||
t.Fatalf("unauthenticated health = %d %s, want 200 {\"ok\":true}", got.Code, got.Body.String())
|
||||
}
|
||||
if got := readyRequest(h, http.MethodGet, "/api/stats"); got.Code != http.StatusUnauthorized {
|
||||
t.Fatalf("unauthenticated stats = %d, want %d", got.Code, http.StatusUnauthorized)
|
||||
}
|
||||
if got := calls.Load(); got != 1 {
|
||||
t.Fatalf("database ping count = %d after readiness and liveness requests, want 1", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestReadyOutageRecoveryAndErrorRedaction(t *testing.T) {
|
||||
var calls atomic.Int32
|
||||
var available atomic.Bool
|
||||
s, _ := newReadyServer(t, func(context.Context) error {
|
||||
calls.Add(1)
|
||||
if !available.Load() {
|
||||
return errors.New("secret PostgreSQL connection details")
|
||||
}
|
||||
return nil
|
||||
})
|
||||
h := s.Handler()
|
||||
|
||||
first := readyRequest(h, http.MethodGet, "/api/ready")
|
||||
assertReadyResponse(t, first, http.StatusServiceUnavailable, false)
|
||||
if strings.Contains(first.Body.String(), "secret") {
|
||||
t.Fatalf("readiness response exposed database error: %s", first.Body.String())
|
||||
}
|
||||
|
||||
available.Store(true)
|
||||
s.readyPG.mu.Lock()
|
||||
s.readyPG.checked = time.Now().Add(-2 * readyCacheTTL)
|
||||
s.readyPG.mu.Unlock()
|
||||
assertReadyResponse(t, readyRequest(h, http.MethodGet, "/api/ready"), http.StatusOK, true)
|
||||
if got := calls.Load(); got != 2 {
|
||||
t.Fatalf("database ping count = %d, want outage and recovery checks", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestReadyClosedDatabaseReturnsUnavailable(t *testing.T) {
|
||||
s, sqlDB := newReadyServer(t, func(context.Context) error { return nil })
|
||||
if err := sqlDB.Close(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assertReadyResponse(t, readyRequest(s.Handler(), http.MethodGet, "/api/ready"), http.StatusServiceUnavailable, false)
|
||||
}
|
||||
|
||||
func TestReadyPingTimeout(t *testing.T) {
|
||||
var cache readyCache
|
||||
started := make(chan struct{})
|
||||
start := time.Now()
|
||||
ready := cache.check(context.Background(), func(ctx context.Context) error {
|
||||
close(started)
|
||||
<-ctx.Done()
|
||||
return ctx.Err()
|
||||
})
|
||||
if ready {
|
||||
t.Fatal("timed-out ping reported ready")
|
||||
}
|
||||
<-started
|
||||
if elapsed := time.Since(start); elapsed < readyPingTimeout || elapsed > 2*readyPingTimeout {
|
||||
t.Fatalf("ping timeout elapsed %s, want about %s", elapsed, readyPingTimeout)
|
||||
}
|
||||
}
|
||||
|
||||
type readyWaitContext struct {
|
||||
context.Context
|
||||
waiting chan struct{}
|
||||
once sync.Once
|
||||
}
|
||||
|
||||
func (c *readyWaitContext) Done() <-chan struct{} {
|
||||
c.once.Do(func() { close(c.waiting) })
|
||||
return c.Context.Done()
|
||||
}
|
||||
|
||||
func TestReadyCanceledWaiterDoesNotCancelSharedPing(t *testing.T) {
|
||||
var cache readyCache
|
||||
started := make(chan struct{})
|
||||
release := make(chan struct{})
|
||||
pingResult := make(chan bool, 1)
|
||||
go func() {
|
||||
pingResult <- cache.check(context.Background(), func(context.Context) error {
|
||||
close(started)
|
||||
<-release
|
||||
return nil
|
||||
})
|
||||
}()
|
||||
<-started
|
||||
|
||||
waitCtx, cancel := context.WithCancel(context.Background())
|
||||
waitingCtx := &readyWaitContext{Context: waitCtx, waiting: make(chan struct{})}
|
||||
waiterResult := make(chan bool, 1)
|
||||
go func() { waiterResult <- cache.check(waitingCtx, func(context.Context) error { return nil }) }()
|
||||
<-waitingCtx.waiting
|
||||
cancel()
|
||||
select {
|
||||
case ready := <-waiterResult:
|
||||
if ready {
|
||||
t.Fatal("canceled waiter reported ready")
|
||||
}
|
||||
case <-time.After(100 * time.Millisecond):
|
||||
t.Fatal("canceled waiter did not return promptly")
|
||||
}
|
||||
|
||||
close(release)
|
||||
if ready := <-pingResult; !ready {
|
||||
t.Fatal("canceling a waiter canceled the shared ping")
|
||||
}
|
||||
}
|
||||
|
||||
func TestReadyConcurrentRequestsShareOnePing(t *testing.T) {
|
||||
var cache readyCache
|
||||
var calls atomic.Int32
|
||||
started := make(chan struct{})
|
||||
release := make(chan struct{})
|
||||
ping := func(context.Context) error {
|
||||
calls.Add(1)
|
||||
close(started)
|
||||
<-release
|
||||
return nil
|
||||
}
|
||||
|
||||
const callers = 20
|
||||
results := make([]bool, callers)
|
||||
var wg sync.WaitGroup
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
results[0] = cache.check(context.Background(), ping)
|
||||
}()
|
||||
<-started
|
||||
|
||||
for i := 1; i < callers; i++ {
|
||||
wg.Add(1)
|
||||
go func(i int) {
|
||||
defer wg.Done()
|
||||
results[i] = cache.check(context.Background(), ping)
|
||||
}(i)
|
||||
}
|
||||
time.Sleep(25 * time.Millisecond)
|
||||
close(release)
|
||||
wg.Wait()
|
||||
if got := calls.Load(); got != 1 {
|
||||
t.Fatalf("database ping count = %d for %d callers, want 1", got, callers)
|
||||
}
|
||||
for i, ready := range results {
|
||||
if !ready {
|
||||
t.Errorf("caller %d reported not ready", i)
|
||||
}
|
||||
}
|
||||
}
|
||||
+102
-23
@@ -66,6 +66,7 @@ type Server struct {
|
||||
authVersionKey string
|
||||
|
||||
loginLimit *loginLimiter // per-IP attempt limit on POST /api/auth/login
|
||||
pwdLimit *loginLimiter // attempt limit on POST /api/auth/change-password (IP + session token)
|
||||
trustedProxies []netip.Prefix // ARTEX_TRUSTED_PROXIES; see clientIP
|
||||
|
||||
// concMu serializes concurrency-cap decisions (admission + reconcile) so a
|
||||
@@ -73,6 +74,8 @@ type Server struct {
|
||||
// free slots off the same snapshot and over-promote past the limit.
|
||||
concMu sync.Mutex
|
||||
|
||||
readyPG readyCache
|
||||
|
||||
cfgMu sync.Mutex
|
||||
chatAgent *agent.ChatAgent // conversational runner for the chat page; nil w/o LLM
|
||||
// llmProv is the fully-decorated global provider (recorder + failover chain)
|
||||
@@ -80,8 +83,12 @@ type Server struct {
|
||||
llmProv llm.Provider
|
||||
llmDirect llm.Provider // concrete global provider, before any failover pool
|
||||
llmCfg agent.Config // current LLM config (key not exposed)
|
||||
llmOn bool
|
||||
llmProf string // active LLM profile name (for llmrec tagging)
|
||||
// llmHealthProfileID is the llm_profiles row llmProv was built from, or 0
|
||||
// when it came from environment settings. Task selections use it to key
|
||||
// breaker health for the global fallback path.
|
||||
llmHealthProfileID int64
|
||||
llmOn bool
|
||||
llmProf string // active LLM profile name (for llmrec tagging)
|
||||
|
||||
// chatBusy guards the per-task main-agent run: the chat handler launches the
|
||||
// agent on the server's background ctx (not the request ctx) and returns
|
||||
@@ -178,7 +185,7 @@ func New(ctx context.Context, m *Manager, skillDir string, dataDir string, keyDi
|
||||
profChatAgents: map[int64]*agent.ChatAgent{},
|
||||
provByProfile: map[int64]*provEntry{},
|
||||
taskAgents: map[string]*taskAgentBundle{}, archiveWake: make(chan struct{}, 1),
|
||||
loginLimit: newLoginLimiter(time.Now)}
|
||||
loginLimit: newLoginLimiter(time.Now), pwdLimit: newLoginLimiter(time.Now)}
|
||||
s.llmHealth, s.llmHealthSync = newLLMHealthRegistry(ctx, m.pg)
|
||||
for _, o := range opts {
|
||||
o(s)
|
||||
@@ -504,11 +511,13 @@ func maxTokensResolver(cfg agent.Config) func() int {
|
||||
// the running engine as the GLOBAL active pair. Safe to call at runtime (UI configures LLM).
|
||||
func (s *Server) applyLLM(cfg agent.Config) error {
|
||||
var prov llm.Provider
|
||||
var healthID int64
|
||||
// A persisted active profile must use the same cached provider as task chains
|
||||
// and Agent bindings, otherwise each path owns a separate rate limiter.
|
||||
if active, _ := s.m.pg.ActiveProfile(); active != nil {
|
||||
if activeCfg, ok := s.loadProfileConfig(active.ID); ok && activeCfg == cfg {
|
||||
prov, _, _ = s.providerForProfile(active.ID)
|
||||
healthID = active.ID
|
||||
}
|
||||
}
|
||||
if prov == nil {
|
||||
@@ -555,6 +564,7 @@ func (s *Server) applyLLM(cfg agent.Config) error {
|
||||
s.chatAgent.SetNoaEnabled(s.m.NoaCompactionEnabled) // experimental: noa context compaction (read per run)
|
||||
s.llmProv = prov
|
||||
s.llmCfg = cfg
|
||||
s.llmHealthProfileID = healthID
|
||||
s.llmOn = true
|
||||
s.cfgMu.Unlock()
|
||||
s.invalidateTaskAgents()
|
||||
@@ -737,6 +747,7 @@ func (s *Server) Handler() http.Handler {
|
||||
mux.HandleFunc("POST /api/auth/change-password", s.authChangePassword)
|
||||
|
||||
mux.HandleFunc("GET /api/health", s.health)
|
||||
mux.HandleFunc("GET /api/ready", s.ready)
|
||||
mux.HandleFunc("GET /api/stats", s.stats)
|
||||
mux.HandleFunc("GET /api/logs", s.getLogs)
|
||||
mux.HandleFunc("GET /api/logs/history", s.getLogsHistory)
|
||||
@@ -848,6 +859,7 @@ func (s *Server) Handler() http.Handler {
|
||||
mux.HandleFunc("POST /api/exploration/findings/{id}/retests", s.startFindingRetest)
|
||||
mux.HandleFunc("PATCH /api/exploration/findings/{id}", s.patchFinding)
|
||||
mux.HandleFunc("POST /api/exploration/findings/bulk-status", s.bulkPatchFindingStatus)
|
||||
mux.HandleFunc("POST /api/exploration/findings/bulk-report-state", s.bulkPatchFindingReportState)
|
||||
mux.HandleFunc("DELETE /api/exploration/findings/{id}", s.deleteFinding)
|
||||
mux.HandleFunc("GET /api/exploration/intents", s.intents)
|
||||
mux.HandleFunc("GET /api/exploration/graph", s.explorationGraph)
|
||||
@@ -1038,7 +1050,14 @@ func (s *Server) Handler() http.Handler {
|
||||
api := cors(s.requireAuth(mux))
|
||||
root := http.NewServeMux()
|
||||
root.Handle("/api/", api)
|
||||
root.Handle("/", s.webuiHandler())
|
||||
webui := s.webuiHandler()
|
||||
root.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
||||
// Keep the operator console out of cross-origin frames and referrers.
|
||||
w.Header().Set("Content-Security-Policy", "frame-ancestors 'self'")
|
||||
w.Header().Set("X-Frame-Options", "SAMEORIGIN")
|
||||
w.Header().Set("Referrer-Policy", "same-origin")
|
||||
webui.ServeHTTP(w, r)
|
||||
})
|
||||
return limitRequestBody(root)
|
||||
}
|
||||
|
||||
@@ -2364,7 +2383,7 @@ func (s *Server) getFinding(w http.ResponseWriter, r *http.Request) {
|
||||
// format = md-single (one combined .md) | md-zip (one .md per vulnerability, zipped)
|
||||
// | csv | json
|
||||
// ids = comma-separated finding ids (required when scope=selected)
|
||||
// Filter params severity/status/vulnclass/task_id/q/sort match the list endpoint (used when scope=filtered).
|
||||
// Filter params severity/status/report_state/vulnclass/task_id/q/sort match the list endpoint (used when scope=filtered).
|
||||
func (s *Server) findingsExport(w http.ResponseWriter, r *http.Request) {
|
||||
q := r.URL.Query()
|
||||
scope := q.Get("scope")
|
||||
@@ -2529,17 +2548,18 @@ func (s *Server) patchFinding(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
var body struct {
|
||||
Status *string `json:"status"`
|
||||
Severity *string `json:"severity"`
|
||||
Name *string `json:"name"`
|
||||
VulnClass *string `json:"vulnclass"`
|
||||
Status *string `json:"status"`
|
||||
ReportState *string `json:"report_state"`
|
||||
Severity *string `json:"severity"`
|
||||
Name *string `json:"name"`
|
||||
VulnClass *string `json:"vulnclass"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
|
||||
writeErr(w, 400, "bad json: "+err.Error())
|
||||
return
|
||||
}
|
||||
if body.Status == nil && body.Severity == nil && body.Name == nil && body.VulnClass == nil {
|
||||
writeErr(w, 400, "nothing to update: provide status/severity/name/vulnclass")
|
||||
if body.Status == nil && body.ReportState == nil && body.Severity == nil && body.Name == nil && body.VulnClass == nil {
|
||||
writeErr(w, 400, "nothing to update: provide status/severity/name/vulnclass/report_state")
|
||||
return
|
||||
}
|
||||
if body.Status != nil {
|
||||
@@ -2563,6 +2583,21 @@ func (s *Server) patchFinding(w http.ResponseWriter, r *http.Request) {
|
||||
log.Printf("[notify] status-change event not registered finding=%d %s→%s (status was updated)", id, from, *body.Status)
|
||||
}
|
||||
}
|
||||
if body.ReportState != nil {
|
||||
if !db.ValidFindingReportState(*body.ReportState) {
|
||||
writeErr(w, 400, "bad report_state: "+*body.ReportState)
|
||||
return
|
||||
}
|
||||
n, err := s.m.pg.SetFindingReportState(id, *body.ReportState)
|
||||
if err != nil {
|
||||
writeErr(w, 500, err.Error())
|
||||
return
|
||||
}
|
||||
if n == 0 {
|
||||
writeErr(w, 404, "finding not found")
|
||||
return
|
||||
}
|
||||
}
|
||||
if body.Severity != nil {
|
||||
if !db.ValidSeverity(*body.Severity) {
|
||||
writeErr(w, 400, "bad severity: "+*body.Severity)
|
||||
@@ -2634,18 +2669,7 @@ func (s *Server) bulkPatchFindingStatus(w http.ResponseWriter, r *http.Request)
|
||||
writeErr(w, 400, "bad status: "+body.Status)
|
||||
return
|
||||
}
|
||||
seen := make(map[int64]bool, len(body.IDs))
|
||||
ids := make([]int64, 0, len(body.IDs))
|
||||
for _, id := range body.IDs {
|
||||
if id <= 0 || seen[id] {
|
||||
continue
|
||||
}
|
||||
seen[id] = true
|
||||
ids = append(ids, id)
|
||||
if len(ids) == maxBulkFindingStatus {
|
||||
break
|
||||
}
|
||||
}
|
||||
ids := normalizeFindingIDs(body.IDs, maxBulkFindingStatus)
|
||||
if len(ids) == 0 {
|
||||
writeErr(w, 400, "no finding ids")
|
||||
return
|
||||
@@ -2667,6 +2691,61 @@ func (s *Server) bulkPatchFindingStatus(w http.ResponseWriter, r *http.Request)
|
||||
writeJSON(w, 200, map[string]any{"updated": updated, "missing": missing, "results": results})
|
||||
}
|
||||
|
||||
// normalizeFindingIDs drops non-positive and duplicate ids, then caps the list.
|
||||
func normalizeFindingIDs(ids []int64, capN int) []int64 {
|
||||
seen := make(map[int64]bool, len(ids))
|
||||
out := make([]int64, 0, len(ids))
|
||||
for _, id := range ids {
|
||||
if id <= 0 || seen[id] {
|
||||
continue
|
||||
}
|
||||
seen[id] = true
|
||||
out = append(out, id)
|
||||
if capN > 0 && len(out) == capN {
|
||||
break
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// bulkPatchFindingReportState sets the same report stage on a batch of findings
|
||||
// in one transaction. Same cap/dedupe/per-id result as bulk status, without
|
||||
// status-change notifications: report_state is a workflow stage, not a verdict.
|
||||
func (s *Server) bulkPatchFindingReportState(w http.ResponseWriter, r *http.Request) {
|
||||
var body struct {
|
||||
IDs []int64 `json:"ids"`
|
||||
ReportState string `json:"report_state"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
|
||||
writeErr(w, 400, "bad json: "+err.Error())
|
||||
return
|
||||
}
|
||||
if !db.ValidFindingReportState(body.ReportState) {
|
||||
writeErr(w, 400, "bad report_state: "+body.ReportState)
|
||||
return
|
||||
}
|
||||
ids := normalizeFindingIDs(body.IDs, maxBulkFindingStatus)
|
||||
if len(ids) == 0 {
|
||||
writeErr(w, 400, "no finding ids")
|
||||
return
|
||||
}
|
||||
results, err := s.m.pg.SetFindingReportStates(r.Context(), ids, body.ReportState)
|
||||
if err != nil {
|
||||
writeErr(w, 500, err.Error())
|
||||
return
|
||||
}
|
||||
updated, missing := 0, 0
|
||||
for _, res := range results {
|
||||
if res.Changed {
|
||||
updated++
|
||||
}
|
||||
if !res.Found {
|
||||
missing++
|
||||
}
|
||||
}
|
||||
writeJSON(w, 200, map[string]any{"updated": updated, "missing": missing, "results": results})
|
||||
}
|
||||
|
||||
// deleteFinding removes a finding (findings row + originating exploration node).
|
||||
// id is the standalone findings-table id (DTO finding_id).
|
||||
func (s *Server) deleteFinding(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
+72
-13
@@ -15,6 +15,7 @@ import (
|
||||
|
||||
"github.com/Autumn-27/artex/agent"
|
||||
"github.com/Autumn-27/artex/db"
|
||||
"github.com/Autumn-27/artex/llmpool"
|
||||
"github.com/Autumn-27/artex/llmrec"
|
||||
"github.com/Autumn-27/norma/llm"
|
||||
"github.com/Autumn-27/norma/transcript"
|
||||
@@ -137,8 +138,15 @@ func resetLLMFailStreak(taskID string, profileID int64) {
|
||||
type taskLLMSelection struct {
|
||||
task *Task
|
||||
profileID int64
|
||||
revision int64
|
||||
provider llm.Provider
|
||||
// healthProfileID is the llm_profiles row whose breaker state the calls on
|
||||
// this selection update. It equals profileID on the task-chain path; a bound
|
||||
// agent or the global provider carries its own id here while profileID stays
|
||||
// 0 (no chain semantics). 0 means "do not report": either there is no
|
||||
// profile (environment-only configuration) or the provider is already the
|
||||
// failover Pool, which updates the registry itself.
|
||||
healthProfileID int64
|
||||
revision int64
|
||||
provider llm.Provider
|
||||
// retry holds the retry parameters resolved for the profile selected this time (profile override → global policy → built-in default).
|
||||
// Same-provider safe-window retries follow it, so switching profiles switches the retry cadence.
|
||||
retry agent.RetryConfig
|
||||
@@ -165,6 +173,24 @@ type taskLLMStreamHooks struct {
|
||||
current func(context.Context) (taskLLMSelection, error)
|
||||
exhaust func(taskLLMSelection, error) (db.TaskLLMTransition, error)
|
||||
transition func(taskLLMSelection, db.TaskLLMTransition, error)
|
||||
// recordHealth reports one physical provider attempt to the process-wide
|
||||
// breaker. It keeps /system/llm/ truthful for every selection whose provider
|
||||
// is not already the failover Pool (the chain, a bound agent, the global
|
||||
// profile). Optional: test literals leave it nil and the call sites skip it.
|
||||
recordHealth func(ctx context.Context, profileID int64, stream, committed bool, err error)
|
||||
}
|
||||
|
||||
// healthIDFor returns the profile whose breaker state a call on this provider
|
||||
// should update. It returns 0 when there is no profile, or when the provider is
|
||||
// the failover Pool, which records every member attempt itself.
|
||||
func healthIDFor(prov llm.Provider, profileID int64) int64 {
|
||||
if profileID == 0 {
|
||||
return 0
|
||||
}
|
||||
if _, pooled := prov.(*llmpool.Pool); pooled {
|
||||
return 0
|
||||
}
|
||||
return profileID
|
||||
}
|
||||
|
||||
// current resolves the provider this role runs on, by precedence:
|
||||
@@ -196,8 +222,9 @@ func (r *taskLLMRuntime) currentFor(ctx context.Context) (taskLLMSelection, erro
|
||||
r.s.syncTaskLLMState(pt)
|
||||
t, _ := r.s.m.Task(r.taskID)
|
||||
sel := taskLLMSelection{task: t, revision: pt.LLMChainRevision}
|
||||
if prov, cfg, ok := r.s.agentBindingProvider(r.agentKey); ok {
|
||||
if prov, cfg, id, ok := r.s.agentBindingProvider(r.agentKey); ok {
|
||||
sel.provider, sel.retry = prov, cfg.Retry
|
||||
sel.healthProfileID = healthIDFor(prov, id)
|
||||
return sel, nil
|
||||
}
|
||||
if len(pt.LLMProfileIDs) > 0 {
|
||||
@@ -218,13 +245,15 @@ func (r *taskLLMRuntime) currentFor(ctx context.Context) (taskLLMSelection, erro
|
||||
return sel, fmt.Errorf("LLM profile #%d is missing or invalid", sel.profileID)
|
||||
}
|
||||
sel.provider, sel.retry = prov, cfg.Retry
|
||||
sel.healthProfileID = sel.profileID // chain selections never go through the Pool
|
||||
return sel, nil
|
||||
}
|
||||
prov, cfg, ok := r.s.globalProvider()
|
||||
prov, cfg, id, ok := r.s.globalProviderWithProfile()
|
||||
if !ok {
|
||||
return sel, fmt.Errorf("task %s has no available fallback LLM provider", r.taskID)
|
||||
}
|
||||
sel.provider, sel.retry = prov, cfg.Retry
|
||||
sel.healthProfileID = healthIDFor(prov, id)
|
||||
return sel, nil
|
||||
}
|
||||
|
||||
@@ -242,7 +271,7 @@ func (r *taskLLMRuntime) activeCfg() (agent.Config, bool) {
|
||||
if err != nil || pt == nil {
|
||||
return agent.Config{}, false
|
||||
}
|
||||
if _, cfg, ok := r.s.agentBindingProvider(r.agentKey); ok {
|
||||
if _, cfg, _, ok := r.s.agentBindingProvider(r.agentKey); ok {
|
||||
return cfg, true
|
||||
}
|
||||
if len(pt.LLMProfileIDs) > 0 && pt.ActiveLLMProfileID != nil {
|
||||
@@ -280,10 +309,19 @@ func parseTaskID(id string) (int64, error) {
|
||||
|
||||
// streamHooks builds the failover/exhaustion callbacks shared by Stream and
|
||||
// Complete: how to read the current profile selection, how to mark it quota
|
||||
// exhausted, and how to emit a failover transition.
|
||||
// exhausted, how to emit a failover transition, and how to report breaker
|
||||
// health for providers that are not the failover Pool.
|
||||
func (r *taskLLMRuntime) streamHooks() taskLLMStreamHooks {
|
||||
return taskLLMStreamHooks{
|
||||
current: func(ctx context.Context) (taskLLMSelection, error) { return r.currentFor(ctx) },
|
||||
recordHealth: func(ctx context.Context, profileID int64, stream, committed bool, err error) {
|
||||
if profileID == 0 || r.s == nil || r.s.llmHealth == nil {
|
||||
return
|
||||
}
|
||||
if tripped, msg := r.s.llmHealth.RecordCall(ctx, profileID, stream, committed, err); tripped {
|
||||
log.Printf("[task-llm] profile #%d breaker tripped: %s", profileID, msg)
|
||||
}
|
||||
},
|
||||
exhaust: func(selection taskLLMSelection, cause error) (db.TaskLLMTransition, error) {
|
||||
taskNum, _ := parseTaskID(r.taskID)
|
||||
transition, err := r.s.m.pg.MarkTaskLLMProfileQuotaExhaustedAtRevision(taskNum, selection.profileID, selection.revision, cause.Error())
|
||||
@@ -338,6 +376,9 @@ func completeTaskLLM(ctx context.Context, taskID string, req llm.CompletionReque
|
||||
for attempt := 0; ; attempt++ {
|
||||
msg, sr, usage, callErr = selection.provider.Complete(ctx, req)
|
||||
total.Add(usage)
|
||||
if hooks.recordHealth != nil {
|
||||
hooks.recordHealth(ctx, selection.healthProfileID, false, false, callErr)
|
||||
}
|
||||
if callErr != nil && ctx.Err() == nil &&
|
||||
attempt < retries && isRetryableStreamError(callErr) {
|
||||
backoff := backoffOf(attempt)
|
||||
@@ -462,6 +503,9 @@ func streamTaskLLM(ctx context.Context, taskID string, req llm.CompletionRequest
|
||||
return
|
||||
}
|
||||
}
|
||||
if hooks.recordHealth != nil {
|
||||
hooks.recordHealth(ctx, selection.healthProfileID, true, committed, streamErr)
|
||||
}
|
||||
if streamErr != nil && !committed {
|
||||
// A failed uncommitted attempt delivers none of its events (they are
|
||||
// never replayed), but the usage it reported survives as one
|
||||
@@ -635,7 +679,7 @@ func isRetryableStreamError(err error) bool {
|
||||
// CompactionWindow mirrors current()'s precedence so the context window always
|
||||
// matches the provider the role will actually stream on.
|
||||
func (r *taskLLMRuntime) CompactionWindow() int {
|
||||
if _, cfg, ok := r.s.agentBindingProvider(r.agentKey); ok {
|
||||
if _, cfg, _, ok := r.s.agentBindingProvider(r.agentKey); ok {
|
||||
return cfg.CompactionWindow()
|
||||
}
|
||||
taskNum, err := parseTaskID(r.taskID)
|
||||
@@ -671,17 +715,19 @@ func (r *taskLLMRuntime) CompactionWindow() int {
|
||||
// (agents.llm_profile_id) — the highest-precedence level for task agents. ok=false
|
||||
// when the role has no binding or the bound profile no longer builds, so callers
|
||||
// fall through to the task chain. A bound profile stays exclusive unless
|
||||
// llm_pool_bind_fallback is on, which is what poolForBinding encodes.
|
||||
func (s *Server) agentBindingProvider(agentKey string) (llm.Provider, agent.Config, bool) {
|
||||
// llm_pool_bind_fallback is on, which is what poolForBinding encodes. The
|
||||
// returned id is the binding's profile, used to key breaker health when the
|
||||
// returned provider is not the Pool.
|
||||
func (s *Server) agentBindingProvider(agentKey string) (llm.Provider, agent.Config, int64, bool) {
|
||||
id := s.effectiveProfileForAgent(agentKey, nil)
|
||||
if id == nil {
|
||||
return nil, agent.Config{}, false
|
||||
return nil, agent.Config{}, 0, false
|
||||
}
|
||||
prov, cfg, ok := s.providerForProfile(*id)
|
||||
if !ok {
|
||||
return nil, agent.Config{}, false
|
||||
return nil, agent.Config{}, 0, false
|
||||
}
|
||||
return s.poolForBinding(*id, prov, cfg), cfg, true
|
||||
return s.poolForBinding(*id, prov, cfg), cfg, *id, true
|
||||
}
|
||||
|
||||
// globalProvider returns the process-wide provider (persisted active profile or
|
||||
@@ -696,6 +742,19 @@ func (s *Server) globalProvider() (llm.Provider, agent.Config, bool) {
|
||||
return s.llmProv, s.llmCfg, true
|
||||
}
|
||||
|
||||
// globalProviderWithProfile is globalProvider plus the llm_profiles row the
|
||||
// provider was built from (0 for an environment-only configuration). The id is
|
||||
// read under the same lock as the provider so the pair cannot be mixed across
|
||||
// an applyLLM rebuild.
|
||||
func (s *Server) globalProviderWithProfile() (llm.Provider, agent.Config, int64, bool) {
|
||||
s.cfgMu.Lock()
|
||||
defer s.cfgMu.Unlock()
|
||||
if !s.llmOn || s.llmProv == nil {
|
||||
return nil, agent.Config{}, 0, false
|
||||
}
|
||||
return s.llmProv, s.llmCfg, s.llmHealthProfileID, true
|
||||
}
|
||||
|
||||
// taskRuntimeAvailable reports whether every listed role can resolve a provider
|
||||
// under the runtime precedence in current(): the role's own binding first, then
|
||||
// the task chain, then global. An exhausted chain is a hard stop for unbound
|
||||
@@ -714,7 +773,7 @@ func (s *Server) taskRuntimeAvailable(t *Task, agentKeys ...string) bool {
|
||||
_, _, unboundReady = s.globalProvider()
|
||||
}
|
||||
for _, key := range agentKeys {
|
||||
if _, _, ok := s.agentBindingProvider(key); ok {
|
||||
if _, _, _, ok := s.agentBindingProvider(key); ok {
|
||||
continue
|
||||
}
|
||||
if !unboundReady {
|
||||
|
||||
@@ -0,0 +1,150 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/Autumn-27/artex/agent"
|
||||
"github.com/Autumn-27/artex/db"
|
||||
"github.com/Autumn-27/artex/llmpool"
|
||||
"github.com/Autumn-27/norma/llm"
|
||||
)
|
||||
|
||||
// healthHooks runs one logical call on p and reports every physical attempt to
|
||||
// reg under healthID, the way streamHooks wires it in production.
|
||||
func healthHooks(reg *llmpool.Registry, p llm.Provider, healthID int64) taskLLMStreamHooks {
|
||||
return taskLLMStreamHooks{
|
||||
current: func(context.Context) (taskLLMSelection, error) {
|
||||
return taskLLMSelection{provider: p, healthProfileID: healthID, retry: agent.RetryConfig{StreamAttempts: 1}}, nil
|
||||
},
|
||||
exhaust: func(taskLLMSelection, error) (db.TaskLLMTransition, error) { return db.TaskLLMTransition{}, nil },
|
||||
recordHealth: func(ctx context.Context, profileID int64, stream, committed bool, err error) {
|
||||
reg.RecordCall(ctx, profileID, stream, committed, err)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// A successful call clears a degraded profile, on both call shapes.
|
||||
func TestTaskLLMRecordsHealthOnSuccess(t *testing.T) {
|
||||
resetLLMFailStreaksForTest()
|
||||
ctx := context.Background()
|
||||
for _, stream := range []bool{false, true} {
|
||||
t.Run(fmt.Sprintf("stream=%v", stream), func(t *testing.T) {
|
||||
reg := llmpool.NewRegistry(nil, nil)
|
||||
reg.RecordCall(ctx, 7, false, false, fmt.Errorf("openai: status 500: down"))
|
||||
if st := reg.Get(7); st.Fails != 1 {
|
||||
t.Fatalf("seed state=%+v, want one failure", st)
|
||||
}
|
||||
runLogicalCall(ctx, stream, "health-success", healthHooks(reg, &scriptedLLMProvider{}, 7))
|
||||
if st := reg.Get(7); st.Fails != 0 || st.Trips != 0 {
|
||||
t.Fatalf("state=%+v after success, want clean", st)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// A deterministic 400 on an atomic call clears the streak, matching
|
||||
// Pool.Complete; the same error on a stream leaves it alone, matching
|
||||
// Pool.Stream.
|
||||
func TestTaskLLMRecordsNonFailoverErrorLikeThePool(t *testing.T) {
|
||||
resetLLMFailStreaksForTest()
|
||||
ctx := context.Background()
|
||||
bad := fmt.Errorf("openai: status 400: bad request")
|
||||
reg := llmpool.NewRegistry(nil, nil)
|
||||
reg.RecordCall(ctx, 7, false, false, fmt.Errorf("openai: status 500: down"))
|
||||
runLogicalCall(ctx, false, "health-atomic-400", healthHooks(reg, &scriptedLLMProvider{err: bad}, 7))
|
||||
if st := reg.Get(7); st.Fails != 0 || st.Trips != 0 {
|
||||
t.Fatalf("atomic state=%+v after 400, want clean", st)
|
||||
}
|
||||
|
||||
reg2 := llmpool.NewRegistry(nil, nil)
|
||||
reg2.RecordCall(ctx, 8, false, false, fmt.Errorf("openai: status 500: down"))
|
||||
runLogicalCall(ctx, true, "health-stream-400", healthHooks(reg2, &scriptedLLMProvider{err: bad}, 8))
|
||||
if st := reg2.Get(8); st.Fails != 1 || st.Trips != 0 {
|
||||
t.Fatalf("stream state=%+v after 400, want the failure kept", st)
|
||||
}
|
||||
}
|
||||
|
||||
// Every physical stream attempt is reported: a retried pre-commit 500 counts
|
||||
// twice and does not trip a three-strike breaker.
|
||||
func TestTaskLLMRecordsEveryStreamAttempt(t *testing.T) {
|
||||
resetLLMFailStreaksForTest()
|
||||
defer withZeroRetryBackoff()()
|
||||
ctx := context.Background()
|
||||
reg := llmpool.NewRegistry(nil, nil)
|
||||
p := &scriptedLLMProvider{err: fmt.Errorf("openai: status 500: down")}
|
||||
runLogicalCall(ctx, true, "health-retry", healthHooks(reg, p, 7))
|
||||
if p.calls != 2 {
|
||||
t.Fatalf("provider calls=%d, want one attempt plus one retry", p.calls)
|
||||
}
|
||||
if st := reg.Get(7); st.Fails != 2 || st.Trips != 0 {
|
||||
t.Fatalf("state=%+v, want two soft failures and no trip", st)
|
||||
}
|
||||
}
|
||||
|
||||
// A failure after output reached the caller is committed: the Pool does not
|
||||
// fail over there and the breaker is left alone.
|
||||
func TestTaskLLMRecordsCommittedFailureAsNoHealthEvent(t *testing.T) {
|
||||
resetLLMFailStreaksForTest()
|
||||
reg := llmpool.NewRegistry(nil, nil)
|
||||
p := &scriptedLLMProvider{
|
||||
events: []llm.StreamEvent{{Type: llm.SETextDelta, Text: "partial"}},
|
||||
err: fmt.Errorf("openai: status 500: mid-stream drop"),
|
||||
}
|
||||
runLogicalCall(context.Background(), true, "health-committed", healthHooks(reg, p, 7))
|
||||
if st := reg.Get(7); st.Fails != 0 || st.Trips != 0 {
|
||||
t.Fatalf("state=%+v after a committed failure, want clean", st)
|
||||
}
|
||||
}
|
||||
|
||||
// Without a health profile (environment-only configuration) nothing is
|
||||
// recorded.
|
||||
func TestTaskLLMRecordsNoHealthWithoutProfile(t *testing.T) {
|
||||
resetLLMFailStreaksForTest()
|
||||
reg := llmpool.NewRegistry(nil, nil)
|
||||
p := &scriptedLLMProvider{err: fmt.Errorf("openai: status 500: down")}
|
||||
runLogicalCall(context.Background(), true, "health-none", healthHooks(reg, p, 0))
|
||||
if n := len(reg.Snapshot()); n != 0 {
|
||||
t.Fatalf("%d states recorded with healthProfileID 0", n)
|
||||
}
|
||||
}
|
||||
|
||||
// healthIDFor keys the registry only for a provider that does not record by
|
||||
// itself: a Pool already updates every member attempt.
|
||||
func TestHealthIDForSkipsPooledProviders(t *testing.T) {
|
||||
bare := &scriptedLLMProvider{}
|
||||
pool := llmpool.New([]*llmpool.Member{{ID: 9, Prov: bare}}, nil)
|
||||
if pool == nil {
|
||||
t.Fatal("pool should be non-nil")
|
||||
}
|
||||
if got := healthIDFor(bare, 7); got != 7 {
|
||||
t.Fatalf("bare provider id=%d, want 7", got)
|
||||
}
|
||||
if got := healthIDFor(pool, 7); got != 0 {
|
||||
t.Fatalf("pooled provider id=%d, want 0", got)
|
||||
}
|
||||
if got := healthIDFor(bare, 0); got != 0 {
|
||||
t.Fatalf("profile 0 id=%d, want 0", got)
|
||||
}
|
||||
}
|
||||
|
||||
// The production hook closure records under the given profile and no-ops on 0.
|
||||
func TestStreamHooksRecordBreakerHealth(t *testing.T) {
|
||||
reg := llmpool.NewRegistry(nil, nil)
|
||||
r := &taskLLMRuntime{s: &Server{llmHealth: reg}}
|
||||
h := r.streamHooks()
|
||||
ctx := context.Background()
|
||||
h.recordHealth(ctx, 0, false, false, fmt.Errorf("openai: status 500: down"))
|
||||
if n := len(reg.Snapshot()); n != 0 {
|
||||
t.Fatalf("%d states recorded for profile 0", n)
|
||||
}
|
||||
h.recordHealth(ctx, 7, false, false, fmt.Errorf("openai: status 500: down"))
|
||||
if st := reg.Get(7); st.Fails != 1 {
|
||||
t.Fatalf("state=%+v, want one failure", st)
|
||||
}
|
||||
h.recordHealth(ctx, 7, false, false, nil)
|
||||
if st := reg.Get(7); st.Fails != 0 || st.Trips != 0 {
|
||||
t.Fatalf("state=%+v after success, want clean", st)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestConsoleBrowserProtections(t *testing.T) {
|
||||
handler := (&Server{}).Handler()
|
||||
headers := map[string]string{
|
||||
"Content-Security-Policy": "frame-ancestors 'self'",
|
||||
"X-Frame-Options": "SAMEORIGIN",
|
||||
"Referrer-Policy": "same-origin",
|
||||
}
|
||||
|
||||
for _, path := range []string{"/", "/settings/"} {
|
||||
res := httptest.NewRecorder()
|
||||
handler.ServeHTTP(res, httptest.NewRequest(http.MethodGet, path, nil))
|
||||
sent := res.Result().Header
|
||||
for name, want := range headers {
|
||||
if got := sent.Get(name); got != want {
|
||||
t.Errorf("%s: %s = %q, want %q", path, name, got, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
res := httptest.NewRecorder()
|
||||
handler.ServeHTTP(res, httptest.NewRequest(http.MethodGet, "/api/health", nil))
|
||||
if res.Code != http.StatusOK {
|
||||
t.Fatalf("health: status = %d, want %d", res.Code, http.StatusOK)
|
||||
}
|
||||
sent := res.Result().Header
|
||||
for name := range headers {
|
||||
if got := sent.Get(name); got != "" {
|
||||
t.Errorf("health: unexpected %s = %q", name, got)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package traffic
|
||||
|
||||
import (
|
||||
"math"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestClampBlobRange(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
offset, length int64
|
||||
size int64
|
||||
wantOff, wantN int64
|
||||
wantEmpty bool
|
||||
}{
|
||||
{"zero length means rest", 2, 0, 10, 2, 8, false},
|
||||
{"negative length means rest", 2, -1, 10, 2, 8, false},
|
||||
{"exact rest", 2, 8, 10, 2, 8, false},
|
||||
{"past end", 2, 100, 10, 2, 8, false},
|
||||
{"offset at end", 10, 4, 10, 10, 0, true},
|
||||
{"offset past end", 11, 4, 10, 11, 0, true},
|
||||
{"negative offset", -3, 4, 10, 0, 4, false},
|
||||
{"empty blob", 0, 10, 0, 0, 0, true},
|
||||
{"overflow length", 1, math.MaxInt64, 10, 1, 9, false},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
off, n, empty := clampBlobRange(tc.offset, tc.length, tc.size)
|
||||
if off != tc.wantOff || n != tc.wantN || empty != tc.wantEmpty {
|
||||
t.Fatalf("got off=%d n=%d empty=%v, want off=%d n=%d empty=%v",
|
||||
off, n, empty, tc.wantOff, tc.wantN, tc.wantEmpty)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -38,6 +38,15 @@ func (t *Traffic) RecordExternal(e ExternalExchange) error {
|
||||
if method == "" {
|
||||
return fmt.Errorf("empty method for %q", e.URL)
|
||||
}
|
||||
if !validHeaderName(method) {
|
||||
return fmt.Errorf("invalid method %q", e.Method)
|
||||
}
|
||||
if err := validateExternalHeaders(e.RequestHeaders); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := validateExternalHeaders(e.ResponseHeaders); err != nil {
|
||||
return err
|
||||
}
|
||||
status := e.Status
|
||||
if status == 0 {
|
||||
status = 200
|
||||
@@ -120,6 +129,18 @@ VALUES(?,?,?,?,?,?,?)`,
|
||||
return nil
|
||||
}
|
||||
|
||||
func validateExternalHeaders(h map[string]string) error {
|
||||
for k, v := range h {
|
||||
if !validHeaderName(k) {
|
||||
return fmt.Errorf("invalid header name %q", k)
|
||||
}
|
||||
if strings.ContainsAny(v, "\r\n\x00") {
|
||||
return fmt.Errorf("header %s contains a line break", k)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func toHeaderMap(flat map[string]string) map[string][]string {
|
||||
m := make(map[string][]string, len(flat))
|
||||
for k, v := range flat {
|
||||
|
||||
@@ -68,10 +68,18 @@ func TestRecordExternalRejectsBadInput(t *testing.T) {
|
||||
{Method: "GET", URL: "not a url"},
|
||||
{Method: "GET", URL: ""},
|
||||
{Method: "", URL: "https://api.example.com/"},
|
||||
{Method: "GET\r\nX-Injected: 1", URL: "https://api.example.com/"},
|
||||
{Method: "GET", URL: "https://api.example.com/", RequestHeaders: map[string]string{"X-Bad\nName": "1"}},
|
||||
{Method: "GET", URL: "https://api.example.com/", RequestHeaders: map[string]string{"x-ok": "one\r\ntwo"}},
|
||||
{Method: "GET", URL: "https://api.example.com/", ResponseHeaders: map[string]string{"x-capture": "ok\r\nX-Forged-Header: injected"}},
|
||||
{Method: "GET", URL: "https://api.example.com/", ResponseHeaders: map[string]string{"x-nul": "a\x00b"}},
|
||||
}
|
||||
for i, c := range cases {
|
||||
if err := tr.RecordExternal(c); err == nil {
|
||||
t.Fatalf("case %d: expected an error for %+v", i, c)
|
||||
}
|
||||
}
|
||||
if n, _ := tr.Count(); n != 0 {
|
||||
t.Fatalf("rejected exchanges were stored: count=%d", n)
|
||||
}
|
||||
}
|
||||
|
||||
+19
-7
@@ -942,15 +942,10 @@ func (t *Traffic) BlobRange(hash string, offset, length int64) (data []byte, tot
|
||||
return nil, 0, err
|
||||
}
|
||||
defer f.Close()
|
||||
if offset < 0 {
|
||||
offset = 0
|
||||
}
|
||||
if offset >= size {
|
||||
offset, length, empty := clampBlobRange(offset, length, size)
|
||||
if empty {
|
||||
return nil, size, nil
|
||||
}
|
||||
if length <= 0 || offset+length > size {
|
||||
length = size - offset
|
||||
}
|
||||
buf := make([]byte, length)
|
||||
n, err := f.ReadAt(buf, offset)
|
||||
if err != nil && !errors.Is(err, io.EOF) {
|
||||
@@ -959,6 +954,23 @@ func (t *Traffic) BlobRange(hash string, offset, length int64) (data []byte, tot
|
||||
return buf[:n], size, nil
|
||||
}
|
||||
|
||||
// clampBlobRange returns a safe (offset, length) for a blob of size bytes.
|
||||
// length > size-offset is used instead of offset+length > size so a huge
|
||||
// length cannot wrap int64 and skip the cap.
|
||||
func clampBlobRange(offset, length, size int64) (off, n int64, empty bool) {
|
||||
if offset < 0 {
|
||||
offset = 0
|
||||
}
|
||||
if size <= 0 || offset >= size {
|
||||
return offset, 0, true
|
||||
}
|
||||
remain := size - offset
|
||||
if length <= 0 || length > remain {
|
||||
length = remain
|
||||
}
|
||||
return offset, length, false
|
||||
}
|
||||
|
||||
// ExchangeMeta is one row of the index (returned by Search).
|
||||
type ExchangeMeta struct {
|
||||
ID string `json:"id"`
|
||||
|
||||
@@ -60,6 +60,7 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@
|
||||
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
|
||||
import { api } from "@/lib/api";
|
||||
import { parseCompanyScopeText } from "@/lib/company-scope";
|
||||
import { httpHref } from "@/lib/http-href";
|
||||
import type { Asset, Company, CompanyScopeRule } from "@/lib/types";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
@@ -605,10 +606,11 @@ export default function AssetsPage() {
|
||||
const isHttp = a.service_type === "http";
|
||||
const svc = a.service_name || (isHttp ? "http" : "") || a.service_type || "";
|
||||
let domainCell: React.ReactNode = "—";
|
||||
if (isHttp && a.url) {
|
||||
const href = isHttp ? httpHref(a.url) : undefined;
|
||||
if (href) {
|
||||
domainCell = (
|
||||
<a
|
||||
href={a.url}
|
||||
href={href}
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
className="text-blue-600 hover:underline dark:text-blue-400"
|
||||
@@ -616,8 +618,8 @@ export default function AssetsPage() {
|
||||
{a.domain || a.url}
|
||||
</a>
|
||||
);
|
||||
} else if (a.domain) {
|
||||
domainCell = a.domain;
|
||||
} else if (a.domain || a.url) {
|
||||
domainCell = a.domain || a.url;
|
||||
}
|
||||
return (
|
||||
<TableRow key={a.id} className={selected.has(a.id) ? "bg-muted/40" : undefined}>
|
||||
|
||||
@@ -37,7 +37,14 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@
|
||||
import { Spinner } from "@/components/ui/spinner";
|
||||
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
|
||||
import { statusMeta, type Tone, toneClasses } from "@/lib/status";
|
||||
import type { ActiveFindingRetest, Finding, FindingStatus, Severity, VerificationStatus } from "@/lib/types";
|
||||
import type {
|
||||
ActiveFindingRetest,
|
||||
Finding,
|
||||
FindingReportState,
|
||||
FindingStatus,
|
||||
Severity,
|
||||
VerificationStatus,
|
||||
} from "@/lib/types";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
export const SEVERITIES: Severity[] = ["critical", "high", "medium", "low"];
|
||||
@@ -62,6 +69,37 @@ export const VERIFICATION_STATUSES: VerificationStatus[] = [
|
||||
"false_positive",
|
||||
];
|
||||
|
||||
export const FINDING_REPORT_STATES: FindingReportState[] = [
|
||||
"none",
|
||||
"submitted",
|
||||
"accepted",
|
||||
"rejected",
|
||||
"duplicate",
|
||||
];
|
||||
|
||||
export const REPORT_STATE_META: Record<FindingReportState, { label: string; tone: Tone }> = {
|
||||
none: { label: "Not submitted", tone: "slate" },
|
||||
submitted: { label: "Submitted", tone: "amber" },
|
||||
accepted: { label: "Accepted", tone: "green" },
|
||||
rejected: { label: "Rejected", tone: "red" },
|
||||
duplicate: { label: "Duplicate report", tone: "neutral" },
|
||||
};
|
||||
|
||||
export function ReportStateBadge({ state }: { state?: FindingReportState }) {
|
||||
const value = state ?? "none";
|
||||
const meta = REPORT_STATE_META[value] ?? REPORT_STATE_META.none;
|
||||
return (
|
||||
<span
|
||||
className={cn(
|
||||
"inline-flex w-fit items-center whitespace-nowrap rounded-md border px-2 py-0.5 font-medium text-xs",
|
||||
toneClasses[meta.tone],
|
||||
)}
|
||||
>
|
||||
{meta.label}
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
||||
// Verification outcome → label/tone, on the same tone tokens StatusBadge uses.
|
||||
export const VERIFICATION_META: Record<VerificationStatus, { label: string; tone: Tone }> = {
|
||||
verified: { label: "Verified", tone: "green" },
|
||||
@@ -125,7 +163,7 @@ export function fmtTime(ts: string) {
|
||||
});
|
||||
}
|
||||
|
||||
const COLUMN_COUNT = 9;
|
||||
const COLUMN_COUNT = 10;
|
||||
|
||||
interface FindingsTableProps {
|
||||
items: Finding[];
|
||||
@@ -141,6 +179,7 @@ interface FindingsTableProps {
|
||||
saving: boolean;
|
||||
onSave: (finding: Finding) => void;
|
||||
onStatusChange: (finding: Finding, next: FindingStatus) => void;
|
||||
onReportStateChange: (finding: Finding, next: FindingReportState) => void;
|
||||
onRetest: (finding: Finding) => void;
|
||||
activeRetests: Record<string, ActiveFindingRetest>;
|
||||
onDeepen: (finding: Finding) => void;
|
||||
@@ -164,6 +203,7 @@ export function FindingsTable({
|
||||
saving,
|
||||
onSave,
|
||||
onStatusChange,
|
||||
onReportStateChange,
|
||||
onRetest,
|
||||
activeRetests,
|
||||
onDeepen,
|
||||
@@ -181,7 +221,7 @@ export function FindingsTable({
|
||||
|
||||
return (
|
||||
/* Fixed column widths keep expanded content from stretching the table; narrow screens scroll horizontally inside the table only. */
|
||||
<Table className="min-w-[60rem] table-fixed">
|
||||
<Table className="min-w-[68rem] table-fixed">
|
||||
<TableHeader>
|
||||
<TableRow>
|
||||
<TableHead className="w-8">
|
||||
@@ -196,6 +236,7 @@ export function FindingsTable({
|
||||
<TableHead>Vulnerability</TableHead>
|
||||
<TableHead className="w-44">Asset</TableHead>
|
||||
<TableHead className="w-28">Status</TableHead>
|
||||
<TableHead className="w-36">Report</TableHead>
|
||||
<TableHead className="w-32">Task</TableHead>
|
||||
<TableHead className="w-24">Time</TableHead>
|
||||
<TableHead className="w-48">Actions</TableHead>
|
||||
@@ -296,6 +337,27 @@ export function FindingsTable({
|
||||
<StatusBadge domain="finding" value={f.status} dot />
|
||||
)}
|
||||
</TableCell>
|
||||
<TableCell onClick={(e) => e.stopPropagation()}>
|
||||
{f.finding_id ? (
|
||||
<Select
|
||||
value={f.report_state ?? "none"}
|
||||
onValueChange={(v) => onReportStateChange(f, v as FindingReportState)}
|
||||
>
|
||||
<SelectTrigger size="sm" className="h-7 w-full border-none px-1 shadow-none focus-visible:ring-0">
|
||||
<ReportStateBadge state={f.report_state} />
|
||||
</SelectTrigger>
|
||||
<SelectContent position="popper" align="end">
|
||||
{FINDING_REPORT_STATES.map((st) => (
|
||||
<SelectItem key={st} value={st}>
|
||||
{REPORT_STATE_META[st].label}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
) : (
|
||||
<ReportStateBadge state={f.report_state} />
|
||||
)}
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
{f.task_id ? (
|
||||
<Link
|
||||
|
||||
@@ -23,9 +23,14 @@ import { SidebarTrigger } from "@/components/ui/sidebar";
|
||||
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
|
||||
import { api } from "@/lib/api";
|
||||
import { statusMeta } from "@/lib/status";
|
||||
import type { Finding, FindingStatus, Severity } from "@/lib/types";
|
||||
import type { Finding, FindingReportState, FindingStatus, Severity } from "@/lib/types";
|
||||
|
||||
import { VerificationBadge } from "../_components/findings-table";
|
||||
import {
|
||||
FINDING_REPORT_STATES,
|
||||
REPORT_STATE_META,
|
||||
ReportStateBadge,
|
||||
VerificationBadge,
|
||||
} from "../_components/findings-table";
|
||||
import { FindingLineageView } from "./lineage";
|
||||
|
||||
const SEVERITIES: Severity[] = ["critical", "high", "medium", "low"];
|
||||
@@ -112,6 +117,23 @@ function FindingDetailInner() {
|
||||
[finding, id],
|
||||
);
|
||||
|
||||
const changeReportState = React.useCallback(
|
||||
async (next: FindingReportState) => {
|
||||
if (!finding || finding.inherited || next === (finding.report_state ?? "none")) return;
|
||||
const prev = finding.report_state ?? "none";
|
||||
setFinding({ ...finding, report_state: next });
|
||||
try {
|
||||
const updated = await api.setFindingReportState(id, next);
|
||||
setFinding(updated);
|
||||
toast.success(`Report stage changed to "${REPORT_STATE_META[next].label}"`);
|
||||
} catch (e) {
|
||||
setFinding((cur) => (cur ? { ...cur, report_state: prev } : cur));
|
||||
toast.error("Update failed: " + (e as Error).message);
|
||||
}
|
||||
},
|
||||
[finding, id],
|
||||
);
|
||||
|
||||
if (!finding) {
|
||||
return (
|
||||
<div className="flex flex-1 flex-col items-center justify-center gap-3 p-10 text-center">
|
||||
@@ -148,6 +170,7 @@ function FindingDetailInner() {
|
||||
<Separator orientation="vertical" className="mx-1 h-4" />
|
||||
<StatusBadge domain="severity" value={finding.severity} dot />
|
||||
<StatusBadge domain="finding" value={finding.status} dot />
|
||||
<ReportStateBadge state={finding.report_state} />
|
||||
<VerificationBadge finding={finding} />
|
||||
{finding.inherited && finding.source_task_id && (
|
||||
<Badge variant="outline">Source task #{finding.source_task_id} · read-only</Badge>
|
||||
@@ -294,6 +317,30 @@ function FindingDetailInner() {
|
||||
)}
|
||||
</FieldRow>
|
||||
|
||||
<FieldRow label="Report stage">
|
||||
{finding.inherited ? (
|
||||
<ReportStateBadge state={finding.report_state} />
|
||||
) : (
|
||||
<Select
|
||||
value={finding.report_state ?? "none"}
|
||||
onValueChange={(v) => changeReportState(v as FindingReportState)}
|
||||
>
|
||||
<SelectTrigger size="sm" className="h-7 w-auto border-none px-1 shadow-none focus-visible:ring-0">
|
||||
<ReportStateBadge state={finding.report_state} />
|
||||
</SelectTrigger>
|
||||
<SelectContent position="popper" align="end">
|
||||
<SelectGroup>
|
||||
{FINDING_REPORT_STATES.map((st) => (
|
||||
<SelectItem key={st} value={st}>
|
||||
{REPORT_STATE_META[st].label}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectGroup>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
)}
|
||||
</FieldRow>
|
||||
|
||||
{/* Verification: automated outcome; the note explains any state other than verified */}
|
||||
{finding.verification_status && (
|
||||
<FieldRow label="Verification">
|
||||
|
||||
@@ -8,8 +8,10 @@ import {
|
||||
ArrowUpRightIcon,
|
||||
BugIcon,
|
||||
ChevronRightIcon,
|
||||
CircleCheckIcon,
|
||||
ClockIcon,
|
||||
DownloadIcon,
|
||||
FileUpIcon,
|
||||
InfoIcon,
|
||||
SearchIcon,
|
||||
ShieldAlertIcon,
|
||||
@@ -46,6 +48,7 @@ import type {
|
||||
Finding,
|
||||
FindingAssetNode,
|
||||
FindingGroup,
|
||||
FindingReportState,
|
||||
FindingStats,
|
||||
FindingStatus,
|
||||
Severity,
|
||||
@@ -55,6 +58,7 @@ import { cn } from "@/lib/utils";
|
||||
|
||||
import { AssetTree, assetPathOf } from "./_components/asset-tree";
|
||||
import {
|
||||
FINDING_REPORT_STATES,
|
||||
FINDING_STATUSES,
|
||||
type FindingEdit,
|
||||
type FindingReport,
|
||||
@@ -62,6 +66,7 @@ import {
|
||||
findingRowKey,
|
||||
fmtTime,
|
||||
isSameFinding,
|
||||
REPORT_STATE_META,
|
||||
SEVERITIES,
|
||||
UNASSIGNED_TASK,
|
||||
VERIFICATION_META,
|
||||
@@ -124,6 +129,8 @@ function findingGroupKey(group: FindingGroup) {
|
||||
const EMPTY_STATS: FindingStats = {
|
||||
total: 0,
|
||||
pending: 0,
|
||||
submitted: 0,
|
||||
accepted: 0,
|
||||
critical: 0,
|
||||
high: 0,
|
||||
medium: 0,
|
||||
@@ -136,6 +143,7 @@ export default function FindingsPage() {
|
||||
const [view, setView] = React.useState<FindingView>("flat");
|
||||
const [severity, setSeverity] = React.useState<"all" | Severity>("all");
|
||||
const [status, setStatus] = React.useState<"all" | FindingStatus>("all");
|
||||
const [reportState, setReportState] = React.useState<"all" | FindingReportState>("all");
|
||||
const [verificationStatus, setVerificationStatus] = React.useState<"all" | VerificationStatus>("all");
|
||||
const [vulnclass, setVulnclass] = React.useState<string>("all");
|
||||
const [task, setTask] = React.useState<string>("all");
|
||||
@@ -167,7 +175,16 @@ export default function FindingsPage() {
|
||||
const retestRefreshVersion = React.useRef(0);
|
||||
const [deepenDescription, setDeepenDescription] = React.useState("");
|
||||
const [deepening, setDeepening] = React.useState(false);
|
||||
const filterFingerprint = JSON.stringify([severity, status, verificationStatus, vulnclass, task, sort, query]);
|
||||
const filterFingerprint = JSON.stringify([
|
||||
severity,
|
||||
status,
|
||||
reportState,
|
||||
verificationStatus,
|
||||
vulnclass,
|
||||
task,
|
||||
sort,
|
||||
query,
|
||||
]);
|
||||
const activeFilterFingerprint = React.useRef(filterFingerprint);
|
||||
activeFilterFingerprint.current = filterFingerprint;
|
||||
|
||||
@@ -205,6 +222,7 @@ export default function FindingsPage() {
|
||||
view?: unknown;
|
||||
severity?: unknown;
|
||||
status?: unknown;
|
||||
reportState?: unknown;
|
||||
verificationStatus?: unknown;
|
||||
vulnclass?: unknown;
|
||||
task?: unknown;
|
||||
@@ -217,6 +235,9 @@ export default function FindingsPage() {
|
||||
if (parsed.status === "all" || FINDING_STATUSES.includes(parsed.status as FindingStatus)) {
|
||||
setStatus(parsed.status as "all" | FindingStatus);
|
||||
}
|
||||
if (parsed.reportState === "all" || FINDING_REPORT_STATES.includes(parsed.reportState as FindingReportState)) {
|
||||
setReportState(parsed.reportState as "all" | FindingReportState);
|
||||
}
|
||||
if (
|
||||
parsed.verificationStatus === "all" ||
|
||||
VERIFICATION_STATUSES.includes(parsed.verificationStatus as VerificationStatus)
|
||||
@@ -237,9 +258,9 @@ export default function FindingsPage() {
|
||||
if (!preferencesHydrated) return;
|
||||
setLocalStorageValue(
|
||||
FINDING_LIST_PREFERENCE_KEY,
|
||||
JSON.stringify({ view, severity, status, verificationStatus, vulnclass, task, sort }),
|
||||
JSON.stringify({ view, severity, status, reportState, verificationStatus, vulnclass, task, sort }),
|
||||
);
|
||||
}, [preferencesHydrated, severity, sort, status, task, verificationStatus, view, vulnclass]);
|
||||
}, [preferencesHydrated, reportState, severity, sort, status, task, verificationStatus, view, vulnclass]);
|
||||
|
||||
React.useEffect(() => {
|
||||
const timer = window.setTimeout(() => setQuery(search.trim()), 300);
|
||||
@@ -299,7 +320,7 @@ export default function FindingsPage() {
|
||||
await api.exportFindings({
|
||||
format: exportFormat,
|
||||
scope: exportScope,
|
||||
filters: { severity, status, verificationStatus, vulnclass, task, query, sort },
|
||||
filters: { severity, status, reportState, verificationStatus, vulnclass, task, query, sort },
|
||||
ids: [...selectedIds],
|
||||
});
|
||||
setExportOpen(false);
|
||||
@@ -339,6 +360,7 @@ export default function FindingsPage() {
|
||||
pageSize: flatPageSize,
|
||||
severity,
|
||||
status,
|
||||
reportState,
|
||||
verificationStatus,
|
||||
vulnclass,
|
||||
task,
|
||||
@@ -360,6 +382,7 @@ export default function FindingsPage() {
|
||||
flatPageSize,
|
||||
severity,
|
||||
status,
|
||||
reportState,
|
||||
verificationStatus,
|
||||
vulnclass,
|
||||
task,
|
||||
@@ -375,7 +398,16 @@ export default function FindingsPage() {
|
||||
const request = ++assetTreeRequest.current;
|
||||
setAssetTree((current) => ({ ...current, loading: true }));
|
||||
try {
|
||||
const result = await api.findingAssetTree({ severity, status, verificationStatus, vulnclass, task, query, sort });
|
||||
const result = await api.findingAssetTree({
|
||||
severity,
|
||||
status,
|
||||
reportState,
|
||||
verificationStatus,
|
||||
vulnclass,
|
||||
task,
|
||||
query,
|
||||
sort,
|
||||
});
|
||||
if (request !== assetTreeRequest.current || activeFilterFingerprint.current !== requestFilter) return;
|
||||
setAssetTree({
|
||||
nodes: result.nodes ?? [],
|
||||
@@ -390,7 +422,7 @@ export default function FindingsPage() {
|
||||
setAssetTree((current) => ({ ...current, loading: false }));
|
||||
toast.error(`Failed to load the asset tree: ${(e as Error).message}`);
|
||||
}
|
||||
}, [filterFingerprint, severity, status, verificationStatus, vulnclass, task, query, sort]);
|
||||
}, [filterFingerprint, reportState, severity, status, verificationStatus, vulnclass, task, query, sort]);
|
||||
|
||||
const refreshGroups = React.useCallback(async () => {
|
||||
const requestFilter = filterFingerprint;
|
||||
@@ -402,6 +434,7 @@ export default function FindingsPage() {
|
||||
pageSize,
|
||||
severity,
|
||||
status,
|
||||
reportState,
|
||||
verificationStatus,
|
||||
vulnclass,
|
||||
task,
|
||||
@@ -415,7 +448,7 @@ export default function FindingsPage() {
|
||||
} catch {
|
||||
// Polling keeps the last successful snapshot visible.
|
||||
}
|
||||
}, [filterFingerprint, page, pageSize, severity, status, verificationStatus, vulnclass, task, query, sort]);
|
||||
}, [filterFingerprint, page, pageSize, reportState, severity, status, verificationStatus, vulnclass, task, query, sort]);
|
||||
|
||||
const loadGroup = React.useCallback(
|
||||
async (key: string, groupPage: number, groupPageSize: number) => {
|
||||
@@ -440,6 +473,7 @@ export default function FindingsPage() {
|
||||
pageSize: groupPageSize,
|
||||
severity,
|
||||
status,
|
||||
reportState,
|
||||
verificationStatus,
|
||||
vulnclass,
|
||||
task: key,
|
||||
@@ -475,7 +509,7 @@ export default function FindingsPage() {
|
||||
}));
|
||||
}
|
||||
},
|
||||
[filterFingerprint, severity, status, verificationStatus, vulnclass, query, sort],
|
||||
[filterFingerprint, reportState, severity, status, verificationStatus, vulnclass, query, sort],
|
||||
);
|
||||
|
||||
React.useEffect(() => {
|
||||
@@ -657,6 +691,34 @@ export default function FindingsPage() {
|
||||
[refreshAfterMutation, setFindings, status],
|
||||
);
|
||||
|
||||
const updateReportState = React.useCallback(
|
||||
async (f: Finding, next: FindingReportState) => {
|
||||
if (!f.finding_id || next === (f.report_state ?? "none")) return;
|
||||
const prev = f.report_state ?? "none";
|
||||
setFindings((cur) => cur.map((x) => (isSameFinding(x, f) ? { ...x, report_state: next } : x)));
|
||||
try {
|
||||
await api.setFindingReportState(f.finding_id, next);
|
||||
toast.success(`Report stage set to "${REPORT_STATE_META[next].label}"`);
|
||||
api
|
||||
.findingStats()
|
||||
.then(setStats)
|
||||
.catch(() => {
|
||||
// The row update remains valid even if the aggregate refresh fails.
|
||||
});
|
||||
if (reportState !== "all" && next !== reportState) {
|
||||
setFindings((cur) => cur.filter((x) => !isSameFinding(x, f)));
|
||||
setTotal((t) => Math.max(0, t - 1));
|
||||
setFlat((cur) => ({ ...cur, total: Math.max(0, cur.total - 1) }));
|
||||
}
|
||||
refreshAfterMutation(f);
|
||||
} catch (e) {
|
||||
setFindings((cur) => cur.map((x) => (isSameFinding(x, f) ? { ...x, report_state: prev } : x)));
|
||||
toast.error(`Update failed: ${(e as Error).message}`);
|
||||
}
|
||||
},
|
||||
[refreshAfterMutation, reportState, setFindings],
|
||||
);
|
||||
|
||||
// applyBulkStatus sets the same triage status on every selected finding, then
|
||||
// reloads the current view so rows hidden by the status filter disappear.
|
||||
const applyBulkStatus = React.useCallback(
|
||||
@@ -687,6 +749,36 @@ export default function FindingsPage() {
|
||||
[bulkBusy, loadAssetTree, loadFlat, selectedIds, view],
|
||||
);
|
||||
|
||||
const applyBulkReportState = React.useCallback(
|
||||
async (next: FindingReportState) => {
|
||||
if (selectedIds.size === 0 || bulkBusy) return;
|
||||
setBulkBusy(true);
|
||||
try {
|
||||
const r = await api.bulkSetFindingReportState([...selectedIds], next);
|
||||
setSelectedIds(new Set());
|
||||
const label = REPORT_STATE_META[next].label;
|
||||
toast.success(
|
||||
r.updated === 1
|
||||
? `Set report stage of 1 finding to "${label}"`
|
||||
: `Set report stage of ${r.updated} findings to "${label}"`,
|
||||
);
|
||||
void loadFlat();
|
||||
if (view === "asset") void loadAssetTree();
|
||||
api
|
||||
.findingStats()
|
||||
.then(setStats)
|
||||
.catch(() => {
|
||||
// The list reload remains valid even if the aggregate refresh fails.
|
||||
});
|
||||
} catch (e) {
|
||||
toast.error(`Bulk update failed: ${(e as Error).message}`);
|
||||
} finally {
|
||||
setBulkBusy(false);
|
||||
}
|
||||
},
|
||||
[bulkBusy, loadAssetTree, loadFlat, selectedIds, view],
|
||||
);
|
||||
|
||||
// The inline expanded detailed-report cache is keyed by the globally stable row key. report is long-form
|
||||
// Markdown the list query doesn't include, so it is fetched once by finding_id on expand; done with empty text = no report yet.
|
||||
const [reports, setReports] = React.useState<Record<string, FindingReport>>({});
|
||||
@@ -812,6 +904,8 @@ export default function FindingsPage() {
|
||||
const statCards = [
|
||||
{ label: "Total findings", value: stats.total, icon: BugIcon },
|
||||
{ label: "Pending", value: stats.pending, tone: "text-amber-500", icon: ClockIcon },
|
||||
{ label: "Submitted", value: stats.submitted, tone: "text-amber-500", icon: FileUpIcon },
|
||||
{ label: "Accepted", value: stats.accepted, tone: "text-emerald-500", icon: CircleCheckIcon },
|
||||
{ label: "Critical", value: stats.critical, tone: "text-rose-600", icon: ShieldAlertIcon },
|
||||
{ label: "High", value: stats.high, tone: "text-red-500", icon: TriangleAlertIcon },
|
||||
{ label: "Medium", value: stats.medium, tone: "text-amber-500", icon: TriangleAlertIcon },
|
||||
@@ -838,6 +932,7 @@ export default function FindingsPage() {
|
||||
saving,
|
||||
onSave: saveEdit,
|
||||
onStatusChange: updateStatus,
|
||||
onReportStateChange: updateReportState,
|
||||
onRetest: setRetestFinding,
|
||||
activeRetests,
|
||||
onDeepen: openDeepen,
|
||||
@@ -888,7 +983,7 @@ export default function FindingsPage() {
|
||||
</Tabs>
|
||||
</div>
|
||||
<div className="flex flex-1 flex-col gap-4 md:gap-6">
|
||||
<div className="grid grid-cols-2 gap-4 sm:grid-cols-3 lg:grid-cols-6">
|
||||
<div className="grid grid-cols-2 gap-4 sm:grid-cols-4 lg:grid-cols-8">
|
||||
{statCards.map((stat) => {
|
||||
const StatIcon = stat.icon;
|
||||
return (
|
||||
@@ -956,6 +1051,20 @@ export default function FindingsPage() {
|
||||
</SelectContent>
|
||||
</Select>
|
||||
|
||||
<Select value={reportState} onValueChange={(v) => setReportState(v as "all" | FindingReportState)}>
|
||||
<SelectTrigger size="sm" className="w-40">
|
||||
<SelectValue placeholder="Report stage" />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="all">All report stages</SelectItem>
|
||||
{FINDING_REPORT_STATES.map((st) => (
|
||||
<SelectItem key={st} value={st}>
|
||||
{REPORT_STATE_META[st].label}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
|
||||
<Select
|
||||
value={verificationStatus}
|
||||
onValueChange={(v) => setVerificationStatus(v as "all" | VerificationStatus)}
|
||||
@@ -1046,6 +1155,24 @@ export default function FindingsPage() {
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<Select
|
||||
value=""
|
||||
onValueChange={(v) => {
|
||||
if (v) void applyBulkReportState(v as FindingReportState);
|
||||
}}
|
||||
disabled={bulkBusy}
|
||||
>
|
||||
<SelectTrigger size="sm" className="w-44" aria-label="Set the report stage of the selected findings">
|
||||
<SelectValue placeholder={bulkBusy ? "Updating…" : "Set report stage"} />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{FINDING_REPORT_STATES.map((st) => (
|
||||
<SelectItem key={st} value={st}>
|
||||
{REPORT_STATE_META[st].label}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
)}
|
||||
<Button size="sm" variant="outline" onClick={openExport}>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user