097c9d0ad5
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.
43 lines
1.4 KiB
Go
43 lines
1.4 KiB
Go
package file
|
|
|
|
import (
|
|
"context"
|
|
"net/url"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// extractTenantIDFromPresignedURL pulls the tenant_id query parameter from a
|
|
// signed URL. Returns "" when the URL is not parseable as a presigned URL.
|
|
func extractTenantIDFromPresignedURL(t *testing.T, presigned string) string {
|
|
t.Helper()
|
|
u, err := url.Parse(presigned)
|
|
require.NoError(t, err)
|
|
return u.Query().Get("tenant_id")
|
|
}
|
|
|
|
// 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")
|
|
|
|
got, err := svc.GetFileURL(context.Background(), "local://7/abc/img.png")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "7", extractTenantIDFromPresignedURL(t, got))
|
|
}
|
|
|
|
// TestLocalGetFileURL_NoExternalURL verifies backward compatibility: without
|
|
// APP_EXTERNAL_URL, GetFileURL still returns the local:// path unchanged.
|
|
func TestLocalGetFileURL_NoExternalURL(t *testing.T) {
|
|
svc := NewLocalFileService("/data/files", "")
|
|
|
|
got, err := svc.GetFileURL(context.Background(), "local://1/abc/img.png")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "local://1/abc/img.png", got)
|
|
}
|