fix main.go:49:21: call of hydra.DoNmapRst copies lock value: sync.WaitGroup contains sync.noCopy

Author: x51pwn

config/config.json

@@ -56,7 +56,7 @@
   "naabu_dns": {},
   "naabu": {"TopPorts": "http","ScanAllIPS": true},
   "nuclei": {},
-  "enablEmbedYaml": false,
+  "enablEmbedYaml": true,
   "httpx": {},
   "enableEsSv": false,
   "esthread": 8,

main.go

@@ -46,7 +46,7 @@ func main() {
 	// 弱密码检测
 	var wg sync.WaitGroup
 	wg.Add(1)
-	go hydra.DoNmapRst(wg)
+	go hydra.DoNmapRst(&wg)
 	err = naabuRunner.Httpxrun()
 	if err != nil {
 		gologger.Fatal().Msgf("naabuRunner.Httpxrun Could not run httpRunner: %s\n", err)

pkg/config.go

@@ -1,12 +1,16 @@
 package pkg
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"github.com/spf13/viper"
 	"io/ioutil"
 	"log"
 	"os"
+	"os/exec"
+	"regexp"
+	"runtime"
 	"strings"
 )
 
@@ -147,3 +151,35 @@ func init() {
 }
 
 var G_Options interface{}
+
+func GetNmap() string {
+	nmap := "nmap"
+	if runtime.GOOS == "windows" {
+		nmap = "nmap.exe"
+	}
+	return nmap
+}
+
+func CheckHvNmap() bool {
+	r, _ := regexp.Compile(`.*Starting Nmap \d\.\d+.*`)
+	s, err := DoCmd(GetNmap(), "-v")
+	if nil == err && r.Match([]byte(s)) {
+		return true
+	}
+	return false
+}
+
+// 最佳的方法是将命令写到临时文件，并通过bash进行执行
+func DoCmd(args ...string) (string, error) {
+	cmd := exec.Command(args[0], args[1:]...)
+	var stdout, stderr bytes.Buffer
+	cmd.Stdout = &stdout // 标准输出
+	cmd.Stderr = &stderr // 标准错误
+	err := cmd.Run()
+	outStr, errStr := string(stdout.Bytes()), string(stderr.Bytes())
+	// out, err := cmd.CombinedOutput()
+	if nil != err {
+		return "", err
+	}
+	return string(outStr + "\n" + errStr), err
+}

pkg/hydra/doNmapResult.go

@@ -70,7 +70,7 @@ func DoParseXml(s string) {
 	}
 }
 
-func DoNmapRst(wg sync.WaitGroup) {
+func DoNmapRst(wg *sync.WaitGroup) {
 	defer wg.Done()
 	if x1, ok := pkg.TmpFile[pkg.Naabu]; ok {
 		for _, x := range x1 {

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

@@ -213,6 +213,7 @@ func (r *Runner) RunEnumeration() error {
 			if err := r.scanner.IPRanger.Add(cidr.String()); err != nil {
 				gologger.Warning().Msgf("Couldn't track %s in scan results: %s\n", cidr, err)
 			}
+			// 可以优化基于nmap
 			ipStream, _ := mapcidr.IPAddressesAsStream(cidr.String())
 			for ip := range ipStream {
 				for _, port := range r.scanner.Ports {
@@ -335,7 +336,7 @@ func (r *Runner) RunEnumeration() error {
 			r.options.ResumeCfg.Retry = currentRetry
 			r.options.ResumeCfg.Seed = currentSeed
 			r.options.ResumeCfg.Unlock()
-
+			// 可以优化基于nmap
 			b := blackrock.New(int64(Range), currentSeed)
 			for index := int64(0); index < int64(Range); index++ {
 				xxx := b.Shuffle(index)