From d494746839e99b24002c6c420fec4a43b16bc837 Mon Sep 17 00:00:00 2001 From: yml Date: Sun, 15 Nov 2026 20:19:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(admin):=20=E6=8B=86=E5=88=86=E7=BB=8F?= =?UTF-8?q?=E8=90=A5=E7=AB=99=E7=82=B9=E4=B8=8E=E5=8E=86=E5=8F=B2=E5=88=86?= =?UTF-8?q?=E9=94=80=E5=90=8E=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../middleware/tenant_legacy_distribution.go | 28 ++++++++ .../tenant_legacy_distribution_test.go | 60 ++++++++++++++++ backend/internal/router/router.go | 1 + .../admin/views/AdminInvitationsView.vue | 69 ++++++++++++++----- .../admin/views/AdminTrackingLinksView.vue | 12 ++-- frontend/src/layouts/AdminLayout.vue | 12 ++++ 6 files changed, 160 insertions(+), 22 deletions(-) create mode 100644 backend/internal/middleware/tenant_legacy_distribution.go create mode 100644 backend/internal/middleware/tenant_legacy_distribution_test.go diff --git a/backend/internal/middleware/tenant_legacy_distribution.go b/backend/internal/middleware/tenant_legacy_distribution.go new file mode 100644 index 00000000..4d198bd9 --- /dev/null +++ b/backend/internal/middleware/tenant_legacy_distribution.go @@ -0,0 +1,28 @@ +package middleware + +import ( + "strings" + + "hfb_sys/backend/internal/sitecode" + "hfb_sys/backend/internal/tenancy" + "hfb_sys/backend/pkg/response" + + "github.com/gin-gonic/gin" +) + +// BlockTenantLegacyDistributionAdmin 阻止经营租户后台调用历史分销管理接口。 +// 独立分销后台使用 /api/distribution/*,不经过该守卫。 +func BlockTenantLegacyDistributionAdmin() gin.HandlerFunc { + return func(c *gin.Context) { + tenantScoped := sitecode.HasTenantScope(c.Request.Context()) + if _, ok := tenancy.FromContext(c.Request.Context()); ok { + tenantScoped = true + } + if tenantScoped && strings.HasPrefix(c.Request.URL.Path, "/api/admin/distribution/") { + response.Forbidden(c, "经营站点后台不能管理历史分销渠道") + c.Abort() + return + } + c.Next() + } +} diff --git a/backend/internal/middleware/tenant_legacy_distribution_test.go b/backend/internal/middleware/tenant_legacy_distribution_test.go new file mode 100644 index 00000000..88d3f946 --- /dev/null +++ b/backend/internal/middleware/tenant_legacy_distribution_test.go @@ -0,0 +1,60 @@ +package middleware + +import ( + "net/http" + "net/http/httptest" + "testing" + + "hfb_sys/backend/internal/sitecode" + "hfb_sys/backend/internal/tenancy" + + "github.com/gin-gonic/gin" +) + +func TestBlockTenantLegacyDistributionAdmin(t *testing.T) { + gin.SetMode(gin.TestMode) + engine := gin.New() + engine.Use(BlockTenantLegacyDistributionAdmin()) + engine.GET("/api/admin/distribution/sites", func(c *gin.Context) { + c.Status(http.StatusNoContent) + }) + engine.GET("/api/admin/invitations", func(c *gin.Context) { + c.Status(http.StatusNoContent) + }) + engine.GET("/api/distribution/sites/1", func(c *gin.Context) { + c.Status(http.StatusNoContent) + }) + + tenantMiddleware := func(c *gin.Context) { + ctx := tenancy.WithScope(c.Request.Context(), tenancy.Scope{TenantID: 2, TenantCode: "jieyou"}) + ctx = sitecode.WithTenantScope(ctx) + c.Request = c.Request.WithContext(ctx) + c.Next() + } + tenantEngine := gin.New() + tenantEngine.Use(tenantMiddleware, BlockTenantLegacyDistributionAdmin()) + tenantEngine.GET("/api/admin/distribution/sites", func(c *gin.Context) { + c.Status(http.StatusNoContent) + }) + + rec := httptest.NewRecorder() + engine.ServeHTTP(rec, httptest.NewRequest(http.MethodGet, "/api/admin/distribution/sites", nil)) + if rec.Code != http.StatusNoContent { + t.Fatalf("legacy request status = %d, want 204", rec.Code) + } + + rec = httptest.NewRecorder() + tenantEngine.ServeHTTP(rec, httptest.NewRequest(http.MethodGet, "/api/admin/distribution/sites", nil)) + if rec.Code != http.StatusForbidden { + t.Fatalf("tenant legacy admin status = %d, want 403", rec.Code) + } + + for _, path := range []string{"/api/admin/invitations", "/api/distribution/sites/1"} { + rec = httptest.NewRecorder() + req := httptest.NewRequest(http.MethodGet, path, nil) + engine.ServeHTTP(rec, req) + if rec.Code != http.StatusNoContent { + t.Fatalf("%s status = %d, want 204", path, rec.Code) + } + } +} diff --git a/backend/internal/router/router.go b/backend/internal/router/router.go index b598664a..72859d51 100644 --- a/backend/internal/router/router.go +++ b/backend/internal/router/router.go @@ -364,6 +364,7 @@ func New(cfg config.Config, deps Dependencies, logger *zap.Logger) *gin.Engine { if distributionRepo != nil { engine.Use(middleware.SiteDomainFallback(distributionRepo, logger)) } + engine.Use(middleware.BlockTenantLegacyDistributionAdmin()) distributionHandler := distribution.NewHandler(distributionService) if invitationHandler != nil && distributionService != nil { invitationHandler.SetSiteScoper(distributionService) diff --git a/frontend/src/features/admin/views/AdminInvitationsView.vue b/frontend/src/features/admin/views/AdminInvitationsView.vue index d237fe60..cb74a99c 100644 --- a/frontend/src/features/admin/views/AdminInvitationsView.vue +++ b/frontend/src/features/admin/views/AdminInvitationsView.vue @@ -1,5 +1,5 @@