mirror of
https://github.com/chainreactors/spray.git
synced 2025-09-15 11:40:13 +00:00
clean output code
enhance output format and color support jsonline output in stdout
This commit is contained in:
M09Ic
parent
237102124e
commit
eb328a4b52
2
go.mod
2
go.mod
@ -8,7 +8,7 @@ require (
|
||||
github.com/chainreactors/files v0.0.0-20231123083421-cea5b4ad18a8
|
||||
github.com/chainreactors/fingers v0.0.0-20240704063230-de8fec05ff8b
|
||||
github.com/chainreactors/logs v0.0.0-20240207121836-c946f072f81f
|
||||
github.com/chainreactors/parsers v0.0.0-20240704062910-decf861def9e
|
||||
github.com/chainreactors/parsers v0.0.0-20240704071623-9d0ee90230a6
|
||||
github.com/chainreactors/utils v0.0.0-20240704062557-662d623b74f4
|
||||
github.com/chainreactors/words v0.4.1-0.20240510105042-5ba5c2edc508
|
||||
github.com/expr-lang/expr v1.16.9
|
||||
|
||||
4
go.sum
4
go.sum
@ -119,6 +119,10 @@ github.com/chainreactors/parsers v0.0.0-20240702104902-1ce563b7ef76 h1:i4sHuonM5
|
||||
github.com/chainreactors/parsers v0.0.0-20240702104902-1ce563b7ef76/go.mod h1:G/XLE5RAaUdqADkbhQ59mPrUAbsJLiQ2DN6CwtwNpBQ=
|
||||
github.com/chainreactors/parsers v0.0.0-20240704062910-decf861def9e h1:42ILX5kS76M1D9IQvXgfelpgUJDi/K+4/egE0tLzuSE=
|
||||
github.com/chainreactors/parsers v0.0.0-20240704062910-decf861def9e/go.mod h1:7rXdYz6jrdjF0WUH1ICcAXKIKKjKmJo2PU8u43V7jkA=
|
||||
github.com/chainreactors/parsers v0.0.0-20240704071443-8a8558f34cf9 h1:XxPUVhP29vnbLuhxFt8VT3eyBR8d/GfHR7YK44zyDVo=
|
||||
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/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=
|
||||
|
||||
@ -87,6 +87,7 @@ type OutputOptions struct {
|
||||
Dump bool `long:"dump" description:"Bool, dump all request" config:"dump"`
|
||||
AutoFile bool `long:"auto-file" description:"Bool, auto generator output and fuzzy filename" config:"auto-file"`
|
||||
Format string `short:"F" long:"format" description:"String, output format, e.g.: --format 1.json" config:"format"`
|
||||
Json bool `short:"j" long:"json" description:"Bool, output json" config:"json"`
|
||||
OutputProbe string `short:"o" long:"probe" description:"String, output format" config:"output_probe"`
|
||||
Quiet bool `short:"q" long:"quiet" description:"Bool, Quiet" config:"quiet"`
|
||||
NoColor bool `long:"no-color" description:"Bool, no color" config:"no-color"`
|
||||
@ -158,36 +159,13 @@ func (opt *Option) PrepareRunner() (*Runner, error) {
|
||||
return nil, err
|
||||
}
|
||||
r := &Runner{
|
||||
Threads: opt.Threads,
|
||||
PoolSize: opt.PoolSize,
|
||||
Mod: opt.Mod,
|
||||
Timeout: opt.Timeout,
|
||||
RateLimit: opt.RateLimit,
|
||||
Deadline: opt.Deadline,
|
||||
Headers: make(map[string]string),
|
||||
Method: opt.Method,
|
||||
Offset: opt.Offset,
|
||||
Total: opt.Limit,
|
||||
Option: opt,
|
||||
taskCh: make(chan *Task),
|
||||
outputCh: make(chan *pkg.Baseline, 256),
|
||||
outwg: &sync.WaitGroup{},
|
||||
fuzzyCh: make(chan *pkg.Baseline, 256),
|
||||
Fuzzy: opt.Fuzzy,
|
||||
Force: opt.Force,
|
||||
CheckOnly: opt.CheckOnly,
|
||||
CheckPeriod: opt.CheckPeriod,
|
||||
ErrPeriod: opt.ErrPeriod,
|
||||
BreakThreshold: opt.BreakThreshold,
|
||||
Crawl: opt.Crawl,
|
||||
Scope: opt.Scope,
|
||||
Finger: opt.Finger,
|
||||
Bak: opt.Bak,
|
||||
Common: opt.Common,
|
||||
RetryCount: opt.RetryCount,
|
||||
RandomUserAgent: opt.RandomUserAgent,
|
||||
Random: opt.Random,
|
||||
Index: opt.Index,
|
||||
Proxy: opt.Proxy,
|
||||
Headers: make(map[string]string),
|
||||
Total: opt.Limit,
|
||||
}
|
||||
|
||||
// log and bar
|
||||
|
||||
@ -28,6 +28,8 @@ var (
|
||||
)
|
||||
|
||||
type Runner struct {
|
||||
*Option
|
||||
|
||||
taskCh chan *Task
|
||||
poolwg sync.WaitGroup
|
||||
outwg *sync.WaitGroup
|
||||
@ -35,56 +37,30 @@ type Runner struct {
|
||||
fuzzyCh chan *pkg.Baseline
|
||||
bar *mpb.Bar
|
||||
finished int
|
||||
|
||||
Pools *ants.PoolWithFunc
|
||||
PoolName map[string]bool
|
||||
Tasks chan *Task
|
||||
Count int // tasks total number
|
||||
Wordlist []string
|
||||
Rules *rule.Program
|
||||
AppendRules *rule.Program
|
||||
AppendWords []string
|
||||
Headers map[string]string
|
||||
Method string
|
||||
Fns []func(string) []string
|
||||
FilterExpr *vm.Program
|
||||
MatchExpr *vm.Program
|
||||
RecursiveExpr *vm.Program
|
||||
RecuDepth int
|
||||
Threads int
|
||||
PoolSize int
|
||||
ClientType int
|
||||
Pools *ants.PoolWithFunc
|
||||
PoolName map[string]bool
|
||||
Timeout int
|
||||
Mod string
|
||||
Probes []string
|
||||
Fuzzy bool
|
||||
OutputFile *files.File
|
||||
FuzzyFile *files.File
|
||||
DumpFile *files.File
|
||||
StatFile *files.File
|
||||
Progress *mpb.Progress
|
||||
Offset int
|
||||
Limit int
|
||||
RateLimit int
|
||||
Fns []func(string) []string
|
||||
Count int // tasks total number
|
||||
Wordlist []string
|
||||
AppendWords []string
|
||||
RecuDepth int
|
||||
ClientType int
|
||||
Probes []string
|
||||
Total int // wordlist total number
|
||||
Deadline int
|
||||
CheckPeriod int
|
||||
ErrPeriod int
|
||||
BreakThreshold int
|
||||
Color bool
|
||||
CheckOnly bool
|
||||
Force bool
|
||||
IgnoreWaf bool
|
||||
Crawl bool
|
||||
Scope []string
|
||||
Finger bool
|
||||
Bak bool
|
||||
Common bool
|
||||
RetryCount int
|
||||
RandomUserAgent bool
|
||||
Random string
|
||||
Index string
|
||||
Proxy string
|
||||
Jsonify bool
|
||||
}
|
||||
|
||||
func (r *Runner) PrepareConfig() *pool.Config {
|
||||
@ -107,7 +83,7 @@ func (r *Runner) PrepareConfig() *pool.Config {
|
||||
RecuExpr: r.RecursiveExpr,
|
||||
AppendRule: r.AppendRules,
|
||||
AppendWords: r.AppendWords,
|
||||
IgnoreWaf: r.IgnoreWaf,
|
||||
//IgnoreWaf: r.IgnoreWaf,
|
||||
Crawl: r.Crawl,
|
||||
Scope: r.Scope,
|
||||
Active: r.Finger,
|
||||
@ -386,38 +362,55 @@ func (r *Runner) OutputHandler() {
|
||||
logs.Log.Debug(bl.String())
|
||||
}
|
||||
}
|
||||
go func() {
|
||||
var saveFunc func(*pkg.Baseline)
|
||||
|
||||
var saveFunc func(string)
|
||||
if r.OutputFile != nil {
|
||||
saveFunc = func(bl *pkg.Baseline) {
|
||||
r.OutputFile.SafeWrite(bl.Jsonify() + "\n")
|
||||
saveFunc = func(line string) {
|
||||
r.OutputFile.SafeWrite(line + "\n")
|
||||
r.OutputFile.SafeSync()
|
||||
}
|
||||
} else {
|
||||
saveFunc = func(line string) {
|
||||
logs.Log.Console(line + "\n")
|
||||
}
|
||||
}
|
||||
|
||||
var fuzzySaveFunc func(string)
|
||||
if r.FuzzyFile != nil {
|
||||
fuzzySaveFunc = func(line string) {
|
||||
r.FuzzyFile.SafeWrite(line + "\n")
|
||||
r.FuzzyFile.SafeSync()
|
||||
}
|
||||
} else {
|
||||
fuzzySaveFunc = func(line string) {
|
||||
logs.Log.Console("[fuzzy] " + line + "\n")
|
||||
}
|
||||
}
|
||||
outputPrint := func(bl *pkg.Baseline) {
|
||||
var outFunc func(string)
|
||||
if bl.IsFuzzy {
|
||||
outFunc = fuzzySaveFunc
|
||||
} else {
|
||||
outFunc = saveFunc
|
||||
}
|
||||
if r.Option.Json {
|
||||
outFunc(bl.Jsonify())
|
||||
} else if r.Color {
|
||||
if len(r.Probes) > 0 {
|
||||
if r.Color {
|
||||
saveFunc = func(bl *pkg.Baseline) {
|
||||
logs.Log.Console(logs.GreenBold("[+] " + bl.Format(r.Probes) + "\n"))
|
||||
outFunc(logs.GreenBold(bl.Format(r.Probes)))
|
||||
} else {
|
||||
outFunc(logs.GreenBold(bl.ColorString()))
|
||||
}
|
||||
} else {
|
||||
saveFunc = func(bl *pkg.Baseline) {
|
||||
logs.Log.Console("[+] " + bl.Format(r.Probes) + "\n")
|
||||
}
|
||||
}
|
||||
if len(r.Probes) > 0 {
|
||||
outFunc(bl.Format(r.Probes))
|
||||
} else {
|
||||
if r.Color {
|
||||
saveFunc = func(bl *pkg.Baseline) {
|
||||
logs.Log.Console(logs.GreenBold("[+] " + bl.ColorString() + "\n"))
|
||||
}
|
||||
} else {
|
||||
saveFunc = func(bl *pkg.Baseline) {
|
||||
logs.Log.Console("[+] " + bl.String() + "\n")
|
||||
}
|
||||
outFunc(bl.String())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
go func() {
|
||||
for {
|
||||
select {
|
||||
case bl, ok := <-r.outputCh:
|
||||
@ -429,7 +422,7 @@ func (r *Runner) OutputHandler() {
|
||||
r.DumpFile.SafeSync()
|
||||
}
|
||||
if bl.IsValid {
|
||||
saveFunc(bl)
|
||||
outputPrint(bl)
|
||||
if bl.Recu {
|
||||
r.AddRecursive(bl)
|
||||
}
|
||||
@ -442,23 +435,6 @@ func (r *Runner) OutputHandler() {
|
||||
}()
|
||||
|
||||
go func() {
|
||||
var fuzzySaveFunc func(*pkg.Baseline)
|
||||
if r.FuzzyFile != nil {
|
||||
fuzzySaveFunc = func(bl *pkg.Baseline) {
|
||||
r.FuzzyFile.SafeWrite(bl.Jsonify() + "\n")
|
||||
}
|
||||
} else {
|
||||
if r.Color {
|
||||
fuzzySaveFunc = func(bl *pkg.Baseline) {
|
||||
logs.Log.Console(logs.GreenBold("[fuzzy] " + bl.ColorString() + "\n"))
|
||||
}
|
||||
} else {
|
||||
fuzzySaveFunc = func(bl *pkg.Baseline) {
|
||||
logs.Log.Console("[fuzzy] " + bl.String() + "\n")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for {
|
||||
select {
|
||||
case bl, ok := <-r.fuzzyCh:
|
||||
@ -466,7 +442,7 @@ func (r *Runner) OutputHandler() {
|
||||
return
|
||||
}
|
||||
if r.Fuzzy {
|
||||
fuzzySaveFunc(bl)
|
||||
outputPrint(bl)
|
||||
}
|
||||
r.outwg.Done()
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user