添加周期性waf检查和连通性检查

internal/pool.go

@@ -21,13 +21,15 @@ var (
 func NewPool(ctx context.Context, config *pkg.Config, outputCh chan *baseline) (*Pool, error) {
 	pctx, cancel := context.WithCancel(ctx)
 	pool := &Pool{
-		Config:   config,
+		Config:      config,
-		ctx:      pctx,
+		ctx:         pctx,
-		client:   pkg.NewClient(config.Thread, 2),
+		client:      pkg.NewClient(config.Thread, 2),
-		worder:   words.NewWorder(config.Wordlist),
+		worder:      words.NewWorder(config.Wordlist),
-		outputCh: outputCh,
+		outputCh:    outputCh,
-		tempCh:   make(chan *baseline, config.Thread),
+		tempCh:      make(chan *baseline, config.Thread),
-		wg:       &sync.WaitGroup{},
+		wg:          &sync.WaitGroup{},
+		checkPeriod: 100,
+		errPeriod:   10,
 	}
 
 	switch config.Mod {
@@ -71,7 +73,15 @@ func NewPool(ctx context.Context, config *pkg.Config, outputCh chan *baseline) (
 
 		switch unit.source {
 		case CheckSource:
-			pool.baseline = bl
+			if pool.baseline == nil {
+				//初次check覆盖baseline
+				pool.baseline = bl
+			} else if bl.Err != nil {
+				logs.Log.Warn("maybe ip banned by waf")
+			} else if !pool.baseline.Equal(bl) {
+				logs.Log.Warn("maybe trigger risk control")
+			}
+
 		case WordSource:
 			// 异步进行性能消耗较大的深度对比
 			pool.tempCh <- bl
@@ -95,23 +105,28 @@ type Pool struct {
 	bar    *pkg.Bar
 	ctx    context.Context
 	//baseReq      *http.Request
-	baseline   *baseline
+	baseline    *baseline
-	outputCh   chan *baseline
+	outputCh    chan *baseline
-	tempCh     chan *baseline
+	tempCh      chan *baseline
-	totalCount int
+	reqCount    int
-	errorCount int
+	errorCount  int
-	genReq     func(s string) (*fasthttp.Request, error)
+	checkPeriod int
+	errPeriod   int
+	genReq      func(s string) (*fasthttp.Request, error)
 	//wordlist     []string
 	worder *words.Worder
 	wg     *sync.WaitGroup
 }
 
-func (p *Pool) Init() error {
+func (p *Pool) check() {
-	//for i := 0; i < p.baseReqCount; i++ {
 	p.wg.Add(1)
 	_ = p.pool.Invoke(newUnit(pkg.RandPath(), CheckSource))
 	//}
 	p.wg.Wait()
+}
+
+func (p *Pool) Init() error {
+	p.check()
 	// todo 分析baseline
 	// 检测基本访问能力
 
@@ -119,6 +134,8 @@ func (p *Pool) Init() error {
 		return p.baseline.Err
 	}
 
+	p.baseline.Collect()
+
 	if p.baseline.RedirectURL != "" {
 		CheckRedirect = func(redirectURL string) bool {
 			if redirectURL == p.baseline.RedirectURL {
@@ -143,8 +160,13 @@ Loop:
 			if !ok {
 				break Loop
 			}
-			p.totalCount++
+			p.reqCount++
 			p.wg.Add(1)
+			if p.reqCount%p.checkPeriod == 0 {
+				go p.check()
+			} else if p.reqCount%p.errPeriod == 0 {
+				go p.check()
+			}
 			_ = p.pool.Invoke(newUnit(u, WordSource))
 		case <-time.NewTimer(time.Duration(p.DeadlineTime) * time.Second).C:
 			break Loop