From 40a1f9060118104c8f0821c7b6528427c2e21f03 Mon Sep 17 00:00:00 2001
From: M09Ic <m09ician@gmail.com>
Date: Sun, 14 Jul 2024 03:27:20 +0800
Subject: [PATCH] support preset port config

---
 go.mod             | 6 +++---
 go.sum             | 8 ++++++++
 internal/option.go | 2 +-
 pkg/load.go        | 9 +++++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index a698c0a..add8ee9 100644
--- a/go.mod
+++ b/go.mod
@@ -6,10 +6,10 @@ toolchain go1.22.2
 
 require (
 	github.com/chainreactors/files v0.0.0-20231123083421-cea5b4ad18a8
-	github.com/chainreactors/fingers v0.0.0-20240704063230-de8fec05ff8b
+	github.com/chainreactors/fingers v0.0.0-20240711193807-8c1518dc63fc
 	github.com/chainreactors/logs v0.0.0-20240207121836-c946f072f81f
-	github.com/chainreactors/parsers v0.0.0-20240704071623-9d0ee90230a6
-	github.com/chainreactors/utils v0.0.0-20240704062557-662d623b74f4
+	github.com/chainreactors/parsers v0.0.0-20240708072709-07deeece7ce2
+	github.com/chainreactors/utils v0.0.0-20240711195624-66696b0879b2
 	github.com/chainreactors/words v0.4.1-0.20240510105042-5ba5c2edc508
 	github.com/expr-lang/expr v1.16.9
 	github.com/gookit/config/v2 v2.2.5
diff --git a/go.sum b/go.sum
index 0c56205..46b00f0 100644
--- a/go.sum
+++ b/go.sum
@@ -104,6 +104,8 @@ github.com/chainreactors/fingers v0.0.0-20240702104653-a66e34aa41df h1:1SrOHwdlU
 github.com/chainreactors/fingers v0.0.0-20240702104653-a66e34aa41df/go.mod h1:l8AO6ZbIL8WQ8PkihCK/MD6Iww/O+LY/osAhRJjThs4=
 github.com/chainreactors/fingers v0.0.0-20240704063230-de8fec05ff8b h1:vqkkXIyeD0PGvWdJuKxinjEerfh8Rov/PqoPlnLVt0E=
 github.com/chainreactors/fingers v0.0.0-20240704063230-de8fec05ff8b/go.mod h1:vQ/LJzHnMdxbK6n1PwqZmvgPudfNpoQsyFAPdt3IlBo=
+github.com/chainreactors/fingers v0.0.0-20240711193807-8c1518dc63fc h1:vMEF9hlKqQ1U6rHG+ZD4wAR3ieSzDNH2PH5PTFcYyFk=
+github.com/chainreactors/fingers v0.0.0-20240711193807-8c1518dc63fc/go.mod h1:/F4FibGLZHIuhLM1F6ZZnqtGysED0IGFUSp6KQs/SjY=
 github.com/chainreactors/logs v0.0.0-20231027080134-7a11bb413460/go.mod h1:VZFqkFDGmp7/JOMeraW+YI7kTGcgz9fgc/HArVFnrGQ=
 github.com/chainreactors/logs v0.0.0-20240207121836-c946f072f81f h1:tcfp+CEdgiMvjyUzWab5edJtxUwRMSMEIkLybupIx0k=
 github.com/chainreactors/logs v0.0.0-20240207121836-c946f072f81f/go.mod h1:6Mv6W70JrtL6VClulZhmMRZnoYpcTahcDTKLMNEjK0o=
@@ -123,11 +125,17 @@ github.com/chainreactors/parsers v0.0.0-20240704071443-8a8558f34cf9 h1:XxPUVhP29
 github.com/chainreactors/parsers v0.0.0-20240704071443-8a8558f34cf9/go.mod h1:7rXdYz6jrdjF0WUH1ICcAXKIKKjKmJo2PU8u43V7jkA=
 github.com/chainreactors/parsers v0.0.0-20240704071623-9d0ee90230a6 h1:jUxPo0RJ/f+/4x3ydeXqCeMq5VbvYBjtmpBePWFfNc8=
 github.com/chainreactors/parsers v0.0.0-20240704071623-9d0ee90230a6/go.mod h1:7rXdYz6jrdjF0WUH1ICcAXKIKKjKmJo2PU8u43V7jkA=
+github.com/chainreactors/parsers v0.0.0-20240708072709-07deeece7ce2 h1:sE3SChgHLtPsEaqHo5tDSy8niDys1SO174C4eHlShSw=
+github.com/chainreactors/parsers v0.0.0-20240708072709-07deeece7ce2/go.mod h1:7rXdYz6jrdjF0WUH1ICcAXKIKKjKmJo2PU8u43V7jkA=
 github.com/chainreactors/utils v0.0.0-20240302165634-2b8494c9cfc3/go.mod h1:JA4eiQZm+7AsfjXBcIzIdVKBEhDCb16eNtWFCGTxlvs=
 github.com/chainreactors/utils v0.0.0-20240528085651-ba1b255482c1 h1:+awuysRKLmdLQbVK+HPSOGvO3dFGdNSbM2jyLh+VYOA=
 github.com/chainreactors/utils v0.0.0-20240528085651-ba1b255482c1/go.mod h1:JA4eiQZm+7AsfjXBcIzIdVKBEhDCb16eNtWFCGTxlvs=
 github.com/chainreactors/utils v0.0.0-20240704062557-662d623b74f4 h1:pW7yzxGD19ykkWnKkuJ8oq+hLt1WuTq9HP+cJZibip8=
 github.com/chainreactors/utils v0.0.0-20240704062557-662d623b74f4/go.mod h1:JA4eiQZm+7AsfjXBcIzIdVKBEhDCb16eNtWFCGTxlvs=
+github.com/chainreactors/utils v0.0.0-20240711193713-3f498c03d1b6 h1:U+gTyfd7rEvuwa74SakP8n110nUIsRvMKV57V2SWz5Y=
+github.com/chainreactors/utils v0.0.0-20240711193713-3f498c03d1b6/go.mod h1:LajXuvESQwP+qCMAvlcoSXppQCjuLlBrnQpu9XQ1HtU=
+github.com/chainreactors/utils v0.0.0-20240711195624-66696b0879b2 h1:0Bwlb6eDCcR6hwXPOBdOooRt1wVklstwVZ47miJV0ZY=
+github.com/chainreactors/utils v0.0.0-20240711195624-66696b0879b2/go.mod h1:LajXuvESQwP+qCMAvlcoSXppQCjuLlBrnQpu9XQ1HtU=
 github.com/chainreactors/words v0.4.1-0.20240510105042-5ba5c2edc508 h1:iT4HWkoZzUAfQYcQMRH8XyrMau9tCVE0zSuFQnkhrqw=
 github.com/chainreactors/words v0.4.1-0.20240510105042-5ba5c2edc508/go.mod h1:DUDx7PdsMEm5PvVhzkFyppzpiUhQb8dOJaWjVc1SMVk=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
diff --git a/internal/option.go b/internal/option.go
index d038e50..a7ace19 100644
--- a/internal/option.go
+++ b/internal/option.go
@@ -399,7 +399,7 @@ func (opt *Option) PrepareRunner() (*Runner, error) {
 		r.AppendWords = append(r.AppendWords, lines...)
 	}
 
-	ports := utils.ParsePort(opt.PortRange)
+	ports := utils.ParsePortsString(opt.PortRange)
 	// prepare task
 	tasks := make(chan *Task, opt.PoolSize)
 	var taskfrom string
diff --git a/pkg/load.go b/pkg/load.go
index 49310ea..d7d55ee 100644
--- a/pkg/load.go
+++ b/pkg/load.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"github.com/chainreactors/fingers"
 	"github.com/chainreactors/parsers"
+	"github.com/chainreactors/utils"
 	"github.com/chainreactors/utils/iutils"
 	"github.com/chainreactors/words/mask"
 	"os"
@@ -64,6 +65,14 @@ func LoadTemplates() error {
 		mask.SpecialWords[k] = t
 	}
 
+	// load ports
+	var ports []*utils.PortConfig
+	err = json.Unmarshal(LoadConfig("port"), &ports)
+	if err != nil {
+		return err
+	}
+	utils.PrePort = utils.NewPortPreset(ports)
+
 	var extracts []*parsers.Extractor
 	err = json.Unmarshal(LoadConfig("extract"), &extracts)
 	if err != nil {