-j参数支持--filter

chainreactors · Nov 2, 2022 · 4521364 · 4521364
1 parent 4b77a6f
commit 4521364
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/v2/go.mod b/v2/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/chainreactors/files v0.2.3
 	github.com/chainreactors/ipcs v0.0.9
 	github.com/chainreactors/logs v0.6.1
-	github.com/chainreactors/parsers v0.1.7
+	github.com/chainreactors/parsers v0.1.8
 	github.com/jessevdk/go-flags v1.5.0
 	github.com/panjf2000/ants/v2 v2.5.0
 	golang.org/x/net v0.0.0-20190603091049-60506f45cf65

diff --git a/v2/go.sum b/v2/go.sum
@@ -7,8 +7,8 @@ github.com/chainreactors/ipcs v0.0.9 h1:4Onroq7gXLG5SLCCgNDx3JmtLxB4XgepGdHCtLp1
 github.com/chainreactors/ipcs v0.0.9/go.mod h1:E9M3Ohyq0TYQLlV4i2dbM9ThBZB1Nnd7Oexoie2xLII=
 github.com/chainreactors/logs v0.6.1 h1:+wLVqxErUyWYayAx6x+m5LA6jQBiHcLdTAJtiOUMoZU=
 github.com/chainreactors/logs v0.6.1/go.mod h1:Y0EtAnoF0kiASIJUnXN0pcOt420iRpHOAnOhEphzRHA=
-github.com/chainreactors/parsers v0.1.7 h1:zUDKEkYddTuijJTXI4hVJrnnPzqnUNd7ASw9pkGCNf0=
-github.com/chainreactors/parsers v0.1.7/go.mod h1:Z9weht+lnFCk7UcwqFu6lXpS7u5vttiy0AJYOAyCCLA=
+github.com/chainreactors/parsers v0.1.8 h1:i2ULyhthD4yYNWlef+82mNvRHz5zboJdt6qHsEs+nA4=
+github.com/chainreactors/parsers v0.1.8/go.mod h1:Z9weht+lnFCk7UcwqFu6lXpS7u5vttiy0AJYOAyCCLA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/v2/internal/core/init.go b/v2/internal/core/init.go
@@ -86,6 +86,11 @@ func InitConfig(config *Config) (*Config, error) {
 		}
 	}
 
+	if config.Results != nil {
+		for _, filter := range config.Filters {
+			config.Results = config.Results.FilterWithString(filter)
+		}
+	}
 	err = config.InitIP()
 	if err != nil {
 		return nil, err

diff --git a/v2/internal/core/runner.go b/v2/internal/core/runner.go
@@ -168,6 +168,7 @@ func (r *Runner) PrepareConfig() {
 		FilePath:    r.FilePath,
 		Compress:    r.Compress,
 		Tee:         r.Tee,
+		Filters:     r.Filters,
 	}
 
 	if r.FileOutputf == Default {

diff --git a/v2/pkg/config.go b/v2/pkg/config.go
@@ -36,10 +36,8 @@ type Config struct {
 	// file
 	IsListInput bool `json:"-"` // 从标准输入中读
 	IsJsonInput bool `json:"-"` // 从标准输入中读
-
-	NoSpray bool `json:"-"`
-
-	Compress bool `json:"-"`
+	NoSpray     bool `json:"-"`
+	Compress    bool `json:"-"`
 
 	// output
 	FilePath       string              `json:"-"`
@@ -57,6 +55,7 @@ type Config struct {
 	Filenamef      string              `json:"-"`
 	Results        parsers.GOGOResults `json:"-"` // json反序列化后的内网,保存在内存中
 	HostsMap       map[string][]string `json:"-"` // host映射表
+	Filters        []string            `json:"-"`
 }
 
 func (config *Config) InitIP() error {