xfy/lolly
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(proxy): 修复 ProxyBind 拨号超时和 Cookie 属性匹配

Browse Source 
ProxyBind 使用 MaxConnWaitTimeout 作为拨号超时不合理，改为默认 30s；
rewriteCookieAttr 属性匹配改为大小写不敏感；预分配 cookies 切片容量。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
xfy 2026-04-21 11:41:03 +08:00
parent b6e9772191
commit 11f9cebcd5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/proxy/proxy.go
View File

@ -298,10 +298,14 @@ func createHostClient(targetURL string, timeout config.ProxyTimeout, transportCf
// ProxyBind：使用指定本地地址作为出站连接源 // ProxyBind：使用指定本地地址作为出站连接源
if proxyBind != "" { if proxyBind != "" {
localAddr := proxyBind localAddr := proxyBind
dialTimeout := client.MaxConnWaitTimeout
if dialTimeout <= 0 {
dialTimeout = 30 * time.Second
}
client.Dial = func(addr string) (net.Conn, error) { client.Dial = func(addr string) (net.Conn, error) {
dialer := &net.Dialer{ dialer := &net.Dialer{
LocalAddr: &net.TCPAddr{IP: net.ParseIP(localAddr)}, LocalAddr: &net.TCPAddr{IP: net.ParseIP(localAddr)},
Timeout: client.MaxConnWaitTimeout, Timeout: dialTimeout,
} }
return dialer.Dial("tcp", addr) return dialer.Dial("tcp", addr)
} }
@ -1110,7 +1114,7 @@ func (p *Proxy) rewriteCookies(respHeaders *fasthttp.ResponseHeader) {
return return
} }
var cookies []string cookies := make([]string, 0, respHeaders.Len())
for _, value := range respHeaders.Cookies() { for _, value := range respHeaders.Cookies() {
cookie := string(value) cookie := string(value)
if cookieDomain != "" { if cookieDomain != "" {
@ -1130,10 +1134,11 @@ func (p *Proxy) rewriteCookies(respHeaders *fasthttp.ResponseHeader) {
} }
} }
// rewriteCookieAttr 替换 Cookie 字符串中指定属性的值。 // rewriteCookieAttr 替换 Cookie 字符串中指定属性的值（大小写不敏感）。
func rewriteCookieAttr(cookie, attr, newValue string) string { func rewriteCookieAttr(cookie, attr, newValue string) string {
prefix := attr + "=" prefix := attr + "="
idx := strings.Index(cookie, prefix) lower := strings.ToLower(cookie)
idx := strings.Index(lower, strings.ToLower(prefix))
if idx == -1 { if idx == -1 {
return cookie return cookie
} }