fix: 非标准端口的服务无法匹配对应插件 #588

端口扫描识别到 8881 上运行 SSH,但 SSH 插件只注册了 [22,2222,2200,22222],
端口不匹配导致插件不执行。

新增服务名称缓存:端口扫描阶段记录 host:port → serviceName,
插件匹配时端口不命中则回退到服务名称匹配。
This commit is contained in:
ZacharyZcR
2026-06-12 19:31:56 +08:00
parent 0918eb38a6
commit 517133f72f
3 changed files with 59 additions and 2 deletions
+12 -2
View File
@@ -472,14 +472,21 @@ func buildWebServiceURL(addr string, serviceInfo *ServiceInfo) string {
return fmt.Sprintf("%s://%s", protocol, addr)
}
if protocol == "http" && port == "80" {
return fmt.Sprintf("http://%s", host)
return fmt.Sprintf("http://%s", urlHost(host))
}
if protocol == "https" && port == "443" {
return fmt.Sprintf("https://%s", host)
return fmt.Sprintf("https://%s", urlHost(host))
}
return fmt.Sprintf("%s://%s", protocol, net.JoinHostPort(host, port))
}
func urlHost(host string) string {
if strings.Contains(host, ":") && !strings.HasPrefix(host, "[") {
return "[" + host + "]"
}
return host
}
// scanSinglePort 扫描单个端口并进行服务识别(重构后的简洁版本)
func scanSinglePort(ctx context.Context, host string, port int, addr string, adaptiveTO *AdaptiveTimeout, metrics *ScanMetrics, count *atomic.Int64, collector *resultCollector, failedCollector *failedPortCollector, session *common.ScanSession) {
config := session.Config
@@ -700,6 +707,9 @@ func processServiceResult(ctx context.Context, host string, port int, addr strin
return
}
// 缓存服务名称,供插件按服务类型匹配(解决非标准端口问题)
MarkServiceName(host, port, serviceInfo.Name)
// 保存并输出服务信息
details := buildServiceDetails(port, serviceInfo)
isWeb := IsWebServiceByFingerprint(serviceInfo)