fix(distribution): 修复分销域名被旧站点头误拦截
This commit is contained in:
@@ -75,11 +75,10 @@ func SiteDomainFallback(resolver SiteDomainResolver, logger *zap.Logger) gin.Han
|
|||||||
c.Next()
|
c.Next()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if sitecode.FromRequest(c) != "" {
|
// 已登记的站点域名是权威来源。即使前端带着旧站点头或 query,
|
||||||
c.Next()
|
// 也必须先确认当前 Host 属于哪个分销站点,否则后续 known-host 校验会误拒绝请求。
|
||||||
return
|
|
||||||
}
|
|
||||||
if code := resolveSiteCodeByHost(c, resolver, cache, logger); code != "" {
|
if code := resolveSiteCodeByHost(c, resolver, cache, logger); code != "" {
|
||||||
|
c.Request.Header.Del(sitecode.LegacyHeaderName)
|
||||||
c.Request.Header.Set(sitecode.HeaderName, code)
|
c.Request.Header.Set(sitecode.HeaderName, code)
|
||||||
c.Request = c.Request.WithContext(sitecode.WithDomainScope(c.Request.Context()))
|
c.Request = c.Request.WithContext(sitecode.WithDomainScope(c.Request.Context()))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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"}}
|
resolver := &fakeSiteDomainResolver{byDomain: map[string]string{"tysh.hao858.com": "gz_dist"}}
|
||||||
engine := newSiteFallbackRouter(resolver)
|
engine := newSiteFallbackRouter(resolver)
|
||||||
|
|
||||||
// 显式头优先:即使域名能解析出 gz_dist,也必须尊重前端给的站点
|
// 已登记域名必须固定解析到自己的站点,避免旧头把请求带到其他站点。
|
||||||
cases := []struct {
|
cases := []struct {
|
||||||
name string
|
name string
|
||||||
target string
|
target string
|
||||||
@@ -89,13 +89,50 @@ func TestSiteDomainFallbackPrefersExplicitSiteCode(t *testing.T) {
|
|||||||
for _, tc := range cases {
|
for _, tc := range cases {
|
||||||
t.Run(tc.name, func(t *testing.T) {
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
got := doSiteFallbackRequest(t, engine, "tysh.hao858.com", tc.target, tc.headers)
|
got := doSiteFallbackRequest(t, engine, "tysh.hao858.com", tc.target, tc.headers)
|
||||||
if got == "gz_dist" || got == "" {
|
if got != "gz_dist" {
|
||||||
t.Fatalf("显式站点应优先于域名兜底, got %q", got)
|
t.Fatalf("已登记域名应解析为 gz_dist, got %q", got)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if resolver.calls != 0 {
|
if resolver.calls != 1 {
|
||||||
t.Fatalf("显式站点不应触发域名解析, calls = %d", resolver.calls)
|
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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user