修复指纹匹配中, rule配置的version规则不生效的bug

chainreactors · Dec 16, 2022 · 5c2b39c · 5c2b39c
1 parent 8666208
commit 5c2b39c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/v2/pkg/fingers/fingers.go b/v2/pkg/fingers/fingers.go
@@ -47,15 +47,15 @@ func (finger *Finger) Compile(portHandler func([]string) []string) error {
 }
 
 func (finger *Finger) ToResult(hasFrame, hasVuln bool, res string, index int) (frame *parsers.Framework, vuln *parsers.Vuln) {
-	if index+1 > len(finger.Rules) {
+	if index >= len(finger.Rules) {
 		return nil, nil
 	}
 
 	if hasFrame {
 		if res != "" {
 			frame = &parsers.Framework{Name: finger.Name, Version: res}
 		} else if finger.Rules[index].Version != "" {
-			frame = &parsers.Framework{Name: finger.Name, Version: res}
+			frame = &parsers.Framework{Name: finger.Name, Version: finger.Rules[index].Version}
 		} else {
 			frame = &parsers.Framework{Name: finger.Name}
 		}