From 5ad4c1a580661f8137aafece616e76007ace67ef Mon Sep 17 00:00:00 2001
From: ZacharyZcR <2903735704@qq.com>
Date: Wed, 18 Dec 2024 23:38:49 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96FTP.go=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=84=E8=8C=83=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plugins/FTP.go | 93 ++++++++++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 40 deletions(-)

diff --git a/Plugins/FTP.go b/Plugins/FTP.go
index b973458..8758a5d 100644
--- a/Plugins/FTP.go
+++ b/Plugins/FTP.go
@@ -9,72 +9,85 @@ import (
 	"time"
 )
 
+// FtpScan 执行FTP服务扫描
 func FtpScan(info *Config.HostInfo) (tmperr error) {
+	// 如果已开启暴力破解则直接返回
 	if Common.IsBrute {
 		return
 	}
+
 	starttime := time.Now().Unix()
+
+	// 尝试匿名登录
 	flag, err := FtpConn(info, "anonymous", "")
 	if flag && err == nil {
 		return err
-	} else {
-		errlog := fmt.Sprintf("[-] ftp %v:%v %v %v", info.Host, info.Ports, "anonymous", err)
-		Common.LogError(errlog)
-		tmperr = err
-		if Common.CheckErrs(err) {
-			return err
-		}
+	}
+	errlog := fmt.Sprintf("[-] ftp %v:%v %v %v", info.Host, info.Ports, "anonymous", err)
+	Common.LogError(errlog)
+	tmperr = err
+	if Common.CheckErrs(err) {
+		return err
 	}
 
+	// 尝试用户名密码组合
 	for _, user := range Common.Userdict["ftp"] {
 		for _, pass := range Common.Passwords {
+			// 替换密码中的用户名占位符
 			pass = strings.Replace(pass, "{user}", user, -1)
+
 			flag, err := FtpConn(info, user, pass)
 			if flag && err == nil {
 				return err
-			} else {
-				errlog := fmt.Sprintf("[-] ftp %v:%v %v %v %v", info.Host, info.Ports, user, pass, err)
-				Common.LogError(errlog)
-				tmperr = err
-				if Common.CheckErrs(err) {
-					return err
-				}
-				if time.Now().Unix()-starttime > (int64(len(Common.Userdict["ftp"])*len(Common.Passwords)) * Common.Timeout) {
-					return err
-				}
+			}
+
+			// 记录错误信息
+			errlog := fmt.Sprintf("[-] ftp %v:%v %v %v %v", info.Host, info.Ports, user, pass, err)
+			Common.LogError(errlog)
+			tmperr = err
+
+			if Common.CheckErrs(err) {
+				return err
+			}
+
+			// 超时检查
+			if time.Now().Unix()-starttime > (int64(len(Common.Userdict["ftp"])*len(Common.Passwords)) * Common.Timeout) {
+				return err
 			}
 		}
 	}
 	return tmperr
 }
 
+// FtpConn 建立FTP连接并尝试登录
 func FtpConn(info *Config.HostInfo, user string, pass string) (flag bool, err error) {
-	flag = false
 	Host, Port, Username, Password := info.Host, info.Ports, user, pass
+
+	// 建立FTP连接
 	conn, err := ftp.DialTimeout(fmt.Sprintf("%v:%v", Host, Port), time.Duration(Common.Timeout)*time.Second)
-	if err == nil {
-		err = conn.Login(Username, Password)
-		if err == nil {
-			flag = true
-			result := fmt.Sprintf("[+] ftp %v:%v:%v %v", Host, Port, Username, Password)
-			dirs, err := conn.List("")
-			//defer conn.Logout()
-			if err == nil {
-				if len(dirs) > 0 {
-					for i := 0; i < len(dirs); i++ {
-						if len(dirs[i].Name) > 50 {
-							result += "\n   [->]" + dirs[i].Name[:50]
-						} else {
-							result += "\n   [->]" + dirs[i].Name
-						}
-						if i == 5 {
-							break
-						}
-					}
-				}
+	if err != nil {
+		return false, err
+	}
+
+	// 尝试登录
+	if err = conn.Login(Username, Password); err != nil {
+		return false, err
+	}
+
+	// 登录成功,获取目录信息
+	result := fmt.Sprintf("[+] ftp %v:%v:%v %v", Host, Port, Username, Password)
+	dirs, err := conn.List("")
+	if err == nil && len(dirs) > 0 {
+		// 最多显示前6个目录
+		for i := 0; i < len(dirs) && i < 6; i++ {
+			name := dirs[i].Name
+			if len(name) > 50 {
+				name = name[:50]
 			}
-			Common.LogSuccess(result)
+			result += "\n   [->]" + name
 		}
 	}
-	return flag, err
+
+	Common.LogSuccess(result)
+	return true, nil
 }