QTom
fdcbf7aacf
提取 proxyurl.Parse() 公共包，将分散在 6 处的代理 URL 验证逻辑 统一收敛，确保无效代理配置在创建时立即失败，永不静默回退直连。 主要变更： - 新增 proxyurl 包：统一 TrimSpace → url.Parse → Host 校验 → Scheme 白名单 - socks5:// 自动升级为 socks5h://，防止 DNS 泄漏（大小写不敏感） - antigravity: http.ProxyURL → proxyutil.ConfigureTransportProxy 支持 SOCKS5 - openai_oauth: 删除 newOpenAIOAuthHTTPClient，收编至 httpclient.GetClient - 移除未使用的 ProxyStrict 字段（fail-fast 已是全局默认行为） - 补充 15 个 proxyurl 测试 + pricing/usage fail-fast 测试
106 lines
3.0 KiB
Go
106 lines
3.0 KiB
Go
package repository
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"log/slog"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/pkg/httpclient"
|
|
"github.com/Wei-Shaw/sub2api/internal/service"
|
|
)
|
|
|
|
type pricingRemoteClient struct {
|
|
httpClient *http.Client
|
|
}
|
|
|
|
// pricingRemoteClientError 代理初始化失败时的错误占位客户端
|
|
// 所有请求直接返回初始化错误，禁止回退到直连
|
|
type pricingRemoteClientError struct {
|
|
err error
|
|
}
|
|
|
|
func (c *pricingRemoteClientError) FetchPricingJSON(_ context.Context, _ string) ([]byte, error) {
|
|
return nil, c.err
|
|
}
|
|
|
|
func (c *pricingRemoteClientError) FetchHashText(_ context.Context, _ string) (string, error) {
|
|
return "", c.err
|
|
}
|
|
|
|
// NewPricingRemoteClient 创建定价数据远程客户端
|
|
// proxyURL 为空时直连，支持 http/https/socks5/socks5h 协议
|
|
// 代理配置失败时行为由 allowDirectOnProxyError 控制：
|
|
// - false（默认）：返回错误占位客户端，禁止回退到直连
|
|
// - true：回退到直连（仅限管理员显式开启）
|
|
func NewPricingRemoteClient(proxyURL string, allowDirectOnProxyError bool) service.PricingRemoteClient {
|
|
// 安全说明：httpclient.GetClient 的错误链（url.Parse / proxyutil）不含明文代理凭据，
|
|
// 但仍通过 slog 仅在服务端日志记录，不会暴露给 HTTP 响应。
|
|
sharedClient, err := httpclient.GetClient(httpclient.Options{
|
|
Timeout: 30 * time.Second,
|
|
ProxyURL: proxyURL,
|
|
})
|
|
if err != nil {
|
|
if strings.TrimSpace(proxyURL) != "" && !allowDirectOnProxyError {
|
|
slog.Warn("proxy client init failed, all requests will fail", "service", "pricing", "error", err)
|
|
return &pricingRemoteClientError{err: fmt.Errorf("proxy client init failed and direct fallback is disabled; set security.proxy_fallback.allow_direct_on_error=true to allow fallback: %w", err)}
|
|
}
|
|
sharedClient = &http.Client{Timeout: 30 * time.Second}
|
|
}
|
|
return &pricingRemoteClient{
|
|
httpClient: sharedClient,
|
|
}
|
|
}
|
|
|
|
func (c *pricingRemoteClient) FetchPricingJSON(ctx context.Context, url string) ([]byte, error) {
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
resp, err := c.httpClient.Do(req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer func() { _ = resp.Body.Close() }()
|
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
return nil, fmt.Errorf("HTTP %d", resp.StatusCode)
|
|
}
|
|
|
|
return io.ReadAll(resp.Body)
|
|
}
|
|
|
|
func (c *pricingRemoteClient) FetchHashText(ctx context.Context, url string) (string, error) {
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
resp, err := c.httpClient.Do(req)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
defer func() { _ = resp.Body.Close() }()
|
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
return "", fmt.Errorf("HTTP %d", resp.StatusCode)
|
|
}
|
|
|
|
body, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
// 哈希文件格式：hash filename 或者纯 hash
|
|
hash := strings.TrimSpace(string(body))
|
|
parts := strings.Fields(hash)
|
|
if len(parts) > 0 {
|
|
return parts[0], nil
|
|
}
|
|
return hash, nil
|
|
}
|