fix 优化naabu close bug 2022-07-08 23:13:1657293197

Author: x51pwn

nuclei_Yaml/nuclei_yaml.go

@@ -294,7 +294,7 @@ func readConfig() {
 
 	options.UpdateNuclei = false
 	options.UpdateTemplates = false
-	options.TemplatesDirectory = ""
+	options.TemplatesDirectory = pwd + "/config/nuclei-templates"
 	// 嵌入式集成私人版本nuclei-templates 共3744个YAML POC
 	if "true" == pkg.GetVal("enablEmbedYaml") {
 		options.Templates = []string{pwd + "/config/nuclei-templates"}

pkg/httpx/runner/runner.go

@@ -342,7 +342,7 @@ func (r *Runner) prepareInput() {
 
 		err := r.stats.Start(makePrintCallback(), time.Duration(r.options.StatsInterval)*time.Second)
 		if err != nil {
-			gologger.Warning().Msgf("Could not create statistics: %s\n", err)
+			gologger.Warning().Msgf("Could not create statistics: %s \n", err)
 		}
 	}
 }
@@ -487,7 +487,7 @@ func makePrintCallback() func(stats clistats.StatisticsClient) {
 		builder.WriteRune('%')
 		builder.WriteRune(')')
 
-		builder.WriteRune('\n')
+		builder.WriteRune('\r')
 
 		fmt.Fprintf(os.Stderr, "%s", builder.String())
 		builder.Reset()

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

@@ -412,6 +412,10 @@ func (r *Runner) ShowScanResultOnExit() {
 func (r *Runner) Close() {
 	os.RemoveAll(r.targetsFile)
 	r.scanner.IPRanger.Hosts.Close()
+	r.scanner.State = scan.Done
+	//r.scanner.CleanupHandlers()
+	//r.scanner.Close()
+	//r.wgscan
 }
 
 // PickIP randomly

pkg/naabu/v2/pkg/scan/scan.go

@@ -9,13 +9,13 @@ import (
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
+	"github.com/hktalent/scan4all/pkg/naabu/v2/pkg/privileges"
+	"github.com/hktalent/scan4all/pkg/naabu/v2/pkg/result"
 	"github.com/phayes/freeport"
 	"github.com/projectdiscovery/cdncheck"
 	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/ipranger"
 	"github.com/projectdiscovery/networkpolicy"
-	"github.com/hktalent/scan4all/pkg/naabu/v2/pkg/privileges"
-	"github.com/hktalent/scan4all/pkg/naabu/v2/pkg/result"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv4"
 	"golang.org/x/net/proxy"