* feat(proxy): 实现第一阶段数据面代理 * feat(proxy): 收敛渠道与代理协议支持 * fix(proxy): 修复环境检测与迁移验证 * fix(proxy): 回收旧代理运行时并校验地址 * fix(proxy): 补齐创建链路与前端校验 * fix(proxy): 收口订阅代理与迁移兼容 * fix(proxy): 修复环境代理与运行时回收 * fix(proxy): 为系统外部请求应用全局代理 * docs(config): 精简环境配置说明 * feat(proxy): 重构代理设置的前端交互与样式 设置页与分组设置页: - 代理设置接入页面统一的草稿态与保存栏,不再独立即时提交 - 计入页面 dirty/valid,参与未保存离开拦截与并发冲突推迟 - 新增 ProxyOverrideRow,用分段控件替代原独立编辑弹层 账号卡片与密钥行: - ProxyConfigEditor 新增 card 外观:标题在白底面板外,与相邻小节同级 - 修掉按视口宽度判断断点的问题,窄容器内不再挤压错乱 - 编辑态下拉固定宽度,不随所选模式伸缩;整体收进两行 - 新增 ProxyScopeIndicator,凭据配置了独立代理时给出标识与悬停提示 密钥行交互: - 操作列收成「更多操作」菜单与展开图标,与账号卡片同构 - 折叠区分为权重、出站代理、运行诊断三个带标题小节,设置与诊断不再混放 - 权重编辑从弹层迁入折叠区,权重列的值可点击直达 - 释放的列宽还给凭据、权重与最近调用列 文案精简为继承、直连、自定义,并清理两处无引用的死键 * refactor(proxy): 统一代理设置的覆盖交互并消除样式重复 设置页与分组设置页: - 代理行改用 RuntimeOverrideRow,与超时等设置项共用同一组件 - inherit 映射为“未覆盖”,direct/custom 映射为“显式覆盖”,因此补齐了 覆盖/恢复默认按钮、覆盖状态徽章、当前有效值与待恢复默认态 - 分段控件只保留直连与自定义,继承由外层覆盖开关表达 - 删除自造的 ProxyOverrideRow,新增只含编辑控件的 ProxyOverrideControl 已保存的自定义地址: - 输入框不做回填,统一由 placeholder 展示已存地址 - 同模式下留空或与已存地址逐字相同均视为未改动,顺带挡住掩码被当作 新密码存回;无改动时保存按钮禁用 - 重新开启覆盖时回到基线已存的覆盖模式,使恢复默认可原路撤销 代码质量: - 面板外壳(标题 + 白底面板 + 标签/值/编辑图标/操作)抽为全局 .setting-panel,代理、权重、诊断三处共用,不再各写一份 - 删除 ProxyConfigEditor 已无调用方的 row 外观及随之失效的 props、 徽章分支与始终隐藏的文案 - 占位地址推导与覆盖开关规则收敛为 proxy.ts 中的共享函数 - 移除代理输入提示文案及其失去引用的 i18n 键 密钥行折叠区诊断值字号对齐上方面板。重构以构建产物 CSS 逐条比对验证, 差异均为已论证的等价改写。 * fix(proxy): 修复代理传输与校验边界
250 lines
6.7 KiB
Go
250 lines
6.7 KiB
Go
// Package outboundproxy defines the provider-neutral outbound proxy policy.
|
|
package outboundproxy
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"errors"
|
|
"io"
|
|
"net/url"
|
|
"os"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
var ErrInvalidConfig = errors.New("invalid outbound proxy config")
|
|
|
|
const SystemSettingKey = "proxy_config"
|
|
|
|
type Mode string
|
|
|
|
const (
|
|
ModeInherit Mode = "inherit"
|
|
ModeDirect Mode = "direct"
|
|
ModeCustom Mode = "custom"
|
|
ModeEnvironment Mode = "environment"
|
|
)
|
|
|
|
type Source string
|
|
|
|
const (
|
|
SourceCredential Source = "credential"
|
|
SourceGroup Source = "group"
|
|
SourceGlobal Source = "global"
|
|
SourceEnvironment Source = "environment"
|
|
SourceDefault Source = "default"
|
|
)
|
|
|
|
// Config is the persisted proxy override. Inherit is represented by an absent
|
|
// persisted value; ModeInherit is retained for control-plane input and views.
|
|
type Config struct {
|
|
Mode Mode `json:"mode"`
|
|
URL string `json:"url,omitempty"`
|
|
}
|
|
|
|
type Effective struct {
|
|
Config Config `json:"config"`
|
|
Source Source `json:"source"`
|
|
}
|
|
|
|
type View struct {
|
|
ConfiguredMode Mode `json:"configured_mode"`
|
|
EffectiveMode Mode `json:"effective_mode"`
|
|
EffectiveSource Source `json:"effective_source"`
|
|
DisplayURL string `json:"display_url,omitempty"`
|
|
HasAuth bool `json:"has_auth"`
|
|
}
|
|
|
|
// Environment snapshots whether the process has a standard proxy configured.
|
|
// The concrete environment values remain owned by the transport implementation.
|
|
func Environment() *Config {
|
|
for _, key := range []string{"HTTPS_PROXY", "https_proxy", "HTTP_PROXY", "http_proxy"} {
|
|
if strings.TrimSpace(os.Getenv(key)) != "" {
|
|
return &Config{Mode: ModeEnvironment}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Normalize(input Config) (Config, error) {
|
|
switch input.Mode {
|
|
case ModeInherit, ModeDirect:
|
|
if input.URL != "" {
|
|
return Config{}, ErrInvalidConfig
|
|
}
|
|
return Config{Mode: input.Mode}, nil
|
|
case ModeCustom:
|
|
return normalizeCustom(input.URL)
|
|
default:
|
|
return Config{}, ErrInvalidConfig
|
|
}
|
|
}
|
|
|
|
func normalizeCustom(endpoint string) (Config, error) {
|
|
endpoint = strings.TrimSpace(endpoint)
|
|
if endpoint == "" {
|
|
return Config{}, ErrInvalidConfig
|
|
}
|
|
parsed, err := url.Parse(endpoint)
|
|
if err != nil || parsed.Opaque != "" || parsed.Hostname() == "" {
|
|
return Config{}, ErrInvalidConfig
|
|
}
|
|
parsed.Scheme = strings.ToLower(parsed.Scheme)
|
|
switch parsed.Scheme {
|
|
case "http", "socks5":
|
|
default:
|
|
return Config{}, ErrInvalidConfig
|
|
}
|
|
port := parsed.Port()
|
|
if strings.HasSuffix(parsed.Host, ":") || (parsed.Scheme == "socks5" && port == "") {
|
|
return Config{}, ErrInvalidConfig
|
|
}
|
|
if port != "" {
|
|
value, parseErr := strconv.ParseUint(port, 10, 16)
|
|
if parseErr != nil || value == 0 {
|
|
return Config{}, ErrInvalidConfig
|
|
}
|
|
}
|
|
if parsed.Path != "" && parsed.Path != "/" {
|
|
return Config{}, ErrInvalidConfig
|
|
}
|
|
if parsed.RawQuery != "" || parsed.ForceQuery || parsed.Fragment != "" || parsed.RawFragment != "" {
|
|
return Config{}, ErrInvalidConfig
|
|
}
|
|
if parsed.User != nil {
|
|
password, hasPassword := parsed.User.Password()
|
|
if parsed.User.Username() == "" || !hasPassword || password == "" {
|
|
return Config{}, ErrInvalidConfig
|
|
}
|
|
}
|
|
parsed.Path = ""
|
|
parsed.RawPath = ""
|
|
return Config{Mode: ModeCustom, URL: parsed.String()}, nil
|
|
}
|
|
|
|
// Display returns the safe UI representation of one proxy override.
|
|
func Display(config Config) (string, bool, error) {
|
|
normalized, err := Normalize(config)
|
|
if err != nil {
|
|
return "", false, err
|
|
}
|
|
if normalized.Mode != ModeCustom {
|
|
return "", false, nil
|
|
}
|
|
parsed, err := url.Parse(normalized.URL)
|
|
if err != nil {
|
|
return "", false, ErrInvalidConfig
|
|
}
|
|
hasAuth := parsed.User != nil
|
|
if parsed.User != nil {
|
|
userinfo := url.User(parsed.User.Username()).String()
|
|
if _, hasPassword := parsed.User.Password(); hasPassword {
|
|
userinfo += ":******"
|
|
}
|
|
return parsed.Scheme + "://" + userinfo + "@" + parsed.Host, hasAuth, nil
|
|
}
|
|
return parsed.String(), hasAuth, nil
|
|
}
|
|
|
|
// Resolve applies Credential > Group > Global > Environment > Direct.
|
|
func Resolve(credential, group, global, environment *Config) (Effective, error) {
|
|
candidates := []struct {
|
|
config *Config
|
|
source Source
|
|
}{
|
|
{config: credential, source: SourceCredential},
|
|
{config: group, source: SourceGroup},
|
|
{config: global, source: SourceGlobal},
|
|
{config: environment, source: SourceEnvironment},
|
|
}
|
|
for _, candidate := range candidates {
|
|
if candidate.config == nil {
|
|
continue
|
|
}
|
|
if candidate.source == SourceEnvironment && candidate.config.Mode == ModeEnvironment && candidate.config.URL == "" {
|
|
return Effective{Config: *candidate.config, Source: candidate.source}, nil
|
|
}
|
|
normalized, err := Normalize(*candidate.config)
|
|
if err != nil {
|
|
return Effective{}, err
|
|
}
|
|
if normalized.Mode == ModeInherit {
|
|
continue
|
|
}
|
|
return Effective{Config: normalized, Source: candidate.source}, nil
|
|
}
|
|
return Effective{Config: Config{Mode: ModeDirect}, Source: SourceDefault}, nil
|
|
}
|
|
|
|
func NormalizeEffective(input Effective) (Effective, error) {
|
|
if input.Config.Mode == "" {
|
|
return Effective{Config: Config{Mode: ModeDirect}, Source: SourceDefault}, nil
|
|
}
|
|
if input.Config.Mode == ModeEnvironment {
|
|
if input.Config.URL != "" {
|
|
return Effective{}, ErrInvalidConfig
|
|
}
|
|
return Effective{Config: Config{Mode: ModeEnvironment}, Source: SourceEnvironment}, nil
|
|
}
|
|
config, err := Normalize(input.Config)
|
|
if err != nil || config.Mode == ModeInherit {
|
|
return Effective{}, ErrInvalidConfig
|
|
}
|
|
source := input.Source
|
|
if source == "" {
|
|
source = SourceDefault
|
|
}
|
|
return Effective{Config: config, Source: source}, nil
|
|
}
|
|
|
|
func NewView(configured *Config, effective Effective) (View, error) {
|
|
configuredMode := ModeInherit
|
|
if configured != nil {
|
|
normalized, err := Normalize(*configured)
|
|
if err != nil {
|
|
return View{}, err
|
|
}
|
|
configuredMode = normalized.Mode
|
|
}
|
|
display, hasAuth, err := Display(effective.Config)
|
|
if effective.Config.Mode == ModeEnvironment {
|
|
display, hasAuth, err = "", false, nil
|
|
}
|
|
if err != nil {
|
|
return View{}, err
|
|
}
|
|
return View{
|
|
ConfiguredMode: configuredMode,
|
|
EffectiveMode: effective.Config.Mode,
|
|
EffectiveSource: effective.Source,
|
|
DisplayURL: display,
|
|
HasAuth: hasAuth,
|
|
}, nil
|
|
}
|
|
|
|
func Encode(config Config) (string, error) {
|
|
normalized, err := Normalize(config)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
encoded, err := json.Marshal(normalized)
|
|
if err != nil {
|
|
return "", ErrInvalidConfig
|
|
}
|
|
return string(encoded), nil
|
|
}
|
|
|
|
func Decode(encoded string) (Config, error) {
|
|
decoder := json.NewDecoder(bytes.NewBufferString(encoded))
|
|
decoder.DisallowUnknownFields()
|
|
var config Config
|
|
if err := decoder.Decode(&config); err != nil {
|
|
return Config{}, ErrInvalidConfig
|
|
}
|
|
var trailing json.RawMessage
|
|
if err := decoder.Decode(&trailing); err != io.EOF {
|
|
return Config{}, ErrInvalidConfig
|
|
}
|
|
return Normalize(config)
|
|
}
|