Merge branch 'dev' of https://github.com/shadow1ng/fscan into dev

# Conflicts:
#	Plugins/RDP.go   resolved by origin/dev(远端) version

Plugins/FTP.go

@@ -20,7 +20,8 @@ func FtpScan(info *Common.HostInfo) (tmperr error) {
 	// 尝试匿名登录
 	flag, err := FtpConn(info, "anonymous", "")
 	if flag && err == nil {
-		return err
+		// 匿名登录成功，不需要继续尝试其他密码
+		return nil
 	}
 	errlog := fmt.Sprintf("[-] ftp %v:%v %v %v", info.Host, info.Ports, "anonymous", err)
 	Common.LogError(errlog)

Plugins/RDP.go

@@ -31,9 +31,7 @@ type Brutelist struct {
 // RdpScan 执行RDP服务扫描
 func RdpScan(info *Common.HostInfo) (tmperr error) {
 	defer func() {
-		if err := recover(); err != nil {
-			fmt.Printf("[-] 扫描错误 %v:%v - %v\n", info.Host, info.Ports, err)
-		}
+		recover()
 	}()
 	if Common.DisableBrute {
 		return
@@ -120,8 +118,7 @@ func incrNum(num *int, mutex *sync.Mutex) {
 // RdpConn 尝试RDP连接
 func RdpConn(ip, domain, user, password string, port int, timeout int64) (bool, error) {
 	defer func() {
-		if err := recover(); err != nil {
-		}
+		recover()
 	}()
 	target := fmt.Sprintf("%s:%d", ip, port)
 

Plugins/SSH.go

@@ -16,7 +16,7 @@ func SshScan(info *Common.HostInfo) (tmperr error) {
 		return
 	}
 
-	threads := 10 // 设置线程数
+	threads := Common.BruteThreads // 使用 BruteThreads 来控制线程数
 	taskChan := make(chan struct {
 		user string
 		pass string