From b857dd4fa72f94fed53ef00c3ae45cfeff1abf77 Mon Sep 17 00:00:00 2001
From: ZacharyZcR <2903735704@qq.com>
Date: Thu, 19 Dec 2024 15:24:10 +0800
Subject: [PATCH] =?UTF-8?q?refacor:=20=E7=BB=93=E6=9E=84=E5=8C=96=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {Plugins => Core}/ICMP.go     |  2 +-
 {Plugins => Core}/PortScan.go |  2 +-
 {Plugins => Core}/Registry.go | 47 +++++++++++++++++++----------------
 {Plugins => Core}/Scanner.go  |  2 +-
 main.go                       |  4 +--
 5 files changed, 30 insertions(+), 27 deletions(-)
 rename {Plugins => Core}/ICMP.go (99%)
 rename {Plugins => Core}/PortScan.go (99%)
 rename {Plugins => Core}/Registry.go (73%)
 rename {Plugins => Core}/Scanner.go (99%)

diff --git a/Plugins/ICMP.go b/Core/ICMP.go
similarity index 99%
rename from Plugins/ICMP.go
rename to Core/ICMP.go
index 4648e5b..f70a895 100644
--- a/Plugins/ICMP.go
+++ b/Core/ICMP.go
@@ -1,4 +1,4 @@
-package Plugins
+package Core
 
 import (
 	"bytes"
diff --git a/Plugins/PortScan.go b/Core/PortScan.go
similarity index 99%
rename from Plugins/PortScan.go
rename to Core/PortScan.go
index a55c9be..47cb659 100644
--- a/Plugins/PortScan.go
+++ b/Core/PortScan.go
@@ -1,4 +1,4 @@
-package Plugins
+package Core
 
 import (
 	"fmt"
diff --git a/Plugins/Registry.go b/Core/Registry.go
similarity index 73%
rename from Plugins/Registry.go
rename to Core/Registry.go
index d23d061..cae17c8 100644
--- a/Plugins/Registry.go
+++ b/Core/Registry.go
@@ -1,127 +1,130 @@
-package Plugins
+package Core
 
-import "github.com/shadow1ng/fscan/Config"
+import (
+	"github.com/shadow1ng/fscan/Config"
+	"github.com/shadow1ng/fscan/Plugins"
+)
 
 func init() {
 	// 注册标准端口服务扫描
 	Config.RegisterPlugin("ftp", Config.ScanPlugin{
 		Name:     "FTP",
 		Port:     21,
-		ScanFunc: FtpScan,
+		ScanFunc: Plugins.FtpScan,
 	})
 
 	Config.RegisterPlugin("ssh", Config.ScanPlugin{
 		Name:     "SSH",
 		Port:     22,
-		ScanFunc: SshScan,
+		ScanFunc: Plugins.SshScan,
 	})
 
 	Config.RegisterPlugin("findnet", Config.ScanPlugin{
 		Name:     "FindNet",
 		Port:     135,
-		ScanFunc: Findnet,
+		ScanFunc: Plugins.Findnet,
 	})
 
 	Config.RegisterPlugin("netbios", Config.ScanPlugin{
 		Name:     "NetBIOS",
 		Port:     139,
-		ScanFunc: NetBIOS,
+		ScanFunc: Plugins.NetBIOS,
 	})
 
 	Config.RegisterPlugin("smb", Config.ScanPlugin{
 		Name:     "SMB",
 		Port:     445,
-		ScanFunc: SmbScan,
+		ScanFunc: Plugins.SmbScan,
 	})
 
 	Config.RegisterPlugin("mssql", Config.ScanPlugin{
 		Name:     "MSSQL",
 		Port:     1433,
-		ScanFunc: MssqlScan,
+		ScanFunc: Plugins.MssqlScan,
 	})
 
 	Config.RegisterPlugin("oracle", Config.ScanPlugin{
 		Name:     "Oracle",
 		Port:     1521,
-		ScanFunc: OracleScan,
+		ScanFunc: Plugins.OracleScan,
 	})
 
 	Config.RegisterPlugin("mysql", Config.ScanPlugin{
 		Name:     "MySQL",
 		Port:     3306,
-		ScanFunc: MysqlScan,
+		ScanFunc: Plugins.MysqlScan,
 	})
 
 	Config.RegisterPlugin("rdp", Config.ScanPlugin{
 		Name:     "RDP",
 		Port:     3389,
-		ScanFunc: RdpScan,
+		ScanFunc: Plugins.RdpScan,
 	})
 
 	Config.RegisterPlugin("postgres", Config.ScanPlugin{
 		Name:     "PostgreSQL",
 		Port:     5432,
-		ScanFunc: PostgresScan,
+		ScanFunc: Plugins.PostgresScan,
 	})
 
 	Config.RegisterPlugin("redis", Config.ScanPlugin{
 		Name:     "Redis",
 		Port:     6379,
-		ScanFunc: RedisScan,
+		ScanFunc: Plugins.RedisScan,
 	})
 
 	Config.RegisterPlugin("fcgi", Config.ScanPlugin{
 		Name:     "FastCGI",
 		Port:     9000,
-		ScanFunc: FcgiScan,
+		ScanFunc: Plugins.FcgiScan,
 	})
 
 	Config.RegisterPlugin("memcached", Config.ScanPlugin{
 		Name:     "Memcached",
 		Port:     11211,
-		ScanFunc: MemcachedScan,
+		ScanFunc: Plugins.MemcachedScan,
 	})
 
 	Config.RegisterPlugin("mongodb", Config.ScanPlugin{
 		Name:     "MongoDB",
 		Port:     27017,
-		ScanFunc: MongodbScan,
+		ScanFunc: Plugins.MongodbScan,
 	})
 
 	// 注册特殊扫描类型
 	Config.RegisterPlugin("ms17010", Config.ScanPlugin{
 		Name:     "MS17010",
 		Port:     445,
-		ScanFunc: MS17010,
+		ScanFunc: Plugins.MS17010,
 	})
 
 	Config.RegisterPlugin("smbghost", Config.ScanPlugin{
 		Name:     "SMBGhost",
 		Port:     445,
-		ScanFunc: SmbGhost,
+		ScanFunc: Plugins.SmbGhost,
 	})
 
 	Config.RegisterPlugin("web", Config.ScanPlugin{
 		Name:     "WebTitle",
 		Port:     0,
-		ScanFunc: WebTitle,
+		ScanFunc: Plugins.WebTitle,
 	})
 
 	Config.RegisterPlugin("smb2", Config.ScanPlugin{
 		Name:     "SMBScan2",
 		Port:     445,
-		ScanFunc: SmbScan2,
+		ScanFunc: Plugins.SmbScan2,
 	})
 
 	Config.RegisterPlugin("wmiexec", Config.ScanPlugin{
 		Name:     "WMIExec",
 		Port:     135,
-		ScanFunc: WmiExec,
+		ScanFunc: Plugins.WmiExec,
 	})
 
 	Config.RegisterPlugin("localinfo", Config.ScanPlugin{
 		Name:     "LocalInfo",
 		Port:     0,
-		ScanFunc: LocalInfoScan,
+		ScanFunc: Plugins.LocalInfoScan,
 	})
 }
diff --git a/Plugins/Scanner.go b/Core/Scanner.go
similarity index 99%
rename from Plugins/Scanner.go
rename to Core/Scanner.go
index 385640d..9f97564 100644
--- a/Plugins/Scanner.go
+++ b/Core/Scanner.go
@@ -1,4 +1,4 @@
-package Plugins
+package Core
 
 import (
 	"fmt"
diff --git a/main.go b/main.go
index b4bc409..5d95fbb 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/shadow1ng/fscan/Common"
 	"github.com/shadow1ng/fscan/Config"
-	"github.com/shadow1ng/fscan/Plugins"
+	"github.com/shadow1ng/fscan/Core"
 	"time"
 )
 
@@ -13,6 +13,6 @@ func main() {
 	var Info Config.HostInfo
 	Common.Flag(&Info)
 	Common.Parse(&Info)
-	Plugins.Scan(Info)
+	Core.Scan(Info)
 	fmt.Printf("[*] 扫描结束,耗时: %s\n", time.Since(start))
 }