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

修复部分情况下过滤不生效的bug

Browse Source
This commit is contained in:
M09Ic 2023-03-24 15:39:40 +08:00
parent 4a12286beb
commit 30506b1f5b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/pool.go
View File

@ -325,8 +325,8 @@ func (pool *Pool) Invoke(v interface{}) {
pool.index = bl pool.index = bl
pool.locker.Unlock() pool.locker.Unlock()
if bl.Status == 200 || (bl.Status/100) == 3 { if bl.Status == 200 || (bl.Status/100) == 3 {
pool.waiter.Add(1) // 保留index输出结果
pool.tempCh <- bl pool.OutputCh <- bl
} }
pool.initwg.Done() pool.initwg.Done()
case CheckSource: case CheckSource:
@ -519,9 +519,7 @@ func (pool *Pool) BaseCompare(bl *pkg.Baseline) bool {
// 使用与baseline相同状态码, 需要在fuzzystatus中提前配置 // 使用与baseline相同状态码, 需要在fuzzystatus中提前配置
base, ok := pool.baselines[bl.Status] // 挑选对应状态码的baseline进行compare base, ok := pool.baselines[bl.Status] // 挑选对应状态码的baseline进行compare
if !ok { if !ok {
if pool.index != nil { if pool.random.Status == bl.Status {
} else if pool.random.Status == bl.Status {
// 当other的状态码与base相同时, 会使用base // 当other的状态码与base相同时, 会使用base
ok = true ok = true
base = pool.random base = pool.random
@ -540,6 +538,7 @@ func (pool *Pool) BaseCompare(bl *pkg.Baseline) bool {
} }
bl.Collect() bl.Collect()
//if !pool.IgnoreWaf { //if !pool.IgnoreWaf {
// // 部分情况下waf的特征可能是全局, 指定了--ignore-waf则不会进行waf的指纹检测 // // 部分情况下waf的特征可能是全局, 指定了--ignore-waf则不会进行waf的指纹检测
// for _, f := range bl.Frameworks { // for _, f := range bl.Frameworks {

1
internal/utils.go
View File

@ -14,6 +14,7 @@ import (
) )
var ( var (
// from feroxbuster
randomUserAgent = []string{ randomUserAgent = []string{
"Mozilla/5.0 (Linux; Android 8.0.0; SM-G960F Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36", "Mozilla/5.0 (Linux; Android 8.0.0; SM-G960F Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36",
"Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1", "Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1",