admin/spray
1
0
Fork 0
mirror of https://github.com/chainreactors/spray.git synced 2025-09-15 11:40:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

统一crawl与extract的输出

Browse Source
This commit is contained in:
M09Ic 2023-01-04 11:18:03 +08:00
parent c83838e1ba
commit 4ab500c049
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/baseline.go
View File

@ -3,6 +3,7 @@ package pkg
import ( import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"github.com/chainreactors/gogo/v2/pkg/fingers"
"github.com/chainreactors/gogo/v2/pkg/utils" "github.com/chainreactors/gogo/v2/pkg/utils"
"github.com/chainreactors/logs" "github.com/chainreactors/logs"
"github.com/chainreactors/parsers" "github.com/chainreactors/parsers"
@ -84,7 +85,7 @@ type Baseline struct {
Reason string `json:"reason"` Reason string `json:"reason"`
IsValid bool `json:"valid"` IsValid bool `json:"valid"`
IsFuzzy bool `json:"fuzzy"` IsFuzzy bool `json:"fuzzy"`
URLs []string `json:"urls"` URLs []string `json:"-"`
Source int `json:"source"` Source int `json:"source"`
RecuDepth int `json:"-"` RecuDepth int `json:"-"`
ReqDepth int `json:"depth"` ReqDepth int `json:"depth"`
@ -130,6 +131,12 @@ func (bl *Baseline) CollectURL() {
} }
} }
} }
if bl.URLs != nil {
bl.Extracteds = append(bl.Extracteds, &fingers.Extracted{
Name: "crawl",
ExtractResult: bl.URLs,
})
}
} }
// Compare // Compare
@ -295,15 +302,9 @@ func (bl *Baseline) ColorString() string {
line.WriteString(logs.CyanLine(bl.RedirectURL)) line.WriteString(logs.CyanLine(bl.RedirectURL))
line.WriteString(" ") line.WriteString(" ")
} }
if len(bl.URLs) > 0 {
line.WriteString("\n crawl: \n")
}
for _, u := range bl.URLs {
line.WriteString("\t" + logs.GreenLine(u) + "\n")
}
if len(bl.Extracteds) > 0 { if len(bl.Extracteds) > 0 {
for _, e := range bl.Extracteds { for _, e := range bl.Extracteds {
line.WriteString(" " + e.Name + ": \n\t") line.WriteString("\n " + e.Name + ": \n\t")
line.WriteString(logs.GreenLine(strings.Join(e.ExtractResult, "\n\t"))) line.WriteString(logs.GreenLine(strings.Join(e.ExtractResult, "\n\t")))
} }
} }
@ -348,15 +349,9 @@ func (bl *Baseline) String() string {
line.WriteString(bl.RedirectURL) line.WriteString(bl.RedirectURL)
line.WriteString(" ") line.WriteString(" ")
} }
if len(bl.URLs) > 0 {
line.WriteString("\n crawl: \n")
}
for _, u := range bl.URLs {
line.WriteString("\t" + u + "\n")
}
if len(bl.Extracteds) > 0 { if len(bl.Extracteds) > 0 {
for _, e := range bl.Extracteds { for _, e := range bl.Extracteds {
line.WriteString(" " + e.Name + ": \n\t") line.WriteString("\n " + e.Name + ": \n\t")
line.WriteString(strings.Join(e.ExtractResult, "\n\t")) line.WriteString(strings.Join(e.ExtractResult, "\n\t"))
} }
} }