fixed #51 2022-08-01

GhostTroops · Aug 1, 2022 · 1019cc1 · 1019cc1
1 parent c185efb
commit 1019cc1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/pkg/naabu/v2/pkg/runner/runner.go b/pkg/naabu/v2/pkg/runner/runner.go
@@ -5,6 +5,7 @@ import (
 	"encoding/csv"
 	"encoding/json"
 	"fmt"
+	"github.com/asaskevich/govalidator"
 	"github.com/hktalent/scan4all/lib/util"
 	"github.com/hktalent/scan4all/pkg/fingerprint"
 	"github.com/hktalent/scan4all/projectdiscovery/nuclei_Yaml"
@@ -242,11 +243,15 @@ func (r *Runner) RunEnumeration() error {
 	case r.options.Stream && !r.options.Passive: // stream active
 		r.scanner.State = scan.Scan
 		for cidr := range r.streamChannel {
-			if err := r.scanner.IPRanger.Add(cidr.String()); err != nil {
+			s01 := cidr.String()
+			if govalidator.IsDNSName(s01) {
+
+			}
+			if err := r.scanner.IPRanger.Add(s01); err != nil {
 				gologger.Warning().Msgf("Couldn't track %s in scan results: %s\n", cidr, err)
 			}
 			// 可以优化基于nmap
-			ipStream, _ := mapcidr.IPAddressesAsStream(cidr.String())
+			ipStream, _ := mapcidr.IPAddressesAsStream(s01)
 			for ip := range ipStream {
 				for _, port := range r.scanner.Ports {
 					r.limiter.Take()

diff --git a/pkg/naabu/v2/pkg/runner/targets.go b/pkg/naabu/v2/pkg/runner/targets.go
@@ -346,7 +346,7 @@ func (r *Runner) DoDns2Ips(target string) []string {
 	}
 	ips, err := r.resolveFQDN(target)
 	if err != nil {
-		return []string{target}
+		return []string{} // fixed #51
 	}
 	return ips
 }