diff --git a/agent/goals.go b/agent/goals.go index 9bf9e17..2dc57cf 100644 --- a/agent/goals.go +++ b/agent/goals.go @@ -82,7 +82,7 @@ type GoalSpec struct { // shares the rate limiter, gets recorded by llmrec, and participates in LLM // failover instead of quietly bypassing all three. // -// desc is the task's free-text description (背景：靶标范围/flag 数量/交战说明等). +// desc is the task's free-text description (背景：靶标范围/数量要求/交战说明等). // It is fed alongside the goal so the decomposer no longer splits blind — the // prompt still forbids inventing anything the two texts don't state. // @@ -140,7 +140,7 @@ func DecomposeGoalsWithProvider(ctx context.Context, prov llm.Provider, dataDir, } userMsg := "任务目标：\n" + goalText if d := strings.TrimSpace(desc); d != "" { - userMsg += "\n\n任务描述（背景信息，可能含靶标范围/flag 数量/交战说明；仅供参考，不要臆造其中未提及的内容）：\n" + d + userMsg += "\n\n任务描述（背景信息，可能含靶标范围/数量要求/交战说明；仅供参考，不要臆造其中未提及的内容）：\n" + d } // Use captureRun so every LLM step is emitted as an activity record (visible in // the plan tab under the round-0 marker). Falls back gracefully when emit is nil. diff --git a/agent/planner.go b/agent/planner.go index 3a13830..1010231 100644 --- a/agent/planner.go +++ b/agent/planner.go @@ -313,7 +313,7 @@ const plannerDefaultTmpl = `你是一个网络安全平台授权渗透测试系 - **要更深细节才按需调**：list_facts（分页，最新在前，默认 20，可 q 过滤、before 翻页，带 total/has_more）、list_findings（全部漏洞）、node_detail(id)（完整证据/详情；列表/recent_facts 只给摘要）、list_assets（pull：q 搜索、type/company_id/task_id 过滤、分页，或 id/ids 直取）、asset_neighbors。资产全局共享，别默认拉全量。 2. **判目标（核心职责）**：goals 字段已含目标与状态；对已被某发现/事实证明的未达成目标，调 prove_goal(goal_id, evidence_id, reason) 标 met。**当你标记的恰是最后一个未完成目标时，系统自动判定整个任务完成**——收官只由逐个 prove_goal 驱动，没有别的"一键完成"手段。 - - ⚠️ **量化验收核对（严禁提前盖章）**：目标含可量化条件（覆盖度达 X%、拿 N 个 flag、获得某权限）时，prove_goal 前【必须】核对上方 graph_overview 的实测值（coverage.pct、findings_total 计数等）：未达标就【禁止】prove_goal，改派意图补差；不得以"大体达成/核心已拿下"为由提前标 met。例：要求覆盖度 100% 而实测 coverage.pct=40% → 未达成，继续派补测意图。 + - ⚠️ **量化验收核对（严禁提前盖章）**：目标含可量化条件（覆盖度达 X%、达到指定数量、获得某权限）时，prove_goal 前【必须】核对上方 graph_overview 的实测值（coverage.pct、findings_total 计数等）：未达标就【禁止】prove_goal，改派意图补差；不得以"大体达成/核心已拿下"为由提前标 met。例：要求覆盖度 100% 而实测 coverage.pct=40% → 未达成，继续派补测意图。 3. **（可选，仅开局、极轻量）探测理解**：仅当图里几乎还没有 fact（recent_facts 基本为空、任务刚开始）、仅凭态势无法把初始意图说具体时，才用 Bash 等对目标做极少量、只读的探测（如 1–2 次 curl 看首页/指纹）。**唯一合法产物是一句更精准的意图描述**——绝不是漏洞的发现/验证/利用，也不是端点/目录/参数的枚举结果（那些是 worker 的活，写成意图派下去）。三条硬边界： - 图里已有 worker 产出的 fact（facts>0 / recent_facts 非空）→【禁止】再自己探测，一切判断基于已有 fact，本轮产物只能是"派新意图"或"结束"；想深挖某线索 → 派意图让 worker 去查，不是自己 curl。 diff --git a/agent/promptcatalog.go b/agent/promptcatalog.go index 1f0bd1b..67f1fa7 100644 --- a/agent/promptcatalog.go +++ b/agent/promptcatalog.go @@ -15,7 +15,7 @@ package agent const autoDefaultTmpl = `你是 **Auto**，这个渗透测试平台的「操作助手」。你不亲自渗透，而是**用工具操作平台**、按用户指令把事情办好。 你能做的（取决于给你开放了哪些工具）： -1. **任务操作**：list_tasks 看全局、spawn_task 起子任务、get_task_graph / list_task_findings 读某任务的进展与漏洞(含 flag)、get_task_worker_trace 看某个 work 的执行过程、pause_task 暂停、add_task_hint 给任务注入提示。 +1. **任务操作**：list_tasks 看全局、spawn_task 起子任务、get_task_graph / list_task_findings 读某任务的进展与漏洞、get_task_worker_trace 看某个 work 的执行过程、pause_task 暂停、add_task_hint 给任务注入提示。 2. **平台管理**：create_skill / update_skill 建改技能；create_custom_tool / update_custom_tool 建改自定义工具(command/script/http)；create_mcp / update_mcp 建改 MCP 服务器。 原则： diff --git a/agent/tools.go b/agent/tools.go index adb09c4..52774b2 100644 --- a/agent/tools.go +++ b/agent/tools.go @@ -1208,7 +1208,7 @@ func (t *ToolSet) proveGoal() actool.CoreTool { } func (t *ToolSet) goalMet() actool.CoreTool { - return writeTool("goal_met", "【立即结束整个任务】——仅当你确认任务的【全部目标都已真正达成、整体收官】时才调（注意是任务【整体】完成；仅仅达成了其中某一个目标/某一个 flag/某一个漏洞【不算】——那种情况用 prove_goal 标记该目标即可）。⚠️它不是用来“结束本轮规划”的：本轮没有新意图要派、或在等 worker 产出，都【直接结束本轮即可，不要调本工具】（0 个意图是完全正常的）。正常判定优先用 prove_goal 逐个证明目标；goal_met 只是绕过逐个证明、直接从全局收官的手段。", + return writeTool("goal_met", "【立即结束整个任务】——仅当你确认任务的【全部目标都已真正达成、整体收官】时才调（注意是任务【整体】完成；仅仅达成了其中某一个目标/某一个漏洞【不算】——那种情况用 prove_goal 标记该目标即可）。⚠️它不是用来“结束本轮规划”的：本轮没有新意图要派、或在等 worker 产出，都【直接结束本轮即可，不要调本工具】（0 个意图是完全正常的）。正常判定优先用 prove_goal 逐个证明目标；goal_met 只是绕过逐个证明、直接从全局收官的手段。", obj(map[string]any{"reason": str("达成理由（必须是目标真正达成的证据，不能是“本轮无新方向”这类结束本轮的理由）")}, "reason"), func(_ context.Context, in json.RawMessage) (actool.Result, error) { var a struct{ Reason string } diff --git a/db/intelligence.go b/db/intelligence.go index a9fc6e9..a559c50 100644 --- a/db/intelligence.go +++ b/db/intelligence.go @@ -260,8 +260,8 @@ func (d *DB) ListIntelligence(ctx context.Context, f IntelligenceFilter) (*Intel if err != nil { return nil, err } - // Search titles and reporters; return the recorded content directly in each row. - where := scope + ` AND ($3='' OR kind=$3) AND ($4='' OR i.status=$4) AND ($5='' OR i.title ILIKE '%'||$5||'%' OR i.worker ILIKE '%'||$5||'%')` + // Search titles, content, evidence, and reporters; return the recorded content directly in each row. + where := scope + ` AND ($3='' OR kind=$3) AND ($4='' OR i.status=$4) AND ($5='' OR i.title ILIKE '%'||$5||'%' OR i.content ILIKE '%'||$5||'%' OR i.evidence ILIKE '%'||$5||'%' OR i.worker ILIKE '%'||$5||'%')` args = append(args, f.Kind, f.Status, f.Query) if err = d.QueryRowContext(ctx, `SELECT count(*)`+where, args...).Scan(&page.Total); err != nil { return nil, err diff --git a/db/schema.sql b/db/schema.sql index 1fe2311..4a35aab 100644 --- a/db/schema.sql +++ b/db/schema.sql @@ -524,6 +524,7 @@ CREATE TABLE IF NOT EXISTS tasks ( timeout_seconds INTEGER NOT NULL DEFAULT 0, plan_heartbeat_seconds INTEGER NOT NULL DEFAULT 300, coverage_enabled BOOLEAN NOT NULL DEFAULT true, + worker_count INTEGER NOT NULL DEFAULT 0, -- 0=用全局默认 workers pinned_at TIMESTAMPTZ, first_run_at TIMESTAMPTZ, deadline_at TIMESTAMPTZ, @@ -546,6 +547,8 @@ ALTER TABLE tasks ADD COLUMN IF NOT EXISTS queued BOOLEAN NOT NULL DEFAULT false -- 给 agent 开放 add_task_scope/list_untested_assets;false=全部关闭(见 task_scope.go)。 -- 存量任务默认 true 保持原行为;company 关联(task_scope kind=company)不受此开关影响。 ALTER TABLE tasks ADD COLUMN IF NOT EXISTS coverage_enabled BOOLEAN NOT NULL DEFAULT true; +-- 任务级 Worker 运行数量;0=用全局默认(settings.workers)。补旧库。 +ALTER TABLE tasks ADD COLUMN IF NOT EXISTS worker_count INTEGER NOT NULL DEFAULT 0; -- queued_at makes admission FIFO reflect the actual enqueue order rather than the -- task creation order. queue_mode distinguishes first bootstrap from resuming an -- exploration that already owns goals/history. @@ -617,16 +620,21 @@ CREATE TABLE IF NOT EXISTS task_templates ( nkey TEXT NOT NULL UNIQUE, description TEXT NOT NULL, goal TEXT NOT NULL, + remark TEXT NOT NULL DEFAULT '', -- 预设的任务分类；分类删除时置空（与 tasks.category_id 一致，不阻断）。 category_id BIGINT REFERENCES task_categories(id) ON DELETE SET NULL, -- 预设的任务级拦截/允许规则快照(AssetInterceptRuleInput 数组)；应用模板时灌进新任务。 intercept_rules JSONB NOT NULL DEFAULT '[]', + -- 预设的任务级 Worker 运行数量;0=用全局默认。 + worker_count INTEGER NOT NULL DEFAULT 0, created_at TIMESTAMPTZ NOT NULL DEFAULT now(), updated_at TIMESTAMPTZ NOT NULL DEFAULT now() ); -- 补旧库(已发版,加列带 IF NOT EXISTS)。 ALTER TABLE task_templates ADD COLUMN IF NOT EXISTS category_id BIGINT REFERENCES task_categories(id) ON DELETE SET NULL; ALTER TABLE task_templates ADD COLUMN IF NOT EXISTS intercept_rules JSONB NOT NULL DEFAULT '[]'; +ALTER TABLE task_templates ADD COLUMN IF NOT EXISTS remark TEXT NOT NULL DEFAULT ''; +ALTER TABLE task_templates ADD COLUMN IF NOT EXISTS worker_count INTEGER NOT NULL DEFAULT 0; CREATE INDEX IF NOT EXISTS idx_task_templates_updated ON task_templates(updated_at DESC, id DESC); DROP TRIGGER IF EXISTS trg_task_templates_upd ON task_templates; CREATE TRIGGER trg_task_templates_upd BEFORE UPDATE ON task_templates diff --git a/db/task_archives_restore.go b/db/task_archives_restore.go index 01094ca..56f102b 100644 --- a/db/task_archives_restore.go +++ b/db/task_archives_restore.go @@ -122,7 +122,7 @@ AND NOT EXISTS ( if _, err := tx.Exec(`UPDATE tasks SET name='',remark='',category_id=NULL,description='',goal='',paused=true,queued=false,queued_at=NULL,queue_mode='', llm_profile_id=NULL,active_llm_profile_id=NULL,llm_chain_revision=llm_chain_revision+1, - company_id=NULL,parent_ref=NULL,timeout_seconds=0,coverage_enabled=true,pinned_at=NULL, + company_id=NULL,parent_ref=NULL,timeout_seconds=0,coverage_enabled=true,worker_count=0,pinned_at=NULL, first_run_at=NULL,deadline_at=NULL,archived_at=now(),deleted_at=now() WHERE id=$1`, taskID); err != nil { return err @@ -322,7 +322,7 @@ func restoreTaskStub(tx *sql.Tx, row map[string]any, taskID, remaining int64) er llm_profile_id=archived.llm_profile_id,active_llm_profile_id=archived.active_llm_profile_id, llm_chain_revision=archived.llm_chain_revision,company_id=archived.company_id,parent_ref=archived.parent_ref, timeout_seconds=archived.timeout_seconds,plan_heartbeat_seconds=archived.plan_heartbeat_seconds, - coverage_enabled=archived.coverage_enabled,pinned_at=archived.pinned_at,first_run_at=archived.first_run_at, + coverage_enabled=archived.coverage_enabled,worker_count=COALESCE(archived.worker_count,0),pinned_at=archived.pinned_at,first_run_at=archived.first_run_at, deadline_at=CASE WHEN archived.paused AND $3>0 THEN now()+make_interval(secs=>$3::double precision) ELSE archived.deadline_at END, deleted_at=NULL,archived_at=NULL,completed_at=archived.completed_at, diff --git a/db/task_archives_test.go b/db/task_archives_test.go index 93a1364..bc4274a 100644 --- a/db/task_archives_test.go +++ b/db/task_archives_test.go @@ -132,7 +132,9 @@ func TestTaskArchiveDatabaseRoundTrip(t *testing.T) { if err := d.EnsureLLMUsageTable(); err != nil { t.Fatal(err) } - task, err := d.CreateTaskWithOptions("archive database roundtrip", "restore exact graph", TaskCreateOptions{Name: "cold task"}) + task, err := d.CreateTaskWithOptions("archive database roundtrip", "restore exact graph", TaskCreateOptions{ + Name: "cold task", WorkerCount: 7, + }) if err != nil { t.Fatal(err) } @@ -297,7 +299,7 @@ VALUES($1,$2,0,'quota_exhausted','balance exhausted',$3,$4,$3)`, task.ID, llmPro if err != nil || live == nil { t.Fatalf("restored task = %+v, %v", live, err) } - if live.Name != "cold task" || live.Remark != remark || !live.Paused { + if live.Name != "cold task" || live.Remark != remark || live.WorkerCount != 7 || !live.Paused { t.Fatalf("restored task metadata mismatch: %+v", live) } if err := d.QueryRow(`SELECT count(*) FROM exploration_nodes WHERE exploration_id=$1`, task.ExplorationID).Scan(&nodes); err != nil { diff --git a/db/task_options_test.go b/db/task_options_test.go new file mode 100644 index 0000000..100bda7 --- /dev/null +++ b/db/task_options_test.go @@ -0,0 +1,102 @@ +package db + +import ( + "fmt" + "strings" + "testing" + "time" +) + +func TestTaskAndTemplateRemarkLimitIsShared(t *testing.T) { + boundary := strings.Repeat("界", MaxTaskRemarkRunes) + if _, _, err := normalizeTaskTemplateInput(TaskTemplateInput{Name: "n", Description: "d", Goal: "g", Remark: boundary}); err != nil { + t.Fatalf("boundary remark rejected: %v", err) + } + if _, _, err := normalizeTaskTemplateInput(TaskTemplateInput{Name: "n", Description: "d", Goal: "g", Remark: boundary + "界"}); err == nil { + t.Fatal("oversized template remark accepted") + } +} + +func TestWorkerCountNormalizationAndLimit(t *testing.T) { + if got := normalizeWorkerCount(-1); got != 0 { + t.Fatalf("negative worker count = %d, want 0", got) + } + if _, _, err := normalizeTaskTemplateInput(TaskTemplateInput{Name: "n", Description: "d", Goal: "g", WorkerCount: MaxTaskWorkerCount}); err != nil { + t.Fatalf("maximum worker count rejected: %v", err) + } + if _, _, err := normalizeTaskTemplateInput(TaskTemplateInput{Name: "n", Description: "d", Goal: "g", WorkerCount: MaxTaskWorkerCount + 1}); err == nil { + t.Fatal("oversized worker count accepted") + } +} + +func TestTaskOptionsPersistAndValidateLimits(t *testing.T) { + d, err := Open(testDSN(t)) + if err != nil { + t.Skipf("postgres unavailable (%v) — skipping", err) + } + defer d.Close() + + if _, err := d.CreateTaskWithOptions("oversized remark", "goal", TaskCreateOptions{ + Remark: strings.Repeat("界", MaxTaskRemarkRunes+1), + }); err == nil { + t.Fatal("2001-rune task remark accepted") + } + if _, err := d.CreateTaskWithOptions("oversized workers", "goal", TaskCreateOptions{ + WorkerCount: MaxTaskWorkerCount + 1, + }); err == nil { + t.Fatal("51-worker task accepted") + } + + remark := strings.Repeat("界", MaxTaskRemarkRunes) + task, err := d.CreateTaskWithOptions("task options boundary", "goal", TaskCreateOptions{ + Remark: remark, WorkerCount: MaxTaskWorkerCount, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = d.DeleteTask(task.ID) }) + gotTask, err := d.GetTask(task.ID) + if err != nil { + t.Fatal(err) + } + if gotTask == nil || gotTask.Remark != remark || gotTask.WorkerCount != MaxTaskWorkerCount { + t.Fatalf("task options round trip = %+v", gotTask) + } + + name := fmt.Sprintf("options template %d", time.Now().UnixNano()) + templateRemark := "模板备注 📝" + template, err := d.CreateTaskTemplate(TaskTemplateInput{ + Name: name, Description: "template description", Goal: "template goal", + Remark: templateRemark, WorkerCount: MaxTaskWorkerCount, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _, _ = d.DeleteTaskTemplate(template.ID) }) + gotTemplate, err := d.GetTaskTemplate(template.ID) + if err != nil { + t.Fatal(err) + } + if gotTemplate == nil || gotTemplate.Remark != templateRemark || gotTemplate.WorkerCount != MaxTaskWorkerCount { + t.Fatalf("created template options round trip = %+v", gotTemplate) + } + + updatedRemark := strings.Repeat("改", MaxTaskRemarkRunes) + updatedWorkers := MaxTaskWorkerCount - 1 + updated, err := d.PatchTaskTemplate(template.ID, TaskTemplatePatch{ + Remark: &updatedRemark, WorkerCount: &updatedWorkers, + }) + if err != nil { + t.Fatal(err) + } + if updated.Remark != updatedRemark || updated.WorkerCount != updatedWorkers { + t.Fatalf("updated template options = %+v", updated) + } + gotTemplate, err = d.GetTaskTemplate(template.ID) + if err != nil { + t.Fatal(err) + } + if gotTemplate == nil || gotTemplate.Remark != updatedRemark || gotTemplate.WorkerCount != updatedWorkers { + t.Fatalf("updated template options round trip = %+v", gotTemplate) + } +} diff --git a/db/task_templates.go b/db/task_templates.go index 80e3116..5401139 100644 --- a/db/task_templates.go +++ b/db/task_templates.go @@ -23,16 +23,18 @@ var ( ErrTaskTemplateNotFound = errors.New("task template not found") ) -// TaskTemplate is a reusable task preset (description/goal + optional category -// and task-level intercept/allow rules). +// TaskTemplate is a reusable task preset (description/goal + optional remark, +// worker count, category, and task-level intercept/allow rules). type TaskTemplate struct { ID int64 `json:"id"` Name string `json:"name"` NKey string `json:"-"` Description string `json:"description"` Goal string `json:"goal"` + Remark string `json:"remark"` CategoryID *int64 `json:"category_id"` InterceptRules []TaskInterceptRuleInput `json:"intercept_rules"` + WorkerCount int `json:"worker_count"` CreatedAt time.Time `json:"created_at"` UpdatedAt time.Time `json:"updated_at"` } @@ -42,8 +44,10 @@ type TaskTemplateInput struct { Name string Description string Goal string + Remark string CategoryID *int64 InterceptRules []TaskInterceptRuleInput + WorkerCount int } // TaskTemplatePatch changes only fields flagged as set. Name/Description/Goal use @@ -53,18 +57,20 @@ type TaskTemplatePatch struct { Name *string Description *string Goal *string + Remark *string CategoryID *int64 SetCategoryID bool InterceptRules []TaskInterceptRuleInput SetInterceptRules bool + WorkerCount *int } -const taskTemplateCols = `id, name, nkey, description, goal, category_id, intercept_rules, created_at, updated_at` +const taskTemplateCols = `id, name, nkey, description, goal, COALESCE(remark,''), category_id, intercept_rules, COALESCE(worker_count,0), created_at, updated_at` func scanTaskTemplate(row interface{ Scan(...any) error }) (TaskTemplate, error) { var t TaskTemplate var rulesRaw []byte - if err := row.Scan(&t.ID, &t.Name, &t.NKey, &t.Description, &t.Goal, &t.CategoryID, &rulesRaw, &t.CreatedAt, &t.UpdatedAt); err != nil { + if err := row.Scan(&t.ID, &t.Name, &t.NKey, &t.Description, &t.Goal, &t.Remark, &t.CategoryID, &rulesRaw, &t.WorkerCount, &t.CreatedAt, &t.UpdatedAt); err != nil { return t, err } t.InterceptRules = []TaskInterceptRuleInput{} @@ -112,11 +118,21 @@ func normalizeTaskTemplateInput(in TaskTemplateInput) (TaskTemplateInput, string case utf8.RuneCountInString(in.Goal) > MaxTaskTemplateTextRunes: return in, "", fmt.Errorf("%w: goal exceeds %d characters", ErrTaskTemplateInvalid, MaxTaskTemplateTextRunes) } + in.Remark = strings.TrimSpace(in.Remark) + // Keep template remarks within the same shared limit as task remarks so + // applying a template cannot produce a rejected create-task payload. + if utf8.RuneCountInString(in.Remark) > MaxTaskRemarkRunes { + return in, "", fmt.Errorf("%w: remark exceeds %d characters", ErrTaskTemplateInvalid, MaxTaskRemarkRunes) + } + in.WorkerCount = normalizeWorkerCount(in.WorkerCount) + if err := validateWorkerCount(in.WorkerCount); err != nil { + return in, "", fmt.Errorf("%w: %v", ErrTaskTemplateInvalid, err) + } return in, taskTemplateNKey(in.Name), nil } func normalizeTaskTemplatePatch(patch TaskTemplatePatch) (TaskTemplatePatch, *string, error) { - if patch.Name == nil && patch.Description == nil && patch.Goal == nil && !patch.SetCategoryID && !patch.SetInterceptRules { + if patch.Name == nil && patch.Description == nil && patch.Goal == nil && patch.Remark == nil && !patch.SetCategoryID && !patch.SetInterceptRules && patch.WorkerCount == nil { return patch, nil, fmt.Errorf("%w: no fields supplied", ErrTaskTemplateInvalid) } var nkey *string @@ -152,6 +168,20 @@ func normalizeTaskTemplatePatch(patch TaskTemplatePatch) (TaskTemplatePatch, *st } patch.Goal = &goal } + if patch.Remark != nil { + remark := strings.TrimSpace(*patch.Remark) + if utf8.RuneCountInString(remark) > MaxTaskRemarkRunes { + return patch, nil, fmt.Errorf("%w: remark exceeds %d characters", ErrTaskTemplateInvalid, MaxTaskRemarkRunes) + } + patch.Remark = &remark + } + if patch.WorkerCount != nil { + n := normalizeWorkerCount(*patch.WorkerCount) + if err := validateWorkerCount(n); err != nil { + return patch, nil, fmt.Errorf("%w: %v", ErrTaskTemplateInvalid, err) + } + patch.WorkerCount = &n + } return patch, nkey, nil } @@ -171,10 +201,10 @@ func (d *DB) CreateTaskTemplate(in TaskTemplateInput) (*TaskTemplate, error) { return nil, err } t, err := scanTaskTemplate(d.QueryRow(` -INSERT INTO task_templates(name, nkey, description, goal, category_id, intercept_rules) -VALUES ($1,$2,$3,$4,$5,$6) +INSERT INTO task_templates(name, nkey, description, goal, remark, category_id, intercept_rules, worker_count) +VALUES ($1,$2,$3,$4,$5,$6,$7,$8) ON CONFLICT (nkey) DO NOTHING -RETURNING `+taskTemplateCols, in.Name, nkey, in.Description, in.Goal, in.CategoryID, rulesJSON)) +RETURNING `+taskTemplateCols, in.Name, nkey, in.Description, in.Goal, in.Remark, in.CategoryID, rulesJSON, in.WorkerCount)) if err == sql.ErrNoRows { return nil, ErrTaskTemplateNameConflict } @@ -221,7 +251,8 @@ func (d *DB) UpdateTaskTemplate(id int64, in TaskTemplateInput) (*TaskTemplate, return nil, err } return d.PatchTaskTemplate(id, TaskTemplatePatch{ - Name: &in.Name, Description: &in.Description, Goal: &in.Goal, + Name: &in.Name, Description: &in.Description, Goal: &in.Goal, Remark: &in.Remark, + WorkerCount: &in.WorkerCount, }) } @@ -242,16 +273,20 @@ SET name=CASE WHEN $2 THEN $3::text ELSE name END, nkey=CASE WHEN $2 THEN $4::text ELSE nkey END, description=CASE WHEN $5 THEN $6::text ELSE description END, goal=CASE WHEN $7 THEN $8::text ELSE goal END, - category_id=CASE WHEN $9 THEN $10::bigint ELSE category_id END, - intercept_rules=CASE WHEN $11 THEN $12::jsonb ELSE intercept_rules END + remark=CASE WHEN $9 THEN $10::text ELSE remark END, + category_id=CASE WHEN $11 THEN $12::bigint ELSE category_id END, + intercept_rules=CASE WHEN $13 THEN $14::jsonb ELSE intercept_rules END, + worker_count=CASE WHEN $15 THEN $16::integer ELSE worker_count END WHERE id=$1 RETURNING `+taskTemplateCols, id, patch.Name != nil, patch.Name, nkey, patch.Description != nil, patch.Description, patch.Goal != nil, patch.Goal, + patch.Remark != nil, patch.Remark, patch.SetCategoryID, patch.CategoryID, patch.SetInterceptRules, rulesJSON, + patch.WorkerCount != nil, patch.WorkerCount, )) if err == sql.ErrNoRows { return nil, ErrTaskTemplateNotFound diff --git a/db/tasks.go b/db/tasks.go index b675bea..c17f1b6 100644 --- a/db/tasks.go +++ b/db/tasks.go @@ -6,7 +6,9 @@ import ( "errors" "fmt" "strconv" + "strings" "time" + "unicode/utf8" ) // Task is a row in the task registry (1:1 with an exploration). @@ -51,6 +53,9 @@ type Task struct { // list_untested_assets、态势里不注入 coverage 块(scope 字段仍保留)。company 关联 // (task_scope kind=company)与此开关无关，永不受影响。见 db/task_scope.go。 CoverageEnabled bool `json:"coverage_enabled"` + // WorkerCount is the per-task concurrent work-agent count. 0 means use the + // global settings.workers default when the engine starts this task. + WorkerCount int `json:"worker_count"` } // TaskDeleteResult reports optional related-data cleanup performed in the same @@ -132,6 +137,29 @@ func normalizeHeartbeat(sec int) int { return sec } +// MaxTaskWorkerCount is the hard upper bound for a per-task worker override. +const MaxTaskWorkerCount = 50 + +// MaxTaskRemarkRunes is the shared limit for task and template remarks. +const MaxTaskRemarkRunes = 2000 + +// normalizeWorkerCount converts negative per-task worker overrides to 0. +// The upper bound is enforced separately by validateWorkerCount; 0 means +// "use the global settings.workers default". +func normalizeWorkerCount(n int) int { + if n < 0 { + return 0 + } + return n +} + +func validateWorkerCount(n int) error { + if n > MaxTaskWorkerCount { + return fmt.Errorf("Worker 运行数量最多 %d", MaxTaskWorkerCount) + } + return nil +} + func (d *DB) CreateTask(description, goal string, llmProfileID *int64, timeoutSeconds, planHeartbeatSeconds int) (*Task, error) { var ids []int64 if llmProfileID != nil { @@ -156,6 +184,10 @@ type TaskCreateOptions struct { // CoverageEnabled 是「资产覆盖度功能」开关;nil=默认开(true)，让不关心该开关的创建 // 路径(编排 spawn、老 API)沿用原行为。仅 web 创建任务时可显式传 false 关闭。 CoverageEnabled *bool + // WorkerCount 是本任务并发运行的工作 Agent 数;0/省略=用全局默认。上限 50。 + WorkerCount int + // Remark 是创建时可带的任务备注(最多 2000 字);空=无备注。 + Remark string // InterceptRules 是任务级资产拦截规则,创建时随任务在同一事务内写入 task_intercept_rules。 InterceptRules []TaskInterceptRuleInput } @@ -200,6 +232,14 @@ VALUES ($1, 'fact', $2, 0, 'origin', 'system')`, expID, string(originPayload)); } opts.PlanHeartbeatSeconds = normalizeHeartbeat(opts.PlanHeartbeatSeconds) coverageEnabled := opts.CoverageEnabled == nil || *opts.CoverageEnabled + opts.WorkerCount = normalizeWorkerCount(opts.WorkerCount) + if err := validateWorkerCount(opts.WorkerCount); err != nil { + return nil, err + } + opts.Remark = strings.TrimSpace(opts.Remark) + if utf8.RuneCountInString(opts.Remark) > MaxTaskRemarkRunes { + return nil, fmt.Errorf("备注最多 %d 个字符", MaxTaskRemarkRunes) + } var categoryName string if opts.CategoryID != nil { if *opts.CategoryID <= 0 { @@ -225,12 +265,12 @@ VALUES ($1, 'fact', $2, 0, 'origin', 'system')`, expID, string(originPayload)); SourceTaskIDs: append([]int64(nil), opts.SourceTaskIDs...), CompanyIDs: append([]int64(nil), opts.CompanyIDs...), TimeoutSeconds: opts.TimeoutSeconds, PlanHeartbeatSeconds: opts.PlanHeartbeatSeconds, - CoverageEnabled: coverageEnabled, + CoverageEnabled: coverageEnabled, WorkerCount: opts.WorkerCount, Remark: opts.Remark, } if err := tx.QueryRow(` -INSERT INTO tasks(name, category_id, description, goal, exploration_id, llm_profile_id, active_llm_profile_id, timeout_seconds, plan_heartbeat_seconds, coverage_enabled) -VALUES ($1,$2,$3,$4,$5,$6,$6,$7,$8,$9) -RETURNING id, status, paused, created_at`, opts.Name, opts.CategoryID, description, goal, expID, active, opts.TimeoutSeconds, opts.PlanHeartbeatSeconds, coverageEnabled).Scan(&t.ID, &t.Status, &t.Paused, &t.CreatedAt); err != nil { +INSERT INTO tasks(name, remark, category_id, description, goal, exploration_id, llm_profile_id, active_llm_profile_id, timeout_seconds, plan_heartbeat_seconds, coverage_enabled, worker_count) +VALUES ($1,$2,$3,$4,$5,$6,$7,$7,$8,$9,$10,$11) +RETURNING id, status, paused, created_at`, opts.Name, opts.Remark, opts.CategoryID, description, goal, expID, active, opts.TimeoutSeconds, opts.PlanHeartbeatSeconds, coverageEnabled, opts.WorkerCount).Scan(&t.ID, &t.Status, &t.Paused, &t.CreatedAt); err != nil { return nil, err } if err := insertTaskRelations(tx, t.ID, opts.SourceTaskIDs); err != nil { @@ -363,11 +403,11 @@ func insertTaskLLMProfiles(tx *sql.Tx, taskID int64, profileIDs []int64) error { const taskCols = `id, COALESCE(name,''), remark, category_id, COALESCE((SELECT category.name FROM task_categories category WHERE category.id=tasks.category_id),''), -description, goal, exploration_id, status, paused, queued, queued_at, COALESCE(queue_mode,''), llm_profile_id, active_llm_profile_id, COALESCE(parent_ref,''), pinned_at, created_at, completed_at, COALESCE(timeout_seconds,0), COALESCE(plan_heartbeat_seconds,300), COALESCE(coverage_enabled,true), first_run_at, deadline_at` +description, goal, exploration_id, status, paused, queued, queued_at, COALESCE(queue_mode,''), llm_profile_id, active_llm_profile_id, COALESCE(parent_ref,''), pinned_at, created_at, completed_at, COALESCE(timeout_seconds,0), COALESCE(plan_heartbeat_seconds,300), COALESCE(coverage_enabled,true), COALESCE(worker_count,0), first_run_at, deadline_at` func scanTask(sc interface{ Scan(...any) error }) (*Task, error) { var t Task - if err := sc.Scan(&t.ID, &t.Name, &t.Remark, &t.CategoryID, &t.CategoryName, &t.Description, &t.Goal, &t.ExplorationID, &t.Status, &t.Paused, &t.Queued, &t.QueuedAt, &t.QueueMode, &t.LLMProfileID, &t.ActiveLLMProfileID, &t.ParentRef, &t.PinnedAt, &t.CreatedAt, &t.CompletedAt, &t.TimeoutSeconds, &t.PlanHeartbeatSeconds, &t.CoverageEnabled, &t.FirstRunAt, &t.DeadlineAt); err != nil { + if err := sc.Scan(&t.ID, &t.Name, &t.Remark, &t.CategoryID, &t.CategoryName, &t.Description, &t.Goal, &t.ExplorationID, &t.Status, &t.Paused, &t.Queued, &t.QueuedAt, &t.QueueMode, &t.LLMProfileID, &t.ActiveLLMProfileID, &t.ParentRef, &t.PinnedAt, &t.CreatedAt, &t.CompletedAt, &t.TimeoutSeconds, &t.PlanHeartbeatSeconds, &t.CoverageEnabled, &t.WorkerCount, &t.FirstRunAt, &t.DeadlineAt); err != nil { return nil, err } t.Pinned = t.PinnedAt != nil diff --git a/go.mod b/go.mod index 35f1a14..ee5f10a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/Autumn-27/artex -go 1.26.3 +go 1.26.10 require ( mvdan.cc/sh/v3 v3.10.0 diff --git a/server/assembly_test.go b/server/assembly_test.go index 1eabeba..1ea94bf 100644 --- a/server/assembly_test.go +++ b/server/assembly_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - actool "github.com/Autumn-27/norma/tool" "github.com/Autumn-27/artex/agent" "github.com/Autumn-27/artex/db" + actool "github.com/Autumn-27/norma/tool" ) // hasSkillTool reports whether the packed tool set contains the Skill meta-tool. diff --git a/server/customtool.go b/server/customtool.go index 4d9e30e..ad68517 100644 --- a/server/customtool.go +++ b/server/customtool.go @@ -462,9 +462,16 @@ func (s *Server) httpProxyTransport(spec httpExec) *http.Transport { proxyStr := strings.TrimSpace(spec.Proxy) var caFile string if spec.UseRecordingProxy { - if addr := s.m.ProxyAddr(); addr != "" { - proxyStr = "http://" + addr - caFile = s.m.ProxyCACert() + // ProxyAddr is already a complete URL while capture is enabled, and + // returns the configured global proxy URL when capture is off. Keep both + // forms intact (including socks5:// and credentials). + if s.m.TrafficEnabled() { + if addr := s.m.ProxyAddr(); addr != "" { + proxyStr = addr + caFile = s.m.ProxyCACert() + } + } else if global := strings.TrimSpace(s.m.GlobalProxy()); global != "" { + proxyStr = global } } if proxyStr == "" { @@ -474,6 +481,9 @@ func (s *Server) httpProxyTransport(spec httpExec) *http.Transport { if err != nil { return nil } + // Go 1.26+ supports http/https/socks5/socks5h in ProxyURL directly, + // including proxy userinfo. Keep one code path so existing HTTP tool + // behavior and proxy authentication remain unchanged. tr := &http.Transport{Proxy: http.ProxyURL(pu)} if caFile != "" { if pem, err := os.ReadFile(caFile); err == nil { diff --git a/server/dto.go b/server/dto.go index 60785a5..339c1f2 100644 --- a/server/dto.go +++ b/server/dto.go @@ -64,6 +64,7 @@ type TaskDTO struct { ArchiveBlockedBy string `json:"archive_blocked_by_task_id,omitempty"` CompanyIDs []int64 `json:"company_ids"` CoverageEnabled bool `json:"coverage_enabled"` // 资产覆盖度功能开关(创建时定) + WorkerCount int `json:"worker_count"` // 本任务 Worker 数;0=用全局默认 } // FindingSeverityDTO 是任务列表里按严重度分档的漏洞计数（严重/高/中/低）。 @@ -138,6 +139,7 @@ func taskDTO(t *Task, status string) TaskDTO { SourceTaskIDs: sourceIDs, CompanyIDs: lifecycle.CompanyIDs, CoverageEnabled: t.CoverageEnabled, + WorkerCount: t.WorkerCount, } } diff --git a/server/engine.go b/server/engine.go index be30998..7c61b74 100644 --- a/server/engine.go +++ b/server/engine.go @@ -793,10 +793,10 @@ func (e *Engine) ReadyFor(t *Task) bool { // but no-op until an LLM is configured (so a task created while idle picks up // automatically once LLM is set from the UI). func (e *Engine) Run(ctx context.Context, t *Task) { - slots, err := ExpandWorkerSlots(e.m.WorkerPools(), e.m.Workers()) + slots, err := workerSlotsForTask(t, e.m.WorkerPools(), e.m.Workers()) if err != nil { log.Printf("[engine] task %s worker pool invalid, using legacy workers: %v", t.ID, err) - slots, _ = ExpandWorkerSlots(nil, e.m.Workers()) + slots, _ = ExpandWorkerSlots(nil, workerCountForTask(t, e.m.Workers())) } e.deleteMu.RLock() if e.IsDeleting(t.ID) { @@ -832,6 +832,27 @@ func (e *Engine) Run(ctx context.Context, t *Task) { } } +// workerSlotsForTask preserves an explicit task concurrency override. Tasks +// using the global default inherit its model pools and their pinned profiles. +func workerSlotsForTask(t *Task, pools []WorkerPool, global int) ([]WorkerSlot, error) { + if t != nil && t.WorkerCount > 0 { + return ExpandWorkerSlots(nil, workerCountForTask(t, global)) + } + return ExpandWorkerSlots(pools, global) +} + +func workerCountForTask(t *Task, global int) int { + if t != nil && t.WorkerCount > 0 { + // Direct database edits can bypass validation; cap those values so the + // engine never starts more than the supported per-task worker count. + if t.WorkerCount > db.MaxTaskWorkerCount { + return db.MaxTaskWorkerCount + } + return t.WorkerCount + } + return global +} + // plannerHeartbeatInterval 解析任务的 planner 心跳间隔。db.CreateTask 已归一 // (低于 600 一律抬到 600);这里再兜一次底,防内存态异常值。 func plannerHeartbeatInterval(t *Task) time.Duration { diff --git a/server/engine_worker_test.go b/server/engine_worker_test.go new file mode 100644 index 0000000..25b1f4b --- /dev/null +++ b/server/engine_worker_test.go @@ -0,0 +1,59 @@ +package server + +import ( + "fmt" + "testing" + + "github.com/Autumn-27/artex/db" +) + +func TestWorkerCountForTaskUsesOverrideOrGlobalDefault(t *testing.T) { + if got := workerCountForTask(&Task{WorkerCount: 5}, 3); got != 5 { + t.Fatalf("override = %d, want 5", got) + } + if got := workerCountForTask(&Task{WorkerCount: 0}, 3); got != 3 { + t.Fatalf("zero override = %d, want global 3", got) + } + if got := workerCountForTask(&Task{WorkerCount: -1}, 3); got != 3 { + t.Fatalf("negative override = %d, want global 3", got) + } + if got := workerCountForTask(&Task{WorkerCount: db.MaxTaskWorkerCount + 1}, 3); got != db.MaxTaskWorkerCount { + t.Fatalf("oversized override = %d, want capped %d", got, db.MaxTaskWorkerCount) + } +} + +func TestWorkerSlotsForTaskCombinesOverridesAndModelPools(t *testing.T) { + pools := []WorkerPool{{ProfileID: 7, Workers: 2}, {ProfileID: 12, Workers: 1}} + for _, tc := range []struct { + name string + task *Task + pools []WorkerPool + global int + profiles []int64 + }{ + {"task inherits model pools", &Task{}, pools, 9, []int64{7, 7, 12}}, + {"task override replaces global pools", &Task{WorkerCount: 2}, pools, 9, []int64{0, 0}}, + {"task inherits legacy count", &Task{}, nil, 4, []int64{0, 0, 0, 0}}, + {"task override without pools", &Task{WorkerCount: 1}, nil, 4, []int64{0}}, + {"invalid task value uses pools", &Task{WorkerCount: -1}, pools, 9, []int64{7, 7, 12}}, + } { + t.Run(tc.name, func(t *testing.T) { + slots, err := workerSlotsForTask(tc.task, tc.pools, tc.global) + if err != nil || len(slots) != len(tc.profiles) { + t.Fatalf("slots=%+v err=%v, want profiles %v", slots, err, tc.profiles) + } + for i, profile := range tc.profiles { + if slots[i].ProfileID != profile || slots[i].Name != fmt.Sprintf("work#%d", i+1) { + t.Fatalf("slot[%d]=%+v, want profile %d", i, slots[i], profile) + } + } + }) + } + slots, err := workerSlotsForTask(&Task{WorkerCount: db.MaxTaskWorkerCount + 1}, pools, 3) + if err != nil || len(slots) != db.MaxTaskWorkerCount { + t.Fatalf("oversized task override: slots=%d err=%v", len(slots), err) + } + if _, err := workerSlotsForTask(&Task{}, []WorkerPool{{ProfileID: 0, Workers: 1}}, 3); err == nil { + t.Fatal("invalid inherited pool accepted") + } +} diff --git a/server/manager.go b/server/manager.go index b2ff3c7..9b61e13 100644 --- a/server/manager.go +++ b/server/manager.go @@ -60,6 +60,7 @@ type Task struct { TimeoutSeconds int `json:"timeout_seconds"` PlanHeartbeatSeconds int `json:"plan_heartbeat_seconds"` // planner 心跳触发间隔(秒) CoverageEnabled bool `json:"coverage_enabled"` // 资产覆盖度功能开关(创建时定,默认开) + WorkerCount int `json:"worker_count"` // 本任务 Worker 数;0=用全局默认 FirstRunAt int64 `json:"first_run_at,omitempty"` DeadlineAt int64 `json:"deadline_at,omitempty"` Store *pgdb.ExplorationStore `json:"-"` @@ -1005,8 +1006,8 @@ func taskFromPG(pt *pgdb.Task, store *pgdb.ExplorationStore, ic *intercept.Inter SourceTaskIDs: append([]int64(nil), pt.SourceTaskIDs...), CompanyIDs: append([]int64(nil), pt.CompanyIDs...), TimeoutSeconds: pt.TimeoutSeconds, PlanHeartbeatSeconds: pt.PlanHeartbeatSeconds, - CoverageEnabled: pt.CoverageEnabled, - FirstRunAt: unixOrZero(pt.FirstRunAt), DeadlineAt: unixOrZero(pt.DeadlineAt), + CoverageEnabled: pt.CoverageEnabled, WorkerCount: pt.WorkerCount, + FirstRunAt: unixOrZero(pt.FirstRunAt), DeadlineAt: unixOrZero(pt.DeadlineAt), Store: store, Guard: guard.NewWithInterceptor(ic), notify: make(chan struct{}, 1), } } diff --git a/server/remarks.go b/server/remarks.go index c33ecc6..0864eb9 100644 --- a/server/remarks.go +++ b/server/remarks.go @@ -10,7 +10,7 @@ import ( "github.com/Autumn-27/artex/db" ) -const maxRemarkRunes = 2000 +const maxRemarkRunes = db.MaxTaskRemarkRunes func normalizeRemark(value string) (string, error) { value = strings.TrimSpace(value) diff --git a/server/repeater.go b/server/repeater.go new file mode 100644 index 0000000..3f157d9 --- /dev/null +++ b/server/repeater.go @@ -0,0 +1,416 @@ +package server + +import ( + "bytes" + "context" + "crypto/tls" + "encoding/json" + "errors" + "fmt" + "io" + "net" + "net/http" + "net/url" + "os" + "strconv" + "strings" + "syscall" + "time" +) + +const ( + repeaterMaxBody = 2 << 20 // 2 MiB, for both the JSON request and response preview + repeaterDefaultTimeout = 30_000 + repeaterMinTimeout = 1_000 + repeaterMaxTimeout = 120_000 + repeaterAllowLocalEnv = "ARTEX_REPEATER_ALLOW_LOCAL" +) + +var repeaterHopByHop = map[string]struct{}{ + "Connection": {}, "Keep-Alive": {}, "Proxy-Connection": {}, "Transfer-Encoding": {}, + "Te": {}, "Trailer": {}, "Upgrade": {}, "Content-Length": {}, "Proxy-Authorization": {}, +} + +type repeaterSendRequest struct { + Method *string `json:"method"` + URL string `json:"url"` + Headers map[string]string `json:"headers"` + Body string `json:"body"` + TimeoutMs int `json:"timeout_ms"` + InsecureSkipVerify bool `json:"insecure_skip_verify"` + UseRecordingProxy *bool `json:"use_recording_proxy"` +} + +type repeaterSendResponse struct { + Status int `json:"status"` + StatusText string `json:"status_text"` + Proto string `json:"proto"` + Headers map[string][]string `json:"headers"` + Body string `json:"body"` + BodyTruncated bool `json:"body_truncated"` + BodyBytes int `json:"body_bytes"` + ElapsedMs int64 `json:"elapsed_ms"` + URL string `json:"url"` + Error string `json:"error,omitempty"` +} + +func (s *Server) registerRepeater(mux *http.ServeMux) { + mux.HandleFunc("POST /api/repeater/send", s.sendRepeater) +} + +func (s *Server) sendRepeater(w http.ResponseWriter, r *http.Request) { + var in repeaterSendRequest + dec := json.NewDecoder(http.MaxBytesReader(w, r.Body, repeaterMaxBody)) + if err := dec.Decode(&in); err != nil { + writeErr(w, http.StatusBadRequest, "请求体无效") + return + } + // Reject a second JSON value (or oversized trailing data) instead of silently + // accepting bytes beyond the documented 2 MiB request limit. + var extra any + if err := dec.Decode(&extra); err != io.EOF { + writeErr(w, http.StatusBadRequest, "请求体无效") + return + } + + method := http.MethodGet + if in.Method != nil { + method = strings.ToUpper(strings.TrimSpace(*in.Method)) + } + if method == "" { + writeErr(w, http.StatusBadRequest, "HTTP 方法不能为空") + return + } + switch method { + case http.MethodGet, http.MethodPost, http.MethodPut, http.MethodPatch, + http.MethodDelete, http.MethodHead, http.MethodOptions: + default: + writeErr(w, http.StatusBadRequest, "不支持的 HTTP 方法") + return + } + + rawURL := strings.TrimSpace(in.URL) + if rawURL == "" { + writeErr(w, http.StatusBadRequest, "url 必填") + return + } + u, err := url.Parse(rawURL) + if err != nil || u.Host == "" || u.Hostname() == "" || + !strings.EqualFold(u.Scheme, "http") && !strings.EqualFold(u.Scheme, "https") { + writeErr(w, http.StatusBadRequest, "仅支持绝对 http/https URL") + return + } + // This check is needed even when a proxy is used: the proxy must remain usable + // for normal targets, while obvious literal metadata/loopback URLs stay blocked. + if err := repeaterCheckURL(u); err != nil { + writeErr(w, http.StatusBadRequest, err.Error()) + return + } + + timeoutMs := in.TimeoutMs + if timeoutMs <= 0 { + timeoutMs = repeaterDefaultTimeout + } + if timeoutMs < repeaterMinTimeout { + timeoutMs = repeaterMinTimeout + } + if timeoutMs > repeaterMaxTimeout { + timeoutMs = repeaterMaxTimeout + } + useRecordingProxy := true + if in.UseRecordingProxy != nil { + useRecordingProxy = *in.UseRecordingProxy + } + + var body io.Reader + if in.Body != "" && method != http.MethodHead { + body = strings.NewReader(in.Body) + } + ctx, cancel := context.WithTimeout(r.Context(), time.Duration(timeoutMs)*time.Millisecond) + defer cancel() + req, err := http.NewRequestWithContext(ctx, method, u.String(), body) + if err != nil { + writeErr(w, http.StatusBadRequest, "构造请求失败") + return + } + for key, value := range in.Headers { + name := strings.TrimSpace(key) + if name == "" { + continue + } + if _, blocked := repeaterHopByHop[http.CanonicalHeaderKey(name)]; blocked { + continue + } + if strings.EqualFold(name, "Host") { + // Host is a special Request field, but retaining it in Header too makes + // the editor semantics explicit; net/http uses req.Host on the wire. + req.Host = strings.TrimSpace(value) + req.Header.Set("Host", strings.TrimSpace(value)) + continue + } + req.Header.Set(name, value) + } + + client := &http.Client{ + Timeout: time.Duration(timeoutMs) * time.Millisecond, + Transport: s.repeaterTransport(useRecordingProxy, in.InsecureSkipVerify), + CheckRedirect: func(next *http.Request, via []*http.Request) error { + if len(via) >= 10 { + return errors.New("重定向次数过多") + } + if err := repeaterCheckURL(next.URL); err != nil { + return err + } + if len(via) > 0 && !strings.EqualFold(next.URL.Host, via[0].URL.Host) { + return fmt.Errorf("拒绝跨主机重定向（%s → %s）", via[0].URL.Host, next.URL.Host) + } + return nil + }, + } + // Each send owns its transport. Registered before Body.Close so idle + // connections are released after the response body, including on errors. + defer client.CloseIdleConnections() + + started := time.Now() + resp, err := client.Do(req) + if err != nil { + writeJSON(w, http.StatusOK, repeaterSendResponse{ + Headers: map[string][]string{}, URL: u.String(), + ElapsedMs: time.Since(started).Milliseconds(), Error: repeaterRedactError(err), + }) + return + } + defer resp.Body.Close() + + out := repeaterSendResponse{ + Status: resp.StatusCode, StatusText: resp.Status, Proto: resp.Proto, + Headers: resp.Header.Clone(), URL: resp.Request.URL.String(), + } + if method != http.MethodHead { + // Read one byte beyond the cap so truncation is exact. The MVP keeps the + // preview as UTF-8 text; invalid bytes are replaced instead of base64. + data, readErr := io.ReadAll(io.LimitReader(resp.Body, repeaterMaxBody+1)) + if len(data) > repeaterMaxBody { + out.BodyTruncated = true + data = data[:repeaterMaxBody] + } + out.Body = repeaterBodyText(data) + out.BodyBytes = len(data) + if readErr != nil && !errors.Is(readErr, io.EOF) { + out.Error = "读取响应失败: " + readErr.Error() + } + } + out.ElapsedMs = time.Since(started).Milliseconds() + writeJSON(w, http.StatusOK, out) +} + +// repeaterBodyText keeps the response preview as text for the MVP. Invalid +// UTF-8 and NUL bytes are replaced so a binary response cannot inject control +// characters into the JSON/UI raw view; the original bytes are not base64 +// encoded and the preview remains bounded by repeaterMaxBody. +func repeaterBodyText(data []byte) string { + text := string(bytes.ToValidUTF8(data, []byte("�"))) + return strings.ReplaceAll(text, "\x00", "�") +} + +func (s *Server) repeaterTransport(useRecordingProxy, insecure bool) http.RoundTripper { + var transport *http.Transport + proxied := false + if useRecordingProxy && s != nil && s.m != nil { + transport = s.httpProxyTransport(httpExec{UseRecordingProxy: true}) + proxied = transport != nil + } + if transport == nil && s != nil && s.m != nil && strings.TrimSpace(s.m.GlobalProxy()) != "" { + transport = s.httpProxyTransport(httpExec{Proxy: s.m.GlobalProxy()}) + proxied = transport != nil + } + if transport == nil { + if base, ok := http.DefaultTransport.(*http.Transport); ok { + transport = base.Clone() + } else { + transport = &http.Transport{} + } + // "Direct" means direct even if the process inherited HTTP_PROXY. The + // configured recording/global proxy paths are handled above explicitly. + transport.Proxy = nil + } + transport = transport.Clone() + // Keep response bytes faithful and make body_bytes match what was received; + // transparent gzip decompression would otherwise obscure both values. + transport.DisableCompression = true + // Use the request's timeout_ms budget instead of inherited phase deadlines. + transport.TLSHandshakeTimeout = 0 + transport.ExpectContinueTimeout = 0 + if !proxied { + // Clear a custom TLS dialer before installing the guarded dialer; when + // DialTLSContext is set, net/http bypasses DialContext entirely. + transport.DialTLSContext = nil + transport.DialTLS = nil + transport.Dial = nil + // Let the request context enforce timeout_ms for the entire dial. + transport.DialContext = (&net.Dialer{ + KeepAlive: 30 * time.Second, + Control: repeaterBlockSensitiveDial, + }).DialContext + } + if insecure { + cfg := &tls.Config{InsecureSkipVerify: true} //nolint:gosec // explicit user option for pentest targets + if transport.TLSClientConfig != nil { + cfg = transport.TLSClientConfig.Clone() + cfg.InsecureSkipVerify = true + } + transport.TLSClientConfig = cfg + } + return transport +} + +func repeaterAllowLocal() bool { + v := strings.TrimSpace(os.Getenv(repeaterAllowLocalEnv)) + return v == "1" || strings.EqualFold(v, "true") +} + +func repeaterCheckURL(u *url.URL) error { + if repeaterAllowLocal() { + return nil + } + host := strings.TrimSuffix(strings.TrimSpace(u.Hostname()), ".") + // URL.Hostname may retain an IPv6 zone (for example fe80::1%eth0); the + // zone is not part of the address classification. + if zone := strings.IndexByte(host, '%'); zone >= 0 { + host = host[:zone] + } + ip := net.ParseIP(host) + if ip == nil && repeaterLooksNumericHost(host) { + var ok bool + ip, ok = repeaterParseLegacyIPv4(host) + if !ok { + return fmt.Errorf("拒绝无法解析的数字主机地址 %q", host) + } + } + if strings.EqualFold(host, "localhost") || (ip != nil && repeaterIsBlockedDialIP(ip)) { + return fmt.Errorf("拒绝访问本机/链路本地地址（如确需访问本机服务，设置 %s=1）", repeaterAllowLocalEnv) + } + return nil +} + +// repeaterLooksNumericHost identifies the legacy numeric spellings accepted by +// common proxy/resolver implementations (decimal, octal, hexadecimal and +// dotted inet_aton forms). A numeric-looking value that fails to parse is +// rejected instead of being handed to a proxy for its own interpretation. +func repeaterLooksNumericHost(host string) bool { + if host == "" || host[0] < '0' || host[0] > '9' { + return false + } + for i := 0; i < len(host); i++ { + c := host[i] + switch { + case c == '.': + case c >= '0' && c <= '9': + case c >= 'a' && c <= 'f', c >= 'A' && c <= 'F': + case c == 'x' || c == 'X': + default: + return false + } + } + return true +} + +// repeaterParseLegacyIPv4 follows inet_aton's 1-, 2-, 3- and 4-part IPv4 +// notation. Parts with a leading zero are octal and parts with 0x are hex. +func repeaterParseLegacyIPv4(host string) (net.IP, bool) { + parts := strings.Split(host, ".") + if len(parts) < 1 || len(parts) > 4 { + return nil, false + } + values := make([]uint64, len(parts)) + for i, part := range parts { + if part == "" { + return nil, false + } + base := 10 + digits := part + if len(digits) > 2 && digits[0] == '0' && (digits[1] == 'x' || digits[1] == 'X') { + base, digits = 16, digits[2:] + } else if len(digits) > 1 && digits[0] == '0' { + base = 8 + } + if digits == "" { + return nil, false + } + value, err := strconv.ParseUint(digits, base, 32) + if err != nil { + return nil, false + } + values[i] = value + } + var value uint64 + switch len(values) { + case 1: + value = values[0] + case 2: + if values[0] > 0xff || values[1] > 0xffffff { + return nil, false + } + value = values[0]<<24 | values[1] + case 3: + if values[0] > 0xff || values[1] > 0xff || values[2] > 0xffff { + return nil, false + } + value = values[0]<<24 | values[1]<<16 | values[2] + case 4: + for _, part := range values { + if part > 0xff { + return nil, false + } + } + value = values[0]<<24 | values[1]<<16 | values[2]<<8 | values[3] + } + if value > 0xffffffff { + return nil, false + } + return net.IPv4(byte(value>>24), byte(value>>16), byte(value>>8), byte(value)), true +} + +func repeaterIsBlockedDialIP(ip net.IP) bool { + if ip == nil { + return true + } + if v4 := ip.To4(); v4 != nil { + ip = v4 + } + return ip.IsLoopback() || ip.IsLinkLocalUnicast() || ip.IsLinkLocalMulticast() || + ip.IsInterfaceLocalMulticast() || ip.IsUnspecified() || ip.IsMulticast() +} + +func repeaterBlockSensitiveDial(_, address string, _ syscall.RawConn) error { + if repeaterAllowLocal() { + return nil + } + host, _, err := net.SplitHostPort(address) + if err != nil { + return err + } + ip := net.ParseIP(host) + if ip == nil { + return fmt.Errorf("无法解析目标地址 %q", host) + } + if repeaterIsBlockedDialIP(ip) { + return fmt.Errorf("拒绝访问本机/链路本地地址 %s（如确需访问本机服务，设置 %s=1）", ip, repeaterAllowLocalEnv) + } + return nil +} + +func repeaterRedactError(err error) string { + var urlErr *url.Error + if errors.As(err, &urlErr) { + host := "" + if parsed, parseErr := url.Parse(urlErr.URL); parseErr == nil { + host = parsed.Host + } + if urlErr.Err != nil { + return fmt.Sprintf("%s %s: %s", urlErr.Op, host, urlErr.Err) + } + return fmt.Sprintf("%s %s: 未知错误", urlErr.Op, host) + } + return err.Error() +} diff --git a/server/repeater_test.go b/server/repeater_test.go new file mode 100644 index 0000000..608f04d --- /dev/null +++ b/server/repeater_test.go @@ -0,0 +1,404 @@ +package server + +import ( + "bytes" + "context" + "crypto/tls" + "crypto/x509" + "encoding/json" + "errors" + "fmt" + "io" + "net" + "net/http" + "net/http/httptest" + "net/url" + "os" + "strings" + "testing" + "time" + + "github.com/Autumn-27/artex/traffic" +) + +func repeaterTestSend(t *testing.T, s *Server, payload any) (int, repeaterSendResponse, string) { + t.Helper() + raw, err := json.Marshal(payload) + if err != nil { + t.Fatal(err) + } + r := httptest.NewRequest(http.MethodPost, "/api/repeater/send", bytes.NewReader(raw)) + w := httptest.NewRecorder() + s.sendRepeater(w, r) + var out repeaterSendResponse + _ = json.Unmarshal(w.Body.Bytes(), &out) + return w.Code, out, w.Body.String() +} + +func TestRepeaterRejectsInvalidInput(t *testing.T) { + t.Setenv(repeaterAllowLocalEnv, "") + s := &Server{} + for _, tc := range []struct { + name string + body string + }{ + {"missing url", `{"method":"GET"}`}, + {"empty method", `{"method":" ","url":"https://example.test/"}`}, + {"bad scheme", `{"method":"GET","url":"file:///etc/passwd"}`}, + {"gopher", `{"method":"GET","url":"gopher://example.test/1"}`}, + {"unknown method", `{"method":"TRACE","url":"http://example.test/"}`}, + } { + t.Run(tc.name, func(t *testing.T) { + r := httptest.NewRequest(http.MethodPost, "/api/repeater/send", strings.NewReader(tc.body)) + w := httptest.NewRecorder() + s.sendRepeater(w, r) + if w.Code != http.StatusBadRequest { + t.Fatalf("status=%d want 400 body=%s", w.Code, w.Body.String()) + } + }) + } +} + +func TestRepeaterBlockedIPs(t *testing.T) { + for _, raw := range []string{"127.0.0.1", "::1", "169.254.169.254", "0.0.0.0", "224.0.0.1"} { + if !repeaterIsBlockedDialIP(net.ParseIP(raw)) { + t.Errorf("expected %s blocked", raw) + } + } + for _, raw := range []string{"8.8.8.8", "10.0.0.1", "192.168.1.20", "172.16.0.5"} { + if repeaterIsBlockedDialIP(net.ParseIP(raw)) { + t.Errorf("expected %s allowed", raw) + } + } + + t.Setenv(repeaterAllowLocalEnv, "") + srv := httptest.NewServer(http.HandlerFunc(func(http.ResponseWriter, *http.Request) { + t.Fatal("loopback handler should not be reached") + })) + defer srv.Close() + code, _, body := repeaterTestSend(t, &Server{}, map[string]any{"url": srv.URL, "use_recording_proxy": false}) + if code != http.StatusBadRequest || !strings.Contains(body, "拒绝") { + t.Fatalf("loopback status=%d body=%s", code, body) + } +} + +func TestRepeaterRejectsLegacyNumericHostsIncludingProxyPath(t *testing.T) { + t.Setenv(repeaterAllowLocalEnv, "") + for _, raw := range []string{ + "http://2130706433/", // decimal 127.0.0.1 + "http://0177.0.0.1/", // octal 127.0.0.1 + "http://127.1/", // two-part inet_aton form + "http://0x7f000001/", // hexadecimal 127.0.0.1 + "http://9999999999/", // numeric-looking but invalid + } { + u, err := url.Parse(raw) + if err != nil { + t.Fatal(err) + } + if err := repeaterCheckURL(u); err == nil { + t.Errorf("repeaterCheckURL(%q) allowed a legacy numeric host", raw) + } + } + + // The check must run before a configured proxy gets a chance to interpret + // the legacy spelling and connect to loopback remotely. + proxy := httptest.NewServer(http.HandlerFunc(func(http.ResponseWriter, *http.Request) { + t.Error("proxy received a blocked numeric target") + })) + defer proxy.Close() + s := &Server{m: &Manager{globalProxy: proxy.URL}} + code, _, body := repeaterTestSend(t, s, map[string]any{"url": "http://2130706433/"}) + if code != http.StatusBadRequest || !strings.Contains(body, "拒绝") { + t.Fatalf("proxied legacy host status=%d body=%s", code, body) + } +} + +func TestRepeaterBlockSensitiveDial(t *testing.T) { + t.Setenv(repeaterAllowLocalEnv, "") + for _, address := range []string{"127.0.0.1:80", "169.254.169.254:80"} { + if err := repeaterBlockSensitiveDial("tcp", address, nil); err == nil { + t.Errorf("repeaterBlockSensitiveDial(%q) allowed blocked address", address) + } + } +} + +func TestRepeaterTransportBlocksSensitiveDial(t *testing.T) { + t.Setenv(repeaterAllowLocalEnv, "") + tr := (&Server{}).repeaterTransport(false, false).(*http.Transport) + defer tr.CloseIdleConnections() + if tr.DialContext == nil { + t.Fatal("direct transport has no guarded DialContext") + } + ctx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + conn, err := tr.DialContext(ctx, "tcp", "127.0.0.1:1") + if conn != nil { + conn.Close() + } + if err == nil || !strings.Contains(err.Error(), "拒绝访问本机/链路本地地址 127.0.0.1") { + t.Fatalf("dial should fail at the sensitive-address guard, got %v", err) + } +} + +func TestRepeaterDirectHTTP2(t *testing.T) { + t.Setenv(repeaterAllowLocalEnv, "1") + srv := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.ProtoMajor != 2 { + t.Errorf("request protocol=%s, want HTTP/2", r.Proto) + } + _, _ = io.WriteString(w, "h2 response") + })) + srv.EnableHTTP2 = true + srv.TLS = &tls.Config{NextProtos: []string{"h2"}} + srv.StartTLS() + defer srv.Close() + + code, out, raw := repeaterTestSend(t, &Server{}, map[string]any{ + "url": srv.URL, "use_recording_proxy": false, "insecure_skip_verify": true, + }) + if code != http.StatusOK || out.Error != "" || out.Status != http.StatusOK || out.Proto != "HTTP/2.0" || out.Body != "h2 response" { + t.Fatalf("HTTP/2 response status=%d raw=%s", code, raw) + } +} + +func TestRepeaterTLSHandshakeUsesRequestTimeout(t *testing.T) { + t.Setenv(repeaterAllowLocalEnv, "1") + // Scale down the inherited timeout so a slow handshake can be tested + // without waiting for the default transport's ten-second deadline. + base := http.DefaultTransport + short := base.(*http.Transport).Clone() + short.TLSHandshakeTimeout = 10 * time.Millisecond + http.DefaultTransport = short + defer func() { http.DefaultTransport = base }() + defer short.CloseIdleConnections() + + srv := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + _, _ = io.WriteString(w, "handshake completed") + })) + srv.TLS = &tls.Config{GetConfigForClient: func(*tls.ClientHelloInfo) (*tls.Config, error) { + time.Sleep(100 * time.Millisecond) + return nil, nil + }} + srv.StartTLS() + defer srv.Close() + + code, out, raw := repeaterTestSend(t, &Server{}, map[string]any{ + "url": srv.URL, "use_recording_proxy": false, "insecure_skip_verify": true, "timeout_ms": 1000, + }) + if code != http.StatusOK || out.Error != "" || out.Status != http.StatusOK || out.Body != "handshake completed" { + t.Fatalf("handshake within request budget failed: status=%d raw=%s", code, raw) + } +} + +func TestRepeaterClosesIdleConnections(t *testing.T) { + t.Setenv(repeaterAllowLocalEnv, "1") + for _, mode := range []string{"direct", "http2", "global proxy", "recording proxy fallback"} { + t.Run(mode, func(t *testing.T) { + closed := make(chan struct{}, 1) + srv := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + _, _ = io.WriteString(w, "response") + })) + srv.Config.ConnState = func(_ net.Conn, state http.ConnState) { + if state == http.StateClosed { + closed <- struct{}{} + } + } + if mode == "http2" { + srv.EnableHTTP2 = true + srv.StartTLS() + } else { + srv.Start() + } + defer srv.Close() + + s := &Server{} + payload := map[string]any{"url": srv.URL, "use_recording_proxy": false, "insecure_skip_verify": true} + if mode == "global proxy" || mode == "recording proxy fallback" { + s.m = &Manager{globalProxy: srv.URL} + payload["url"] = "http://target.example/" + if mode == "recording proxy fallback" { + delete(payload, "use_recording_proxy") + } + } + code, out, raw := repeaterTestSend(t, s, payload) + if code != http.StatusOK || out.Error != "" || out.Status != http.StatusOK || out.Body != "response" { + t.Fatalf("status=%d raw=%s", code, raw) + } + select { + case <-closed: + case <-time.After(time.Second): + t.Fatal("connection still open after sendRepeater returned") + } + }) + } +} + +func TestRepeaterRoundTripHeadersAndBody(t *testing.T) { + t.Setenv(repeaterAllowLocalEnv, "1") + var got http.Request + var gotBody string + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + got = *r + b, _ := io.ReadAll(r.Body) + gotBody = string(b) + w.Header().Set("X-Echo", "ok") + w.WriteHeader(http.StatusCreated) + _, _ = io.WriteString(w, "hello") + })) + defer srv.Close() + + code, out, body := repeaterTestSend(t, &Server{}, map[string]any{ + "method": "POST", "url": srv.URL, "headers": map[string]string{ + "X-Test": "yes", "Host": "custom.example", "Connection": "keep-alive", + "Keep-Alive": "timeout=5", "Transfer-Encoding": "chunked", "Content-Length": "99", + }, "body": "payload", "use_recording_proxy": false, + }) + if code != http.StatusOK || out.Error != "" { + t.Fatalf("status=%d out=%+v raw=%s", code, out, body) + } + if out.Status != http.StatusCreated || out.Body != "hello" || out.BodyBytes != 5 { + t.Fatalf("response=%+v", out) + } + if out.Headers["X-Echo"][0] != "ok" || got.Method != http.MethodPost || gotBody != "payload" || got.Host != "custom.example" { + t.Fatalf("request method=%s host=%s body=%q headers=%v", got.Method, got.Host, gotBody, got.Header) + } + for _, name := range []string{"Connection", "Keep-Alive", "Transfer-Encoding"} { + if got.Header.Get(name) != "" { + t.Errorf("hop-by-hop header %s was forwarded: %q", name, got.Header.Get(name)) + } + } + if got.Header.Get("Content-Length") != "7" { + t.Errorf("content length should match body, got %q", got.Header.Get("Content-Length")) + } +} + +func TestRepeaterTruncatesAndHonoursHEAD(t *testing.T) { + t.Setenv(repeaterAllowLocalEnv, "1") + large := strings.Repeat("x", repeaterMaxBody+1) + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.Method == http.MethodHead { + _, _ = io.WriteString(w, "should-not-be-read") + return + } + _, _ = io.WriteString(w, large) + })) + defer srv.Close() + _, out, _ := repeaterTestSend(t, &Server{}, map[string]any{"url": srv.URL, "use_recording_proxy": false}) + if !out.BodyTruncated || out.BodyBytes != repeaterMaxBody || len(out.Body) != repeaterMaxBody { + t.Fatalf("truncation=%+v", out) + } + _, head, _ := repeaterTestSend(t, &Server{}, map[string]any{"method": "HEAD", "url": srv.URL, "use_recording_proxy": false}) + if head.Body != "" || head.BodyBytes != 0 { + t.Fatalf("HEAD body=%q bytes=%d", head.Body, head.BodyBytes) + } +} + +func TestRepeaterBodyTextReplacesBinaryControls(t *testing.T) { + if got := repeaterBodyText([]byte{'a', 0, 0xff, 'b'}); got != "a��b" { + t.Fatalf("body text=%q", got) + } +} + +func TestRepeaterRejectsCrossHostRedirect(t *testing.T) { + t.Setenv(repeaterAllowLocalEnv, "1") + target := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { _, _ = io.WriteString(w, "target") })) + defer target.Close() + redirect := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + http.Redirect(w, r, target.URL, http.StatusFound) + })) + defer redirect.Close() + _, out, _ := repeaterTestSend(t, &Server{}, map[string]any{"url": redirect.URL, "use_recording_proxy": false}) + if out.Status != 0 || !strings.Contains(out.Error, "跨主机") { + t.Fatalf("redirect response=%+v", out) + } +} + +func TestRepeaterProxyTransportConstruction(t *testing.T) { + s := &Server{m: &Manager{}} + for _, scheme := range []string{"http", "https", "socks5", "socks5h"} { + tr := s.httpProxyTransport(httpExec{Proxy: scheme + "://user:pass@127.0.0.1:1080"}) + if tr == nil || tr.Proxy == nil { + t.Fatalf("%s proxy transport not configured: %#v", scheme, tr) + } + proxyURL, err := tr.Proxy(httptest.NewRequest(http.MethodGet, "https://target.example/", nil)) + if err != nil || proxyURL == nil || proxyURL.Scheme != scheme || proxyURL.Host != "127.0.0.1:1080" { + t.Fatalf("%s proxy URL = %#v, err=%v", scheme, proxyURL, err) + } + if user := proxyURL.User; user == nil || user.Username() != "user" { + t.Fatalf("%s proxy credentials missing: %v", scheme, proxyURL.User) + } + password, ok := proxyURL.User.Password() + if !ok || password != "pass" { + t.Fatalf("%s proxy password missing: %q (ok=%v)", scheme, password, ok) + } + } + + // With capture disabled, the recording-proxy option must preserve the + // configured global proxy URL instead of treating it as a host:port. + s.m.globalProxy = "socks5://user:pass@127.0.0.1:1080" + tr := s.httpProxyTransport(httpExec{UseRecordingProxy: true}) + if tr == nil || tr.Proxy == nil { + t.Fatal("global SOCKS5 proxy was not configured") + } + proxyURL, err := tr.Proxy(httptest.NewRequest(http.MethodGet, "https://target.example/", nil)) + if err != nil || proxyURL == nil || proxyURL.Scheme != "socks5" { + t.Fatalf("global proxy URL = %#v, err=%v", proxyURL, err) + } + + // Capture mode supplies a complete HTTP URL from Traffic.ProxyAddr. The + // helper must preserve that scheme and host rather than prefixing http:// a + // second time. + captured, err := traffic.Open(t.TempDir(), "127.0.0.1:18788") + if err != nil { + t.Fatalf("traffic.Open: %v", err) + } + defer captured.Close() + s.m.traffic = captured + s.m.trafficOn = true + tr = s.httpProxyTransport(httpExec{UseRecordingProxy: true}) + if tr == nil || tr.Proxy == nil { + t.Fatal("recording proxy was not configured") + } + proxyURL, err = tr.Proxy(httptest.NewRequest(http.MethodGet, "https://target.example/", nil)) + if err != nil || proxyURL == nil || proxyURL.Scheme != "http" || proxyURL.Host != "127.0.0.1:18788" { + t.Fatalf("recording proxy URL = %#v, err=%v", proxyURL, err) + } + caFile := s.m.ProxyCACert() + if caFile == "" { + t.Fatal("recording proxy CA path is empty") + } + caPEM, err := os.ReadFile(caFile) + if err != nil { + t.Fatalf("read recording proxy CA: %v", err) + } + wantRoots := x509.NewCertPool() + if !wantRoots.AppendCertsFromPEM(caPEM) { + t.Fatal("recording proxy CA is not valid PEM") + } + if tr.TLSClientConfig == nil || tr.TLSClientConfig.RootCAs == nil || !tr.TLSClientConfig.RootCAs.Equal(wantRoots) { + t.Fatal("recording proxy CA was not loaded into transport RootCAs") + } + if s.repeaterTransport(true, false).(*http.Transport).ForceAttemptHTTP2 { + t.Fatal("recording proxy transport must not force HTTP/2") + } +} + +func TestRepeaterRedactProxyCredentials(t *testing.T) { + for _, scheme := range []string{"http", "https", "socks5", "socks5h"} { + t.Run(scheme, func(t *testing.T) { + proxyErr := &url.Error{ + Op: "proxyconnect", URL: scheme + "://proxy-user:proxy-secret@127.0.0.1:1080", + Err: errors.New("connection refused"), + } + for _, err := range []error{proxyErr, fmt.Errorf("send request: %w", proxyErr)} { + got := repeaterRedactError(err) + if strings.Contains(got, "proxy-secret") || strings.Contains(got, "proxy-user") { + t.Fatalf("proxy credentials leaked: %q", got) + } + if got != "proxyconnect 127.0.0.1:1080: connection refused" { + t.Fatalf("unexpected redacted error: %q", got) + } + } + }) + } +} diff --git a/server/server.go b/server/server.go index 71cf168..672069e 100644 --- a/server/server.go +++ b/server/server.go @@ -828,6 +828,7 @@ func (s *Server) Handler() http.Handler { mux.HandleFunc("GET /api/exploration/findings/stats", s.findingStats) mux.HandleFunc("GET /api/exploration/findings/export", s.findingsExport) s.registerFindingTraffic(mux) + s.registerRepeater(mux) mux.HandleFunc("GET /api/exploration/findings/{id}", s.getFinding) mux.HandleFunc("GET /api/exploration/findings/{id}/lineage", s.findingLineage) mux.HandleFunc("POST /api/exploration/findings/{id}/deepen", s.deepenFinding) @@ -1544,6 +1545,8 @@ type createTaskReq struct { PlanHeartbeatSeconds int `json:"plan_heartbeat_seconds"` // planner 心跳触发间隔(秒);0/省略=默认600(10min);下限=默认=600,低于自动抬到600 SeedFirstIntent *bool `json:"seed_first_intent,omitempty"` // 创建时直接下发一条种子意图(内容=描述+目标),让 worker 免等首轮 planner 直接开跑;省略/null=默认关闭,走标准先规划再执行。显式传 true 才开(CTF 常一 work 解决时可省掉开跑前的 planner 轮)。 CoverageEnabled *bool `json:"coverage_enabled,omitempty"` // 资产覆盖度功能;省略/null=默认开(true)。false=关闭覆盖度计算/展示/自动累积范围+隐藏 add_task_scope/list_untested_assets。company 关联不受影响。 + Remark string `json:"remark,omitempty"` // 任务备注(最多2000字);空=无 + WorkerCount int `json:"worker_count,omitempty"` // 本任务 Worker 数;0/省略=用全局默认;上限50 // InterceptRules 任务级资产拦截/允许规则(创建时录入,存 task_intercept_rules,不进全局表)。 InterceptRules []taskInterceptRuleReq `json:"intercept_rules,omitempty"` } @@ -1607,12 +1610,27 @@ func (s *Server) createTask(w http.ResponseWriter, r *http.Request) { } schedule = &input } + remark, err := normalizeRemark(req.Remark) + if err != nil { + writeErr(w, 400, err.Error()) + return + } + if req.WorkerCount < 0 { + writeErr(w, 400, "Worker 运行数量不能为负数") + return + } + if req.WorkerCount > db.MaxTaskWorkerCount { + writeErr(w, 400, fmt.Sprintf("Worker 运行数量最多 %d", db.MaxTaskWorkerCount)) + return + } t, err := s.m.CreateTaskWithOptions(req.Description, req.Goal, db.TaskCreateOptions{ Schedule: schedule, Name: strings.TrimSpace(req.Name), CategoryID: req.CategoryID, SourceTaskIDs: sourceIDs, CompanyIDs: req.CompanyIDs, LLMProfileIDs: req.LLMProfileIDs, TimeoutSeconds: req.TimeoutSeconds, PlanHeartbeatSeconds: req.PlanHeartbeatSeconds, CoverageEnabled: req.CoverageEnabled, + Remark: remark, + WorkerCount: req.WorkerCount, InterceptRules: interceptRules, }) if err != nil { diff --git a/server/task_templates.go b/server/task_templates.go index 7125177..f94de47 100644 --- a/server/task_templates.go +++ b/server/task_templates.go @@ -22,8 +22,10 @@ type taskTemplateRequest struct { Name *string `json:"name"` Description *string `json:"description"` Goal *string `json:"goal"` + Remark *string `json:"remark"` CategoryID *int64 `json:"category_id"` InterceptRules []taskInterceptRuleReq `json:"intercept_rules"` + WorkerCount *int `json:"worker_count"` } // decodeTaskTemplateRequest decodes the body into req and returns the set of @@ -65,6 +67,7 @@ func validateTaskTemplateRequest(req taskTemplateRequest) error { {name: "name", value: req.Name, limit: db.MaxTaskTemplateNameRunes}, {name: "description", value: req.Description, limit: db.MaxTaskTemplateTextRunes}, {name: "goal", value: req.Goal, limit: db.MaxTaskTemplateTextRunes}, + {name: "remark", value: req.Remark, limit: db.MaxTaskRemarkRunes}, // 与任务备注 normalizeRemark 上限一致 } for _, check := range checks { if check.value == nil { @@ -75,9 +78,20 @@ func validateTaskTemplateRequest(req taskTemplateRequest) error { value = strings.Join(strings.Fields(value), " ") } if utf8.RuneCountInString(value) > check.limit { + if check.name == "remark" { + return fmt.Errorf("备注最多 %d 个字符", check.limit) + } return fmt.Errorf("%s 最多 %d 个字符", check.name, check.limit) } } + if req.WorkerCount != nil { + if *req.WorkerCount < 0 { + return fmt.Errorf("Worker 运行数量不能为负数") + } + if *req.WorkerCount > db.MaxTaskWorkerCount { + return fmt.Errorf("Worker 运行数量最多 %d", db.MaxTaskWorkerCount) + } + } return nil } @@ -125,12 +139,18 @@ func (s *Server) pgCreateTaskTemplate(w http.ResponseWriter, r *http.Request) { writeErr(w, http.StatusBadRequest, "拦截/允许规则无效："+err.Error()) return } + workerCount := 0 + if req.WorkerCount != nil { + workerCount = *req.WorkerCount + } template, err := pg.CreateTaskTemplate(db.TaskTemplateInput{ Name: stringValue(req.Name), Description: stringValue(req.Description), Goal: stringValue(req.Goal), + Remark: stringValue(req.Remark), CategoryID: req.CategoryID, InterceptRules: rules, + WorkerCount: workerCount, }) if err != nil { writeTaskTemplateErr(w, err) @@ -160,11 +180,21 @@ func (s *Server) pgUpdateTaskTemplate(w http.ResponseWriter, r *http.Request) { } _, catPresent := present["category_id"] _, rulesPresent := present["intercept_rules"] - if req.Name == nil && req.Description == nil && req.Goal == nil && !catPresent && !rulesPresent { - writeErr(w, http.StatusBadRequest, "至少需要提供 name、description、goal、category_id 或 intercept_rules") + _, remarkPresent := present["remark"] + _, workerPresent := present["worker_count"] + if req.Name == nil && req.Description == nil && req.Goal == nil && !catPresent && !rulesPresent && !remarkPresent && !workerPresent { + writeErr(w, http.StatusBadRequest, "至少需要提供 name、description、goal、remark、category_id、intercept_rules 或 worker_count") return } patch := db.TaskTemplatePatch{Name: req.Name, Description: req.Description, Goal: req.Goal} + if remarkPresent { + if req.Remark == nil { + empty := "" + patch.Remark = &empty + } else { + patch.Remark = req.Remark + } + } if catPresent { patch.SetCategoryID = true patch.CategoryID = req.CategoryID @@ -178,6 +208,13 @@ func (s *Server) pgUpdateTaskTemplate(w http.ResponseWriter, r *http.Request) { patch.SetInterceptRules = true patch.InterceptRules = rules } + if workerPresent { + n := 0 + if req.WorkerCount != nil { + n = *req.WorkerCount + } + patch.WorkerCount = &n + } template, err := pg.PatchTaskTemplate(id, patch) if err != nil { writeTaskTemplateErr(w, err) diff --git a/server/tools_wire_test.go b/server/tools_wire_test.go index dd4850e..705138a 100644 --- a/server/tools_wire_test.go +++ b/server/tools_wire_test.go @@ -5,9 +5,9 @@ import ( "encoding/json" "testing" - actool "github.com/Autumn-27/norma/tool" "github.com/Autumn-27/artex/agent" "github.com/Autumn-27/artex/db" + actool "github.com/Autumn-27/norma/tool" ) func names(tools []actool.CoreTool) map[string]actool.CoreTool { diff --git a/web/src/app/(main)/function/findings/detail/page.tsx b/web/src/app/(main)/function/findings/detail/page.tsx index f771776..d4a640a 100644 --- a/web/src/app/(main)/function/findings/detail/page.tsx +++ b/web/src/app/(main)/function/findings/detail/page.tsx @@ -58,6 +58,7 @@ function FindingDetailInner() { const searchParams = useSearchParams(); const id = searchParams.get("id") ?? ""; const contextTaskId = searchParams.get("context_task") ?? ""; + const backHref = contextTaskId ? `/function/tasks/detail?id=${contextTaskId}&tab=findings` : "/function/findings"; const [finding, setFinding] = React.useState(null); const [loaded, setLoaded] = React.useState(false); const [tab, setTab] = React.useState("overview"); @@ -117,7 +118,7 @@ function FindingDetailInner() {

{loaded ? `未找到发现 ${id}` : "加载中…"}

{loaded && ( @@ -135,7 +136,7 @@ function FindingDetailInner() {
diff --git a/web/src/app/(main)/function/tasks/detail/_tabs/findings-tab.tsx b/web/src/app/(main)/function/tasks/detail/_tabs/findings-tab.tsx index b643264..ef7ed95 100644 --- a/web/src/app/(main)/function/tasks/detail/_tabs/findings-tab.tsx +++ b/web/src/app/(main)/function/tasks/detail/_tabs/findings-tab.tsx @@ -113,11 +113,7 @@ function Row({ {f.finding_id && ( @@ -190,7 +186,7 @@ export function FindingsTab({ taskId }: { taskId: string }) { return (
- + {[ ...new Set( items diff --git a/web/src/app/(main)/function/tasks/detail/page.tsx b/web/src/app/(main)/function/tasks/detail/page.tsx index 3c23d3e..db99f6c 100644 --- a/web/src/app/(main)/function/tasks/detail/page.tsx +++ b/web/src/app/(main)/function/tasks/detail/page.tsx @@ -354,7 +354,17 @@ function TaskDetailInner() { ); return ( - + { + setTab(value); + const params = new URLSearchParams(searchParams.toString()); + params.set("tab", value); + params.delete("session"); + router.replace(`/function/tasks/detail?${params.toString()}`, { scroll: false }); + }} + className="flex flex-1 flex-col gap-0" + > {/* Top fixed area */}
@@ -404,6 +414,11 @@ function TaskDetailInner() {

{task.goal}

+ {task.remark ? ( +

+ 备注：{task.remark} +

+ ) : null} {/* Tabs */}
diff --git a/web/src/app/(main)/function/tasks/page.tsx b/web/src/app/(main)/function/tasks/page.tsx index bc9ae91..3737d6d 100644 --- a/web/src/app/(main)/function/tasks/page.tsx +++ b/web/src/app/(main)/function/tasks/page.tsx @@ -137,6 +137,7 @@ import type { TaskCategory, TaskStatus, } from "@/lib/types"; +import { MAX_TASK_REMARK_RUNES, MAX_TASK_WORKER_COUNT, parseWorkerCountInput } from "@/lib/types"; import { cn } from "@/lib/utils"; // fmtBytes renders a human file size for the upload manifest. @@ -3104,6 +3105,7 @@ function CreateTaskSheet({ }) { const [open, setOpen] = React.useState(false); const [name, setName] = React.useState(""); + const [remark, setRemark] = React.useState(""); const [categoryID, setCategoryID] = React.useState(undefined); const [description, setDescription] = React.useState(""); const [goal, setGoal] = React.useState(""); @@ -3118,6 +3120,7 @@ function CreateTaskSheet({ const [heartbeatMin, setHeartbeatMin] = React.useState("10"); // planner 心跳(分钟);默认10,下限10(与后端一致) const [seedFirstIntent, setSeedFirstIntent] = React.useState(false); // 创建时下发种子意图,worker 免等首轮 planner 直接开跑;默认关闭,走标准先规划再执行 const [coverageEnabled, setCoverageEnabled] = React.useState(true); // 资产覆盖度功能;默认开。关闭=不计算/展示覆盖度、不累积范围、隐藏范围类工具(company 关联不受影响) + const [workerCount, setWorkerCount] = React.useState(""); // 本任务 Worker 数;空/0=用全局默认 const [interceptRules, setInterceptRules] = React.useState([]); // 任务级资产拦截规则(仅本任务生效,不进全局表) const [scheduleEnabled, setScheduleEnabled] = React.useState(false); const [schedule, setSchedule] = React.useState({ @@ -3181,12 +3184,18 @@ function CreateTaskSheet({ toast.error(`最多关联 ${MAX_SOURCE_TASKS} 个来源任务`); return; } + const workerCountNum = parseWorkerCountInput(workerCount); + if (workerCountNum == null) { + toast.error(`Worker 运行数量必须是 0-${MAX_TASK_WORKER_COUNT} 的整数`); + return; + } setCreating(true); try { const timeoutSec = Math.max(0, Math.floor(Number(timeoutMin) || 0)) * 60; const heartbeatSec = Math.max(10, Math.floor(Number(heartbeatMin) || 10)) * 60; // 下限 10min，与后端归一一致 await api.createTask({ name: name.trim(), + remark: remark.trim(), categoryId: categoryID, description: description.trim(), goal: goal.trim(), @@ -3197,6 +3206,7 @@ function CreateTaskSheet({ seedFirstIntent, planHeartbeatSeconds: heartbeatSec, coverageEnabled, + workerCount: workerCountNum, schedule: scheduleEnabled ? { ...schedule, task_ids: [] } : undefined, interceptRules: interceptRules .map((r) => ({ ...r, pattern: r.pattern.trim() })) @@ -3204,6 +3214,7 @@ function CreateTaskSheet({ }); toast.success("任务已创建"); setName(""); + setRemark(""); setCategoryID(undefined); setDescription(""); setGoal(""); @@ -3215,6 +3226,7 @@ function CreateTaskSheet({ setHeartbeatMin("10"); setSeedFirstIntent(false); setCoverageEnabled(true); + setWorkerCount(""); setInterceptRules([]); setScheduleEnabled(false); setSchedule({ @@ -3263,15 +3275,19 @@ function CreateTaskSheet({ { setDescription(template.description); setGoal(template.goal); + setRemark(template.remark ?? ""); setCategoryID(template.category_id ?? undefined); setInterceptRules(template.intercept_rules ?? []); + setWorkerCount(template.worker_count ? String(template.worker_count) : ""); setUploadCount(0); }} portalContainer={sheetContentRef} @@ -3285,6 +3301,17 @@ function CreateTaskSheet({ onChange={(e) => setName(e.target.value)} />
+
+ +