refactor: context 穿透扫描生命周期,修复长驻插件阻塞和 Web Stop 无效

- RunScan 接受 context.Context,创建可取消上下文并穿透到所有策略和插件
- 长驻插件(forwardshell/socks5proxy/reverseshell)不再进入 scan WaitGroup,
  通过 ctx.Done() 管理生命周期,解除 wg.Wait() 死锁
- Web Stop API 从 stopChan 改为 context.CancelFunc,取消信号真正传播到扫描链路
- ExecuteScanTasks 和 executeScanTask 支持 context 取消检查,停止分发新任务
- CLI 模式传 context.Background(),行为完全不变
This commit is contained in:
ZacharyZcR
2026-04-27 19:04:26 +08:00
parent 1fe8bb5182
commit d7749c4766
8 changed files with 85 additions and 25 deletions
+16 -6
View File
@@ -3,6 +3,7 @@
package api
import (
"context"
"encoding/json"
"net/http"
"sync"
@@ -73,7 +74,7 @@ type ScanHandler struct {
hub *ws.Hub
state int32
startTime time.Time
stopChan chan struct{}
cancelFn context.CancelFunc
mu sync.RWMutex
results *ResultStore
}
@@ -122,7 +123,6 @@ func (h *ScanHandler) Start(w http.ResponseWriter, r *http.Request) {
h.mu.Lock()
h.startTime = time.Now()
h.stopChan = make(chan struct{})
h.mu.Unlock()
// 清空旧结果
@@ -145,8 +145,18 @@ func (h *ScanHandler) Start(w http.ResponseWriter, r *http.Request) {
// runScan 执行扫描
func (h *ScanHandler) runScan(req ScanRequest) {
ctx, cancel := context.WithCancel(context.Background())
h.mu.Lock()
h.cancelFn = cancel
h.mu.Unlock()
defer func() {
common.ClearResultCallback() // 清除回调
cancel()
h.mu.Lock()
h.cancelFn = nil
h.mu.Unlock()
common.ClearResultCallback()
atomic.StoreInt32(&h.state, int32(ScanStateIdle))
h.hub.Broadcast(ws.MsgScanCompleted, map[string]interface{}{
"duration": time.Since(h.startTime).Seconds(),
@@ -209,7 +219,7 @@ func (h *ScanHandler) runScan(req ScanRequest) {
})
// 执行扫描
core.RunScan(info, config, state)
core.RunScan(ctx, info, config, state)
}
// Stop 停止扫描
@@ -229,8 +239,8 @@ func (h *ScanHandler) Stop(w http.ResponseWriter, r *http.Request) {
atomic.StoreInt32(&h.state, int32(ScanStateStopping))
h.mu.Lock()
if h.stopChan != nil {
close(h.stopChan)
if h.cancelFn != nil {
h.cancelFn()
}
h.mu.Unlock()