fix 中间结果重复传入下一节点的bug

Author: x51pwn

pkg/hydra/doNmapResult.go

@@ -52,15 +52,13 @@ func DoParseXml(s string) {
 }
 
 func DoNmapRst() {
-	log.Println("start check weak passwd")
 	if x1, ok := pkg.TmpFile[pkg.Naabu]; ok {
 		for _, x := range x1 {
 			defer func(r *os.File) {
 				r.Close()
 				os.RemoveAll(r.Name())
 			}(x)
 			b, err := ioutil.ReadFile(x.Name())
-			log.Println("nmap tmp file: ", x.Name(), " file size: ", len(b))
 			if nil == err && 0 < len(b) {
 				//log.Println("read config file ok: ", s)
 				DoParseXml(string(b))

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

@@ -2,6 +2,9 @@ package runner
 
 import (
 	"github.com/hktalent/scan4all/pkg"
+	"github.com/hktalent/scan4all/pkg/naabu/v2/pkg/privileges"
+	"github.com/hktalent/scan4all/pkg/naabu/v2/pkg/scan"
+	"net"
 	"os"
 	"runtime"
 	"strings"
@@ -69,6 +72,8 @@ type Options struct {
 // OnResultCallback (hostname, ip, ports)
 type OnResultCallback func(string, string, []int)
 
+const Version = `2.0.7`
+
 // ParseOptions parses the command line flags provided by a user
 func ParseOptions() *Options {
 	options := &Options{}
@@ -197,6 +202,53 @@ func ParseOptions() *Options {
 
 	return options
 }
+func showNetworkCapabilities(options *Options) {
+	var accessLevel, scanType string
+
+	switch {
+	case privileges.IsPrivileged && options.ScanType == SynScan:
+		accessLevel = "root"
+		if isLinux() {
+			accessLevel = "CAP_NET_RAW"
+		}
+		scanType = "SYN"
+	case options.Passive:
+		accessLevel = "non root"
+		scanType = "PASSIVE"
+	default:
+		accessLevel = "non root"
+		scanType = "CONNECT"
+	}
+
+	gologger.Info().Msgf("Running %s scan with %s privileges\n", scanType, accessLevel)
+}
+func showNetworkInterfaces() error {
+	// Interfaces List
+	interfaces, err := net.Interfaces()
+	if err != nil {
+		return err
+	}
+	for _, itf := range interfaces {
+		addresses, addErr := itf.Addrs()
+		if addErr != nil {
+			gologger.Warning().Msgf("Could not retrieve addresses for %s: %s\n", itf.Name, addErr)
+			continue
+		}
+		var addrstr []string
+		for _, address := range addresses {
+			addrstr = append(addrstr, address.String())
+		}
+		gologger.Info().Msgf("Interface %s:\nMAC: %s\nAddresses: %s\nMTU: %d\nFlags: %s\n", itf.Name, itf.HardwareAddr, strings.Join(addrstr, " "), itf.MTU, itf.Flags.String())
+	}
+	// External ip
+	externalIP, err := scan.WhatsMyIP()
+	if err != nil {
+		gologger.Warning().Msgf("Could not obtain public ip: %s\n", err)
+	}
+	gologger.Info().Msgf("External Ip: %s\n", externalIP)
+
+	return nil
+}
 
 // ShouldLoadResume resume file
 func (options *Options) ShouldLoadResume() bool {

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

@@ -122,27 +122,23 @@ func (r *Runner) PreProcessTargets() error {
 	return nil
 }
 
-// 避免重复
-var noRpt1 = map[string]string{}
-
 func Add2Naabubuffer(target string) {
-	if s1, ok := noRpt1[target]; ok {
-		log.Println("重复：", s1, " = ", target)
+	k1 := target + "_Add2Naabubuffer"
+	if b1, err := pkg.Cache1.Get(k1); nil == err && string(b1) == target {
+		log.Println("重复：", target)
 		return
 	}
-	noRpt1[target] = "1"
+	pkg.PutAny[string](k1, target)
 	Naabubuffer.Write([]byte(target))
 }
 
-// 避免重复
-var noRpt = map[string]string{}
-
 func (r *Runner) AddTarget(target string) error {
-	target = strings.TrimSpace(target)
-	if _, ok := noRpt[target]; ok {
+	k1 := target + "_AddTarget"
+	if b1, err := pkg.Cache1.Get(k1); nil == err && string(b1) == target {
+		log.Println("重复：", target)
 		return nil
 	}
-	noRpt[target] = "1"
+	pkg.PutAny[string](k1, target)
 	if target == "" {
 		return nil
 	} else if ipranger.IsCidr(target) {

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

@@ -25,9 +25,9 @@ import (
 var noRpt = map[string]string{}
 
 func POCcheck(wappalyzertechnologies []string, URL string, finalURL string, checklog4j bool) []string {
-	if _, ok := noRpt[URL]; ok {
-		return []string{}
-	}
+	//if _, ok := noRpt[URL]; ok {
+	//	return []string{}
+	//}
 	noRpt[URL] = "1"
 	var HOST string
 	var technologies []string