archive/fscan
1
0
Fork 0
mirror of https://github.com/shadow1ng/fscan.git synced 2026-09-24 20:21:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: 完成全局状态到 session 的完整迁移

Browse Source 
将 plugins/services、plugins/local、plugins/web、webscan 层的日志输出、
漏洞结果保存和 TCP 计数器从全局 common.Log*/GetGlobalState() 迁移到
session 实例方法，确保 SDK 并发扫描时各实例完全隔离。

- 50 个文件，所有插件日志走 session.Log*
- DoRequest 加入 session 参数，计数器走 session.State
- POC 执行器通过 POCContext.Session 传递
- 仅保留 init() 和 CEL runtime 等无 session 场景的全局回退
This commit is contained in:
ZacharyZcR
2026-06-01 08:13:23 +08:00
parent 569d21a8bc
commit d6d323854a
50 changed files with 256 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/local/forwardshell.go
+9 -9
View File
@@ -53,7 +53,7 @@ func (p *ForwardShellPlugin) Scan(ctx context.Context, info *common.HostInfo, se
output.WriteString(i18n.Tr("local_platform", runtime.GOOS) + "\n\n")
// 启动正向Shell服务器
err := p.startForwardShellServer(ctx, port, state)
err := p.startForwardShellServer(ctx, port, state, session)
if err != nil {
output.WriteString(i18n.Tr("forwardshell_server_error", err) + "\n")
return &plugins.Result{
@@ -64,7 +64,7 @@ func (p *ForwardShellPlugin) Scan(ctx context.Context, info *common.HostInfo, se
}
output.WriteString(i18n.GetText("forwardshell_done") + "\n")
common.LogSuccess(i18n.Tr("forwardshell_complete", port))
session.LogSuccess(i18n.Tr("forwardshell_complete", port))
return &plugins.Result{
Success: true,
@@ -75,7 +75,7 @@ func (p *ForwardShellPlugin) Scan(ctx context.Context, info *common.HostInfo, se
}
// startForwardShellServer 启动正向Shell服务器
func (p *ForwardShellPlugin) startForwardShellServer(ctx context.Context, port int, state *common.State) error {
func (p *ForwardShellPlugin) startForwardShellServer(ctx context.Context, port int, state *common.State, session *common.ScanSession) error {
// 监听指定端口
listener, err := net.Listen("tcp", fmt.Sprintf("0.0.0.0:%d", port))
if err != nil {
@@ -84,7 +84,7 @@ func (p *ForwardShellPlugin) startForwardShellServer(ctx context.Context, port i
defer func() { _ = listener.Close() }()
p.listener = listener
common.LogSuccess(i18n.Tr("forwardshell_started", port))
session.LogSuccess(i18n.Tr("forwardshell_started", port))
// 设置正向Shell为活跃状态
state.SetForwardShellActive(true)
@@ -111,17 +111,17 @@ func (p *ForwardShellPlugin) startForwardShellServer(ctx context.Context, port i
if errors.As(err, &netErr) && netErr.Timeout() {
continue
}
common.LogError(i18n.Tr("forwardshell_accept_failed", err))
session.LogError(i18n.Tr("forwardshell_accept_failed", err))
continue
}
common.LogSuccess(i18n.Tr("forwardshell_client_connected", conn.RemoteAddr().String()))
go p.handleClient(ctx, conn)
session.LogSuccess(i18n.Tr("forwardshell_client_connected", conn.RemoteAddr().String()))
go p.handleClient(ctx, conn, session)
}
}
// handleClient 处理客户端连接
func (p *ForwardShellPlugin) handleClient(ctx context.Context, clientConn net.Conn) {
func (p *ForwardShellPlugin) handleClient(ctx context.Context, clientConn net.Conn, session *common.ScanSession) {
defer func() { _ = clientConn.Close() }()
// ctx 取消时关闭连接，解除阻塞的读操作
@@ -154,7 +154,7 @@ func (p *ForwardShellPlugin) handleClient(ctx context.Context, clientConn net.Co
}
if err := scanner.Err(); err != nil && ctx.Err() == nil {
common.LogError(i18n.Tr("forwardshell_read_failed", err))
session.LogError(i18n.Tr("forwardshell_read_failed", err))
}
}