From 097c9d0ad5e688e01ca1959682c4a55b5b38c014 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Thu, 30 Apr 2026 11:05:06 +0800 Subject: [PATCH] fix(im): revert tenant-from-context for presigned URL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reverts the tenant-ID-from-context change in da5fcd3. The storage path encodes the resource owner's tenant, and the presigned-URL verifier uses that ID to look up the owning tenant's StorageEngineConfig. Using the caller's tenant ID from context would break cross-tenant shared resources — e.g. when tenant Y reads an image from a KB shared by tenant X, signing with Y would cause the verifier to open Y's storage backend and 404 on X's file. Keep: - presignDefaultTTL shortened from 24h to 2h (independent improvement). - godoc note on ParseTenantIDFromStoragePath flagging the ambiguity for cloud paths with numeric bucket/region names. - Unit tests for path-based tenant extraction and the no-external-URL backward-compat path. --- internal/application/service/file/local.go | 13 +++++------ .../application/service/file/local_test.go | 23 ++++--------------- internal/utils/presign.go | 9 ++++---- 3 files changed, 15 insertions(+), 30 deletions(-) diff --git a/internal/application/service/file/local.go b/internal/application/service/file/local.go index 63a3f52a..156cf95c 100644 --- a/internal/application/service/file/local.go +++ b/internal/application/service/file/local.go @@ -11,7 +11,6 @@ import ( "time" "github.com/Tencent/WeKnora/internal/logger" - "github.com/Tencent/WeKnora/internal/types" "github.com/Tencent/WeKnora/internal/types/interfaces" secutils "github.com/Tencent/WeKnora/internal/utils" ) @@ -205,12 +204,12 @@ func (s *localFileService) GetFileURL(ctx context.Context, filePath string) (str // If external URL is configured, generate a presigned HTTP URL. if s.externalURL != "" { - // Prefer tenant ID from context (authoritative); fall back to parsing - // the storage path for callers that don't propagate tenant context. - tenantID, ok := types.TenantIDFromContext(ctx) - if !ok || tenantID == 0 { - tenantID = secutils.ParseTenantIDFromStoragePath(normalized) - } + // Tenant ID is parsed from the storage path, which encodes the + // resource owner's tenant (not the caller's). The verifier on + // /api/v1/files/presigned uses this ID to look up the owning + // tenant's StorageEngineConfig — using the caller's tenant would + // break cross-tenant shared resources (e.g. shared KB images). + tenantID := secutils.ParseTenantIDFromStoragePath(normalized) presignedURL, err := secutils.SignFileURL(s.externalURL, normalized, tenantID, 0) if err != nil { logger.Warnf(ctx, "Failed to generate presigned URL for %s: %v, returning local:// path", normalized, err) diff --git a/internal/application/service/file/local_test.go b/internal/application/service/file/local_test.go index a72c23b4..6dbe8cc7 100644 --- a/internal/application/service/file/local_test.go +++ b/internal/application/service/file/local_test.go @@ -5,7 +5,6 @@ import ( "net/url" "testing" - "github.com/Tencent/WeKnora/internal/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -19,24 +18,10 @@ func extractTenantIDFromPresignedURL(t *testing.T, presigned string) string { return u.Query().Get("tenant_id") } -// TestLocalGetFileURL_TenantIDFromContext verifies that tenant context wins -// over path parsing — critical when the first numeric segment of the path is -// a bucket name or region (not the tenant). -func TestLocalGetFileURL_TenantIDFromContext(t *testing.T) { - t.Setenv("SYSTEM_AES_KEY", "weknora-test-aes-key-32bytes!!!") - - svc := NewLocalFileService("/data/files", "https://weknora.example.com") - - ctx := context.WithValue(context.Background(), types.TenantIDContextKey, uint64(42)) - got, err := svc.GetFileURL(ctx, "local://1/abc/img.png") - require.NoError(t, err) - // Context tenant (42) must override the path's first numeric segment (1). - assert.Equal(t, "42", extractTenantIDFromPresignedURL(t, got)) -} - -// TestLocalGetFileURL_FallbackToPathParse verifies that when context is -// missing, the service falls back to parsing the tenant ID from the path. -func TestLocalGetFileURL_FallbackToPathParse(t *testing.T) { +// TestLocalGetFileURL_TenantIDFromPath verifies that tenant ID is extracted +// from the storage path — which encodes the resource owner, so cross-tenant +// shared resources resolve to the correct owning tenant's storage config. +func TestLocalGetFileURL_TenantIDFromPath(t *testing.T) { t.Setenv("SYSTEM_AES_KEY", "weknora-test-aes-key-32bytes!!!") svc := NewLocalFileService("/data/files", "https://weknora.example.com") diff --git a/internal/utils/presign.go b/internal/utils/presign.go index 2f5365ed..07a75ab2 100644 --- a/internal/utils/presign.go +++ b/internal/utils/presign.go @@ -96,12 +96,13 @@ func VerifyFileURLSig(filePath string, tenantID uint64, expiresStr, sig string) } // ParseTenantIDFromStoragePath extracts the tenant ID from a provider:// storage path. -// Storage paths follow the convention: {scheme}://{tenantID}/... +// Storage paths follow the convention: {scheme}://.../{tenantID}/... // Returns 0 if the path does not contain a valid tenant ID. // -// NOTE: This is a best-effort fallback. Prefer passing the tenant ID from -// request context when available — for cloud providers with numeric bucket -// or region names, the first numeric segment may not be the tenant ID. +// NOTE: For cloud providers whose paths embed numeric bucket or region names +// before the tenant segment, the first numeric segment may not be the tenant. +// Callers that have an authoritative resource-owner tenant ID available +// should pass it directly to SignFileURL instead of relying on this parser. func ParseTenantIDFromStoragePath(filePath string) uint64 { // Strip scheme: "local://1/abc/img.png" → "1/abc/img.png" _, rest, ok := strings.Cut(filePath, "://")