fix(tenant): 封堵审计文件与历史用户跨站访问

This commit is contained in:
yml
2026-11-15 22:46:58 +08:00
parent 0cb385d84f
commit 1108df195d
28 changed files with 531 additions and 60 deletions
@@ -168,7 +168,11 @@ func (r *Repository) adminListBase(ctx context.Context, query AnnouncementListQu
Select("a.id, a.distribution_site_id, COALESCE(s.site_name, '') AS distribution_site_name, a.title, a.content, a.category, a.priority, a.is_pinned, a.is_important, a.is_popup, a.view_count, a.status, a.published_at, a.created_at, a.updated_at").
Joins("LEFT JOIN distribution_sites AS s ON s.id = a.distribution_site_id")
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
base = base.Where("a.tenant_id = ?", tenantID)
base = base.
Where("a.tenant_id = ?", tenantID).
Where("(a.distribution_site_id = 0 OR a.distribution_site_id IS NULL)")
} else if query.AdminSiteID != nil {
base = base.Where("a.distribution_site_id = ?", *query.AdminSiteID)
}
if query.Status != "" {
@@ -177,9 +181,6 @@ func (r *Repository) adminListBase(ctx context.Context, query AnnouncementListQu
if query.Category != "" {
base = base.Where("a.category = ?", query.Category)
}
if query.AdminSiteID != nil {
base = base.Where("a.distribution_site_id = ?", *query.AdminSiteID)
}
return base
}
@@ -199,9 +200,13 @@ func (r *Repository) AdminGetByID(ctx context.Context, id uint64) (*Announcement
// Create 创建公告
func (r *Repository) Create(ctx context.Context, req CreateAnnouncementRequest, createdBy uint64) (*AnnouncementDTO, error) {
siteID := req.DistributionSiteID
if tenancy.IDFromContext(ctx) > 0 {
siteID = 0
}
announcement := model.Announcement{
TenantID: tenancy.IDFromContext(ctx),
DistributionSiteID: req.DistributionSiteID,
DistributionSiteID: siteID,
Title: req.Title,
Content: req.Content,
Category: req.Category,
@@ -241,7 +246,9 @@ func (r *Repository) Update(ctx context.Context, id uint64, req UpdateAnnounceme
query := r.db.WithContext(ctx).Model(&model.Announcement{}).Where("id = ?", id)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.
Where("tenant_id = ?", tenantID).
Where("(distribution_site_id = 0 OR distribution_site_id IS NULL)")
}
if err := query.Updates(updates).Error; err != nil {
return nil, err
@@ -255,7 +262,9 @@ func (r *Repository) Publish(ctx context.Context, id uint64) error {
now := time.Now()
query := r.db.WithContext(ctx).Model(&model.Announcement{}).Where("id = ?", id)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.
Where("tenant_id = ?", tenantID).
Where("(distribution_site_id = 0 OR distribution_site_id IS NULL)")
}
return query.
Updates(map[string]interface{}{
@@ -268,7 +277,9 @@ func (r *Repository) Publish(ctx context.Context, id uint64) error {
func (r *Repository) Archive(ctx context.Context, id uint64) error {
query := r.db.WithContext(ctx).Model(&model.Announcement{}).Where("id = ?", id)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.
Where("tenant_id = ?", tenantID).
Where("(distribution_site_id = 0 OR distribution_site_id IS NULL)")
}
return query.
Update("status", "archived").Error
@@ -279,7 +290,9 @@ func (r *Repository) Unarchive(ctx context.Context, id uint64) error {
now := time.Now()
query := r.db.WithContext(ctx).Model(&model.Announcement{}).Where("id = ?", id)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.
Where("tenant_id = ?", tenantID).
Where("(distribution_site_id = 0 OR distribution_site_id IS NULL)")
}
return query.
Updates(map[string]interface{}{
@@ -292,7 +305,9 @@ func (r *Repository) Unarchive(ctx context.Context, id uint64) error {
func (r *Repository) Delete(ctx context.Context, id uint64) error {
query := r.db.WithContext(ctx).Where("id = ?", id)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.
Where("tenant_id = ?", tenantID).
Where("(distribution_site_id = 0 OR distribution_site_id IS NULL)")
}
return query.Delete(&model.Announcement{}).Error
}
@@ -6,6 +6,7 @@ import (
"hfb_sys/backend/internal/database"
"hfb_sys/backend/internal/model"
"hfb_sys/backend/internal/tenancy"
)
// TestPublicScopeAndSiteIsolation 覆盖公告中心的分站可见范围:
@@ -175,6 +176,47 @@ func TestAdminListFiltersBySite(t *testing.T) {
}
}
func TestTenantAdminAnnouncementsExcludeLegacyDistributionSite(t *testing.T) {
db := database.NewTestDB()
repo := NewRepository(db)
ctx := tenancy.WithScope(context.Background(), tenancy.Scope{TenantID: 101})
site := model.DistributionSite{
SiteCode: "ann_legacy_tenant", SiteName: "历史公告站",
Domain: "ann-legacy-tenant.example.com", Status: "active",
}
if err := db.Create(&site).Error; err != nil {
t.Fatal(err)
}
rows := []model.Announcement{
{TenantID: 101, Title: "本站公告", Content: "x", Category: "notice", Status: "draft"},
{TenantID: 101, DistributionSiteID: site.ID, Title: "历史分销公告", Content: "y", Category: "notice", Status: "draft"},
{TenantID: 202, Title: "其他站点公告", Content: "z", Category: "notice", Status: "draft"},
}
if err := db.Create(&rows).Error; err != nil {
t.Fatal(err)
}
result, err := repo.AdminList(ctx, AnnouncementListQuery{
AdminSiteID: &site.ID, Page: 1, PageSize: 20,
})
if err != nil {
t.Fatal(err)
}
items := result.Items.([]AnnouncementDTO)
if result.Total != 1 || len(items) != 1 || items[0].Title != "本站公告" {
t.Fatalf("tenant announcement list = %+v", result)
}
created, err := repo.Create(ctx, CreateAnnouncementRequest{
DistributionSiteID: site.ID, Title: "强制本站", Content: "content", Category: "notice",
}, 9)
if err != nil {
t.Fatal(err)
}
if created.TenantID != 101 || created.DistributionSiteID != 0 {
t.Fatalf("tenant announcement scope = %+v", created)
}
}
// TestPublicPopupSelection 覆盖弹窗公告的选取口径:
// 只有 published + is_popup 才参与,站点范围内按优先级取最高的一条,无候选时返回 nil。
func TestPublicPopupSelection(t *testing.T) {