adapt spray_dict load

pkg/load.go

@@ -55,13 +55,20 @@ func LoadFingers() error {
 func LoadTemplates() error {
 	var err error
 	// load rule
-	var data map[string]interface{}
-	err = json.Unmarshal(LoadConfig("spray_rule"), &data)
+
+	err = json.Unmarshal(LoadConfig("spray_rule"), &Rules)
 	if err != nil {
 		return err
 	}
-	for k, v := range data {
-		Rules[k] = v.(string)
+
+	// load default words
+	var dicts map[string]string
+	err = json.Unmarshal(LoadConfig("spray_dict"), &dicts)
+	if err != nil {
+		return err
+	}
+	for name, wordlist := range dicts {
+		Dicts[strings.TrimRight(name, ".txt")] = strings.Split(strings.TrimSpace(wordlist), "\n")
 	}
 
 	// load mask
@@ -131,7 +138,3 @@ func Load() error {
 
 	return nil
 }
-
-func LoadDefaultDict() []string {
-	return strings.Split(strings.TrimSpace(string(LoadConfig("spray_default"))), "\n")
-}

pkg/utils.go

@@ -32,10 +32,10 @@ var (
 	EnableAllFingerEngine = false
 )
 var (
-	Rules map[string]string = make(map[string]string)
-
-	BadExt = []string{".js", ".css", ".scss", ".,", ".jpeg", ".jpg", ".png", ".gif", ".svg", ".vue", ".ts", ".swf", ".pdf", ".mp4", ".zip", ".rar"}
-	BadURL = []string{";", "}", "\\n", "webpack://", "{", "www.w3.org", ".src", ".url", ".att", ".href", "location.href", "javascript:", "location:", ".createObject", ":location", ".path"}
+	Rules  map[string]string   = make(map[string]string)
+	Dicts  map[string][]string = make(map[string][]string)
+	BadExt                     = []string{".js", ".css", ".scss", ".,", ".jpeg", ".jpg", ".png", ".gif", ".svg", ".vue", ".ts", ".swf", ".pdf", ".mp4", ".zip", ".rar"}
+	BadURL                     = []string{";", "}", "\\n", "webpack://", "{", "www.w3.org", ".src", ".url", ".att", ".href", "location.href", "javascript:", "location:", ".createObject", ":location", ".path"}
 
 	ContentTypeMap = map[string]string{
 		"application/javascript":   "js",