为分布式pro版本提供扩展接口 2022-07-26

punishell · Jul 26, 2022 · 41dd865 · 41dd865
1 parent e99355f
commit 41dd865
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/pkg/naabu/v2/pkg/runner/runner.go b/pkg/naabu/v2/pkg/runner/runner.go
@@ -8,6 +8,7 @@ import (
 	"github.com/hktalent/scan4all/lib/util"
 	"github.com/hktalent/scan4all/pkg/fingerprint"
 	"github.com/hktalent/scan4all/projectdiscovery/nuclei_Yaml"
+	runner2 "github.com/hktalent/scan4all/projectdiscovery/nuclei_Yaml/nclruner/runner"
 	"github.com/projectdiscovery/fileutil"
 	"github.com/projectdiscovery/retryablehttp-go"
 	"log"
@@ -59,7 +60,16 @@ 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, nil)
+	var xx1 = make(chan *runner2.Runner, 3)
+	go nuclei_Yaml.RunNuclei(&httpxrunner.Naabubuffer, nucleiDone, nil, xx1)
+	select {
+	case <-xx1:
+		close(xx1)
+	case <-nucleiDone:
+		close(xx1)
+	default:
+	}
+
 	httpxoptions := httpxrunner.ParseOptions()
 	// 指纹去重复 请求路径
 	if "" != fingerprint.FgDictFile {

diff --git a/projectdiscovery/nuclei_Yaml/nuclei_yaml.go b/projectdiscovery/nuclei_Yaml/nuclei_yaml.go
@@ -22,7 +22,7 @@ var (
 	cfgFile string
 )
 
-func RunNuclei(buf *bytes.Buffer, xx chan bool, oOpts *map[string]interface{}) {
+func RunNuclei(buf *bytes.Buffer, xx chan bool, oOpts *map[string]interface{}, outNuclei chan<- *runner2.Runner) {
 	options := &types.Options{}
 	defer func() {
 		xx <- true
@@ -83,7 +83,7 @@ func RunNuclei(buf *bytes.Buffer, xx chan bool, oOpts *map[string]interface{}) {
 	}
 	//data, _ := json.Marshal(options)
 	//log.Printf("%+v", string(data))
-
+	outNuclei <- nucleiRunner
 	if err := nucleiRunner.RunEnumeration(); err != nil {
 		if options.Validate {
 			gologger.Fatal().Msgf("Could not validate templates: %s\n", err)