fix(distribution): 修复分销后台域名登录被拦截
This commit is contained in:
@@ -16,11 +16,22 @@ import (
|
||||
// RequireKnownApplicationHost prevents unknown hosts from falling through to
|
||||
// legacy unscoped handlers when the application is reached without the Caddy
|
||||
// on-demand TLS guard.
|
||||
func RequireKnownApplicationHost(appEnv string) gin.HandlerFunc {
|
||||
func RequireKnownApplicationHost(appEnv string, extraKnownHosts ...string) gin.HandlerFunc {
|
||||
if !config.IsProductionEnv(appEnv) {
|
||||
return func(c *gin.Context) { c.Next() }
|
||||
}
|
||||
knownHosts := make(map[string]struct{}, len(extraKnownHosts))
|
||||
for _, rawHost := range extraKnownHosts {
|
||||
if host := normalizeKnownHost(rawHost); host != "" {
|
||||
knownHosts[host] = struct{}{}
|
||||
}
|
||||
}
|
||||
return func(c *gin.Context) {
|
||||
requestHost := sitecode.ExtractHost(c.Request.Host)
|
||||
if _, ok := knownHosts[requestHost]; ok {
|
||||
c.Next()
|
||||
return
|
||||
}
|
||||
if platformscope.IsScope(c.Request.Context()) ||
|
||||
tenancy.IDFromContext(c.Request.Context()) > 0 ||
|
||||
sitecode.HasDomainScope(c.Request.Context()) ||
|
||||
@@ -33,6 +44,16 @@ func RequireKnownApplicationHost(appEnv string) gin.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
func normalizeKnownHost(raw string) string {
|
||||
host := strings.TrimSpace(raw)
|
||||
host = strings.TrimPrefix(host, "https://")
|
||||
host = strings.TrimPrefix(host, "http://")
|
||||
if slash := strings.IndexByte(host, '/'); slash >= 0 {
|
||||
host = host[:slash]
|
||||
}
|
||||
return sitecode.ExtractHost(host)
|
||||
}
|
||||
|
||||
func isInfrastructureOrCallbackPath(path string) bool {
|
||||
switch path {
|
||||
case "/health", "/health/ready", "/api/health", "/api/site/check-domain":
|
||||
|
||||
@@ -13,15 +13,16 @@ import (
|
||||
func TestRequireKnownApplicationHostFailsClosedOnlyInProduction(t *testing.T) {
|
||||
gin.SetMode(gin.TestMode)
|
||||
|
||||
newEngine := func(appEnv string) *gin.Engine {
|
||||
newEngine := func(appEnv string, extraKnownHosts ...string) *gin.Engine {
|
||||
engine := gin.New()
|
||||
engine.Use(RequireKnownApplicationHost(appEnv))
|
||||
engine.Use(RequireKnownApplicationHost(appEnv, extraKnownHosts...))
|
||||
engine.GET("/api/listings", func(c *gin.Context) { c.Status(http.StatusOK) })
|
||||
engine.POST("/api/distribution/auth/login", func(c *gin.Context) { c.Status(http.StatusOK) })
|
||||
engine.POST("/api/payments/leshua/notify", func(c *gin.Context) { c.Status(http.StatusOK) })
|
||||
return engine
|
||||
}
|
||||
|
||||
production := newEngine("production")
|
||||
production := newEngine("production", "https://distribution.hao858.com/")
|
||||
req := httptest.NewRequest(http.MethodGet, "http://unknown.example.com/api/listings", nil)
|
||||
req.Host = "unknown.example.com"
|
||||
rec := httptest.NewRecorder()
|
||||
@@ -30,6 +31,14 @@ func TestRequireKnownApplicationHostFailsClosedOnlyInProduction(t *testing.T) {
|
||||
t.Fatalf("unknown production host status = %d, want 404", rec.Code)
|
||||
}
|
||||
|
||||
req = httptest.NewRequest(http.MethodPost, "http://distribution.hao858.com/api/distribution/auth/login", nil)
|
||||
req.Host = "distribution.hao858.com"
|
||||
rec = httptest.NewRecorder()
|
||||
production.ServeHTTP(rec, req)
|
||||
if rec.Code != http.StatusOK {
|
||||
t.Fatalf("distribution admin host status = %d, want 200", rec.Code)
|
||||
}
|
||||
|
||||
req = httptest.NewRequest(http.MethodPost, "http://callback.example.com/api/payments/leshua/notify", nil)
|
||||
req.Host = "callback.example.com"
|
||||
rec = httptest.NewRecorder()
|
||||
|
||||
Reference in New Issue
Block a user