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

修复-m host 场景下字典与redirect生成错误的bug

Browse Source
This commit is contained in:
M09Ic 2023-03-24 13:41:00 +08:00
parent 7879d55856
commit bdc793c75b
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
internal/pool.go
View File

@ -199,8 +199,13 @@ Loop:
} }
pool.waiter.Add(1) pool.waiter.Add(1)
//pool.urls[w] = struct{}{} if pool.Mod == pkg.HostSpray {
pool.reqPool.Invoke(newUnitWithNumber(pool.safePath(w), WordSource, pool.wordOffset)) // 原样的目录拼接, 输入了几个"/"就是几个, 适配java的目录解析 pool.reqPool.Invoke(newUnitWithNumber(w, WordSource, pool.wordOffset))
} else {
// 原样的目录拼接, 输入了几个"/"就是几个, 适配/有语义的中间件
pool.reqPool.Invoke(newUnitWithNumber(pool.safePath(w), WordSource, pool.wordOffset))
}
case source := <-pool.checkCh: case source := <-pool.checkCh:
pool.Statistor.CheckNumber++ pool.Statistor.CheckNumber++
if pool.Mod == pkg.HostSpray { if pool.Mod == pkg.HostSpray {
@ -239,7 +244,15 @@ func (pool *Pool) Invoke(v interface{}) {
atomic.AddInt32(&pool.Statistor.ReqTotal, 1) atomic.AddInt32(&pool.Statistor.ReqTotal, 1)
unit := v.(*Unit) unit := v.(*Unit)
req, err := pool.genReq(unit.path)
var req *ihttp.Request
var err error
if unit.source == WordSource {
req, err = pool.genReq(pool.Mod, unit.path)
} else {
req, err = pool.genReq(pkg.PathSpray, unit.path)
}
if err != nil { if err != nil {
logs.Log.Error(err.Error()) logs.Log.Error(err.Error())
return return
@ -453,10 +466,10 @@ func (pool *Pool) checkRedirect(redirectURL string) bool {
} }
} }
func (pool *Pool) genReq(s string) (*ihttp.Request, error) { func (pool *Pool) genReq(mod pkg.SprayMod, s string) (*ihttp.Request, error) {
if pool.Mod == pkg.HostSpray { if mod == pkg.HostSpray {
return ihttp.BuildHostRequest(pool.ClientType, pool.BaseURL, s) return ihttp.BuildHostRequest(pool.ClientType, pool.BaseURL, s)
} else if pool.Mod == pkg.PathSpray { } else if mod == pkg.PathSpray {
return ihttp.BuildPathRequest(pool.ClientType, pool.base, s) return ihttp.BuildPathRequest(pool.ClientType, pool.base, s)
} }
return nil, fmt.Errorf("unknown mod") return nil, fmt.Errorf("unknown mod")