From b2b2c4a2153464c986b96a1eae913dca43b44727 Mon Sep 17 00:00:00 2001 From: ZacharyZcR Date: Sat, 9 Aug 2025 17:31:40 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=88=86=E7=B1=BB=E7=B3=BB=E7=BB=9F=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DFindNet=E6=89=A7=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复FindNet插件分类从information改为service，解决不在服务扫描阶段执行的问题 - 统一所有插件分类为标准的三种类型：service、web、local - 将vulnerability类型插件(smbghost、ms17010)重分类为service - 将information类型插件(netbios、findnet)重分类为service - 确保所有网络服务端口扫描插件都在服务扫描阶段正确执行 - 保持插件功能不变，仅调整分类以符合新架构要求 测试验证：FindNet现已能正确在135端口扫描时显示网络接口信息 --- Plugins/legacy/findnet/plugin.go | 4 ++-- Plugins/legacy/ms17010/plugin.go | 4 ++-- Plugins/legacy/netbios/plugin.go | 4 ++-- Plugins/legacy/smbghost/plugin.go | 4 ++-- adapters/legacy_plugins/ms17010/plugin.go | 4 ++-- adapters/legacy_plugins/netbios/plugin.go | 4 ++-- adapters/legacy_plugins/smbghost/plugin.go | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Plugins/legacy/findnet/plugin.go b/Plugins/legacy/findnet/plugin.go index cb21102..d4d2770 100644 --- a/Plugins/legacy/findnet/plugin.go +++ b/Plugins/legacy/findnet/plugin.go @@ -14,7 +14,7 @@ func NewFindNetPlugin() base.Plugin { Version: "1.0.0", Author: "fscan-team", Description: "Windows网络接口发现和主机名解析 (通过RPC)", - Category: "information", + Category: "service", Ports: []int{135}, // RPC端口 Protocols: []string{"tcp"}, Tags: []string{"findnet", "rpc", "information-gathering", "windows", "network-discovery"}, @@ -40,7 +40,7 @@ func init() { Version: "1.0.0", Author: "fscan-team", Description: "Windows网络接口发现和主机名解析 (通过RPC)", - Category: "information", + Category: "service", Ports: []int{135}, Protocols: []string{"tcp"}, Tags: []string{"findnet", "rpc", "information-gathering", "windows", "network-discovery"}, diff --git a/Plugins/legacy/ms17010/plugin.go b/Plugins/legacy/ms17010/plugin.go index 1224c20..4bd4705 100644 --- a/Plugins/legacy/ms17010/plugin.go +++ b/Plugins/legacy/ms17010/plugin.go @@ -14,7 +14,7 @@ func NewMS17010Plugin() base.Plugin { Version: "1.0.0", Author: "fscan-team", Description: "MS17010 SMB远程代码执行漏洞检测 (EternalBlue)", - Category: "vulnerability", + Category: "service", Ports: []int{445}, // SMB端口 Protocols: []string{"tcp"}, Tags: []string{"smb", "ms17010", "eternalblue", "vulnerability"}, @@ -40,7 +40,7 @@ func init() { Version: "1.0.0", Author: "fscan-team", Description: "MS17010 SMB远程代码执行漏洞检测 (EternalBlue)", - Category: "vulnerability", + Category: "service", Ports: []int{445}, Protocols: []string{"tcp"}, Tags: []string{"smb", "ms17010", "eternalblue", "vulnerability"}, diff --git a/Plugins/legacy/netbios/plugin.go b/Plugins/legacy/netbios/plugin.go index 3b7fd11..a3ad8a3 100644 --- a/Plugins/legacy/netbios/plugin.go +++ b/Plugins/legacy/netbios/plugin.go @@ -14,7 +14,7 @@ func NewNetBiosPlugin() base.Plugin { Version: "1.0.0", Author: "fscan-team", Description: "NetBIOS信息收集和主机名解析", - Category: "information", + Category: "service", Ports: []int{139, 445}, // NetBIOS端口 Protocols: []string{"tcp", "udp"}, Tags: []string{"netbios", "information-gathering", "hostname", "smb"}, @@ -40,7 +40,7 @@ func init() { Version: "1.0.0", Author: "fscan-team", Description: "NetBIOS信息收集和主机名解析", - Category: "information", + Category: "service", Ports: []int{139, 445}, Protocols: []string{"tcp", "udp"}, Tags: []string{"netbios", "information-gathering", "hostname", "smb"}, diff --git a/Plugins/legacy/smbghost/plugin.go b/Plugins/legacy/smbghost/plugin.go index e0460ec..60dcc15 100644 --- a/Plugins/legacy/smbghost/plugin.go +++ b/Plugins/legacy/smbghost/plugin.go @@ -14,7 +14,7 @@ func NewSmbGhostPlugin() base.Plugin { Version: "1.0.0", Author: "fscan-team", Description: "SMBGhost (CVE-2020-0796) 远程代码执行漏洞检测", - Category: "vulnerability", + Category: "service", Ports: []int{445}, // SMB端口 Protocols: []string{"tcp"}, Tags: []string{"smb", "smbghost", "cve-2020-0796", "vulnerability"}, @@ -40,7 +40,7 @@ func init() { Version: "1.0.0", Author: "fscan-team", Description: "SMBGhost (CVE-2020-0796) 远程代码执行漏洞检测", - Category: "vulnerability", + Category: "service", Ports: []int{445}, Protocols: []string{"tcp"}, Tags: []string{"smb", "smbghost", "cve-2020-0796", "vulnerability"}, diff --git a/adapters/legacy_plugins/ms17010/plugin.go b/adapters/legacy_plugins/ms17010/plugin.go index 6b6f774..52d605e 100644 --- a/adapters/legacy_plugins/ms17010/plugin.go +++ b/adapters/legacy_plugins/ms17010/plugin.go @@ -14,7 +14,7 @@ func NewMS17010Plugin() base.Plugin { Version: "1.0.0", Author: "fscan-team", Description: "MS17010 SMB远程代码执行漏洞检测 (EternalBlue)", - Category: "vulnerability", + Category: "service", Ports: []int{445}, // SMB端口 Protocols: []string{"tcp"}, Tags: []string{"smb", "ms17010", "eternalblue", "vulnerability"}, @@ -40,7 +40,7 @@ func init() { Version: "1.0.0", Author: "fscan-team", Description: "MS17010 SMB远程代码执行漏洞检测 (EternalBlue)", - Category: "vulnerability", + Category: "service", Ports: []int{445}, Protocols: []string{"tcp"}, Tags: []string{"smb", "ms17010", "eternalblue", "vulnerability"}, diff --git a/adapters/legacy_plugins/netbios/plugin.go b/adapters/legacy_plugins/netbios/plugin.go index 3f5231b..563be31 100644 --- a/adapters/legacy_plugins/netbios/plugin.go +++ b/adapters/legacy_plugins/netbios/plugin.go @@ -14,7 +14,7 @@ func NewNetBiosPlugin() base.Plugin { Version: "1.0.0", Author: "fscan-team", Description: "NetBIOS信息收集和主机名解析", - Category: "information", + Category: "service", Ports: []int{139, 445}, // NetBIOS端口 Protocols: []string{"tcp", "udp"}, Tags: []string{"netbios", "information-gathering", "hostname", "smb"}, @@ -40,7 +40,7 @@ func init() { Version: "1.0.0", Author: "fscan-team", Description: "NetBIOS信息收集和主机名解析", - Category: "information", + Category: "service", Ports: []int{139, 445}, Protocols: []string{"tcp", "udp"}, Tags: []string{"netbios", "information-gathering", "hostname", "smb"}, diff --git a/adapters/legacy_plugins/smbghost/plugin.go b/adapters/legacy_plugins/smbghost/plugin.go index 8ce1f99..c0cc291 100644 --- a/adapters/legacy_plugins/smbghost/plugin.go +++ b/adapters/legacy_plugins/smbghost/plugin.go @@ -14,7 +14,7 @@ func NewSmbGhostPlugin() base.Plugin { Version: "1.0.0", Author: "fscan-team", Description: "SMBGhost (CVE-2020-0796) 远程代码执行漏洞检测", - Category: "vulnerability", + Category: "service", Ports: []int{445}, // SMB端口 Protocols: []string{"tcp"}, Tags: []string{"smb", "smbghost", "cve-2020-0796", "vulnerability"}, @@ -40,7 +40,7 @@ func init() { Version: "1.0.0", Author: "fscan-team", Description: "SMBGhost (CVE-2020-0796) 远程代码执行漏洞检测", - Category: "vulnerability", + Category: "service", Ports: []int{445}, Protocols: []string{"tcp"}, Tags: []string{"smb", "smbghost", "cve-2020-0796", "vulnerability"},