修改线程处理机制

Plugins/ftp.go

@@ -35,7 +35,7 @@ func FtpScan(info *common.HostInfo) (tmperr error) {
 				if common.CheckErrs(err) {
 					return err
 				}
-				if time.Now().Unix()-starttime > 300 {
+				if time.Now().Unix()-starttime > (int64(len(common.Userdict["ftp"])*len(common.Passwords)) * info.Timeout) {
 					return err
 				}
 			}

Plugins/mssql.go

@@ -24,7 +24,7 @@ func MssqlScan(info *common.HostInfo) (tmperr error) {
 				if common.CheckErrs(err) {
 					return err
 				}
-				if time.Now().Unix()-starttime > 300 {
+				if time.Now().Unix()-starttime > (int64(len(common.Userdict["mssql"])*len(common.Passwords)) * info.Timeout) {
 					return err
 				}
 			}

Plugins/mysql.go

@@ -24,7 +24,7 @@ func MysqlScan(info *common.HostInfo) (tmperr error) {
 				if common.CheckErrs(err) {
 					return err
 				}
-				if time.Now().Unix()-starttime > 300 {
+				if time.Now().Unix()-starttime > (int64(len(common.Userdict["mysql"])*len(common.Passwords)) * info.Timeout) {
 					return err
 				}
 			}

Plugins/postgres.go

@@ -24,7 +24,7 @@ func PostgresScan(info *common.HostInfo) (tmperr error) {
 				if common.CheckErrs(err) {
 					return err
 				}
-				if time.Now().Unix()-starttime > 300 {
+				if time.Now().Unix()-starttime > (int64(len(common.Userdict["postgresql"])*len(common.Passwords)) * info.Timeout) {
 					return err
 				}
 			}

Plugins/redis.go

@@ -28,7 +28,7 @@ func RedisScan(info *common.HostInfo) (tmperr error) {
 			if common.CheckErrs(err) {
 				return err
 			}
-			if time.Now().Unix()-starttime > 300 {
+			if time.Now().Unix()-starttime > (int64(len(common.Passwords)) * info.Timeout) {
 				return err
 			}
 		}
@@ -128,7 +128,7 @@ func Expoilt(realhost string, conn net.Conn) error {
 			}
 		}
 	}
-	recoverdb(dbfilename, dir, conn)
+	err = recoverdb(dbfilename, dir, conn)
 	return err
 }
 

Plugins/scanner.go

@@ -12,7 +12,7 @@ import (
 )
 
 func Scan(info common.HostInfo) {
-	fmt.Println("scan start")
+	fmt.Println("start infoscan")
 	Hosts, _ := common.ParseIP(info.Host, common.HostFile)
 	WebScan.Inithttp(common.Pocinfo)
 	var ch = make(chan struct{}, common.Threads)
@@ -34,6 +34,7 @@ func Scan(info common.HostInfo) {
 		for _, port := range common.PORTList {
 			severports = append(severports, strconv.Itoa(port))
 		}
+		fmt.Println("start vulscan")
 		for _, targetIP := range AlivePorts {
 			info.Host, info.Ports = strings.Split(targetIP, ":")[0], strings.Split(targetIP, ":")[1]
 			if info.Scantype == "all" {
@@ -63,7 +64,8 @@ func Scan(info common.HostInfo) {
 		}
 	}
 	wg.Wait()
-	common.WaitSave()
+	close(common.Results)
+	fmt.Println(fmt.Sprintf("已完成 %v/%v", common.End, common.Num))
 }
 
 var Mutex = &sync.Mutex{}

Plugins/smb.go

@@ -25,12 +25,13 @@ func SmbScan(info *common.HostInfo) (tmperr error) {
 				return err
 			} else {
 				errlog := fmt.Sprintf("[-] smb %v:%v %v %v %v", info.Host, 445, user, pass, err)
+				errlog = strings.Replace(errlog, "\n", "", -1)
 				common.LogError(errlog)
 				tmperr = err
 				if common.CheckErrs(err) {
 					return err
 				}
-				if time.Now().Unix()-starttime > 300 {
+				if time.Now().Unix()-starttime > (int64(len(common.Userdict["smb"])*len(common.Passwords)) * info.Timeout) {
 					return err
 				}
 			}

Plugins/ssh.go

@@ -24,7 +24,7 @@ func SshScan(info *common.HostInfo) (tmperr error) {
 				if common.CheckErrs(err) {
 					return err
 				}
-				if time.Now().Unix()-starttime > 300 {
+				if time.Now().Unix()-starttime > (int64(len(common.Userdict["ssh"])*len(common.Passwords)) * info.Timeout) {
 					return err
 				}
 			}

Plugins/webtitle.go

@@ -95,7 +95,7 @@ func geturl(info *common.HostInfo, flag bool, CheckData []WebScan.CheckDatas) (e
 				title = "None"
 			}
 			if flag == true {
-				result := fmt.Sprintf("WebTitle:%-25v %-3v %v", Url, resp.StatusCode, title)
+				result := fmt.Sprintf("[*] WebTitle:%-25v %-3v %v", Url, resp.StatusCode, title)
 				common.LogSuccess(result)
 			}