fix CheckIsErrPageAI bug;add support windows nmap 2022-07-21

README.md

@@ -20,7 +20,7 @@
   并对这些集成对项目进行代码级别优化、参数优化，个别模块重写  
   原则上不重复造轮子，除非轮子bug、问题太多
 - 跨平台：基于golang实现，轻量级、高度可定制、开源，支持Linux、windows、mac os等
-- 支持【20】种密码爆破，支持自定义字典 
+- 支持【20】种密码爆破，支持自定义字典, 通过 "priorityNmap": true 开启 
   * RDP
   * SSH
   * rsh-spx
@@ -100,7 +100,7 @@
 
 # 如何安装
 ```bash
-go install github.com/hktalent/scan4all@2.5.8
+go install github.com/hktalent/scan4all@2.5.9
 scan4all -h
 ```
 # 如何使用

config/config.json

@@ -65,8 +65,8 @@
   "EnableKsubdomain": true,
   "KsubdomainRegxp": "([0-9a-zA-Z\\-]+\\.[0-9a-zA-Z\\-]+)$",
   "naabu_dns": {},
-  "naabu": {"TopPorts": "http","ScanAllIPS": true,"Threads": 50,"EnableProgressBar": false},
-  "priorityNmap": false,
+  "naabu": {"TopPorts": "1000","ScanAllIPS": true,"Threads": 50,"EnableProgressBar": false},
+  "priorityNmap": true,
   "enableNuclei": false,
   "nuclei": {
     "Severities": "critical,high,medium",

config/config_me.json

@@ -55,7 +55,7 @@
   "EnableHoneyportDetection": true,
   "KsubdomainRegxp": "([0-9a-zA-Z\\-]+\\.[0-9a-zA-Z\\-]+)$",
   "naabu_dns": {},
-  "naabu": {"TopPorts": "http","ScanAllIPS": true,"Threads": 64,"EnableProgressBar": false},
+  "naabu": {"TopPorts": "full","ScanAllIPS": true,"Threads": 64,"EnableProgressBar": false},
   "enableNuclei": true,
   "nuclei": {
     "RateLimit": 150,

config/doNmapScanWin.bat

@@ -0,0 +1 @@
+nmap.exe -F --top-ports=65535 -n --unique --resolve-all -Pn -sU -sS --min-hostgroup 64 --max-retries 0 --host-timeout 10m --script-timeout 3m --version-intensity 9 --min-rate 5000 -T4  -iL %1 -oX %2

pkg/config.go

@@ -207,7 +207,7 @@ func GetNmap() string {
 var hvNmap = false
 
 func CheckHvNmap() bool {
-	if runtime.GOOS == "windows" || !GetValAsBool("priorityNmap") {
+	if !GetValAsBool("priorityNmap") {
 		return false
 	}
 	if hvNmap {

pkg/kscan/lib/color/color.go

@@ -2,8 +2,8 @@ package color
 
 import (
 	"fmt"
+	"github.com/hktalent/scan4all/pkg"
 	"math/rand"
-	"os"
 	"runtime"
 	"strconv"
 	"strings"
@@ -52,7 +52,7 @@ func Init(b bool) bool {
 		mod = 1
 		return false
 	}
-	if os.Getenv("github.com/hktalent/scan4all/pkg/kscan_COLOR") == "TRUE" {
+	if !pkg.GetValAsBool("kscan_COLOR") {
 		return false
 	}
 	mod = 0

pkg/kvDb.go

@@ -4,8 +4,6 @@ import (
 	"encoding/json"
 	"github.com/dgraph-io/badger"
 	"log"
-	"os"
-	"runtime"
 	"sync"
 )
 
@@ -35,9 +33,6 @@ func (r *KvDbOp) SetExpiresAt(ExpiresAt uint64) {
 }
 
 func (r *KvDbOp) Init(szDb string) error {
-	if runtime.GOOS == "windows" {
-		os.RemoveAll(szDb)
-	}
 	opts := badger.DefaultOptions(szDb)
 	opts.CompactL0OnClose = true
 	opts.EventLogging = false

pkg/naabu/v2/pkg/runner/targets.go

@@ -20,6 +20,7 @@ import (
 	"net/url"
 	"os"
 	"regexp"
+	"runtime"
 	"strings"
 )
 
@@ -182,7 +183,11 @@ func (r *Runner) DoTargets() (bool, error) {
 		tempInput1, err := ioutil.TempFile("", "stdin-out-*")
 		if err == nil {
 			defer tempInput1.Close()
-			x := pkg.SzPwd + "/config/doNmapScan.sh " + r.targetsFile + " " + tempInput1.Name()
+			s009 := "/config/doNmapScan.sh "
+			if runtime.GOOS == "windows" {
+				s009 = "/config/doNmapScanWin.bat "
+			}
+			x := pkg.SzPwd + s009 + r.targetsFile + " " + tempInput1.Name()
 			log.Println(x)
 			ss, err := pkg.DoCmd(strings.Split(x, " ")...)
 			s0 := tempInput1.Name()

pocs_go/go_poc_check.go

@@ -283,7 +283,8 @@ func init() {
 					close(lib.PocCheck_pipe)
 					return
 				}
-				fmt.Printf(" go-POC-check wait %d ....\r", nMax-nCnt)
+				var f01 float32 = float32(nCnt/nMax) * 100
+				fmt.Printf(" Asynchronous go PoCs detection task %%%0.2f ....\r", f01)
 				<-time.After(time.Duration(1) * time.Second)
 				nCnt += 1
 			}