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
+86
View File
@@ -135,6 +135,92 @@ WHERE w.user_id = ?
}
}
// adminPrivateFileAuthorizer 将经营站点后台的私有文件访问限制在当前租户。
// 历史分销后台(tenant_id=0)保留原有平台级访问语义。
func adminPrivateFileAuthorizer(db *gorm.DB) func(context.Context, uint64, string) (bool, error) {
return func(ctx context.Context, _ uint64, key string) (bool, error) {
if db == nil || key == "" {
return false, nil
}
encodedKey := url.QueryEscape(key)
basePrefix := strings.TrimSuffix(strings.TrimSuffix(key, ".medium.jpg"), ".thumb.jpg")
encodedBasePrefix := url.QueryEscape(basePrefix)
tenantID := tenancy.IDFromContext(ctx)
queries := []struct {
sql string
args []any
}{
{
sql: "SELECT COUNT(1) FROM file_upload_owners WHERE object_key = ? AND (? = 0 OR tenant_id = ?)",
args: []any{key, tenantID, tenantID},
},
{
sql: `SELECT COUNT(1) FROM game_accounts a
JOIN rental_listings l ON l.account_id = a.id
WHERE (? = 0 OR (l.source_tenant_id = ? AND (l.distribution_site_id IS NULL OR l.distribution_site_id = 0)))
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{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 (? = 0 OR (o.buyer_tenant_id = ? AND (o.distribution_site_id IS NULL OR o.distribution_site_id = 0)))
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{tenantID, tenantID, key, encodedKey, basePrefix, encodedBasePrefix},
},
{
sql: `SELECT COUNT(1) FROM disputes d
JOIN rental_orders o ON o.id = d.order_id
WHERE (? = 0 OR (o.buyer_tenant_id = ? AND (o.distribution_site_id IS NULL OR o.distribution_site_id = 0)))
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{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 (? = 0 OR ((o.buyer_tenant_id = ? OR o.source_tenant_id = ?)
AND (o.distribution_site_id IS NULL OR o.distribution_site_id = 0)))
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{tenantID, tenantID, tenantID, key, encodedKey, basePrefix, encodedBasePrefix},
},
{
sql: `SELECT COUNT(1) FROM chat_messages m
JOIN chat_conversations c ON c.id = m.conversation_id
WHERE (? = 0 OR c.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{tenantID, tenantID, key, encodedKey, basePrefix, encodedBasePrefix},
},
{
sql: `SELECT COUNT(1) FROM user_payment_accounts p
JOIN users u ON u.id = p.user_id
WHERE (? = 0 OR (p.tenant_id = ? AND u.tenant_id = ? AND u.distribution_site_id = 0))
AND (INSTR(p.certificate_urls, ?) > 0 OR INSTR(p.certificate_urls, ?) > 0 OR INSTR(p.certificate_urls, ?) > 0 OR INSTR(p.certificate_urls, ?) > 0)`,
args: []any{tenantID, tenantID, tenantID, key, encodedKey, basePrefix, encodedBasePrefix},
},
{
sql: `SELECT COUNT(1) FROM withdrawal_requests w
WHERE (? = 0 OR (w.tenant_id = ? AND w.distribution_site_id = 0))
AND (INSTR(w.payment_proof_url, ?) > 0 OR INSTR(w.payment_proof_url, ?) > 0 OR INSTR(w.payment_proof_url, ?) > 0 OR INSTR(w.payment_proof_url, ?) > 0)`,
args: []any{tenantID, tenantID, key, encodedKey, basePrefix, encodedBasePrefix},
},
}
for _, query := range queries {
var count int64
if err := db.WithContext(ctx).Raw(query.sql, query.args...).Scan(&count).Error; err != nil {
if strings.Contains(strings.ToLower(err.Error()), "doesn't exist") {
continue
}
return false, err
}
if count > 0 {
return true, nil
}
}
return false, nil
}
}
// recordPrivateFileUpload 记录用户上传的原图和变体,保证草稿状态下也仅上传者可预览。
func recordPrivateFileUpload(db *gorm.DB) func(context.Context, uint64, []string) error {
return func(ctx context.Context, userID uint64, objectKeys []string) error {
@@ -130,6 +130,38 @@ func TestPrivateFileAuthorizerRejectsCrossTenantOwner(t *testing.T) {
}
}
func TestAdminPrivateFileAuthorizerScopesOperatingTenant(t *testing.T) {
db := openAuthorizerTestDB(t)
if err := database.AutoMigrateIfMissing(db, &model.FileUploadOwner{}); err != nil {
t.Fatalf("AutoMigrate() error = %v", err)
}
rows := []model.FileUploadOwner{
{TenantID: 101, UserID: 11, ObjectKey: "listing/admin-tenant-a.jpg"},
{TenantID: 202, UserID: 12, ObjectKey: "listing/admin-tenant-b.jpg"},
}
if err := db.Create(&rows).Error; err != nil {
t.Fatalf("create upload owners: %v", err)
}
authorize := adminPrivateFileAuthorizer(db)
ctxA := tenancy.WithScope(context.Background(), tenancy.Scope{TenantID: 101})
ctxB := tenancy.WithScope(context.Background(), tenancy.Scope{TenantID: 202})
if allowed, err := authorize(ctxA, 1, "listing/admin-tenant-a.jpg"); err != nil || !allowed {
t.Fatalf("tenant A own file allowed=%v err=%v", allowed, err)
}
if allowed, err := authorize(ctxA, 1, "listing/admin-tenant-b.jpg"); err != nil {
t.Fatalf("tenant A cross file error=%v", err)
} else if allowed {
t.Fatal("tenant A must not read tenant B file")
}
if allowed, err := authorize(ctxB, 2, "listing/admin-tenant-b.jpg"); err != nil || !allowed {
t.Fatalf("tenant B own file allowed=%v err=%v", allowed, err)
}
if allowed, err := authorize(context.Background(), 3, "listing/admin-tenant-a.jpg"); err != nil || !allowed {
t.Fatalf("legacy admin file allowed=%v err=%v", allowed, err)
}
}
func openAuthorizerTestDB(t *testing.T) *gorm.DB {
t.Helper()
db := database.NewTestDB()
+7 -1
View File
@@ -426,7 +426,13 @@ func New(cfg config.Config, deps Dependencies, logger *zap.Logger) *gin.Engine {
}
}
fileService := filemodule.NewService(fileStorage)
fileHandler := filemodule.NewHandler(fileService, fileStorage, privateFileAuthorizer(deps.DB), recordPrivateFileUpload(deps.DB))
fileHandler := filemodule.NewHandler(
fileService,
fileStorage,
privateFileAuthorizer(deps.DB),
recordPrivateFileUpload(deps.DB),
adminPrivateFileAuthorizer(deps.DB),
)
listingService := listing.NewService(listingRepo, systemConfigRepo)
listingHandler := listing.NewHandler(listingService, fileStorage, listing.HandlerOptions{
ExternalUploadSecret: cfg.ExternalUploadSecret,