Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a999ed7
fix(web): move finding retest below status
RuoJi6 Oct 28, 2026
404c4bb
feat: add finding side question panel
RuoJi6 Oct 28, 2026
76c76ee
feat(repeater): redesign request replay workspace
RuoJi6 Oct 28, 2026
3c6070a
feat(web): highlight HTTP packets consistently
RuoJi6 Oct 28, 2026
44924ec
feat(web): add segmented asset topology paths
RuoJi6 Oct 28, 2026
e8572a1
feat: add structured finding reproduction screenshots
RuoJi6 Oct 28, 2026
85ce362
Merge remote-tracking branch 'origin/codex/move-retest-panel'
RuoJi6 Oct 28, 2026
d85ba36
Merge remote-tracking branch 'origin/codex/finding-side-questions'
RuoJi6 Oct 28, 2026
b71c757
Merge remote-tracking branch 'origin/codex/repeater-burp-layout'
RuoJi6 Oct 28, 2026
252e83f
Merge remote-tracking branch 'origin/codex/packet-highlighting'
RuoJi6 Oct 28, 2026
248b4d1
Merge remote-tracking branch 'origin/codex/asset-topology'
RuoJi6 Oct 28, 2026
fe93980
Merge remote-tracking branch 'origin/codex/finding-reproduction'
RuoJi6 Oct 28, 2026
fb6942f
fix: align asset coverage zones and remapping chat
RuoJi6 Oct 28, 2026
6b0acf2
fix: bound asset mapping context and use layered topology
RuoJi6 Oct 28, 2026
d51bf25
fix: place topology nodes by zone and show mapping progress
RuoJi6 Oct 28, 2026
495ab57
fix: focus selected topology paths
RuoJi6 Oct 28, 2026
14ebf44
fix: restore topology view and mapping progress state
RuoJi6 Oct 28, 2026
3e04b68
fix: preserve explicit topology node positions
RuoJi6 Oct 28, 2026
67c0aee
fix: bind topology node coordinates to G6 styles
RuoJi6 Oct 28, 2026
6fc7317
fix: preserve topology zone columns when fitting graph
RuoJi6 Oct 28, 2026
5472330
feat: add topology modes and resettable viewport
RuoJi6 Oct 28, 2026
7d5c710
feat: simplify network topology asset nodes
RuoJi6 Oct 28, 2026
21646d5
feat: separate topology mapping from asset graph
RuoJi6 Oct 28, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions agent/promptcatalog.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@ const autoDefaultTmpl = `你是 **Auto**,这个渗透测试平台的「操作
- 用人话简洁汇报你做了什么、结果如何;只根据工具真实返回作答,不臆造。
- 只在授权范围内操作。`

// assetMapperDefaultTmpl is the read-only assistant behind the topology canvas.
const assetMapperDefaultTmpl = `你是授权渗透测试平台的「资产梳理」Agent。你的职责是根据资产库中的真实数据,整理公网、边界服务和内网业务资产之间的关系,并解释用户指定的入站路径。

工作规则:
- 先使用 list_assets 和 list_companies 获取事实,再给出结论;没有证据的关系标记为“待验证”,不要臆造。
- 识别域名、子域名、IP、服务、应用和端点之间的关联,说明数据来源和最近更新时间。
- 用户询问“从哪里进入内网”时,按“公网入口 → 边界服务 → 目标资产”的顺序回答;当前资产库没有网络流量或防火墙证据时,明确说明这是资产关系推导,不把它描述成已验证的网络通路。
- 用简洁中文输出,优先给出资产清单、关系链、可信度和下一步验证建议。
- 只读分析,不主动修改资产库,不执行探测。`

// pentestDefaultTmpl is the built-in "渗透测试" (solo pentest) agent's prompt. Unlike
// the orchestration roles (goals/planner/worker), it runs standalone via the chat page
// and is its own planner + executor + auditor. Default tools: list_assets / insert_assets
Expand Down Expand Up @@ -90,11 +100,20 @@ const ReporterDefaultPrompt = `你是一个授权渗透测试系统里的**漏
4. **写报告**:综合以上,写一份结构化 Markdown 报告(见下方模板)。
5. **保存**:调用 **update_finding_report(finding_id=<node_id>, report=<Markdown 全文>, evidence_version=<实际读取的 version>)** 保存;未读取版本时省略 evidence_version,不得猜测。这是你的最终产物——不写进去等于没做。

━━ 报告步骤截图(仅在系统设置开启时)━━
- 当系统设置开启报告步骤截图时,你会自动获得 browser MCP;此时对每个复现步骤中真实出现且仍可访问的 HTTP 页面,使用 browser_navigate 后调用 browser_take_screenshot。
- 只访问漏洞证据中出现的 URL,不扩大测试范围。把截图保存到当前工作目录的 findings/screenshots/ 下,命名 finding-<finding_id>-step-<n>.png;确认文件存在后,在对应步骤中加入 Markdown 图片链接:![步骤 <n> 截图](workspace://<截图绝对路径>)。
- 截图失败时如实说明;系统设置关闭或 browser MCP 不可用时,不要伪造图片链接,也不要把文字描述冒充截图。

━━ 报告结构(Markdown,按需裁剪,但证据/复现/修复必须有)━━
- ` + "`## 概述`" + `:一句话说清是什么漏洞、在哪、能造成什么。
- ` + "`## 影响与危害`" + `:结合业务讲清最坏后果(数据泄露/接管/RCE/横向…),给出**严重等级**判断及理由。
- ` + "`## 受影响范围`" + `:受影响的资产/接口/参数/版本。
- ` + "`## 复现步骤`" + `:**可照做复现**的分步操作(请求/命令/参数),能贴 PoC 就贴。
- 复现步骤必须使用明确的编号标题:` + "`### 步骤 1:准备环境`" + `、` + "`### 步骤 2:构造请求`" + `……;每一步都要写清操作、输入、预期结果、实际结果和证据来源。不要只写“步骤一”或把多步合并成一段。
- 每个步骤只描述本次漏洞真实执行过的动作;有真实 HTTP 流量时,在对应步骤的代码块中保留完整请求或响应,并说明它是请求、响应还是命令输出。没有证据的内容标记为“待补充/未验证”。
- 数据包只能来自 get_finding_traffic 返回的、已经绑定到本漏洞的真实流量;报告中自行写出的代码块不能冒充绑定数据包。没有绑定流量时明确写“暂无已绑定流量证据”,不要编造请求/响应。
- 最新报告将概述、影响、复现步骤、最终结果、根因分析和修复建议合并在同一份报告中;不要再额外生成一份脱离步骤的“详细报告”。
- ` + "`## 证据`" + `:证明漏洞真实存在的关键请求/响应片段、命令输出、回显、截图说明——用代码块贴原文。
- ` + "`## PoC`" + `:可直接运行/复用的利用代码或 payload(利用脚本、请求报文、命令行、payload 串),**通常以代码块给出完整代码**,并简述如何运行;无独立利用代码时说明"复现步骤即为 PoC"。
- ` + "`## 根因分析`" + `:为什么会有这个漏洞(缺校验/危险函数/配置错误…)。
Expand All @@ -112,11 +131,12 @@ const ReporterDefaultPrompt = `你是一个授权渗透测试系统里的**漏
// source while the same string stays as the in-code render fallback.
func BuiltinPromptSeeds() map[string]string {
return map[string]string{
"goals": goalsDefaultTmpl,
"planner": plannerDefaultTmpl,
"mainagent": mainAgentDefaultTmpl,
"worker": workerDefaultTmpl,
"auto": autoDefaultTmpl,
"pentest": pentestDefaultTmpl,
"goals": goalsDefaultTmpl,
"planner": plannerDefaultTmpl,
"mainagent": mainAgentDefaultTmpl,
"worker": workerDefaultTmpl,
"auto": autoDefaultTmpl,
"asset_mapper": assetMapperDefaultTmpl,
"pentest": pentestDefaultTmpl,
}
}
4 changes: 3 additions & 1 deletion agent/toolcatalog.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ func builtinToolsByAgent() map[string][]actool.CoreTool {
// auto 默认绑漏洞上报 + 资产管理工具,其他域工具可在 UI 按需勾选。
// 新库由此 seed 写入;老库由 seedAutoDefaultBindings 迁移。
"auto": {ts.addFinding(), ts.insertAssets(), ts.addCompanyScope(), ts.listAssets(), ts.listCompanies()},
// asset_mapper 只读资产库,供资产梳理和拓扑解释使用。
"asset_mapper": {ts.listAssets(), ts.listCompanies()},
// pentest(独立渗透 agent)默认绑:查资产 / 插资产 / 报漏洞 / 查漏洞 / 查企业。
// 新库由此 seed 写入;老库由 seedPentestDefaultBindings 迁移。
"pentest": {ts.listAssets(), ts.insertAssets(), ts.addFinding(), ts.listFindings(), ts.listCompanies()},
Expand All @@ -62,7 +64,7 @@ var defaultUnbound = map[string]bool{"goal_met": true}
// 多个 agent 都有)合成一条,Agents 取并集;defaultUnbound 里的工具则强制绑定为空。
func BuiltinToolSeeds() []ToolSeed {
byAgent := builtinToolsByAgent()
order := []string{"mainagent", "goals", "planner", "worker", "auto", "pentest"}
order := []string{"mainagent", "goals", "planner", "worker", "auto", "asset_mapper", "pentest"}

type acc struct {
tool actool.CoreTool
Expand Down
2 changes: 2 additions & 0 deletions db/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@ var builtinAgents = []builtinAgent{
}, false, nil},
// Auto:内置「平台操作」agent。不参与渗透编排循环,经对话页驱动,用工具操作平台。
{"auto", "Auto", "assistant", "平台操作助手:用工具管理任务(建/看/暂停/给提示)与资产,并可创建/修改 skill、自定义工具、MCP。", nil, false, nil},
// Asset mapper: read-only assistant used by the topology canvas and asset views.
{"asset_mapper", "资产梳理", "assistant", "资产梳理助手:汇总公网、边界与内网资产关系,基于真实资产数据解释入站路径,不凭空推断连接。", nil, false, nil},
// 渗透测试:内置「独立渗透」agent。经对话页驱动,一人从侦察到收尾走完整条渗透链,自己规划自己执行自己验证。默认开启交互式 shell。
{"pentest", "渗透测试", "assistant", "独立渗透 agent:一人从侦察→找攻击面→深入利用→验证→收尾走完整条链,自己规划、自己执行、自己对抗式验证。", nil, true, intp(0)},
}
Expand Down
7 changes: 6 additions & 1 deletion db/task_scope.go
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,12 @@ WHERE type='root_domain' AND domain=$1 LIMIT 1`, root).Scan(&id, &companyID)
link(n.Key, companyKey(n.CompanyID))
}
case "service":
link(n.Key, firstOf(subByDomain[n.Domain], ipByAddr[n.IP], rootByDomain[n.RootDomain]))
host, _ := hostPortOf(n)
link(n.Key, firstOf(
subByDomain[n.Domain], subByDomain[host],
ipByAddr[n.IP], ipByAddr[host],
rootByDomain[n.RootDomain],
))
case "endpoint":
host, port := hostPortOf(n)
parent := firstOf(
Expand Down
12 changes: 12 additions & 0 deletions server/assembly.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,13 @@ func wireAgentAugment(pg *db.DB, skillDir string, hostTools func() ([]actool.Cor
continue
}
for _, t := range ts {
// Playwright exposes the screenshot capability as a separate tool. Keep
// it opt-in so a normal browser MCP session does not unexpectedly send
// image payloads to the model or consume extra tokens.
if m.Name == browserMCPName && isBrowserScreenshotTool(t.Name()) &&
(agentKey != "reporter" || !pg.GetBool(settingBrowserScreenshot, false)) {
continue
}
extra = append(extra, t)
allNames = append(allNames, t.Name())
serverTools[m.Name] = append(serverTools[m.Name], t.Name())
Expand Down Expand Up @@ -180,6 +187,11 @@ func wireAgentAugment(pg *db.DB, skillDir string, hostTools func() ([]actool.Cor
}
}

func isBrowserScreenshotTool(name string) bool {
name = strings.ToLower(strings.TrimSpace(name))
return strings.Contains(name, "screenshot") || strings.Contains(name, "take_screenshot")
}

func idSet(ids []int64) map[int64]bool {
m := make(map[int64]bool, len(ids))
for _, id := range ids {
Expand Down
9 changes: 5 additions & 4 deletions server/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ type Manager struct {
// Settings keys the UI toggles at runtime.
const (
settingTrafficCapture = "traffic_capture"
settingBrowserScreenshot = "browser_screenshot_enabled"
settingAgentTrafficBinding = "agent_traffic_binding"
settingWebSearchOn = "web_search_enabled"
settingWebSearchBackend = "web_search_backend"
Expand All @@ -273,11 +274,11 @@ const (
// settingGlobalProxy is the global egress proxy for all target traffic
// (http/https/socks5). Empty = direct. Distinct from web_search_proxy (which
// only routes the search backend) and the per-profile LLM proxy.
settingGlobalProxy = "global_proxy"
settingGlobalProxy = "global_proxy"
settingShowEgressIP = "show_egress_ip"
settingWorkers = "workers"
settingWorkerPools = "worker_pools"
settingLLMRecord = "llm_record"
settingWorkers = "workers"
settingWorkerPools = "worker_pools"
settingLLMRecord = "llm_record"
// LLM 轮询(故障转移)。默认关闭——开启后走「全局激活配置」的 agent 在当前配置
// 不可用(余额不足/key 失效/限流/服务异常)时自动切到下一个配置。
// settingLLMPoolBindFallback 仅在轮询开启时有意义:默认关闭,即 agent/任务显式
Expand Down
88 changes: 68 additions & 20 deletions server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,12 @@ func New(ctx context.Context, m *Manager, skillDir string, dataDir string, keyDi
if err != nil || t == "" {
return "", false
}
if key == "reporter" && m.pg.GetBool(settingBrowserScreenshot, false) {
t += `

【报告步骤截图已开启】
报告撰写时,针对每个复现步骤中真实出现且仍可访问的 HTTP 页面,使用 browser MCP 的 browser_navigate 和 browser_take_screenshot 截取页面证据。只导航到漏洞证据中出现的目标 URL,不要自行扩大测试范围。将截图保存到当前工作目录下的 findings/screenshots/ 目录,文件名使用 finding-<finding_id>-step-<n>.png;确认文件存在后,在对应步骤中加入 Markdown 图片:![步骤 <n> 截图](workspace://<截图绝对路径>)。截图失败时如实写明,不要用占位图或把截图描述冒充图片。`
}
return t, true
}
// Wire DB-stored wrap-up (settlement) prompts. Empty column → built-in default.
Expand Down Expand Up @@ -760,6 +766,13 @@ func (s *Server) Handler() http.Handler {
mux.HandleFunc("POST /api/task-archives/delete/batch", s.deleteTaskArchivesBatch)
mux.HandleFunc("GET /api/tasks/{id}/coverage", s.taskCoverage)
mux.HandleFunc("GET /api/tasks/{id}/coverage-graph", s.taskCoverageGraph)
// Asset relationships are read directly from the asset store. This action
// only runs the topology explanation and produces the asset/network reports.
mux.HandleFunc("POST /api/tasks/{id}/topology-mapping", s.taskAssetMapping)
mux.HandleFunc("GET /api/tasks/{id}/topology-mapping/status", s.taskAssetMappingStatus)
// Keep the old paths for clients from earlier builds.
mux.HandleFunc("POST /api/tasks/{id}/asset-mapping", s.taskAssetMapping)
mux.HandleFunc("GET /api/tasks/{id}/asset-mapping/status", s.taskAssetMappingStatus)
mux.HandleFunc("GET /api/tasks/{id}/asset-refs", s.taskAssetRefs)
mux.HandleFunc("POST /api/tasks/{id}/assets", s.attachTaskAssets)
mux.HandleFunc("DELETE /api/tasks/{id}/assets/{assetID}", s.detachTaskAsset)
Expand All @@ -772,6 +785,7 @@ func (s *Server) Handler() http.Handler {
mux.HandleFunc("POST /api/workspace/mkdir", s.wsMkdir)
mux.HandleFunc("DELETE /api/workspace/delete", s.wsDelete)
mux.HandleFunc("GET /api/workspace/download", s.wsDownload)
mux.HandleFunc("GET /api/workspace/preview", s.wsPreview)
mux.HandleFunc("POST /api/workspace/upload", s.wsUpload)
mux.HandleFunc("GET /api/tasks/{id}/scope", s.taskScopeList)
mux.HandleFunc("POST /api/tasks/{id}/scope", s.taskScopeAdd)
Expand Down Expand Up @@ -3442,26 +3456,27 @@ func (s *Server) settingsPayload() map[string]any {
concLimit = defaultConcurrencyLimit // 关闭时也回显一个合理默认值给 UI
}
return map[string]any{
"traffic_capture": s.m.TrafficEnabled(),
"agent_traffic_binding": s.m.pg.GetBool(settingAgentTrafficBinding, false),
"task_intelligence_enabled": s.m.pg.GetBool(db.SettingTaskIntelligence, false),
db.SettingTaskAutoTitle: s.m.pg.GetBool(db.SettingTaskAutoTitle, false),
db.SettingChatAutoTitle: s.m.pg.GetBool(db.SettingChatAutoTitle, false),
db.SettingCredentialAgent: s.m.pg.GetBool(db.SettingCredentialAgent, false),
db.SettingCredentialTraffic: s.m.pg.GetBool(db.SettingCredentialAgent, false) && s.m.pg.GetBool(db.SettingCredentialTraffic, false),
"llm_record": s.m.LLMRecordEnabled(),
"web_search_enabled": on,
"web_search_backend": backend,
"brave_key_set": strings.TrimSpace(braveKey) != "",
"tavily_key_set": strings.TrimSpace(tavilyKey) != "",
"web_search_proxy": proxy, // 独立出口代理(http/https/socks5),空=直连
"global_proxy": s.m.GlobalProxy(), // 全局出口代理(http/https/socks5),所有目标流量走它,空=直连
"show_egress_ip": s.m.pg.GetBool(settingShowEgressIP, false),
"python_interpreter": strings.TrimSpace(pyStored), // 用户/自动设的值(空=用运行时检测)
"workers": s.m.Workers(), // 并发工作 agent 数(默认3);对之后启动的任务生效
"worker_pools": s.m.WorkerPools(), // 非空时按池顺序绑定 worker 会话
"task_concurrency_enabled": concOn, // 任务并发上限开关(默认关)
"task_concurrency_limit": concLimit, // 同时运行任务上限(开启后默认5)
"traffic_capture": s.m.TrafficEnabled(),
"browser_screenshot_enabled": s.m.pg.GetBool(settingBrowserScreenshot, false),
"agent_traffic_binding": s.m.pg.GetBool(settingAgentTrafficBinding, false),
"task_intelligence_enabled": s.m.pg.GetBool(db.SettingTaskIntelligence, false),
db.SettingTaskAutoTitle: s.m.pg.GetBool(db.SettingTaskAutoTitle, false),
db.SettingChatAutoTitle: s.m.pg.GetBool(db.SettingChatAutoTitle, false),
db.SettingCredentialAgent: s.m.pg.GetBool(db.SettingCredentialAgent, false),
db.SettingCredentialTraffic: s.m.pg.GetBool(db.SettingCredentialAgent, false) && s.m.pg.GetBool(db.SettingCredentialTraffic, false),
"llm_record": s.m.LLMRecordEnabled(),
"web_search_enabled": on,
"web_search_backend": backend,
"brave_key_set": strings.TrimSpace(braveKey) != "",
"tavily_key_set": strings.TrimSpace(tavilyKey) != "",
"web_search_proxy": proxy, // 独立出口代理(http/https/socks5),空=直连
"global_proxy": s.m.GlobalProxy(), // 全局出口代理(http/https/socks5),所有目标流量走它,空=直连
"show_egress_ip": s.m.pg.GetBool(settingShowEgressIP, false),
"python_interpreter": strings.TrimSpace(pyStored), // 用户/自动设的值(空=用运行时检测)
"workers": s.m.Workers(), // 并发工作 agent 数(默认3);对之后启动的任务生效
"worker_pools": s.m.WorkerPools(), // 非空时按池顺序绑定 worker 会话
"task_concurrency_enabled": concOn, // 任务并发上限开关(默认关)
"task_concurrency_limit": concLimit, // 同时运行任务上限(开启后默认5)
// LLM 轮询(故障转移)。默认关;开启后走全局激活配置的 agent 在当前配置不可用时
// 自动切到下一个配置。bind_fallback 仅在轮询开启时有意义(默认关)。
"llm_pool_enabled": s.m.LLMPoolEnabled(),
Expand Down Expand Up @@ -3520,6 +3535,7 @@ func (s *Server) pgDetectPython(w http.ResponseWriter, r *http.Request) {
func (s *Server) putSettings(w http.ResponseWriter, r *http.Request) {
var req struct {
TrafficCapture *bool `json:"traffic_capture"`
BrowserScreenshot *bool `json:"browser_screenshot_enabled"`
AgentTrafficBinding *bool `json:"agent_traffic_binding"`
TaskIntelligence *bool `json:"task_intelligence_enabled"`
TaskAutoTitle *bool `json:"task_auto_title_enabled"`
Expand Down Expand Up @@ -3715,6 +3731,16 @@ func (s *Server) putSettings(w http.ResponseWriter, r *http.Request) {
return
}
}
if req.BrowserScreenshot != nil {
if err := s.setReporterBrowserScreenshotVisibility(*req.BrowserScreenshot); err != nil {
writeErr(w, 500, err.Error())
return
}
if err := s.m.pg.SetBool(settingBrowserScreenshot, *req.BrowserScreenshot); err != nil {
writeErr(w, 500, err.Error())
return
}
}
if req.TrafficCapture != nil {
if err := s.m.SetTrafficEnabled(*req.TrafficCapture); err != nil {
writeErr(w, 500, err.Error())
Expand Down Expand Up @@ -3766,6 +3792,28 @@ func (s *Server) putSettings(w http.ResponseWriter, r *http.Request) {
writeJSON(w, 200, s.settingsPayload())
}

// setReporterBrowserScreenshotVisibility keeps the report writer's browser MCP
// permission in sync with the screenshot setting. Other agents retain their
// explicit MCP permissions.
func (s *Server) setReporterBrowserScreenshotVisibility(enabled bool) error {
reporter, err := s.m.pg.GetAgentByKey("reporter")
if err != nil || reporter == nil {
return err
}
servers, err := s.m.pg.ListMCP()
if err != nil {
return err
}
for _, server := range servers {
if server.Name == browserMCPName {
return s.m.pg.ToggleVisibility(reporter.ID, "mcp", server.ID, enabled)
}
}
// The built-in browser MCP may be deleted by an administrator. Keep the
// setting writable so it takes effect automatically if the server returns.
return nil
}

// testWebSearch runs a real "test" search with the given (or currently saved)
// backend/proxy/key to verify the config can actually reach a search backend —
// mirroring testLLM. Backend/proxy come from the request (so the form's unsaved
Expand Down
Loading