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

优化命令行参数, 当-w与-d都为空的时候自动添加"/"防止报错

Browse Source
This commit is contained in:
M09Ic 2023-01-09 15:45:17 +08:00
parent a94f9e3dc7
commit f8b84c733b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/option.go
View File

@ -232,12 +232,14 @@ func (opt *Option) PrepareRunner() (*Runner, error) {
logs.Log.Importantf("Loaded %d word from %s", len(dicts[i]), f) logs.Log.Importantf("Loaded %d word from %s", len(dicts[i]), f)
} }
if opt.Word == "" { if len(opt.Dictionaries) > 0 && opt.Word == "" {
opt.Word = "{?" opt.Word = "{?"
for i, _ := range dicts { for i, _ := range dicts {
opt.Word += strconv.Itoa(i) opt.Word += strconv.Itoa(i)
} }
opt.Word += "}" opt.Word += "}"
} else {
opt.Word = "/"
} }
if opt.Suffixes != nil { if opt.Suffixes != nil {

7
pkg/baseline.go
View File

@ -337,11 +337,12 @@ func (bl *Baseline) Format(probes []string) string {
func (bl *Baseline) ColorString() string { func (bl *Baseline) ColorString() string {
var line strings.Builder var line strings.Builder
line.WriteString(logs.GreenLine("[" + GetSourceName(bl.Source) + "]"))
if bl.FrontURL != "" { if bl.FrontURL != "" {
line.WriteString("\t")
line.WriteString(logs.CyanLine(bl.FrontURL)) line.WriteString(logs.CyanLine(bl.FrontURL))
line.WriteString(" --> ") line.WriteString(" --> ")
} }
line.WriteString(" ")
line.WriteString(logs.GreenLine(bl.UrlString)) line.WriteString(logs.GreenLine(bl.UrlString))
if bl.Host != "" { if bl.Host != "" {
line.WriteString(" (" + bl.Host + ")") line.WriteString(" (" + bl.Host + ")")
@ -368,7 +369,6 @@ func (bl *Baseline) ColorString() string {
} }
line.WriteString(" - ") line.WriteString(" - ")
line.WriteString(logs.YellowBold(strconv.Itoa(int(bl.Spended)) + "ms")) line.WriteString(logs.YellowBold(strconv.Itoa(int(bl.Spended)) + "ms"))
line.WriteString(logs.YellowBold(" - " + GetSourceName(bl.Source)))
line.WriteString(logs.GreenLine(bl.Additional("title"))) line.WriteString(logs.GreenLine(bl.Additional("title")))
if bl.Distance != 0 { if bl.Distance != 0 {
line.WriteString(logs.GreenLine(bl.Additional("sim"))) line.WriteString(logs.GreenLine(bl.Additional("sim")))
@ -391,11 +391,12 @@ func (bl *Baseline) ColorString() string {
func (bl *Baseline) String() string { func (bl *Baseline) String() string {
var line strings.Builder var line strings.Builder
line.WriteString(logs.GreenLine("[" + GetSourceName(bl.Source) + "]"))
if bl.FrontURL != "" { if bl.FrontURL != "" {
line.WriteString("\t")
line.WriteString(bl.FrontURL) line.WriteString(bl.FrontURL)
line.WriteString(" --> ") line.WriteString(" --> ")
} }
line.WriteString(" ")
line.WriteString(bl.UrlString) line.WriteString(bl.UrlString)
if bl.Host != "" { if bl.Host != "" {
line.WriteString(" (" + bl.Host + ")") line.WriteString(" (" + bl.Host + ")")