fix(distribution): 修复分销域名被旧站点头误拦截

This commit is contained in:
yml
2026-11-17 15:12:34 +08:00
parent d9e781ac68
commit cc296d94df
2 changed files with 46 additions and 10 deletions
@@ -71,11 +71,11 @@ func TestSiteDomainFallbackResolvesByHost(t *testing.T) {
}
}
func TestSiteDomainFallbackPrefersExplicitSiteCode(t *testing.T) {
func TestSiteDomainFallbackKnownHostOverridesExplicitSiteCode(t *testing.T) {
resolver := &fakeSiteDomainResolver{byDomain: map[string]string{"tysh.hao858.com": "gz_dist"}}
engine := newSiteFallbackRouter(resolver)
// 显式头优先:即使域名能解析出 gz_dist,也必须尊重前端给的站点
// 已登记域名必须固定解析到自己的站点,避免旧头把请求带到其他站点。
cases := []struct {
name string
target string
@@ -89,13 +89,50 @@ func TestSiteDomainFallbackPrefersExplicitSiteCode(t *testing.T) {
for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
got := doSiteFallbackRequest(t, engine, "tysh.hao858.com", tc.target, tc.headers)
if got == "gz_dist" || got == "" {
t.Fatalf("显式站点应优先于域名兜底, got %q", got)
if got != "gz_dist" {
t.Fatalf("已登记域名应解析为 gz_dist, got %q", got)
}
})
}
if resolver.calls != 0 {
t.Fatalf("显式站点不应触发域名解析, calls = %d", resolver.calls)
if resolver.calls != 1 {
t.Fatalf("同一域名应只解析一次并命中缓存, calls = %d", resolver.calls)
}
}
func TestSiteDomainFallbackMarksKnownHostBeforeKnownHostGuard(t *testing.T) {
resolver := &fakeSiteDomainResolver{byDomain: map[string]string{"tysh.hao858.com": "gz_dist"}}
gin.SetMode(gin.TestMode)
engine := gin.New()
engine.Use(SiteDomainFallback(resolver, nil))
engine.Use(RequireKnownApplicationHost("production"))
engine.GET("/probe", func(c *gin.Context) {
c.Status(http.StatusNoContent)
})
req := httptest.NewRequest(http.MethodGet, "/probe", nil)
req.Host = "tysh.hao858.com"
req.Header.Set(sitecode.HeaderName, "gz_dist")
recorder := httptest.NewRecorder()
engine.ServeHTTP(recorder, req)
if recorder.Code != http.StatusNoContent {
t.Fatalf("status = %d, want %d, body=%s", recorder.Code, http.StatusNoContent, recorder.Body.String())
}
req = httptest.NewRequest(http.MethodGet, "/probe", nil)
req.Host = "unknown.example.com"
recorder = httptest.NewRecorder()
engine.ServeHTTP(recorder, req)
if recorder.Code != http.StatusNotFound {
t.Fatalf("unknown host status = %d, want %d", recorder.Code, http.StatusNotFound)
}
}
func TestSiteDomainFallbackKeepsExplicitCodeForUnregisteredHost(t *testing.T) {
resolver := &fakeSiteDomainResolver{byDomain: map[string]string{}}
engine := newSiteFallbackRouter(resolver)
got := doSiteFallbackRequest(t, engine, "preview.hao858.com", "/probe?site_code=preview_site", nil)
if got != "preview_site" {
t.Fatalf("未登记域名应保留显式站点编码, got %q", got)
}
}