fix: resolve recent service scan regressions

This commit is contained in:
ZacharyZcR
2026-08-26 04:19:58 +08:00
parent 1418f6d8ce
commit a1ff55ef55
11 changed files with 153 additions and 24 deletions
+2 -2
View File
@@ -88,8 +88,8 @@ func TestCacheServiceInfo_BasicCRUD(t *testing.T) {
func TestWebServiceFiltering(t *testing.T) { func TestWebServiceFiltering(t *testing.T) {
clearServiceCache() clearServiceCache()
webNames := []string{"http", "https", "ssl", "tls", "nginx", "apache", "iis", "tomcat"} webNames := []string{"http", "https", "nginx", "apache", "iis", "tomcat"}
nonWebNames := []string{"ssh", "mysql", "postgresql", "redis", "mongodb", "ftp", "smtp", "telnet", "vnc", "rdp"} nonWebNames := []string{"ssl", "tls", "ssh", "mysql", "postgresql", "redis", "mongodb", "ftp", "smtp", "telnet", "vnc", "rdp"}
for _, name := range webNames { for _, name := range webNames {
clearServiceCache() clearServiceCache()
+1 -2
View File
@@ -222,7 +222,7 @@ var (
"telnet", "ftp", "smtp", "pop3", "imap", "ldap", "snmp", "vnc", "rdp", "smb", "telnet", "ftp", "smtp", "pop3", "imap", "ldap", "snmp", "vnc", "rdp", "smb",
} }
webKeywords = []string{ webKeywords = []string{
"http", "https", "ssl", "tls", "nginx", "apache", "iis", "tomcat", "http", "https", "nginx", "apache", "iis", "tomcat",
"jetty", "nodejs", "php", "asp", "jsp", "jetty", "nodejs", "php", "asp", "jsp",
} }
bannerKeywords = []string{"server:", "http/", "content-type:"} bannerKeywords = []string{"server:", "http/", "content-type:"}
@@ -514,4 +514,3 @@ func hasMalformedURLPort(host string) bool {
} }
return strings.Contains(host, ":") return strings.Contains(host, ":")
} }
+2 -2
View File
@@ -230,11 +230,11 @@ func TestIsWebServiceByFingerprint(t *testing.T) {
expected: true, expected: true,
}, },
{ {
name: "SSL/TLS服务", name: "通用TLS服务不是Web",
serviceInfo: &ServiceInfo{ serviceInfo: &ServiceInfo{
Name: "ssl", Name: "ssl",
}, },
expected: true, expected: false,
}, },
{ {
name: "包含非Web关键字-postgresql", name: "包含非Web关键字-postgresql",
+7
View File
@@ -477,6 +477,13 @@ func (t *TPKT) recvFastPath(s []byte, err error) {
return return
} }
// NLA-only authentication can receive a Fast-Path packet before the PDU
// layer installs a listener. Treat it as an ignorable early packet instead
// of dereferencing a nil interface and crashing the whole scan.
if t.fastPathListener == nil {
return
}
t.fastPathListener.RecvFastPath(t.secFlag, s) t.fastPathListener.RecvFastPath(t.secFlag, s)
core.StartReadBytes(2, t.Conn, t.recvHeader) core.StartReadBytes(2, t.Conn, t.recvHeader)
} }
+13
View File
@@ -0,0 +1,13 @@
package tpkt
import (
"testing"
"github.com/shadow1ng/fscan/libs/grdp/glog"
)
func TestRecvFastPathWithoutListenerDoesNotPanic(t *testing.T) {
glog.SetLevel(glog.NONE)
tpkt := &TPKT{}
tpkt.recvFastPath([]byte{0x00}, nil)
}
+11 -5
View File
@@ -20,6 +20,10 @@ import (
) )
func main() { func main() {
os.Exit(run())
}
func run() int {
// 启动 pprof(仅调试版本) // 启动 pprof(仅调试版本)
debug.Start() debug.Start()
defer debug.Stop() defer debug.Stop()
@@ -28,23 +32,23 @@ func main() {
var info common.HostInfo var info common.HostInfo
if err := common.Flag(&info); err != nil { if err := common.Flag(&info); err != nil {
if err == common.ErrShowHelp { if err == common.ErrShowHelp {
os.Exit(0) // 显示帮助是正常退出 return 0 // 显示帮助是正常退出
} }
common.LogError(i18n.Tr("param_error", err)) common.LogError(i18n.Tr("param_error", err))
os.Exit(1) return 1
} }
// 检查参数互斥性 // 检查参数互斥性
if err := common.ValidateExclusiveParams(&info); err != nil { if err := common.ValidateExclusiveParams(&info); err != nil {
common.LogError(i18n.Tr("error_generic", err)) common.LogError(i18n.Tr("error_generic", err))
os.Exit(1) return 1
} }
// 统一初始化:解析 → 配置 → 输出 // 统一初始化:解析 → 配置 → 输出
result, err := common.Initialize(&info) result, err := common.Initialize(&info)
if err != nil { if err != nil {
common.LogError(i18n.Tr("init_failed", err)) common.LogError(i18n.Tr("init_failed", err))
os.Exit(1) return 1
} }
// 设置信号处理,确保 Ctrl+C 时能正确保存结果 // 设置信号处理,确保 Ctrl+C 时能正确保存结果
@@ -62,6 +66,8 @@ func main() {
// 执行扫描 // 执行扫描
if _, err := core.RunScan(context.Background(), *result.Info, result.Session); err != nil { if _, err := core.RunScan(context.Background(), *result.Info, result.Session); err != nil {
common.LogError(i18n.Tr("error_generic", err)) common.LogError(i18n.Tr("error_generic", err))
os.Exit(1) return 1
} }
return 0
} }
+19 -10
View File
@@ -3,6 +3,7 @@
package services package services
import ( import (
"bufio"
"context" "context"
"fmt" "fmt"
"io" "io"
@@ -308,19 +309,27 @@ func (p *SSHPlugin) identifyService(ctx context.Context, info *common.HostInfo,
func (p *SSHPlugin) readSSHBanner(conn net.Conn, config *common.Config) string { func (p *SSHPlugin) readSSHBanner(conn net.Conn, config *common.Config) string {
_ = conn.SetReadDeadline(time.Now().Add(config.ModuleTimeout())) _ = conn.SetReadDeadline(time.Now().Add(config.ModuleTimeout()))
banner := make([]byte, 256) // RFC 4253 permits servers to send informational lines before the SSH
n, err := conn.Read(banner) // identification string. Read bounded lines until the protocol banner is
if err != nil || n < 4 { // found instead of requiring SSH- at the first byte of the first read.
return "" reader := bufio.NewReaderSize(conn, 256)
} for range 50 {
line, err := reader.ReadString('\n')
if len(line) > 255 {
return ""
}
bannerStr := strings.TrimSpace(string(banner[:n])) banner := strings.TrimSpace(line)
if strings.HasPrefix(banner, "SSH-") {
if matched := sshBannerRegex.FindStringSubmatch(banner); len(matched) >= 3 {
return fmt.Sprintf("SSH %s (%s)", matched[1], matched[2])
}
return i18n.Tr("ssh_service_banner", banner)
}
if strings.HasPrefix(bannerStr, "SSH-") { if err != nil {
if matched := sshBannerRegex.FindStringSubmatch(bannerStr); len(matched) >= 3 { return ""
return fmt.Sprintf("SSH %s (%s)", matched[1], matched[2])
} }
return i18n.Tr("ssh_service_banner", bannerStr)
} }
return "" return ""
+38
View File
@@ -4,9 +4,47 @@ package services
import ( import (
"errors" "errors"
"net"
"testing" "testing"
"time"
"github.com/shadow1ng/fscan/common"
) )
func TestReadSSHBannerAllowsPreBannerLines(t *testing.T) {
client, server := net.Pipe()
defer client.Close()
defer server.Close()
go func() {
_, _ = server.Write([]byte("Authorized access only\r\nSSH-2.0-OpenSSH_9.6\r\n"))
}()
cfg := common.NewConfig()
cfg.Timeout = time.Second
got := NewSSHPlugin().readSSHBanner(client, cfg)
if got != "SSH 2.0 (OpenSSH_9.6)" {
t.Fatalf("readSSHBanner() = %q", got)
}
}
func TestReadSSHBannerRejectsNonSSHService(t *testing.T) {
client, server := net.Pipe()
defer client.Close()
defer server.Close()
go func() {
_, _ = server.Write([]byte("HTTP/1.1 200 OK\r\n"))
_ = server.Close()
}()
cfg := common.NewConfig()
cfg.Timeout = time.Second
if got := NewSSHPlugin().readSSHBanner(client, cfg); got != "" {
t.Fatalf("readSSHBanner() = %q, want empty", got)
}
}
func TestClassifySSHErrorType(t *testing.T) { func TestClassifySSHErrorType(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
+2 -3
View File
@@ -61,12 +61,11 @@ func (p *TelnetPlugin) Scan(ctx context.Context, info *common.HostInfo, session
// 检测未授权访问 // 检测未授权访问
if result := p.testUnauthAccess(ctx, info, session); result != nil && result.Success { if result := p.testUnauthAccess(ctx, info, session); result != nil && result.Success {
session.LogVuln(i18n.Tr("telnet_service", target, result.Banner))
// 验证命令执行能力
if ok, osType, evidence := p.verifyCommandExecution(ctx, info, "", "", session); ok { if ok, osType, evidence := p.verifyCommandExecution(ctx, info, "", "", session); ok {
session.LogVuln(i18n.Tr("telnet_service", target, result.Banner))
session.LogVuln(i18n.Tr("telnet_unauth_rce", target, osType, evidence)) session.LogVuln(i18n.Tr("telnet_unauth_rce", target, osType, evidence))
return result
} }
return result
} }
// 生成密码字典 // 生成密码字典
+9
View File
@@ -34,6 +34,15 @@ func (p *VNCPlugin) Scan(ctx context.Context, info *common.HostInfo, session *co
return result return result
} }
// -nobr 仅保留未授权访问检测,不继续尝试密码。
if config.DisableBrute {
return &ScanResult{
Type: plugins.ResultTypeService,
Success: true,
Service: "vnc",
}
}
// 生成密码列表 // 生成密码列表
var credentials []Credential var credentials []Credential
if config.Credentials.Passwords != nil { if config.Credentials.Passwords != nil {
+49
View File
@@ -3,10 +3,59 @@
package services package services
import ( import (
"context"
"errors" "errors"
"net"
"strconv"
"sync/atomic"
"testing" "testing"
"time"
"github.com/shadow1ng/fscan/common"
) )
func TestVNCDisableBruteOnlyChecksUnauthenticatedAccess(t *testing.T) {
listener, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
t.Fatal(err)
}
defer listener.Close()
var connections atomic.Int32
go func() {
for {
conn, err := listener.Accept()
if err != nil {
return
}
connections.Add(1)
_ = conn.Close()
}
}()
host, portText, err := net.SplitHostPort(listener.Addr().String())
if err != nil {
t.Fatal(err)
}
port, err := strconv.Atoi(portText)
if err != nil {
t.Fatal(err)
}
cfg := common.NewConfig()
cfg.DisableBrute = true
session := common.NewScanSession(cfg, common.NewState(), &common.FlagVars{})
result := NewVNCPlugin().Scan(context.Background(), &common.HostInfo{Host: host, Port: port}, session)
if result == nil || !result.Success || result.Service != "vnc" {
t.Fatalf("Scan() = %#v, want identified VNC service", result)
}
time.Sleep(20 * time.Millisecond)
if got := connections.Load(); got != 1 {
t.Fatalf("connections = %d, want one unauthenticated-access check and no password attempts", got)
}
}
func TestClassifyVNCErrorType(t *testing.T) { func TestClassifyVNCErrorType(t *testing.T) {
tests := []struct { tests := []struct {
name string name string