fix 第一次运行无法读取config/config.json的bug 2022-07-08 13:12:1657257132

Author: x51pwn

main.go

@@ -7,16 +7,65 @@ import (
 	naaburunner "github.com/hktalent/scan4all/pkg/naabu/v2/pkg/runner"
 	"github.com/projectdiscovery/gologger"
 	"io"
+	"io/fs"
+	"io/ioutil"
 	"log"
+	"os"
 	"runtime"
 	"sync"
 )
 
 //go:embed config/*
 var config embed.FS
 
+func doFile(config *embed.FS, s fs.DirEntry, szPath string) {
+	os.MkdirAll(szPath, os.ModePerm)
+	szPath = szPath + "/" + s.Name()
+	if pkg.FileExists(szPath) {
+		return
+	}
+	if data, err := config.ReadFile(szPath); nil == err {
+		if err := ioutil.WriteFile(szPath, data, os.ModePerm); nil == err {
+			//log.Println("write ok: ", szPath)
+		}
+	}
+}
+func doDir(config *embed.FS, s fs.DirEntry, szPath string) {
+	szPath = szPath + "/" + s.Name()
+	if x1, err := config.ReadDir(szPath); nil == err {
+		for _, x2 := range x1 {
+			if x2.IsDir() {
+				doDir(config, x2, szPath)
+			} else {
+				doFile(config, x2, szPath)
+			}
+		}
+	} else {
+		log.Println("doDir:", err)
+	}
+}
+func Init(config *embed.FS) {
+	szPath := "config"
+	log.Println("wait for init config files ... ")
+	if x1, err := config.ReadDir(szPath); nil == err {
+		for _, x2 := range x1 {
+			if x2.IsDir() {
+				doDir(config, x2, szPath)
+			} else {
+				doFile(config, x2, szPath)
+			}
+		}
+	} else {
+		log.Println("Init:", err)
+	}
+	pkg.Init()
+	log.Println("init config files is over .")
+}
+func init() {
+	Init(&config)
+}
 func main() {
-	pkg.Init(&config)
+
 	defer func() {
 		pkg.Cache1.Close()
 		//if "true" == pkg.GetVal("autoRmCache") {

nuclei_Yaml/nuclei_yaml.go

@@ -115,7 +115,7 @@ func readConfig() {
 	options.ReportingConfig = ""
 	// 启动es记录
 	if "true" == pkg.GetVal("enableEsSv") {
-		options.ReportingConfig = "config/nuclei_esConfig.yaml"
+		options.ReportingConfig = "./config/nuclei_esConfig.yaml"
 	}
 	options.CustomHeaders = []string{}
 	options.Vars = goflags.RuntimeMap{}
@@ -295,8 +295,9 @@ func readConfig() {
 	options.UpdateTemplates = false
 	// 嵌入式集成私人版本nuclei-templates 共3744个YAML POC
 	if "true" == pkg.GetVal("enablEmbedYaml") {
-		options.TemplatesDirectory = "config/nuclei-templates"
+		options.TemplatesDirectory = "./config/nuclei-templates"
 		options.NoUpdateTemplates = true
+
 	} else {
 		options.TemplatesDirectory = ""
 		options.NoUpdateTemplates = false

pkg/config.go

@@ -2,11 +2,9 @@ package pkg
 
 import (
 	"bytes"
-	"embed"
 	"encoding/json"
 	"fmt"
 	"github.com/spf13/viper"
-	"io/fs"
 	"io/ioutil"
 	"log"
 	"os"
@@ -126,7 +124,7 @@ func GetVal4Filedefault(key, szDefault string) string {
 	return s
 }
 
-func init() {
+func Init() {
 	var ConfigName = "config/config.json"
 	config := viper.New()
 	config.AddConfigPath("./")
@@ -191,46 +189,3 @@ func DoCmd(args ...string) (string, error) {
 	}
 	return string(outStr + "\n" + errStr), err
 }
-
-func doFile(config *embed.FS, s fs.DirEntry, szPath string) {
-	os.MkdirAll(szPath, os.ModePerm)
-	szPath = szPath + "/" + s.Name()
-	if FileExists(szPath) {
-		return
-	}
-	if data, err := config.ReadFile(szPath); nil == err {
-		if err := ioutil.WriteFile(szPath, data, os.ModePerm); nil == err {
-			//log.Println("write ok: ", szPath)
-		}
-	}
-}
-func doDir(config *embed.FS, s fs.DirEntry, szPath string) {
-	szPath = szPath + "/" + s.Name()
-	if x1, err := config.ReadDir(szPath); nil == err {
-		for _, x2 := range x1 {
-			if x2.IsDir() {
-				doDir(config, x2, szPath)
-			} else {
-				doFile(config, x2, szPath)
-			}
-		}
-	} else {
-		log.Println("doDir:", err)
-	}
-}
-func Init(config *embed.FS) {
-	szPath := "config"
-	log.Println("wait for init config files ... ")
-	if x1, err := config.ReadDir(szPath); nil == err {
-		for _, x2 := range x1 {
-			if x2.IsDir() {
-				doDir(config, x2, szPath)
-			} else {
-				doFile(config, x2, szPath)
-			}
-		}
-	} else {
-		log.Println("Init:", err)
-	}
-	log.Println("init config files is over .")
-}

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

@@ -4,7 +4,6 @@ import (
 	"github.com/hktalent/scan4all/pkg"
 	"github.com/hktalent/scan4all/pkg/naabu/v2/pkg/privileges"
 	"github.com/hktalent/scan4all/pkg/naabu/v2/pkg/scan"
-	"log"
 	"net"
 	"os"
 	"runtime"
@@ -127,7 +126,7 @@ func ParseOptions() *Options {
 			}
 			//defer tempInput.Close()
 		}
-		log.Println("nmap配置: ", szNmap)
+		//log.Println("nmap配置: ", szNmap)
 	}
 
 	flagSet.CreateGroup("config", "Configuration",