实装fuzzy compare

internal/pool.go

@@ -260,6 +260,7 @@ func (p *Pool) PreCompare(resp *ihttp.Response) error {
 }
 
 func (p *Pool) comparing() {
+Loop:
 	for bl := range p.tempCh {
 		if !bl.IsValid {
 			// precompare 确认无效数据直接送入管道
@@ -267,26 +268,23 @@ func (p *Pool) comparing() {
 			continue
 		}
 
-		if p.base.Compare(bl) == 1 {
+		if base, ok := p.baselines[bl.Status]; ok && base.Compare(bl) == 1 {
-			// 如果是同一个包则设置为无效包
+			// 挑选对应状态码的baseline进行compare
-			bl.IsValid = false
+			p.PutToInvalid(bl, "compare failed")
-			p.outputCh <- bl
-			continue
-		} else if base, ok := p.baselines[bl.Status]; ok && base.Compare(bl) == 1 {
-			bl.IsValid = false
-			bl.IsFuzzy = true
-			p.outputCh <- bl
-			p.fuzzyCh <- bl
 			continue
 		}
 
 		bl.Collect()
-		// todo fuzzy compare
+		for _, f := range bl.Frameworks {
-		if p.base.FuzzyCompare(bl) {
+			if f.Tag == "waf/cdn" {
-			bl.IsValid = false
+				p.PutToInvalid(bl, "waf")
-			bl.IsFuzzy = true
+				continue Loop
-			p.outputCh <- bl
+			}
-			p.fuzzyCh <- bl
+		}
+
+		if base, ok := p.baselines[bl.Status]; ok && base.FuzzyCompare(bl) {
+			p.PutToInvalid(bl, "fuzzy compare failed")
+			p.PutToFuzzy(bl)
 			continue
 		}
 
@@ -308,6 +306,17 @@ func (p *Pool) addFuzzyBaseline(bl *pkg.Baseline) {
 	}
 }
 
+func (p *Pool) PutToInvalid(bl *pkg.Baseline, reason string) {
+	bl.IsValid = false
+	bl.Reason = reason
+	p.outputCh <- bl
+}
+
+func (p *Pool) PutToFuzzy(bl *pkg.Baseline) {
+	bl.IsFuzzy = true
+	p.fuzzyCh <- bl
+}
+
 func (p *Pool) resetFailed() {
 	p.failedCount = 0
 	p.failedBaselines = nil

pkg/types.go

@@ -2,10 +2,11 @@ package pkg
 
 import (
 	"github.com/chainreactors/gogo/v2/pkg/fingers"
+	"github.com/chainreactors/parsers"
 	"strings"
 )
 
-type Frameworks []*fingers.Framework
+type Frameworks []*parsers.Framework
 
 func (fs Frameworks) ToString() string {
 	frameworkStrs := make([]string, len(fs))