fix 线程过多、目标多时内存开销过大多bug 2022-07-11 11:27:1657510051

Author: x51pwn

README.md

@@ -15,6 +15,7 @@
 <img width="928" alt="image" src="https://user-images.githubusercontent.com/18223385/175768227-098c779b-6c5f-48ee-91b1-c56e3daa9c87.png">
 </h1>
 
+- 默认检测系统有nmap时优先使用nmap进行快速扫描，弊端：因为设置网络包过大会导致结果不全，另外需要将root密码设置到环境变量PPSSWWDD，更多参考config/doNmapScan.sh
 - 快速端口扫描，指纹检测功能
 - 快速登录密码爆破功能
 - 快速POC检测功能

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

@@ -2,10 +2,10 @@ package runner
 
 const (
 	DefaultPortTimeoutSynScan     = 1000
-	DefaultPortTimeoutConnectScan = 5000
+	DefaultPortTimeoutConnectScan = 3000
 
 	DefaultRateSynScan     = 1000
-	DefaultRateConnectScan = 1500
+	DefaultRateConnectScan = 2000
 
 	DefaultRetriesSynScan     = 3
 	DefaultRetriesConnectScan = 3

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

@@ -96,15 +96,15 @@ func ParseOptions() *Options {
 
 	flagSet.CreateGroup("port", "Port",
 		flagSet.StringVarP(&options.Ports, "p", "port", "", "ports to scan (80,443, 100-200"),
-		flagSet.StringVarP(&options.TopPorts, "tp", "top-ports", "full", "top ports to scan (default 100)"),
+		flagSet.StringVarP(&options.TopPorts, "tp", "top-ports", "1000", "top ports to scan (default 100)"),
 		flagSet.StringVarP(&options.ExcludePorts, "ep", "exclude-ports", "", "ports to exclude from scan (comma-separated)"),
 		flagSet.StringVarP(&options.PortsFile, "pf", "ports-file", "", "list of ports to exclude from scan (file)"),
 		flagSet.BoolVarP(&options.ExcludeCDN, "ec", "exclude-cdn", false, "skip full port scans for CDN's (only checks for 80,443)"),
 	)
 
 	flagSet.CreateGroup("rate-limit", "Rate-limit",
-		flagSet.IntVar(&options.Threads, "c", 256*2, "general internal worker threads"),
-		flagSet.IntVar(&options.Rate, "rate", DefaultRateSynScan*2, "packets to send per second"),
+		flagSet.IntVar(&options.Threads, "c", 64, "general internal worker threads"),
+		flagSet.IntVar(&options.Rate, "rate", DefaultRateSynScan, "packets to send per second"),
 	)
 
 	flagSet.CreateGroup("output", "Output",

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

@@ -62,7 +62,7 @@ func (r *Runner) Httpxrun() error {
 	httpxoptions.CSVOutput = r.options.CSV
 	httpxoptions.JSONOutput = r.options.JSON
 	httpxoptions.HTTPProxy = r.options.Proxy
-	httpxoptions.Threads = r.options.Threads * 2
+	httpxoptions.Threads = r.options.Threads
 	httpxoptions.Verbose = r.options.Verbose
 	httpxoptions.NoColor = r.options.NoColor
 	httpxoptions.Silent = r.options.Silent