refactor: SSH模块重构

Plugins/ssh.go

@@ -1,7 +1,6 @@
 package Plugins
 
 import (
-	"errors"
 	"fmt"
 	"github.com/shadow1ng/fscan/common"
 	"golang.org/x/crypto/ssh"
@@ -11,28 +10,43 @@ import (
 	"time"
 )
 
+// SshScan 执行SSH服务的认证扫描
 func SshScan(info *common.HostInfo) (tmperr error) {
 	if common.IsBrute {
 		return
 	}
-	starttime := time.Now().Unix()
+
+	startTime := time.Now().Unix()
+
+	// 遍历用户名和密码字典进行认证尝试
 	for _, user := range common.Userdict["ssh"] {
 		for _, pass := range common.Passwords {
+			// 替换密码中的用户名占位符
 			pass = strings.Replace(pass, "{user}", user, -1)
-			flag, err := SshConn(info, user, pass)
+
-			if flag == true && err == nil {
+			success, err := SshConn(info, user, pass)
+			if success && err == nil {
 				return err
-			} else {
-				errlog := fmt.Sprintf("[-] ssh %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["ssh"])*len(common.Passwords)) * common.Timeout) {
-					return err
-				}
 			}
+
+			// 记录失败信息
+			errlog := fmt.Sprintf("[x] SSH认证失败 %v:%v User:%v Pass:%v Err:%v",
+				info.Host, info.Ports, user, pass, err)
+			common.LogError(errlog)
+			tmperr = err
+
+			// 检查是否需要中断扫描
+			if common.CheckErrs(err) {
+				return err
+			}
+
+			// 检查是否超时
+			timeoutLimit := int64(len(common.Userdict["ssh"])*len(common.Passwords)) * common.Timeout
+			if time.Now().Unix()-startTime > timeoutLimit {
+				return err
+			}
+
+			// 如果指定了SSH密钥，则不进行密码尝试
 			if common.SshKey != "" {
 				return err
 			}
@@ -41,57 +55,68 @@ func SshScan(info *common.HostInfo) (tmperr error) {
 	return tmperr
 }
 
+// SshConn 尝试建立SSH连接并进行认证
 func SshConn(info *common.HostInfo, user string, pass string) (flag bool, err error) {
-	flag = false
+	// 准备认证方法
-	Host, Port, Username, Password := info.Host, info.Ports, user, pass
+	var auth []ssh.AuthMethod
-	var Auth []ssh.AuthMethod
 	if common.SshKey != "" {
+		// 使用SSH密钥认证
 		pemBytes, err := ioutil.ReadFile(common.SshKey)
 		if err != nil {
-			return false, errors.New("read key failed" + err.Error())
+			return false, fmt.Errorf("读取密钥失败: %v", err)
 		}
+
 		signer, err := ssh.ParsePrivateKey(pemBytes)
 		if err != nil {
-			return false, errors.New("parse key failed" + err.Error())
+			return false, fmt.Errorf("解析密钥失败: %v", err)
 		}
-		Auth = []ssh.AuthMethod{ssh.PublicKeys(signer)}
+		auth = []ssh.AuthMethod{ssh.PublicKeys(signer)}
 	} else {
-		Auth = []ssh.AuthMethod{ssh.Password(Password)}
+		// 使用密码认证
+		auth = []ssh.AuthMethod{ssh.Password(pass)}
 	}
 
+	// 配置SSH客户端
 	config := &ssh.ClientConfig{
-		User:    Username,
+		User:    user,
-		Auth:    Auth,
+		Auth:    auth,
 		Timeout: time.Duration(common.Timeout) * time.Second,
 		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
 			return nil
 		},
 	}
 
-	client, err := ssh.Dial("tcp", fmt.Sprintf("%v:%v", Host, Port), config)
+	// 建立SSH连接
+	client, err := ssh.Dial("tcp", fmt.Sprintf("%v:%v", info.Host, info.Ports), config)
 	if err == nil {
 		defer client.Close()
 		session, err := client.NewSession()
 		if err == nil {
 			defer session.Close()
 			flag = true
-			var result string
+
+			// 处理认证成功的情况
 			if common.Command != "" {
-				combo, _ := session.CombinedOutput(common.Command)
+				// 执行指定命令
-				result = fmt.Sprintf("[+] SSH %v:%v:%v %v \n %v", Host, Port, Username, Password, string(combo))
+				output, _ := session.CombinedOutput(common.Command)
 				if common.SshKey != "" {
-					result = fmt.Sprintf("[+] SSH %v:%v sshkey correct \n %v", Host, Port, string(combo))
+					common.LogSuccess(fmt.Sprintf("[✓] SSH密钥认证成功 %v:%v\n命令输出:\n%v",
+						info.Host, info.Ports, string(output)))
+				} else {
+					common.LogSuccess(fmt.Sprintf("[✓] SSH认证成功 %v:%v User:%v Pass:%v\n命令输出:\n%v",
+						info.Host, info.Ports, user, pass, string(output)))
 				}
-				common.LogSuccess(result)
 			} else {
-				result = fmt.Sprintf("[+] SSH %v:%v:%v %v", Host, Port, Username, Password)
+				// 仅记录认证成功
 				if common.SshKey != "" {
-					result = fmt.Sprintf("[+] SSH %v:%v sshkey correct", Host, Port)
+					common.LogSuccess(fmt.Sprintf("[✓] SSH密钥认证成功 %v:%v",
+						info.Host, info.Ports))
+				} else {
+					common.LogSuccess(fmt.Sprintf("[✓] SSH认证成功 %v:%v User:%v Pass:%v",
+						info.Host, info.Ports, user, pass))
 				}
-				common.LogSuccess(result)
 			}
 		}
 	}
 	return flag, err
-
 }