feat(tenant): 隔离客服通知文件与后台任务

This commit is contained in:
yml
2026-11-15 16:23:28 +08:00
parent c7dacfa025
commit e994fd9166
52 changed files with 1670 additions and 254 deletions
+25 -11
View File
@@ -6,6 +6,7 @@ import (
"strings"
"hfb_sys/backend/internal/model"
"hfb_sys/backend/internal/tenancy"
"github.com/redis/go-redis/v9"
"gorm.io/gorm"
@@ -35,6 +36,7 @@ func privateFileAuthorizer(db *gorm.DB) func(context.Context, uint64, string) (b
}
}
encodedBasePrefix := url.QueryEscape(basePrefix)
tenantID := tenancy.IDFromContext(ctx)
var count int64
queries := []struct {
@@ -42,56 +44,67 @@ func privateFileAuthorizer(db *gorm.DB) func(context.Context, uint64, string) (b
args []any
}{
{
sql: "SELECT COUNT(1) FROM file_upload_owners WHERE user_id = ? AND object_key = ?",
args: []any{userID, key},
sql: "SELECT COUNT(1) FROM file_upload_owners WHERE user_id = ? AND object_key = ? AND (? = 0 OR tenant_id = ?)",
args: []any{userID, key, tenantID, tenantID},
},
{
sql: `SELECT COUNT(1) FROM game_accounts a
JOIN rental_listings l ON l.account_id = a.id
WHERE l.status = 'published' AND l.review_status = 'approved'
AND (? = 0 OR l.source_tenant_id = ?)
AND (INSTR(a.screenshot_urls, ?) > 0 OR INSTR(a.screenshot_urls, ?) > 0 OR INSTR(a.screenshot_urls, ?) > 0 OR INSTR(a.screenshot_urls, ?) > 0)`,
args: []any{key, encodedKey, basePrefix, encodedBasePrefix},
args: []any{tenantID, tenantID, key, encodedKey, basePrefix, encodedBasePrefix},
},
{
sql: `SELECT COUNT(1) FROM game_accounts a
WHERE a.owner_id = ?
WHERE a.owner_id = ? AND (? = 0 OR a.source_tenant_id = ?)
AND (INSTR(a.screenshot_urls, ?) > 0 OR INSTR(a.screenshot_urls, ?) > 0 OR INSTR(a.screenshot_urls, ?) > 0 OR INSTR(a.screenshot_urls, ?) > 0)`,
args: []any{userID, key, encodedKey, basePrefix, encodedBasePrefix},
args: []any{userID, tenantID, tenantID, key, encodedKey, basePrefix, encodedBasePrefix},
},
{
sql: `SELECT COUNT(1) FROM game_accounts a
JOIN rental_orders o ON o.account_id = a.id
WHERE (o.owner_id = ? OR o.renter_id = ?)
AND (? = 0 OR o.buyer_tenant_id = ? OR o.source_tenant_id = ?)
AND (INSTR(a.screenshot_urls, ?) > 0 OR INSTR(a.screenshot_urls, ?) > 0 OR INSTR(a.screenshot_urls, ?) > 0 OR INSTR(a.screenshot_urls, ?) > 0)`,
args: []any{userID, userID, key, encodedKey, basePrefix, encodedBasePrefix},
args: []any{userID, userID, tenantID, tenantID, tenantID, key, encodedKey, basePrefix, encodedBasePrefix},
},
{
sql: `SELECT COUNT(1) FROM order_checkouts c
JOIN rental_orders o ON o.id = c.order_id
WHERE (o.owner_id = ? OR o.renter_id = ?)
AND (? = 0 OR o.buyer_tenant_id = ? OR o.source_tenant_id = ?)
AND (INSTR(c.evidence_urls, ?) > 0 OR INSTR(c.evidence_urls, ?) > 0 OR INSTR(c.evidence_urls, ?) > 0 OR INSTR(c.evidence_urls, ?) > 0)`,
args: []any{userID, userID, key, encodedKey, basePrefix, encodedBasePrefix},
args: []any{userID, userID, tenantID, tenantID, tenantID, key, encodedKey, basePrefix, encodedBasePrefix},
},
{
sql: `SELECT COUNT(1) FROM disputes d
JOIN rental_orders o ON o.id = d.order_id
WHERE (o.owner_id = ? OR o.renter_id = ?)
AND (? = 0 OR o.buyer_tenant_id = ? OR o.source_tenant_id = ?)
AND (INSTR(d.evidence_urls, ?) > 0 OR INSTR(d.evidence_urls, ?) > 0 OR INSTR(d.evidence_urls, ?) > 0 OR INSTR(d.evidence_urls, ?) > 0)`,
args: []any{userID, userID, key, encodedKey, basePrefix, encodedBasePrefix},
args: []any{userID, userID, tenantID, tenantID, tenantID, key, encodedKey, basePrefix, encodedBasePrefix},
},
{
sql: `SELECT COUNT(1) FROM handoff_records h
JOIN rental_orders o ON o.id = h.order_id
WHERE (o.owner_id = ? OR o.renter_id = ?)
AND (? = 0 OR o.buyer_tenant_id = ? OR o.source_tenant_id = ?)
AND (INSTR(h.attachment_urls, ?) > 0 OR INSTR(h.attachment_urls, ?) > 0 OR INSTR(h.attachment_urls, ?) > 0 OR INSTR(h.attachment_urls, ?) > 0)`,
args: []any{userID, userID, key, encodedKey, basePrefix, encodedBasePrefix},
args: []any{userID, userID, tenantID, tenantID, tenantID, key, encodedKey, basePrefix, encodedBasePrefix},
},
{
sql: `SELECT COUNT(1) FROM chat_messages m
JOIN chat_participants p ON p.conversation_id = m.conversation_id
LEFT JOIN chat_conversations c ON c.id = m.conversation_id
WHERE p.participant_type = 'user' AND p.participant_id = ?
AND (? = 0 OR c.tenant_id = ? OR EXISTS (
SELECT 1 FROM rental_orders ro WHERE ro.id = c.order_id AND (ro.buyer_tenant_id = ? OR ro.source_tenant_id = ?)
) OR EXISTS (
SELECT 1 FROM rental_listings rl WHERE rl.id = c.listing_id AND rl.source_tenant_id = ?
))
AND (INSTR(m.attachment_urls, ?) > 0 OR INSTR(m.attachment_urls, ?) > 0 OR INSTR(m.attachment_urls, ?) > 0 OR INSTR(m.attachment_urls, ?) > 0)`,
args: []any{userID, key, encodedKey, basePrefix, encodedBasePrefix},
args: []any{userID, tenantID, tenantID, tenantID, tenantID, tenantID, key, encodedKey, basePrefix, encodedBasePrefix},
},
{
sql: `SELECT COUNT(1) FROM user_payment_accounts p
@@ -129,11 +142,12 @@ func recordPrivateFileUpload(db *gorm.DB) func(context.Context, uint64, []string
return nil
}
records := make([]model.FileUploadOwner, 0, len(objectKeys))
tenantID := tenancy.IDFromContext(ctx)
for _, key := range objectKeys {
if key == "" {
continue
}
records = append(records, model.FileUploadOwner{UserID: userID, ObjectKey: key})
records = append(records, model.FileUploadOwner{TenantID: tenantID, UserID: userID, ObjectKey: key})
}
if len(records) == 0 {
return nil
@@ -6,6 +6,7 @@ import (
"hfb_sys/backend/internal/database"
"hfb_sys/backend/internal/model"
"hfb_sys/backend/internal/tenancy"
"gorm.io/gorm"
)
@@ -105,6 +106,30 @@ func TestRecordPrivateFileUpload(t *testing.T) {
}
}
func TestPrivateFileAuthorizerRejectsCrossTenantOwner(t *testing.T) {
db := openAuthorizerTestDB(t)
if err := database.AutoMigrateIfMissing(db, &model.FileUploadOwner{}); err != nil {
t.Fatalf("AutoMigrate() error = %v", err)
}
if err := db.Create(&model.FileUploadOwner{TenantID: 101, UserID: 11, ObjectKey: "listing/tenant-a.jpg"}).Error; err != nil {
t.Fatalf("create upload owner: %v", err)
}
authorize := privateFileAuthorizer(db)
ctxA := tenancy.WithScope(context.Background(), tenancy.Scope{TenantID: 101})
ctxB := tenancy.WithScope(context.Background(), tenancy.Scope{TenantID: 202})
allowed, err := authorize(ctxA, 11, "listing/tenant-a.jpg")
if err != nil || !allowed {
t.Fatalf("same tenant allowed=%v err=%v", allowed, err)
}
allowed, err = authorize(ctxB, 11, "listing/tenant-a.jpg")
if err != nil {
t.Fatalf("cross tenant authorize error: %v", err)
}
if allowed {
t.Fatal("cross tenant upload owner must not be readable")
}
}
func openAuthorizerTestDB(t *testing.T) *gorm.DB {
t.Helper()
db := database.NewTestDB()
+7 -1
View File
@@ -319,7 +319,13 @@ func New(cfg config.Config, deps Dependencies, logger *zap.Logger) *gin.Engine {
var systemConfigRepo *systemconfig.Repository
if deps.DB != nil {
systemConfigRepo = systemconfig.NewRepository(deps.DB)
if err := systemConfigRepo.EnsureDefaults(context.Background()); err != nil && logger != nil {
configCtx := context.Background()
if tenantRepo != nil {
if scope, err := tenantRepo.ResolveCode(configCtx, "dachui"); err == nil && scope != nil {
configCtx = tenancy.WithScope(configCtx, *scope)
}
}
if err := systemConfigRepo.EnsureDefaults(configCtx); err != nil && logger != nil {
logger.Warn("系统配置默认值初始化失败,将在请求时按需重试", zap.Error(err))
}
}