fix(admin): 恢复超级管理员分销管理入口
This commit is contained in:
@@ -8,17 +8,28 @@ import (
|
|||||||
"hfb_sys/backend/pkg/response"
|
"hfb_sys/backend/pkg/response"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"gorm.io/gorm"
|
||||||
)
|
)
|
||||||
|
|
||||||
// BlockTenantLegacyDistributionAdmin 阻止经营租户后台调用历史分销管理接口。
|
// BlockTenantLegacyDistributionAdmin 阻止经营租户后台调用历史分销管理接口。
|
||||||
// 独立分销后台使用 /api/distribution/*,不经过该守卫。
|
// 独立分销后台使用 /api/distribution/*,不经过该守卫。
|
||||||
func BlockTenantLegacyDistributionAdmin() gin.HandlerFunc {
|
func BlockTenantLegacyDistributionAdmin(db *gorm.DB) gin.HandlerFunc {
|
||||||
return func(c *gin.Context) {
|
return func(c *gin.Context) {
|
||||||
tenantScoped := sitecode.HasTenantScope(c.Request.Context())
|
tenantScoped := sitecode.HasTenantScope(c.Request.Context())
|
||||||
if _, ok := tenancy.FromContext(c.Request.Context()); ok {
|
if _, ok := tenancy.FromContext(c.Request.Context()); ok {
|
||||||
tenantScoped = true
|
tenantScoped = true
|
||||||
}
|
}
|
||||||
if tenantScoped && strings.HasPrefix(c.Request.URL.Path, "/api/admin/distribution/") {
|
if tenantScoped && strings.HasPrefix(c.Request.URL.Path, "/api/admin/distribution/") {
|
||||||
|
allowed, err := requestAdminIsPlatformSuperAdmin(c, db)
|
||||||
|
if err != nil {
|
||||||
|
response.ServiceUnavailable(c, "权限校验服务暂时不可用")
|
||||||
|
c.Abort()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if allowed {
|
||||||
|
c.Next()
|
||||||
|
return
|
||||||
|
}
|
||||||
response.Forbidden(c, "经营站点后台不能管理历史分销渠道")
|
response.Forbidden(c, "经营站点后台不能管理历史分销渠道")
|
||||||
c.Abort()
|
c.Abort()
|
||||||
return
|
return
|
||||||
@@ -26,3 +37,24 @@ func BlockTenantLegacyDistributionAdmin() gin.HandlerFunc {
|
|||||||
c.Next()
|
c.Next()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func requestAdminIsPlatformSuperAdmin(c *gin.Context, db *gorm.DB) (bool, error) {
|
||||||
|
if db == nil {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
value, ok := c.Get(ContextAdminID)
|
||||||
|
if !ok {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
adminID, ok := value.(uint64)
|
||||||
|
if !ok || adminID == 0 {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
var count int64
|
||||||
|
err := db.WithContext(c.Request.Context()).
|
||||||
|
Table("admin_user_roles AS aur").
|
||||||
|
Joins("JOIN roles AS r ON r.id = aur.role_id").
|
||||||
|
Where("aur.admin_user_id = ? AND r.code = ?", adminID, "super_admin").
|
||||||
|
Count(&count).Error
|
||||||
|
return count > 0, err
|
||||||
|
}
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ import (
|
|||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"hfb_sys/backend/internal/database"
|
||||||
|
"hfb_sys/backend/internal/model"
|
||||||
"hfb_sys/backend/internal/sitecode"
|
"hfb_sys/backend/internal/sitecode"
|
||||||
"hfb_sys/backend/internal/tenancy"
|
"hfb_sys/backend/internal/tenancy"
|
||||||
|
|
||||||
@@ -14,7 +16,7 @@ import (
|
|||||||
func TestBlockTenantLegacyDistributionAdmin(t *testing.T) {
|
func TestBlockTenantLegacyDistributionAdmin(t *testing.T) {
|
||||||
gin.SetMode(gin.TestMode)
|
gin.SetMode(gin.TestMode)
|
||||||
engine := gin.New()
|
engine := gin.New()
|
||||||
engine.Use(BlockTenantLegacyDistributionAdmin())
|
engine.Use(BlockTenantLegacyDistributionAdmin(nil))
|
||||||
engine.GET("/api/admin/distribution/sites", func(c *gin.Context) {
|
engine.GET("/api/admin/distribution/sites", func(c *gin.Context) {
|
||||||
c.Status(http.StatusNoContent)
|
c.Status(http.StatusNoContent)
|
||||||
})
|
})
|
||||||
@@ -32,7 +34,7 @@ func TestBlockTenantLegacyDistributionAdmin(t *testing.T) {
|
|||||||
c.Next()
|
c.Next()
|
||||||
}
|
}
|
||||||
tenantEngine := gin.New()
|
tenantEngine := gin.New()
|
||||||
tenantEngine.Use(tenantMiddleware, BlockTenantLegacyDistributionAdmin())
|
tenantEngine.Use(tenantMiddleware, BlockTenantLegacyDistributionAdmin(nil))
|
||||||
tenantEngine.GET("/api/admin/distribution/sites", func(c *gin.Context) {
|
tenantEngine.GET("/api/admin/distribution/sites", func(c *gin.Context) {
|
||||||
c.Status(http.StatusNoContent)
|
c.Status(http.StatusNoContent)
|
||||||
})
|
})
|
||||||
@@ -58,3 +60,40 @@ func TestBlockTenantLegacyDistributionAdmin(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestBlockTenantLegacyDistributionAdminAllowsPlatformSuperAdmin(t *testing.T) {
|
||||||
|
db := database.NewTestDB()
|
||||||
|
role := model.Role{Code: "super_admin", Name: "超级管理员"}
|
||||||
|
if err := db.Create(&role).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
admin := model.AdminUser{Username: "legacy-dist-root", PasswordHash: "x", Status: "active"}
|
||||||
|
if err := db.Create(&admin).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := db.Create(&model.AdminUserRole{
|
||||||
|
AdminID: admin.ID,
|
||||||
|
RoleID: role.ID,
|
||||||
|
TenantID: 0,
|
||||||
|
}).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
gin.SetMode(gin.TestMode)
|
||||||
|
engine := gin.New()
|
||||||
|
engine.Use(func(c *gin.Context) {
|
||||||
|
ctx := tenancy.WithScope(c.Request.Context(), tenancy.Scope{TenantID: 1, TenantCode: "dachui"})
|
||||||
|
c.Request = c.Request.WithContext(sitecode.WithTenantScope(ctx))
|
||||||
|
c.Set(ContextAdminID, admin.ID)
|
||||||
|
c.Next()
|
||||||
|
}, BlockTenantLegacyDistributionAdmin(db))
|
||||||
|
engine.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("platform super admin status = %d, want 204, body=%s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -379,7 +379,6 @@ func New(cfg config.Config, deps Dependencies, logger *zap.Logger) *gin.Engine {
|
|||||||
engine.Use(middleware.SiteDomainFallback(distributionRepo, logger))
|
engine.Use(middleware.SiteDomainFallback(distributionRepo, logger))
|
||||||
}
|
}
|
||||||
engine.Use(middleware.RequireKnownApplicationHost(cfg.AppEnv))
|
engine.Use(middleware.RequireKnownApplicationHost(cfg.AppEnv))
|
||||||
engine.Use(middleware.BlockTenantLegacyDistributionAdmin())
|
|
||||||
engine.Use(middleware.PlatformOpsReadOnlyGuard())
|
engine.Use(middleware.PlatformOpsReadOnlyGuard())
|
||||||
distributionHandler := distribution.NewHandler(distributionService)
|
distributionHandler := distribution.NewHandler(distributionService)
|
||||||
if invitationHandler != nil && distributionService != nil {
|
if invitationHandler != nil && distributionService != nil {
|
||||||
@@ -791,6 +790,7 @@ func New(cfg config.Config, deps Dependencies, logger *zap.Logger) *gin.Engine {
|
|||||||
}
|
}
|
||||||
|
|
||||||
adminRoutes := api.Group("/admin", requireAdmin, middleware.RequireAdminPasswordChanged())
|
adminRoutes := api.Group("/admin", requireAdmin, middleware.RequireAdminPasswordChanged())
|
||||||
|
adminRoutes.Use(middleware.BlockTenantLegacyDistributionAdmin(deps.DB))
|
||||||
{
|
{
|
||||||
adminRoutes.GET("/me", adminAuthHandler.Me)
|
adminRoutes.GET("/me", adminAuthHandler.Me)
|
||||||
adminRoutes.PUT("/me/support-status", adminAuthHandler.UpdateSupportStatus)
|
adminRoutes.PUT("/me/support-status", adminAuthHandler.UpdateSupportStatus)
|
||||||
|
|||||||
@@ -405,7 +405,11 @@ const navGroups = computed(() => {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
return allNavGroups
|
return allNavGroups
|
||||||
.filter(group => (siteStore.isTenant ? !group.legacyOnly : !group.tenantOnly))
|
.filter(group => {
|
||||||
|
if (group.legacyOnly) return !siteStore.isTenant || adminSession.isSuperAdmin
|
||||||
|
if (group.tenantOnly) return siteStore.isTenant
|
||||||
|
return true
|
||||||
|
})
|
||||||
.map(group => ({
|
.map(group => ({
|
||||||
...group,
|
...group,
|
||||||
children: group.children.filter(item => canAccessNavItem(item)),
|
children: group.children.filter(item => canAccessNavItem(item)),
|
||||||
|
|||||||
Reference in New Issue
Block a user