fix 当将非http端口加上http进行盲打时发生当req和header无效导致当内存错误 2022-07-10 02:42:1657392140

Author: x51pwn

brute/filefuzz.go

@@ -70,9 +70,11 @@ func reqPage(u string) (*page, *pkg.Response, error) {
 		InitGeneral()
 		regs = append(regs, ret...)
 		for _, reg := range regs {
-			matched, _ := regexp.Match(reg, []byte(req.Header.Get("Content-Type")))
-			if matched {
-				page.isBackUpPage = true
+			if x0, ok := req.Header["Content-Type"]; ok && 0 < len(x0) {
+				matched, _ := regexp.Match(reg, []byte(x0[0]))
+				if matched {
+					page.isBackUpPage = true
+				}
 			}
 		}
 		if req.StatusCode == 403 && strings.HasSuffix(u, "/") {

nuclei_Yaml/nuclei_yaml.go

@@ -2,8 +2,8 @@ package nuclei_Yaml
 
 import (
 	"bytes"
-	"fmt"
 	"github.com/hktalent/scan4all/pkg"
+	"log"
 	"os"
 	"strings"
 	"time"
@@ -22,7 +22,7 @@ var (
 	options = &types.Options{}
 )
 
-func RunNuclei(buf bytes.Buffer, xx chan bool) {
+func RunNuclei(buf *bytes.Buffer, xx chan bool) {
 	defer func() {
 		xx <- true
 		close(xx)
@@ -34,7 +34,8 @@ func RunNuclei(buf bytes.Buffer, xx chan bool) {
 	}
 
 	readConfig()
-	options.Targets = strings.Split(buf.String(), "\n")
+	options.Targets = strings.Split(strings.TrimSpace(buf.String()), "\n")
+	log.Printf("options.Targets = %+v", options.Targets)
 	runner.ParseOptions(options)
 	/////////////////////////////////////
 	options.Verbose = false
@@ -54,7 +55,7 @@ func RunNuclei(buf bytes.Buffer, xx chan bool) {
 	////////////////////////////////////*/
 	nucleiRunner, err := runner.New(options)
 	if err != nil {
-		fmt.Println(options)
+		//fmt.Println(options)
 		gologger.Fatal().Msgf("nucleiRunner Could not create runner: %s\n", err)
 	}
 	if nucleiRunner == nil {

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

@@ -150,7 +150,7 @@ func ParseOptions() *Options {
 
 	flagSet.CreateGroup("optimization", "Optimization",
 		flagSet.IntVar(&options.Retries, "retries", DefaultRetriesSynScan, "number of retries for the port scan"),
-		flagSet.IntVar(&options.Timeout, "timeout", DefaultPortTimeoutSynScan/2, "millisecond to wait before timing out"),
+		flagSet.IntVar(&options.Timeout, "timeout", DefaultPortTimeoutSynScan, "millisecond to wait before timing out"),
 		flagSet.IntVar(&options.WarmUpTime, "warm-up-time", 2, "time in seconds between scan phases"),
 		flagSet.BoolVar(&options.Ping, "ping", false, "ping probes for verification of host"),
 		flagSet.BoolVar(&options.Verify, "verify", false, "validate the ports again with TCP verification"),
@@ -162,7 +162,7 @@ func ParseOptions() *Options {
 		flagSet.BoolVarP(&options.NoColor, "nc", "no-color", false, "disable colors in CLI output"),
 		flagSet.BoolVar(&options.Silent, "silent", false, "display only results in output"),
 		flagSet.BoolVar(&options.Version, "version", false, "display version of naabu"),
-		flagSet.BoolVar(&options.EnableProgressBar, "stats", true, "display stats of the running scan"),
+		flagSet.BoolVar(&options.EnableProgressBar, "stats", false, "display stats of the running scan"),
 		flagSet.IntVarP(&options.StatsInterval, "stats-interval", "si", DefautStatsInterval, "number of seconds to wait between showing a statistics update"),
 	)
 

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

@@ -56,7 +56,7 @@ func (r *Runner) Httpxrun() error {
 	//log.Println("httpxrunner.Naabubuffer = ", httpxrunner.Naabubuffer.String())
 	//Naabubuffer1 := bytes.Buffer{}
 	//Naabubuffer1.Write(httpxrunner.Naabubuffer.Bytes())
-	go nuclei_Yaml.RunNuclei(httpxrunner.Naabubuffer, nucleiDone)
+	go nuclei_Yaml.RunNuclei(&httpxrunner.Naabubuffer, nucleiDone)
 	httpxoptions := httpxrunner.ParseOptions()
 	httpxoptions.Output = r.options.Output
 	httpxoptions.CSVOutput = r.options.CSV
@@ -571,7 +571,7 @@ func (r *Runner) handleOutput() {
 			if host == "ip" {
 				host = hostIP
 			}
-			log.Println("%s found ports: %i", hostIP, len(ports))
+			log.Printf("%s found ports: %d", hostIP, len(ports))
 			for port := range ports {
 				Add2Naabubuffer(fmt.Sprintf("%s:%d\n", host, port))
 			}