Files
tbphp 4f9eba5802 feat(proxy): 完成数据面代理与渠道约束 (#459)
* 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): 修复代理传输与校验边界
2026-08-24 11:11:22 +08:00

175 lines
5.6 KiB
Go

package outboundproxy
import (
"errors"
"strings"
"testing"
)
func TestEnvironmentDetectsOnlyHTTPProxyVariables(t *testing.T) {
for _, key := range []string{
"HTTPS_PROXY", "https_proxy", "HTTP_PROXY", "http_proxy", "ALL_PROXY", "all_proxy",
} {
t.Setenv(key, "")
}
t.Setenv("ALL_PROXY", "socks5://proxy.example.com:1080")
if got := Environment(); got != nil {
t.Fatalf("Environment() with only ALL_PROXY = %#v, want nil", got)
}
t.Setenv("ALL_PROXY", "")
t.Setenv("HTTP_PROXY", "http://proxy.example.com:8080")
if got := Environment(); got == nil || got.Mode != ModeEnvironment {
t.Fatalf("Environment() with HTTP_PROXY = %#v, want environment mode", got)
}
}
func TestNormalizeSupportsProductProxySchemes(t *testing.T) {
t.Parallel()
for _, endpoint := range []string{
"http://proxy.example.com",
"http://proxy.example.com:8080",
"http://[::1]:8080",
"socks5://user:password@proxy.example.com:1080",
"socks5://[2001:db8::1]:1080",
} {
t.Run(endpoint, func(t *testing.T) {
t.Parallel()
got, err := Normalize(Config{Mode: ModeCustom, URL: endpoint})
if err != nil {
t.Fatalf("Normalize() error = %v", err)
}
if got.URL != endpoint {
t.Fatalf("Normalize().URL = %q, want %q", got.URL, endpoint)
}
})
}
}
func TestNormalizeRejectsInvalidPoliciesWithoutLeakingEndpoint(t *testing.T) {
t.Parallel()
tests := []Config{
{Mode: ModeInherit, URL: "http://secret:password@proxy.example.com"},
{Mode: ModeDirect, URL: "http://secret:password@proxy.example.com"},
{Mode: ModeCustom},
{Mode: ModeCustom, URL: "https://secret:password@proxy.example.com"},
{Mode: ModeCustom, URL: "ftp://secret:password@proxy.example.com"},
{Mode: ModeCustom, URL: "http://:8080"},
{Mode: ModeCustom, URL: "http://proxy.example.com:"},
{Mode: ModeCustom, URL: "http://proxy.example.com:0"},
{Mode: ModeCustom, URL: "http://proxy.example.com:65536"},
{Mode: ModeCustom, URL: "socks5://proxy.example.com"},
{Mode: ModeCustom, URL: "http://secret:password@proxy.example.com/path"},
{Mode: ModeCustom, URL: "http://secret:password@proxy.example.com?token=secret"},
{Mode: ModeCustom, URL: "http://:password@proxy.example.com"},
{Mode: ModeCustom, URL: "http://user@proxy.example.com"},
{Mode: ModeCustom, URL: "http://user:@proxy.example.com"},
{Mode: ModeCustom, URL: "socks5://user@proxy.example.com:1080"},
{Mode: ModeCustom, URL: "socks5://user:@proxy.example.com:1080"},
{Mode: "unknown"},
}
for _, input := range tests {
_, err := Normalize(input)
if !errors.Is(err, ErrInvalidConfig) {
t.Fatalf("Normalize(%#v) error = %v, want ErrInvalidConfig", input, err)
}
if strings.Contains(err.Error(), "secret") || strings.Contains(err.Error(), "password") {
t.Fatalf("Normalize(%#v) leaked endpoint in error %q", input, err)
}
}
}
func TestDisplayMasksPassword(t *testing.T) {
t.Parallel()
display, hasAuth, err := Display(Config{
Mode: ModeCustom,
URL: "http://proxy-user:proxy-password@proxy.example.com:8080",
})
if err != nil {
t.Fatalf("Display() error = %v", err)
}
if display != "http://proxy-user:******@proxy.example.com:8080" {
t.Fatalf("Display() = %q", display)
}
if !hasAuth {
t.Fatal("Display() hasAuth = false, want true")
}
}
func TestResolveUsesCredentialGroupGlobalEnvironmentOrder(t *testing.T) {
t.Parallel()
credential := Config{Mode: ModeDirect}
group := Config{Mode: ModeCustom, URL: "http://group.example.com"}
global := Config{Mode: ModeCustom, URL: "http://global.example.com"}
environment := Config{Mode: ModeCustom, URL: "http://environment.example.com"}
tests := []struct {
name string
credential *Config
group *Config
global *Config
env *Config
wantSource Source
wantMode Mode
}{
{name: "credential", credential: &credential, group: &group, global: &global, env: &environment, wantSource: SourceCredential, wantMode: ModeDirect},
{name: "group", group: &group, global: &global, env: &environment, wantSource: SourceGroup, wantMode: ModeCustom},
{name: "global", global: &global, env: &environment, wantSource: SourceGlobal, wantMode: ModeCustom},
{name: "environment", env: &environment, wantSource: SourceEnvironment, wantMode: ModeCustom},
{name: "default", wantSource: SourceDefault, wantMode: ModeDirect},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
got, err := Resolve(test.credential, test.group, test.global, test.env)
if err != nil {
t.Fatalf("Resolve() error = %v", err)
}
if got.Source != test.wantSource || got.Config.Mode != test.wantMode {
t.Fatalf("Resolve() = %#v, want source=%q mode=%q", got, test.wantSource, test.wantMode)
}
})
}
}
func TestNewViewShowsConfiguredAndEffectiveStateWithoutPassword(t *testing.T) {
t.Parallel()
configured := Config{Mode: ModeInherit}
effective := Effective{
Config: Config{Mode: ModeCustom, URL: "http://user:password@proxy.example.com:8080"},
Source: SourceGroup,
}
got, err := NewView(&configured, effective)
if err != nil {
t.Fatalf("NewView() error = %v", err)
}
if got.ConfiguredMode != ModeInherit || got.EffectiveMode != ModeCustom || got.EffectiveSource != SourceGroup {
t.Fatalf("NewView() = %#v", got)
}
if got.DisplayURL != "http://user:******@proxy.example.com:8080" || !got.HasAuth {
t.Fatalf("NewView() display = %#v", got)
}
}
func TestEncodeDecodeRoundTrip(t *testing.T) {
t.Parallel()
want := Config{Mode: ModeCustom, URL: "socks5://user:password@proxy.example.com:1080"}
encoded, err := Encode(want)
if err != nil {
t.Fatalf("Encode() error = %v", err)
}
got, err := Decode(encoded)
if err != nil {
t.Fatalf("Decode() error = %v", err)
}
if got != want {
t.Fatalf("Decode() = %#v, want %#v", got, want)
}
}