fix socket body match not work and passive match not work bug

chainreactors · Jul 16, 2024 · 692cbbf · 692cbbf
1 parent d87d3b4
commit 692cbbf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/v2/go.mod b/v2/go.mod
@@ -5,7 +5,7 @@ go 1.10
 require (
 	github.com/M09ic/go-ntlmssp v0.0.0-20230312133735-dcccd454dfe0
 	github.com/chainreactors/files v0.0.0-20231123083421-cea5b4ad18a8
-	github.com/chainreactors/fingers v0.0.0-20240715183710-884bb8fbec81
+	github.com/chainreactors/fingers v0.0.0-20240716060852-2fda69a0d7fa
 	github.com/chainreactors/logs v0.0.0-20240207121836-c946f072f81f
 	github.com/chainreactors/neutron v0.0.0-20240715184426-66d4353a43c6
 	github.com/chainreactors/parsers v0.0.0-20240708072709-07deeece7ce2

diff --git a/v2/go.sum b/v2/go.sum
@@ -89,6 +89,10 @@ github.com/chainreactors/fingers v0.0.0-20240715181037-4dbb468ecf8d h1:PO92uNrAL
 github.com/chainreactors/fingers v0.0.0-20240715181037-4dbb468ecf8d/go.mod h1:R03soobTE/AnZWtFgfQVYNM5QLH52NZ946wZTJVBXh4=
 github.com/chainreactors/fingers v0.0.0-20240715183710-884bb8fbec81 h1:uv7WTuLGUfjQvOlnwWPGR7yT1GWvVlHktHNdYpj9AOE=
 github.com/chainreactors/fingers v0.0.0-20240715183710-884bb8fbec81/go.mod h1:R03soobTE/AnZWtFgfQVYNM5QLH52NZ946wZTJVBXh4=
+github.com/chainreactors/fingers v0.0.0-20240716052615-a9a5b7a56456 h1:qu/FYpkBlnT989yMqBEvekZiTuqAUHZsrQzoV8X/2Vw=
+github.com/chainreactors/fingers v0.0.0-20240716052615-a9a5b7a56456/go.mod h1:R03soobTE/AnZWtFgfQVYNM5QLH52NZ946wZTJVBXh4=
+github.com/chainreactors/fingers v0.0.0-20240716060852-2fda69a0d7fa h1:+V0Rz+to7K+VsdZlM0OggwPS4BM4awQp8+bGHRVknIc=
+github.com/chainreactors/fingers v0.0.0-20240716060852-2fda69a0d7fa/go.mod h1:R03soobTE/AnZWtFgfQVYNM5QLH52NZ946wZTJVBXh4=
 github.com/chainreactors/logs v0.0.0-20240207121836-c946f072f81f h1:tcfp+CEdgiMvjyUzWab5edJtxUwRMSMEIkLybupIx0k=
 github.com/chainreactors/logs v0.0.0-20240207121836-c946f072f81f/go.mod h1:6Mv6W70JrtL6VClulZhmMRZnoYpcTahcDTKLMNEjK0o=
 github.com/chainreactors/neutron v0.0.0-20240715173317-9af9e51d3d00 h1:fONWVbht1ksVPwT0WUPievHKaay43m41dh4Q8a9dE/o=

diff --git a/v2/internal/plugin/socketfingerScan.go b/v2/internal/plugin/socketfingerScan.go
@@ -67,7 +67,10 @@ func socketFingerScan(result *Result) {
 		FingerEngine.SocketMatch(result.Content, result.Port, RunOpt.VersionLevel, tcpsender, callback)
 	} else {
 		if group, ok := FingerEngine.SocketGroup[result.Port]; ok {
-			group.Match(result.ToContent(), 1, tcpsender, callback, true)
+			frames, _ := group.Match(result.ToContent(), 1, tcpsender, callback, true)
+			if len(frames) == 0 {
+				FingerEngine.SocketMatch(result.Content, "", RunOpt.VersionLevel, nil, callback)
+			}
 		}
 	}