From b13903ea9822d4620c79efb72deeb6f016d58622 Mon Sep 17 00:00:00 2001 From: M09Ic Date: Tue, 4 Mar 2025 14:45:31 +0800 Subject: [PATCH] fix: map panic, https://github.com/chainreactors/spray/issues/93 --- core/ihttp/request.go | 12 ++---------- core/pool/brutepool.go | 9 ++++++++- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/core/ihttp/request.go b/core/ihttp/request.go index 93c2949..4e52912 100644 --- a/core/ihttp/request.go +++ b/core/ihttp/request.go @@ -32,16 +32,8 @@ type Request struct { } func (r *Request) SetHeaders(header map[string]string, RandomUA bool) { - if header["User-Agent"] == "" { - if RandomUA { - header["User-Agent"] = pkg.RandomUA() - } else { - header["User-Agent"] = pkg.DefaultUserAgent - } - } - - if header["Accept"] == "" { - header["Accept"] = "*/*" + if RandomUA { + r.SetHeader("User-Agent", pkg.RandomUA()) } if r.StandardRequest != nil { diff --git a/core/pool/brutepool.go b/core/pool/brutepool.go index a7394a7..b051c80 100644 --- a/core/pool/brutepool.go +++ b/core/pool/brutepool.go @@ -107,6 +107,14 @@ type BrutePool struct { } func (pool *BrutePool) Init() error { + if pool.Headers["User-Agent"] == "" { + pool.Headers["User-Agent"] = pkg.DefaultUserAgent + } + + if pool.Headers["Accept"] == "" { + pool.Headers["Accept"] = "*/*" + } + pool.initwg.Add(2) if pool.Index != "/" { logs.Log.Logf(pkg.LogVerbose, "custom index url: %s", pkg.BaseURL(pool.url)+pkg.FormatURL(pkg.BaseURL(pool.url), pool.Index)) @@ -394,7 +402,6 @@ func (pool *BrutePool) NoScopeInvoke(v interface{}) { return } req.SetHeaders(pool.Headers, pool.RandomUserAgent) - req.SetHeader("User-Agent", pkg.RandomUA()) resp, reqerr := pool.client.Do(req) if pool.ClientType == ihttp.FAST { defer fasthttp.ReleaseResponse(resp.FastResponse)