修改线程处理机制

common/config.go

@@ -1,16 +1,16 @@
 package common
 
 var Userdict = map[string][]string{
-	"ftp":        {"www", "admin", "root", "db", "wwwroot", "data", "web", "ftp"},
-	"mysql":      {"root"},
-	"mssql":      {"root", "sa"},
+	"ftp":        {"ftp", "admin", "www", "web", "root", "db", "wwwroot", "data"},
+	"mysql":      {"root", "mysql"},
+	"mssql":      {"sa", "root"},
 	"smb":        {"administrator", "guest"},
 	"postgresql": {"postgres", "admin"},
 	"ssh":        {"root", "admin"},
 	"mongodb":    {"root", "admin"},
 }
 
-var Passwords = []string{"admin123A", "admin123", "123456", "admin", "root", "password", "123123", "654321", "123", "1", "admin@123", "Admin@123", "{user}", "{user}123", "", "P@ssw0rd!", "qwa123", "12345678", "test", "123qwe!@#", "123456789", "123321", "666666", "fuckyou", "000000", "1234567890", "8888888", "qwerty", "1qaz2wsx", "abc123", "abc123456", "1qaz@WSX", "Aa123456", "sysadmin", "system", "huawei"}
+var Passwords = []string{"123456", "admin", "admin123", "root", "", "password", "123123", "654321", "123", "1", "admin@123", "Admin@123", "{user}", "{user}123", "P@ssw0rd!", "qwa123", "12345678", "test", "123qwe!@#", "123456789", "123321", "666666", "fuckyou", "000000", "1234567890", "8888888", "qwerty", "1qaz2wsx", "abc123", "abc123456", "1qaz@WSX", "Aa123456", "sysadmin", "system", "huawei"}
 
 var PORTList = map[string]int{
 	"ftp":         21,

common/flag.go

@@ -11,7 +11,7 @@ func Banner() {
  / /_\/____/ __|/ __| '__/ _` + "`" + ` |/ __| |/ /
 / /_\\_____\__ \ (__| | | (_| | (__|   <    
 \____/     |___/\___|_|  \__,_|\___|_|\_\   
-                     fscan version: 1.5.1.1
+                     fscan version: 1.5.1.2
 `
 	print(banner)
 }

common/log.go

@@ -3,9 +3,12 @@ package common
 import (
 	"fmt"
 	"os"
+	"strings"
 	"time"
 )
 
+var Num int64
+var End int64
 var Results = make(chan string)
 var Worker = 0
 var Start = true
@@ -49,7 +52,7 @@ func WriteFile(result string, filename string) {
 
 func WaitSave() {
 	for {
-		if Worker == 0 {
+		if Worker <= 0 {
 			close(Results)
 			return
 		}
@@ -60,7 +63,27 @@ func LogError(errinfo interface{}) {
 	if LogErr {
 		if (time.Now().Unix()-LogSucTime) > 10 && (time.Now().Unix()-LogErrTime) > 10 {
 			fmt.Println(errinfo)
+			fmt.Println(fmt.Sprintf("已完成 %v/%v", End, Num))
+			LogErrTime = time.Now().Unix()
+		}
+	} else {
+		if (time.Now().Unix()-LogSucTime) > 60 && (time.Now().Unix()-LogErrTime) > 60 {
+			fmt.Println(errinfo)
+			fmt.Println(fmt.Sprintf("已完成 %v/%v", End, Num))
 			LogErrTime = time.Now().Unix()
 		}
 	}
 }
+
+func CheckErrs(err error) bool {
+	if err == nil {
+		return false
+	}
+	errs := []string{"closed by the remote host", "too many connections", "i/o timeout", "EOF", "A connection attempt failed", "established connection failed", "connection attempt failed", "Unable to read", "is not allowed to connect to this", "no pg_hba.conf entry"}
+	for _, key := range errs {
+		if strings.Contains(strings.ToLower(err.Error()), strings.ToLower(key)) {
+			return true
+		}
+	}
+	return false
+}