From cc296d94df4635084308d496d5410c9b715dcf31 Mon Sep 17 00:00:00 2001 From: yml Date: Tue, 17 Nov 2026 15:12:34 +0800 Subject: [PATCH] =?UTF-8?q?fix(distribution):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=86=E9=94=80=E5=9F=9F=E5=90=8D=E8=A2=AB=E6=97=A7=E7=AB=99?= =?UTF-8?q?=E7=82=B9=E5=A4=B4=E8=AF=AF=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../middleware/site_domain_fallback.go | 7 ++- .../middleware/site_domain_fallback_test.go | 49 ++++++++++++++++--- 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/backend/internal/middleware/site_domain_fallback.go b/backend/internal/middleware/site_domain_fallback.go index da631905..ed5e2df7 100644 --- a/backend/internal/middleware/site_domain_fallback.go +++ b/backend/internal/middleware/site_domain_fallback.go @@ -75,11 +75,10 @@ func SiteDomainFallback(resolver SiteDomainResolver, logger *zap.Logger) gin.Han c.Next() return } - if sitecode.FromRequest(c) != "" { - c.Next() - return - } + // 已登记的站点域名是权威来源。即使前端带着旧站点头或 query, + // 也必须先确认当前 Host 属于哪个分销站点,否则后续 known-host 校验会误拒绝请求。 if code := resolveSiteCodeByHost(c, resolver, cache, logger); code != "" { + c.Request.Header.Del(sitecode.LegacyHeaderName) c.Request.Header.Set(sitecode.HeaderName, code) c.Request = c.Request.WithContext(sitecode.WithDomainScope(c.Request.Context())) } diff --git a/backend/internal/middleware/site_domain_fallback_test.go b/backend/internal/middleware/site_domain_fallback_test.go index 3a6e8638..41681407 100644 --- a/backend/internal/middleware/site_domain_fallback_test.go +++ b/backend/internal/middleware/site_domain_fallback_test.go @@ -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) } }