性能优化 2.5.3

Author: x51pwn

config/config.json

@@ -56,17 +56,26 @@
   "naabu_dns": {},
   "naabu": {"TopPorts": "1000","ScanAllIPS": true,"Threads": 25},
   "priorityNmap": true,
-  "nuclei": {},
+  "nuclei": {
+    "RateLimit": 150,
+    "BulkSize":64,
+    "TemplateThreads": 64,
+    "HeadlessBulkSize": 10,
+    "DisableRedirects": true,
+    "HeadlessTemplateThreads": 10
+  },
   "enablEmbedYaml": true,
   "enablFileFuzz": true,
   "enablNmapStdIO": false,
   "httpx": {
-    "Pipeline": true,
-    "HTTP2Probe": true,
-    "VHost": true,
+    "Pipeline": false,
+    "HTTP2Probe": false,
+    "VHost": false,
     "CSPProbe": true,
     "TLSProbe": true,
-    "TechDetect": true
+    "TechDetect": true,
+    "FollowRedirects": false,
+    "MaxRedirects": 3
   },
   "enableEsSv": false,
   "esthread": 8,

config/config_me.json

@@ -55,18 +55,27 @@
   "KsubdomainRegxp": "([0-9a-zA-Z\\-]+\\.[0-9a-zA-Z\\-]+)$",
   "naabu_dns": {},
   "naabu": {"TopPorts": "1000","ScanAllIPS": true,"Threads": 64},
-  "nuclei": {},
+  "nuclei": {
+    "RateLimit": 150,
+    "BulkSize":64,
+    "TemplateThreads": 64,
+    "HeadlessBulkSize": 10,
+    "DisableRedirects": true,
+    "HeadlessTemplateThreads": 10
+  },
   "priorityNmap": true,
   "enablEmbedYaml": true,
   "enablFileFuzz": true,
   "enablNmapStdIO": false,
   "httpx": {
-    "Pipeline": true,
+    "Pipeline": false,
     "HTTP2Probe": true,
     "VHost": true,
     "CSPProbe": true,
     "TLSProbe": true,
-    "TechDetect": true
+    "TechDetect": true,
+    "FollowRedirects": false,
+    "MaxRedirects": 3
   },
   "enableEsSv": true,
   "esthread": 8,

main.go

@@ -4,6 +4,7 @@ import (
 	"embed"
 	"fmt"
 	"github.com/hktalent/scan4all/pkg"
+	"github.com/hktalent/scan4all/pkg/fingerprint"
 	naaburunner "github.com/hktalent/scan4all/pkg/naabu/v2/pkg/runner"
 	"github.com/projectdiscovery/gologger"
 	"io"
@@ -27,6 +28,8 @@ func main() {
 		//if "true" == pkg.GetVal("autoRmCache") {
 		//	os.RemoveAll(pkg.GetVal(pkg.CacheName))
 		//}
+		// clear
+		fingerprint.ClearData()
 	}()
 	options := naaburunner.ParseOptions()
 	if options.Debug {

nuclei_Yaml/nuclei_yaml.go

@@ -113,7 +113,7 @@ func readConfig() {
 	cfgFile = ""
 	options.FollowRedirects = false
 	options.MaxRedirects = 10
-	options.DisableRedirects = false
+	options.DisableRedirects = true
 
 	options.ReportingConfig = ""
 	// 启动es记录

pkg/httpx/runner/options.go

@@ -308,8 +308,8 @@ func ParseOptions() *Options {
 	options.HTTPProxy = ""
 	options.Unsafe = false
 	options.Resume = false
-	options.FollowRedirects = true
-	options.MaxRedirects = 10
+	options.FollowRedirects = false
+	options.MaxRedirects = 3
 	options.FollowHostRedirects = false
 	options.VHostInput = false
 	options.Methods = ""

pkg/httpx/runner/runner.go

@@ -1241,8 +1241,7 @@ retry:
 			technologies = append(technologies, match)
 		}
 		matchlocals := fingerprint.FingerScan(resp.Headers, resp.Data, title, ul, strconv.Itoa(resp.StatusCode))
-		// clear
-		fingerprint.ClearData()
+
 		for _, matchlocal := range matchlocals {
 			technologies = append(technologies, matchlocal)
 		}

pkg/util.go

@@ -34,19 +34,22 @@ var (
 
 func HttpRequsetBasic(username string, password string, urlstring string, method string, postdata string, isredirect bool, headers map[string]string) (*Response, error) {
 	var tr *http.Transport
+	var err error
 	if HttpProxy != "" {
 		uri, _ := url.Parse(HttpProxy)
 		tr = &http.Transport{
 			MaxIdleConnsPerHost: -1,
 			TLSClientConfig:     &tls.Config{InsecureSkipVerify: true},
 			DisableKeepAlives:   true,
 			Proxy:               http.ProxyURL(uri),
+			IdleConnTimeout:     15 * time.Second,
 		}
 	} else {
 		tr = &http.Transport{
 			MaxIdleConnsPerHost: -1,
 			TLSClientConfig:     &tls.Config{InsecureSkipVerify: true},
 			DisableKeepAlives:   true,
+			IdleConnTimeout:     15 * time.Second,
 		}
 	}
 
@@ -74,7 +77,10 @@ func HttpRequsetBasic(username string, password string, urlstring string, method
 	for v, k := range headers {
 		req.Header[v] = []string{k}
 	}
-	resp, err := client.Do(req)
+	var resp *http.Response
+
+	// resp, err = tr.RoundTrip(req)
+	resp, err = client.Do(req)
 	if err != nil {
 		//防止空指针
 		return &Response{"999", 999, "", nil, 0, "", ""}, err