From ca84a8a7131e2be81ead697c472bf967548d97ec Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 18 Nov 2025 23:18:35 -0800 Subject: [PATCH] S3: Directly read write volume servers (#7481) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Lazy Versioning Check, Conditional SSE Entry Fetch, HEAD Request Optimization * revert Reverted the conditional versioning check to always check versioning status Reverted the conditional SSE entry fetch to always fetch entry metadata Reverted the conditional versioning check to always check versioning status Reverted the conditional SSE entry fetch to always fetch entry metadata * Lazy Entry Fetch for SSE, Skip Conditional Header Check * SSE-KMS headers are present, this is not an SSE-C request (mutually exclusive) * SSE-C is mutually exclusive with SSE-S3 and SSE-KMS * refactor * Removed Premature Mutual Exclusivity Check * check for the presence of the X-Amz-Server-Side-Encryption header * not used * fmt * directly read write volume servers * HTTP Range Request Support * set header * md5 * copy object * fix sse * fmt * implement sse * sse continue * fixed the suffix range bug (bytes=-N for "last N bytes") * debug logs * Missing PartsCount Header * profiling * url encoding * test_multipart_get_part * headers * debug * adjust log level * handle part number * Update s3api_object_handlers.go * nil safety * set ModifiedTsNs * remove * nil check * fix sse header * same logic as filer * decode values * decode ivBase64 * s3: Fix SSE decryption JWT authentication and streaming errors Critical fix for SSE (Server-Side Encryption) test failures: 1. **JWT Authentication Bug** (Root Cause): - Changed from GenJwtForFilerServer to GenJwtForVolumeServer - S3 API now uses correct JWT when directly reading from volume servers - Matches filer's authentication pattern for direct volume access - Fixes 'unexpected EOF' and 500 errors in SSE tests 2. **Streaming Error Handling**: - Added error propagation in getEncryptedStreamFromVolumes goroutine - Use CloseWithError() to properly communicate stream failures - Added debug logging for streaming errors 3. **Response Header Timing**: - Removed premature WriteHeader(http.StatusOK) call - Let Go's http package write status automatically on first write - Prevents header lock when errors occur during streaming 4. **Enhanced SSE Decryption Debugging**: - Added IV/Key validation and logging for SSE-C, SSE-KMS, SSE-S3 - Better error messages for missing or invalid encryption metadata - Added glog.V(2) debugging for decryption setup This fixes SSE integration test failures where encrypted objects could not be retrieved due to volume server authentication failures. The JWT bug was causing volume servers to reject requests, resulting in truncated/empty streams (EOF) or internal errors. * s3: Fix SSE multipart upload metadata preservation Critical fix for SSE multipart upload test failures (SSE-C and SSE-KMS): **Root Cause - Incomplete SSE Metadata Copying**: The old code only tried to copy 'SeaweedFSSSEKMSKey' from the first part to the completed object. This had TWO bugs: 1. **Wrong Constant Name** (Key Mismatch Bug): - Storage uses: SeaweedFSSSEKMSKeyHeader = 'X-SeaweedFS-SSE-KMS-Key' - Old code read: SeaweedFSSSEKMSKey = 'x-seaweedfs-sse-kms-key' - Result: SSE-KMS metadata was NEVER copied → 500 errors 2. **Missing SSE-C and SSE-S3 Headers**: - SSE-C requires: IV, Algorithm, KeyMD5 - SSE-S3 requires: encrypted key data + standard headers - Old code: copied nothing for SSE-C/SSE-S3 → decryption failures **Fix - Complete SSE Header Preservation**: Now copies ALL SSE headers from first part to completed object: - SSE-C: SeaweedFSSSEIV, CustomerAlgorithm, CustomerKeyMD5 - SSE-KMS: SeaweedFSSSEKMSKeyHeader, AwsKmsKeyId, ServerSideEncryption - SSE-S3: SeaweedFSSSES3Key, ServerSideEncryption Applied consistently to all 3 code paths: 1. Versioned buckets (creates version file) 2. Suspended versioning (creates main object with null versionId) 3. Non-versioned buckets (creates main object) **Why This Is Correct**: The headers copied EXACTLY match what putToFiler stores during part upload (lines 496-521 in s3api_object_handlers_put.go). This ensures detectPrimarySSEType() can correctly identify encrypted multipart objects and trigger inline decryption with proper metadata. Fixes: TestSSEMultipartUploadIntegration (SSE-C and SSE-KMS subtests) * s3: Add debug logging for versioning state diagnosis Temporary debug logging to diagnose test_versioning_obj_plain_null_version_overwrite_suspended failure. Added glog.V(0) logging to show: 1. setBucketVersioningStatus: when versioning status is changed 2. PutObjectHandler: what versioning state is detected (Enabled/Suspended/none) 3. PutObjectHandler: which code path is taken (putVersionedObject vs putSuspendedVersioningObject) This will help identify if: - The versioning status is being set correctly in bucket config - The cache is returning stale/incorrect versioning state - The switch statement is correctly routing to suspended vs enabled handlers * s3: Enhanced versioning state tracing for suspended versioning diagnosis Added comprehensive logging across the entire versioning state flow: PutBucketVersioningHandler: - Log requested status (Enabled/Suspended) - Log when calling setBucketVersioningStatus - Log success/failure of status change setBucketVersioningStatus: - Log bucket and status being set - Log when config is updated - Log completion with error code updateBucketConfig: - Log versioning state being written to cache - Immediate cache verification after Set - Log if cache verification fails getVersioningState: - Log bucket name and state being returned - Log if object lock forces VersioningEnabled - Log errors This will reveal: 1. If PutBucketVersioning(Suspended) is reaching the handler 2. If the cache update succeeds 3. What state getVersioningState returns during PUT 4. Any cache consistency issues Expected to show why bucket still reports 'Enabled' after 'Suspended' call. * s3: Add SSE chunk detection debugging for multipart uploads Added comprehensive logging to diagnose why TestSSEMultipartUploadIntegration fails: detectPrimarySSEType now logs: 1. Total chunk count and extended header count 2. All extended headers with 'sse'/'SSE'/'encryption' in the name 3. For each chunk: index, SseType, and whether it has metadata 4. Final SSE type counts (SSE-C, SSE-KMS, SSE-S3) This will reveal if: - Chunks are missing SSE metadata after multipart completion - Extended headers are copied correctly from first part - The SSE detection logic is working correctly Expected to show if chunks have SseType=0 (none) or proper SSE types set. * s3: Trace SSE chunk metadata through multipart completion and retrieval Added end-to-end logging to track SSE chunk metadata lifecycle: **During Multipart Completion (filer_multipart.go)**: 1. Log finalParts chunks BEFORE mkFile - shows SseType and metadata 2. Log versionEntry.Chunks INSIDE mkFile callback - shows if mkFile preserves SSE info 3. Log success after mkFile completes **During GET Retrieval (s3api_object_handlers.go)**: 1. Log retrieved entry chunks - shows SseType and metadata after retrieval 2. Log detected SSE type result This will reveal at which point SSE chunk metadata is lost: - If finalParts have SSE metadata but versionEntry.Chunks don't → mkFile bug - If versionEntry.Chunks have SSE metadata but retrieved chunks don't → storage/retrieval bug - If chunks never have SSE metadata → multipart completion SSE processing bug Expected to show chunks with SseType=NONE during retrieval even though they were created with proper SseType during multipart completion. * s3: Fix SSE-C multipart IV base64 decoding bug **Critical Bug Found**: SSE-C multipart uploads were failing because: Root Cause: - entry.Extended[SeaweedFSSSEIV] stores base64-encoded IV (24 bytes for 16-byte IV) - SerializeSSECMetadata expects raw IV bytes (16 bytes) - During multipart completion, we were passing base64 IV directly → serialization error Error Message: "Failed to serialize SSE-C metadata for chunk in part X: invalid IV length: expected 16 bytes, got 24" Fix: - Base64-decode IV before passing to SerializeSSECMetadata - Added error handling for decode failures Impact: - SSE-C multipart uploads will now correctly serialize chunk metadata - Chunks will have proper SSE metadata for decryption during GET This fixes the SSE-C subtest of TestSSEMultipartUploadIntegration. SSE-KMS still has a separate issue (error code 23) being investigated. * fixes * kms sse * handle retry if not found in .versions folder and should read the normal object * quick check (no retries) to see if the .versions/ directory exists * skip retry if object is not found * explicit update to avoid sync delay * fix map update lock * Remove fmt.Printf debug statements * Fix SSE-KMS multipart base IV fallback to fail instead of regenerating * fmt * Fix ACL grants storage logic * header handling * nil handling * range read for sse content * test range requests for sse objects * fmt * unused code * upload in chunks * header case * fix url * bucket policy error vs bucket not found * jwt handling * fmt * jwt in request header * Optimize Case-Insensitive Prefix Check * dead code * Eliminated Unnecessary Stream Prefetch for Multipart SSE * range sse * sse * refactor * context * fmt * fix type * fix SSE-C IV Mismatch * Fix Headers Being Set After WriteHeader * fix url parsing * propergate sse headers * multipart sse-s3 * aws sig v4 authen * sse kms * set content range * better errors * Update s3api_object_handlers_copy.go * Update s3api_object_handlers.go * Update s3api_object_handlers.go * avoid magic number * clean up * Update s3api_bucket_policy_handlers.go * fix url parsing * context * data and metadata both use background context * adjust the offset * SSE Range Request IV Calculation * adjust logs * IV relative to offset in each part, not the whole file * collect logs * offset * fix offset * fix url * logs * variable * jwt * Multipart ETag semantics: conditionally set object-level Md5 for single-chunk uploads only. * sse * adjust IV and offset * multipart boundaries * ensures PUT and GET operations return consistent ETags * Metadata Header Case * CommonPrefixes Sorting with URL Encoding * always sort * remove the extra PathUnescape call * fix the multipart get part ETag * the FileChunk is created without setting ModifiedTsNs * Sort CommonPrefixes lexicographically to match AWS S3 behavior * set md5 for multipart uploads * prevents any potential data loss or corruption in the small-file inline storage path * compiles correctly * decryptedReader will now be properly closed after use * Fixed URL encoding and sort order for CommonPrefixes * Update s3api_object_handlers_list.go * SSE-x Chunk View Decryption * Different IV offset calculations for single-part vs multipart objects * still too verbose in logs * less logs * ensure correct conversion * fix listing * nil check * minor fixes * nil check * single character delimiter * optimize * range on empty object or zero-length * correct IV based on its position within that part, not its position in the entire object * adjust offset * offset Fetch FULL encrypted chunk (not just the range) Adjust IV by PartOffset/ChunkOffset only Decrypt full chunk Skip in the DECRYPTED stream to reach OffsetInChunk * look breaking * refactor * error on no content * handle intra-block byte skipping * Incomplete HTTP Response Error Handling * multipart SSE * Update s3api_object_handlers.go * address comments * less logs * handling directory * Optimized rejectDirectoryObjectWithoutSlash() to avoid unnecessary lookups * Revert "handling directory" This reverts commit 3a335f0ac33c63f51975abc63c40e5328857a74b. * constant * Consolidate nil entry checks in GetObjectHandler * add range tests * Consolidate redundant nil entry checks in HeadObjectHandler * adjust logs * SSE type * large files * large files Reverted the plain-object range test * ErrNoEncryptionConfig * Fixed SSERangeReader Infinite Loop Vulnerability * Fixed SSE-KMS Multipart ChunkReader HTTP Body Leak * handle empty directory in S3, added PyArrow tests * purge unused code * Update s3_parquet_test.py * Update requirements.txt * According to S3 specifications, when both partNumber and Range are present, the Range should apply within the selected part's boundaries, not to the full object. * handle errors * errors after writing header * https * fix: Wait for volume assignment readiness before running Parquet tests The test-implicit-dir-with-server test was failing with an Internal Error because volume assignment was not ready when tests started. This fix adds a check that attempts a volume assignment and waits for it to succeed before proceeding with tests. This ensures that: 1. Volume servers are registered with the master 2. Volume growth is triggered if needed 3. The system can successfully assign volumes for writes Fixes the timeout issue where boto3 would retry 4 times and fail with 'We encountered an internal error, please try again.' * sse tests * store derived IV * fix: Clean up gRPC ports between tests to prevent port conflicts The second test (test-implicit-dir-with-server) was failing because the volume server's gRPC port (18080 = VOLUME_PORT + 10000) was still in use from the first test. The cleanup code only killed HTTP port processes, not gRPC port processes. Added cleanup for gRPC ports in all stop targets: - Master gRPC: MASTER_PORT + 10000 (19333) - Volume gRPC: VOLUME_PORT + 10000 (18080) - Filer gRPC: FILER_PORT + 10000 (18888) This ensures clean state between test runs in CI. * add import * address comments * docs: Add placeholder documentation files for Parquet test suite Added three missing documentation files referenced in test/s3/parquet/README.md: 1. TEST_COVERAGE.md - Documents 43 total test cases (17 Go unit tests, 6 Python integration tests, 20 Python end-to-end tests) 2. FINAL_ROOT_CAUSE_ANALYSIS.md - Explains the s3fs compatibility issue with PyArrow, the implicit directory problem, and how the fix works 3. MINIO_DIRECTORY_HANDLING.md - Compares MinIO's directory handling approach with SeaweedFS's implementation Each file contains: - Title and overview - Key technical details relevant to the topic - TODO sections for future expansion These placeholder files resolve the broken README links and provide structure for future detailed documentation. * clean up if metadata operation failed * Update s3_parquet_test.py * clean up * Update Makefile * Update s3_parquet_test.py * Update Makefile * Handle ivSkip for non-block-aligned offsets * Update README.md * stop volume server faster * stop volume server in 1 second * different IV for each chunk in SSE-S3 and SSE-KMS * clean up if fails * testing upload * error propagation * fmt * simplify * fix copying * less logs * endian * Added marshaling error handling * handling invalid ranges * error handling for adding to log buffer * fix logging * avoid returning too quickly and ensure proper cleaning up * Activity Tracking for Disk Reads * Cleanup Unused Parameters * Activity Tracking for Kafka Publishers * Proper Test Error Reporting * refactoring * less logs * less logs * go fmt * guard it with if entry.Attributes.TtlSec > 0 to match the pattern used elsewhere. * Handle bucket-default encryption config errors explicitly for multipart * consistent activity tracking * obsolete code for s3 on filer read/write handlers * Update weed/s3api/s3api_object_handlers_list.go Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- .github/workflows/s3-parquet-tests.yml | 130 + .github/workflows/s3-sse-tests.yml | 12 +- .github/workflows/s3tests.yml | 2 +- .../test-s3-over-https-using-awscli.yml | 25 +- test/s3/parquet/.gitignore | 40 + test/s3/parquet/FINAL_ROOT_CAUSE_ANALYSIS.md | 58 + test/s3/parquet/MINIO_DIRECTORY_HANDLING.md | 70 + test/s3/parquet/Makefile | 365 +++ test/s3/parquet/README.md | 206 ++ test/s3/parquet/TEST_COVERAGE.md | 46 + test/s3/parquet/requirements.txt | 7 + test/s3/parquet/s3_parquet_test.py | 421 +++ .../s3/parquet/test_implicit_directory_fix.py | 307 ++ test/s3/sse/s3_range_headers_test.go | 104 + test/s3/sse/s3_sse_range_server_test.go | 445 +++ weed/filer/filer_notify.go | 4 +- weed/filer/meta_aggregator.go | 5 +- weed/mq/broker/broker_grpc_pub_follow.go | 6 +- weed/mq/broker/broker_log_buffer_offset.go | 27 +- weed/mq/topic/local_partition.go | 22 +- weed/mq/topic/local_partition_offset.go | 7 +- weed/operation/upload_chunked.go | 267 ++ weed/operation/upload_chunked_test.go | 312 ++ weed/pb/filer_pb/filer_pb_helper.go | 2 +- weed/s3api/auth_credentials.go | 26 +- weed/s3api/auth_credentials_subscribe.go | 12 +- weed/s3api/custom_types.go | 4 +- weed/s3api/filer_multipart.go | 267 +- weed/s3api/filer_util.go | 6 +- weed/s3api/policy_conversion.go | 5 +- weed/s3api/policy_conversion_test.go | 27 +- weed/s3api/s3_bucket_encryption.go | 18 +- weed/s3api/s3_constants/header.go | 13 +- weed/s3api/s3_iam_middleware.go | 2 +- weed/s3api/s3_multipart_iam.go | 2 +- weed/s3api/s3_sse_c.go | 25 +- weed/s3api/s3_sse_ctr_test.go | 307 ++ weed/s3api/s3_sse_kms.go | 18 +- weed/s3api/s3_sse_s3.go | 14 +- weed/s3api/s3_sse_s3_multipart_test.go | 266 ++ weed/s3api/s3_sse_utils.go | 15 +- weed/s3api/s3api_bucket_config.go | 11 +- weed/s3api/s3api_bucket_handlers.go | 3 +- weed/s3api/s3api_bucket_policy_arn_test.go | 3 +- weed/s3api/s3api_bucket_policy_engine.go | 4 +- weed/s3api/s3api_bucket_policy_handlers.go | 64 +- weed/s3api/s3api_implicit_directory_test.go | 285 ++ weed/s3api/s3api_object_handlers.go | 2763 +++++++++++++---- weed/s3api/s3api_object_handlers_copy.go | 136 +- weed/s3api/s3api_object_handlers_list.go | 77 +- weed/s3api/s3api_object_handlers_multipart.go | 34 +- .../s3api/s3api_object_handlers_postpolicy.go | 4 +- weed/s3api/s3api_object_handlers_put.go | 694 +++-- weed/s3api/s3api_object_handlers_test.go | 109 + weed/s3api/s3api_object_versioning.go | 22 +- weed/s3api/s3api_put_handlers.go | 24 +- weed/s3api/s3api_server.go | 16 +- weed/s3api/s3api_sse_chunk_metadata_test.go | 361 +++ weed/s3api/s3api_sse_decrypt_test.go | 189 ++ weed/s3api/s3api_sse_s3_upload_test.go | 257 ++ weed/s3api/s3err/error_handler.go | 4 +- weed/server/filer_server_handlers_read.go | 26 - .../filer_server_handlers_write_autochunk.go | 54 +- .../filer_server_handlers_write_upload.go | 68 - weed/util/log_buffer/log_buffer.go | 167 +- .../log_buffer/log_buffer_corruption_test.go | 224 ++ .../log_buffer/log_buffer_flush_gap_test.go | 43 +- .../log_buffer_queryability_test.go | 20 +- weed/util/log_buffer/log_buffer_test.go | 24 +- weed/util/log_buffer/log_read.go | 18 + .../log_buffer/log_read_integration_test.go | 18 +- .../log_buffer/log_read_stateless_test.go | 36 +- weed/util/log_buffer/log_read_test.go | 4 +- weed/util/log_buffer/sealed_buffer.go | 12 +- 74 files changed, 8380 insertions(+), 1311 deletions(-) create mode 100644 .github/workflows/s3-parquet-tests.yml create mode 100644 test/s3/parquet/.gitignore create mode 100644 test/s3/parquet/FINAL_ROOT_CAUSE_ANALYSIS.md create mode 100644 test/s3/parquet/MINIO_DIRECTORY_HANDLING.md create mode 100644 test/s3/parquet/Makefile create mode 100644 test/s3/parquet/README.md create mode 100644 test/s3/parquet/TEST_COVERAGE.md create mode 100644 test/s3/parquet/requirements.txt create mode 100755 test/s3/parquet/s3_parquet_test.py create mode 100755 test/s3/parquet/test_implicit_directory_fix.py create mode 100644 test/s3/sse/s3_range_headers_test.go create mode 100644 test/s3/sse/s3_sse_range_server_test.go create mode 100644 weed/operation/upload_chunked.go create mode 100644 weed/operation/upload_chunked_test.go create mode 100644 weed/s3api/s3_sse_ctr_test.go create mode 100644 weed/s3api/s3_sse_s3_multipart_test.go create mode 100644 weed/s3api/s3api_implicit_directory_test.go create mode 100644 weed/s3api/s3api_sse_chunk_metadata_test.go create mode 100644 weed/s3api/s3api_sse_decrypt_test.go create mode 100644 weed/s3api/s3api_sse_s3_upload_test.go create mode 100644 weed/util/log_buffer/log_buffer_corruption_test.go diff --git a/.github/workflows/s3-parquet-tests.yml b/.github/workflows/s3-parquet-tests.yml new file mode 100644 index 000000000..8fbd062ef --- /dev/null +++ b/.github/workflows/s3-parquet-tests.yml @@ -0,0 +1,130 @@ +name: "S3 PyArrow Parquet Tests" + +on: + push: + branches: [master] + paths: + - 'weed/s3api/**' + - 'weed/filer/**' + - 'test/s3/parquet/**' + - '.github/workflows/s3-parquet-tests.yml' + pull_request: + branches: [master] + paths: + - 'weed/s3api/**' + - 'weed/filer/**' + - 'test/s3/parquet/**' + - '.github/workflows/s3-parquet-tests.yml' + workflow_dispatch: + +env: + S3_ACCESS_KEY: some_access_key1 + S3_SECRET_KEY: some_secret_key1 + S3_ENDPOINT_URL: http://localhost:8333 + BUCKET_NAME: test-parquet-bucket + +jobs: + parquet-integration-tests: + name: PyArrow Parquet Tests (Python ${{ matrix.python-version }}) + runs-on: ubuntu-latest + timeout-minutes: 20 + + strategy: + fail-fast: false + matrix: + python-version: ['3.9', '3.11', '3.12'] + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Go + uses: actions/setup-go@v5 + with: + go-version: ^1.24 + cache: true + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' + cache-dependency-path: 'test/s3/parquet/requirements.txt' + + - name: Install system dependencies + run: | + sudo apt-get update + sudo apt-get install -y lsof netcat-openbsd + + - name: Build SeaweedFS + run: | + cd weed + go build -v + sudo cp weed /usr/local/bin/ + weed version + + - name: Run PyArrow Parquet integration tests + run: | + cd test/s3/parquet + make test-with-server + env: + SEAWEEDFS_BINARY: weed + S3_PORT: 8333 + FILER_PORT: 8888 + VOLUME_PORT: 8080 + MASTER_PORT: 9333 + VOLUME_MAX_SIZE_MB: 50 + + - name: Run implicit directory fix tests + run: | + cd test/s3/parquet + make test-implicit-dir-with-server + env: + SEAWEEDFS_BINARY: weed + S3_PORT: 8333 + FILER_PORT: 8888 + VOLUME_PORT: 8080 + MASTER_PORT: 9333 + + - name: Upload test logs on failure + if: failure() + uses: actions/upload-artifact@v4 + with: + name: test-logs-python-${{ matrix.python-version }} + path: | + /tmp/seaweedfs-parquet-*.log + test/s3/parquet/*.log + retention-days: 7 + + - name: Cleanup + if: always() + run: | + cd test/s3/parquet + make stop-seaweedfs-safe || true + make clean || true + + unit-tests: + name: Go Unit Tests (Implicit Directory) + runs-on: ubuntu-latest + timeout-minutes: 10 + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Go + uses: actions/setup-go@v5 + with: + go-version: ^1.24 + cache: true + + - name: Run Go unit tests + run: | + cd weed/s3api + go test -v -run TestImplicitDirectory + + - name: Run all S3 API tests + run: | + cd weed/s3api + go test -v -timeout 5m + diff --git a/.github/workflows/s3-sse-tests.yml b/.github/workflows/s3-sse-tests.yml index 5bc9e6be0..42db38d6d 100644 --- a/.github/workflows/s3-sse-tests.yml +++ b/.github/workflows/s3-sse-tests.yml @@ -4,6 +4,7 @@ on: pull_request: paths: - 'weed/s3api/s3_sse_*.go' + - 'weed/s3api/s3api_object_handlers.go' - 'weed/s3api/s3api_object_handlers_put.go' - 'weed/s3api/s3api_object_handlers_copy*.go' - 'weed/server/filer_server_handlers_*.go' @@ -14,6 +15,7 @@ on: branches: [ master, main ] paths: - 'weed/s3api/s3_sse_*.go' + - 'weed/s3api/s3api_object_handlers.go' - 'weed/s3api/s3api_object_handlers_put.go' - 'weed/s3api/s3api_object_handlers_copy*.go' - 'weed/server/filer_server_handlers_*.go' @@ -68,11 +70,11 @@ jobs: # Run tests with automatic server management # The test-with-server target handles server startup/shutdown automatically if [ "${{ matrix.test-type }}" = "quick" ]; then - # Quick tests - basic SSE-C and SSE-KMS functionality - make test-with-server TEST_PATTERN="TestSSECIntegrationBasic|TestSSEKMSIntegrationBasic|TestSimpleSSECIntegration" + # Quick tests - basic SSE-C and SSE-KMS functionality + Range requests + make test-with-server TEST_PATTERN="TestSSECIntegrationBasic|TestSSEKMSIntegrationBasic|TestSimpleSSECIntegration|.*RangeRequestsServerBehavior" else # Comprehensive tests - SSE-C/KMS functionality, excluding copy operations (pre-existing SSE-C issues) - make test-with-server TEST_PATTERN="TestSSECIntegrationBasic|TestSSECIntegrationVariousDataSizes|TestSSEKMSIntegrationBasic|TestSSEKMSIntegrationVariousDataSizes|.*Multipart.*Integration|TestSimpleSSECIntegration" + make test-with-server TEST_PATTERN="TestSSECIntegrationBasic|TestSSECIntegrationVariousDataSizes|TestSSEKMSIntegrationBasic|TestSSEKMSIntegrationVariousDataSizes|.*Multipart.*Integration|TestSimpleSSECIntegration|.*RangeRequestsServerBehavior" fi - name: Show server logs on failure @@ -127,8 +129,8 @@ jobs: uname -a free -h - # Run the specific tests that validate AWS S3 SSE compatibility - both SSE-C and SSE-KMS basic functionality - make test-with-server TEST_PATTERN="TestSSECIntegrationBasic|TestSSEKMSIntegrationBasic" || { + # Run the specific tests that validate AWS S3 SSE compatibility - both SSE-C and SSE-KMS basic functionality plus Range requests + make test-with-server TEST_PATTERN="TestSSECIntegrationBasic|TestSSEKMSIntegrationBasic|.*RangeRequestsServerBehavior" || { echo "❌ SSE compatibility test failed, checking logs..." if [ -f weed-test.log ]; then echo "=== Server logs ===" diff --git a/.github/workflows/s3tests.yml b/.github/workflows/s3tests.yml index 11327c109..c3c6c00d7 100644 --- a/.github/workflows/s3tests.yml +++ b/.github/workflows/s3tests.yml @@ -59,7 +59,7 @@ jobs: # Create clean data directory for this test run export WEED_DATA_DIR="/tmp/seaweedfs-s3tests-$(date +%s)" mkdir -p "$WEED_DATA_DIR" - weed -v 0 server -filer -filer.maxMB=64 -s3 -ip.bind 0.0.0.0 \ + weed -v 3 server -filer -filer.maxMB=64 -s3 -ip.bind 0.0.0.0 \ -dir="$WEED_DATA_DIR" \ -master.raftHashicorp -master.electionTimeout 1s -master.volumeSizeLimitMB=100 \ -volume.max=100 -volume.preStopSeconds=1 \ diff --git a/.github/workflows/test-s3-over-https-using-awscli.yml b/.github/workflows/test-s3-over-https-using-awscli.yml index fd0f8eb4f..9a26f4d82 100644 --- a/.github/workflows/test-s3-over-https-using-awscli.yml +++ b/.github/workflows/test-s3-over-https-using-awscli.yml @@ -83,6 +83,29 @@ jobs: set -e dd if=/dev/urandom of=generated bs=1M count=32 ETAG=$(aws --no-verify-ssl s3api put-object --bucket bucket --key test-get-obj --body generated | jq -r .ETag) - aws --no-verify-ssl s3api get-object --bucket bucket --key test-get-obj --if-match ${ETAG:1:32} downloaded + # jq -r already removes quotes, so use ETAG directly (handles both simple and multipart ETags) + aws --no-verify-ssl s3api get-object --bucket bucket --key test-get-obj --if-match "$ETAG" downloaded diff -q generated downloaded rm -f generated downloaded + + - name: Show server logs on failure + if: failure() + run: | + echo "=========================================" + echo "SeaweedFS Server Logs" + echo "=========================================" + # Note: weed.log is relative to working-directory (weed/) + if [ -f weed.log ]; then + cat weed.log + else + echo "No weed.log file found" + fi + + - name: Upload server logs on failure + if: failure() + uses: actions/upload-artifact@v5 + with: + name: seaweedfs-logs + # Note: actions don't use defaults.run.working-directory, so path is relative to workspace root + path: weed/weed.log + retention-days: 3 diff --git a/test/s3/parquet/.gitignore b/test/s3/parquet/.gitignore new file mode 100644 index 000000000..75800e63c --- /dev/null +++ b/test/s3/parquet/.gitignore @@ -0,0 +1,40 @@ +# Python virtual environment +venv/ +.venv/ +env/ +ENV/ + +# Python cache +__pycache__/ +*.py[cod] +*$py.class +*.so +.Python + +# Test artifacts +*.log +test_run.log +weed-test.log + +# SeaweedFS data directories +filerldb2/ +idx/ +dat/ +*.idx +*.dat + +# Temporary test files +.pytest_cache/ +.coverage +htmlcov/ + +# IDE +.vscode/ +.idea/ +*.swp +*.swo +*~ + +# OS +.DS_Store +Thumbs.db diff --git a/test/s3/parquet/FINAL_ROOT_CAUSE_ANALYSIS.md b/test/s3/parquet/FINAL_ROOT_CAUSE_ANALYSIS.md new file mode 100644 index 000000000..3dff9cb03 --- /dev/null +++ b/test/s3/parquet/FINAL_ROOT_CAUSE_ANALYSIS.md @@ -0,0 +1,58 @@ +# Final Root Cause Analysis + +## Overview + +This document provides a deep technical analysis of the s3fs compatibility issue with PyArrow Parquet datasets on SeaweedFS, and the solution implemented to resolve it. + +## Root Cause + +When PyArrow writes datasets using `write_dataset()`, it creates implicit directory structures by writing files without explicit directory markers. However, some S3 workflows may create 0-byte directory markers. + +### The Problem + +1. **PyArrow writes dataset files** without creating explicit directory objects +2. **s3fs calls HEAD** on the directory path to check if it exists +3. **If HEAD returns 200** with `Content-Length: 0`, s3fs interprets it as a file (not a directory) +4. **PyArrow fails** when trying to read, reporting "Parquet file size is 0 bytes" + +### AWS S3 Behavior + +AWS S3 returns **404 Not Found** for implicit directories (directories that only exist because they have children but no explicit marker object). This allows s3fs to fall back to LIST operations to detect the directory. + +## The Solution + +### Implementation + +Modified the S3 API HEAD handler in `weed/s3api/s3api_object_handlers.go` to: + +1. **Check if object ends with `/`**: Explicit directory markers return 200 as before +2. **Check if object has children**: If a 0-byte object has children in the filer, treat it as an implicit directory +3. **Return 404 for implicit directories**: This matches AWS S3 behavior and triggers s3fs's LIST fallback + +### Code Changes + +The fix is implemented in the `HeadObjectHandler` function with logic to: +- Detect implicit directories by checking for child entries +- Return 404 (NoSuchKey) for implicit directories +- Preserve existing behavior for explicit directory markers and regular files + +## Performance Considerations + +### Optimization: Child Check Cache +- Child existence checks are performed via filer LIST operations +- Results could be cached for frequently accessed paths +- Trade-off between consistency and performance + +### Impact +- Minimal performance impact for normal file operations +- Slight overhead for HEAD requests on implicit directories (one additional LIST call) +- Overall improvement in PyArrow compatibility outweighs minor performance cost + +## TODO + +- [ ] Add detailed benchmarking results comparing before/after fix +- [ ] Document edge cases discovered during implementation +- [ ] Add architectural diagrams showing the request flow +- [ ] Document alternative solutions considered and why they were rejected +- [ ] Add performance profiling data for child existence checks + diff --git a/test/s3/parquet/MINIO_DIRECTORY_HANDLING.md b/test/s3/parquet/MINIO_DIRECTORY_HANDLING.md new file mode 100644 index 000000000..04d80cfcb --- /dev/null +++ b/test/s3/parquet/MINIO_DIRECTORY_HANDLING.md @@ -0,0 +1,70 @@ +# MinIO Directory Handling Comparison + +## Overview + +This document compares how MinIO handles directory markers versus SeaweedFS's implementation, and explains the different approaches to S3 directory semantics. + +## MinIO's Approach + +MinIO handles implicit directories similarly to AWS S3: + +1. **No explicit directory objects**: Directories are implicit, defined only by object key prefixes +2. **HEAD on directory returns 404**: Consistent with AWS S3 behavior +3. **LIST operations reveal directories**: Directories are discovered through delimiter-based LIST operations +4. **Automatic prefix handling**: MinIO automatically recognizes prefixes as directories + +### MinIO Implementation Details + +- Uses in-memory metadata for fast prefix lookups +- Optimized for LIST operations with common delimiter (`/`) +- No persistent directory objects in storage layer +- Directories "exist" as long as they contain objects + +## SeaweedFS Approach + +SeaweedFS uses a filer-based approach with real directory entries: + +### Before the Fix + +1. **Explicit directory objects**: Could create 0-byte objects as directory markers +2. **HEAD returns 200**: Even for implicit directories +3. **Caused s3fs issues**: s3fs interpreted 0-byte HEAD responses as empty files + +### After the Fix + +1. **Hybrid approach**: Supports both explicit markers (with `/` suffix) and implicit directories +2. **HEAD returns 404 for implicit directories**: Matches AWS S3 and MinIO behavior +3. **Filer integration**: Uses filer's directory metadata to detect implicit directories +4. **s3fs compatibility**: Triggers proper LIST fallback behavior + +## Key Differences + +| Aspect | MinIO | SeaweedFS (After Fix) | +|--------|-------|----------------------| +| Directory Storage | No persistent objects | Filer directory entries | +| Implicit Directory HEAD | 404 Not Found | 404 Not Found | +| Explicit Marker HEAD | Not applicable | 200 OK (with `/` suffix) | +| Child Detection | Prefix scan | Filer LIST operation | +| Performance | In-memory lookups | Filer gRPC calls | + +## Implementation Considerations + +### Advantages of SeaweedFS Approach +- Integrates with existing filer metadata +- Supports both implicit and explicit directories +- Preserves directory metadata and attributes +- Compatible with POSIX filer semantics + +### Trade-offs +- Additional filer communication overhead for HEAD requests +- Complexity of supporting both directory paradigms +- Performance depends on filer efficiency + +## TODO + +- [ ] Add performance benchmark comparison: MinIO vs SeaweedFS +- [ ] Document edge cases where behaviors differ +- [ ] Add example request/response traces for both systems +- [ ] Document migration path for users moving from MinIO to SeaweedFS +- [ ] Add compatibility matrix for different S3 clients + diff --git a/test/s3/parquet/Makefile b/test/s3/parquet/Makefile new file mode 100644 index 000000000..dd65b6e9f --- /dev/null +++ b/test/s3/parquet/Makefile @@ -0,0 +1,365 @@ +# Makefile for S3 Parquet Integration Tests +# This Makefile provides targets for running comprehensive S3 Parquet tests with PyArrow + +# Default values +SEAWEEDFS_BINARY ?= weed +S3_PORT ?= 8333 +FILER_PORT ?= 8888 +VOLUME_PORT ?= 8080 +MASTER_PORT ?= 9333 +TEST_TIMEOUT ?= 15m +ACCESS_KEY ?= some_access_key1 +SECRET_KEY ?= some_secret_key1 +VOLUME_MAX_SIZE_MB ?= 50 +VOLUME_MAX_COUNT ?= 100 +BUCKET_NAME ?= test-parquet-bucket + +# Python configuration +PYTHON ?= python3 +VENV_DIR ?= .venv +PYTHON_TEST_SCRIPT ?= s3_parquet_test.py + +# Test directory +TEST_DIR := $(shell pwd) +SEAWEEDFS_ROOT := $(shell cd ../../../ && pwd) + +# Colors for output +RED := \033[0;31m +GREEN := \033[0;32m +YELLOW := \033[1;33m +NC := \033[0m # No Color + +.PHONY: all build-weed check-binary check-python ci-test clean debug-logs debug-status help manual-start manual-stop setup-python start-seaweedfs start-seaweedfs-ci stop-seaweedfs stop-seaweedfs-safe test test-implicit-dir test-implicit-dir-with-server test-quick test-with-server + +all: test + +# Build SeaweedFS binary (GitHub Actions compatible) +build-weed: + @echo "Building SeaweedFS binary..." + @cd $(SEAWEEDFS_ROOT)/weed && go install -buildvcs=false + @echo "✅ SeaweedFS binary built successfully" + +help: + @echo "SeaweedFS S3 Parquet Integration Tests" + @echo "" + @echo "Available targets:" + @echo " test - Run full S3 Parquet integration tests (small and large files)" + @echo " test-with-server - Run full tests with automatic server management (CI compatible)" + @echo " test-quick - Run quick tests with small files only (sets TEST_QUICK=1)" + @echo " test-implicit-dir - Test implicit directory fix for s3fs compatibility" + @echo " test-implicit-dir-with-server - Test implicit directory fix with server management" + @echo " setup-python - Setup Python virtual environment and install dependencies" + @echo " check-python - Check if Python and required packages are available" + @echo " start-seaweedfs - Start SeaweedFS server for testing" + @echo " start-seaweedfs-ci - Start SeaweedFS server (CI-safe version)" + @echo " stop-seaweedfs - Stop SeaweedFS server" + @echo " stop-seaweedfs-safe - Stop SeaweedFS server (CI-safe version)" + @echo " clean - Clean up test artifacts" + @echo " check-binary - Check if SeaweedFS binary exists" + @echo " build-weed - Build SeaweedFS binary" + @echo "" + @echo "Configuration:" + @echo " SEAWEEDFS_BINARY=$(SEAWEEDFS_BINARY)" + @echo " S3_PORT=$(S3_PORT)" + @echo " FILER_PORT=$(FILER_PORT)" + @echo " VOLUME_PORT=$(VOLUME_PORT)" + @echo " MASTER_PORT=$(MASTER_PORT)" + @echo " BUCKET_NAME=$(BUCKET_NAME)" + @echo " VOLUME_MAX_SIZE_MB=$(VOLUME_MAX_SIZE_MB)" + @echo " PYTHON=$(PYTHON)" + +check-binary: + @if ! command -v $(SEAWEEDFS_BINARY) > /dev/null 2>&1; then \ + echo "$(RED)Error: SeaweedFS binary '$(SEAWEEDFS_BINARY)' not found in PATH$(NC)"; \ + echo "Please build SeaweedFS first by running 'make' in the root directory"; \ + exit 1; \ + fi + @echo "$(GREEN)SeaweedFS binary found: $$(which $(SEAWEEDFS_BINARY))$(NC)" + +check-python: + @if ! command -v $(PYTHON) > /dev/null 2>&1; then \ + echo "$(RED)Error: Python '$(PYTHON)' not found$(NC)"; \ + echo "Please install Python 3.8 or later"; \ + exit 1; \ + fi + @echo "$(GREEN)Python found: $$(which $(PYTHON)) ($$($(PYTHON) --version))$(NC)" + +setup-python: check-python + @echo "$(YELLOW)Setting up Python virtual environment...$(NC)" + @if [ ! -d "$(VENV_DIR)" ]; then \ + $(PYTHON) -m venv $(VENV_DIR); \ + echo "$(GREEN)Virtual environment created$(NC)"; \ + fi + @echo "$(YELLOW)Installing Python dependencies...$(NC)" + @$(VENV_DIR)/bin/pip install --upgrade pip > /dev/null + @$(VENV_DIR)/bin/pip install -r requirements.txt + @echo "$(GREEN)Python dependencies installed successfully$(NC)" + +start-seaweedfs-ci: check-binary + @echo "$(YELLOW)Starting SeaweedFS server for Parquet testing...$(NC)" + + # Clean up any existing processes first (CI-safe) + @echo "Cleaning up any existing processes..." + @if command -v lsof >/dev/null 2>&1; then \ + lsof -ti :$(MASTER_PORT) 2>/dev/null | head -5 | while read pid; do kill -TERM $$pid 2>/dev/null || true; done; \ + lsof -ti :$(VOLUME_PORT) 2>/dev/null | head -5 | while read pid; do kill -TERM $$pid 2>/dev/null || true; done; \ + lsof -ti :$(FILER_PORT) 2>/dev/null | head -5 | while read pid; do kill -TERM $$pid 2>/dev/null || true; done; \ + lsof -ti :$(S3_PORT) 2>/dev/null | head -5 | while read pid; do kill -TERM $$pid 2>/dev/null || true; done; \ + lsof -ti :$$(( $(MASTER_PORT) + 10000 )) 2>/dev/null | head -5 | while read pid; do kill -TERM $$pid 2>/dev/null || true; done; \ + lsof -ti :$$(( $(VOLUME_PORT) + 10000 )) 2>/dev/null | head -5 | while read pid; do kill -TERM $$pid 2>/dev/null || true; done; \ + lsof -ti :$$(( $(FILER_PORT) + 10000 )) 2>/dev/null | head -5 | while read pid; do kill -TERM $$pid 2>/dev/null || true; done; \ + fi + @sleep 2 + + # Create necessary directories + @mkdir -p /tmp/seaweedfs-test-parquet-master + @mkdir -p /tmp/seaweedfs-test-parquet-volume + @mkdir -p /tmp/seaweedfs-test-parquet-filer + + # Clean up any old server logs + @rm -f /tmp/seaweedfs-parquet-*.log || true + + # Start master server with volume size limit and explicit gRPC port + @echo "Starting master server..." + @nohup $(SEAWEEDFS_BINARY) master -port=$(MASTER_PORT) -port.grpc=$$(( $(MASTER_PORT) + 10000 )) -mdir=/tmp/seaweedfs-test-parquet-master -volumeSizeLimitMB=$(VOLUME_MAX_SIZE_MB) -ip=127.0.0.1 -peers=none > /tmp/seaweedfs-parquet-master.log 2>&1 & + @sleep 3 + + # Start volume server with master HTTP port and increased capacity + @echo "Starting volume server..." + @nohup $(SEAWEEDFS_BINARY) volume -port=$(VOLUME_PORT) -mserver=127.0.0.1:$(MASTER_PORT) -dir=/tmp/seaweedfs-test-parquet-volume -max=$(VOLUME_MAX_COUNT) -ip=127.0.0.1 -preStopSeconds=1 > /tmp/seaweedfs-parquet-volume.log 2>&1 & + @sleep 5 + + # Start filer server with embedded S3 + @echo "Starting filer server with embedded S3..." + @printf '{"identities":[{"name":"%s","credentials":[{"accessKey":"%s","secretKey":"%s"}],"actions":["Admin","Read","Write"]}]}' "$(ACCESS_KEY)" "$(ACCESS_KEY)" "$(SECRET_KEY)" > /tmp/seaweedfs-parquet-s3.json + @AWS_ACCESS_KEY_ID=$(ACCESS_KEY) AWS_SECRET_ACCESS_KEY=$(SECRET_KEY) nohup $(SEAWEEDFS_BINARY) filer -port=$(FILER_PORT) -port.grpc=$$(( $(FILER_PORT) + 10000 )) -master=127.0.0.1:$(MASTER_PORT) -dataCenter=defaultDataCenter -ip=127.0.0.1 -s3 -s3.port=$(S3_PORT) -s3.config=/tmp/seaweedfs-parquet-s3.json > /tmp/seaweedfs-parquet-filer.log 2>&1 & + @sleep 5 + + # Wait for S3 service to be ready - use port-based checking for reliability + @echo "$(YELLOW)Waiting for S3 service to be ready...$(NC)" + @for i in $$(seq 1 20); do \ + if netstat -an 2>/dev/null | grep -q ":$(S3_PORT).*LISTEN" || \ + ss -an 2>/dev/null | grep -q ":$(S3_PORT).*LISTEN" || \ + lsof -i :$(S3_PORT) >/dev/null 2>&1; then \ + echo "$(GREEN)S3 service is listening on port $(S3_PORT)$(NC)"; \ + sleep 1; \ + break; \ + fi; \ + if [ $$i -eq 20 ]; then \ + echo "$(RED)S3 service failed to start within 20 seconds$(NC)"; \ + echo "=== Detailed Logs ==="; \ + echo "Master log:"; tail -30 /tmp/seaweedfs-parquet-master.log || true; \ + echo "Volume log:"; tail -30 /tmp/seaweedfs-parquet-volume.log || true; \ + echo "Filer log:"; tail -30 /tmp/seaweedfs-parquet-filer.log || true; \ + echo "=== Port Status ==="; \ + netstat -an 2>/dev/null | grep ":$(S3_PORT)" || \ + ss -an 2>/dev/null | grep ":$(S3_PORT)" || \ + echo "No port listening on $(S3_PORT)"; \ + exit 1; \ + fi; \ + echo "Waiting for S3 service... ($$i/20)"; \ + sleep 1; \ + done + + # Additional wait for filer gRPC to be ready + @echo "$(YELLOW)Waiting for filer gRPC to be ready...$(NC)" + @sleep 2 + + # Wait for volume server to register with master and ensure volume assignment works + @echo "$(YELLOW)Waiting for volume assignment to be ready...$(NC)" + @for i in $$(seq 1 30); do \ + ASSIGN_RESULT=$$(curl -s "http://localhost:$(MASTER_PORT)/dir/assign?count=1" 2>/dev/null); \ + if echo "$$ASSIGN_RESULT" | grep -q '"fid"'; then \ + echo "$(GREEN)Volume assignment is ready$(NC)"; \ + break; \ + fi; \ + if [ $$i -eq 30 ]; then \ + echo "$(RED)Volume assignment not ready after 30 seconds$(NC)"; \ + echo "=== Last assign attempt ==="; \ + echo "$$ASSIGN_RESULT"; \ + echo "=== Master Status ==="; \ + curl -s "http://localhost:$(MASTER_PORT)/dir/status" 2>/dev/null || echo "Failed to get master status"; \ + echo "=== Master Logs ==="; \ + tail -50 /tmp/seaweedfs-parquet-master.log 2>/dev/null || echo "No master log"; \ + echo "=== Volume Logs ==="; \ + tail -50 /tmp/seaweedfs-parquet-volume.log 2>/dev/null || echo "No volume log"; \ + exit 1; \ + fi; \ + echo "Waiting for volume assignment... ($$i/30)"; \ + sleep 1; \ + done + + @echo "$(GREEN)SeaweedFS server started successfully for Parquet testing$(NC)" + @echo "Master: http://localhost:$(MASTER_PORT)" + @echo "Volume: http://localhost:$(VOLUME_PORT)" + @echo "Filer: http://localhost:$(FILER_PORT)" + @echo "S3: http://localhost:$(S3_PORT)" + @echo "Volume Max Size: $(VOLUME_MAX_SIZE_MB)MB" + +start-seaweedfs: check-binary + @echo "$(YELLOW)Starting SeaweedFS server for Parquet testing...$(NC)" + @# Use port-based cleanup for consistency and safety + @echo "Cleaning up any existing processes..." + @lsof -ti :$(MASTER_PORT) 2>/dev/null | xargs -r kill -TERM || true + @lsof -ti :$(VOLUME_PORT) 2>/dev/null | xargs -r kill -TERM || true + @lsof -ti :$(FILER_PORT) 2>/dev/null | xargs -r kill -TERM || true + @lsof -ti :$(S3_PORT) 2>/dev/null | xargs -r kill -TERM || true + @# Clean up gRPC ports (HTTP port + 10000) + @lsof -ti :$$(( $(MASTER_PORT) + 10000 )) 2>/dev/null | xargs -r kill -TERM || true + @lsof -ti :$$(( $(VOLUME_PORT) + 10000 )) 2>/dev/null | xargs -r kill -TERM || true + @lsof -ti :$$(( $(FILER_PORT) + 10000 )) 2>/dev/null | xargs -r kill -TERM || true + @sleep 2 + @$(MAKE) start-seaweedfs-ci + +stop-seaweedfs: + @echo "$(YELLOW)Stopping SeaweedFS server...$(NC)" + @# Use port-based cleanup for consistency and safety + @lsof -ti :$(MASTER_PORT) 2>/dev/null | xargs -r kill -TERM || true + @lsof -ti :$(VOLUME_PORT) 2>/dev/null | xargs -r kill -TERM || true + @lsof -ti :$(FILER_PORT) 2>/dev/null | xargs -r kill -TERM || true + @lsof -ti :$(S3_PORT) 2>/dev/null | xargs -r kill -TERM || true + @# Clean up gRPC ports (HTTP port + 10000) + @lsof -ti :$$(( $(MASTER_PORT) + 10000 )) 2>/dev/null | xargs -r kill -TERM || true + @lsof -ti :$$(( $(VOLUME_PORT) + 10000 )) 2>/dev/null | xargs -r kill -TERM || true + @lsof -ti :$$(( $(FILER_PORT) + 10000 )) 2>/dev/null | xargs -r kill -TERM || true + @sleep 2 + @echo "$(GREEN)SeaweedFS server stopped$(NC)" + +# CI-safe server stop that's more conservative +stop-seaweedfs-safe: + @echo "$(YELLOW)Safely stopping SeaweedFS server...$(NC)" + @# Use port-based cleanup which is safer in CI + @if command -v lsof >/dev/null 2>&1; then \ + echo "Using lsof for port-based cleanup..."; \ + lsof -ti :$(MASTER_PORT) 2>/dev/null | head -5 | while read pid; do kill -TERM $$pid 2>/dev/null || true; done; \ + lsof -ti :$(VOLUME_PORT) 2>/dev/null | head -5 | while read pid; do kill -TERM $$pid 2>/dev/null || true; done; \ + lsof -ti :$(FILER_PORT) 2>/dev/null | head -5 | while read pid; do kill -TERM $$pid 2>/dev/null || true; done; \ + lsof -ti :$(S3_PORT) 2>/dev/null | head -5 | while read pid; do kill -TERM $$pid 2>/dev/null || true; done; \ + lsof -ti :$$(( $(MASTER_PORT) + 10000 )) 2>/dev/null | head -5 | while read pid; do kill -TERM $$pid 2>/dev/null || true; done; \ + lsof -ti :$$(( $(VOLUME_PORT) + 10000 )) 2>/dev/null | head -5 | while read pid; do kill -TERM $$pid 2>/dev/null || true; done; \ + lsof -ti :$$(( $(FILER_PORT) + 10000 )) 2>/dev/null | head -5 | while read pid; do kill -TERM $$pid 2>/dev/null || true; done; \ + else \ + echo "lsof not available, using netstat approach..."; \ + netstat -tlnp 2>/dev/null | grep :$(MASTER_PORT) | awk '{print $$7}' | cut -d/ -f1 | head -5 | while read pid; do [ "$$pid" != "-" ] && kill -TERM $$pid 2>/dev/null || true; done; \ + netstat -tlnp 2>/dev/null | grep :$(VOLUME_PORT) | awk '{print $$7}' | cut -d/ -f1 | head -5 | while read pid; do [ "$$pid" != "-" ] && kill -TERM $$pid 2>/dev/null || true; done; \ + netstat -tlnp 2>/dev/null | grep :$(FILER_PORT) | awk '{print $$7}' | cut -d/ -f1 | head -5 | while read pid; do [ "$$pid" != "-" ] && kill -TERM $$pid 2>/dev/null || true; done; \ + netstat -tlnp 2>/dev/null | grep :$(S3_PORT) | awk '{print $$7}' | cut -d/ -f1 | head -5 | while read pid; do [ "$$pid" != "-" ] && kill -TERM $$pid 2>/dev/null || true; done; \ + netstat -tlnp 2>/dev/null | grep :$$(( $(MASTER_PORT) + 10000 )) | awk '{print $$7}' | cut -d/ -f1 | head -5 | while read pid; do [ "$$pid" != "-" ] && kill -TERM $$pid 2>/dev/null || true; done; \ + netstat -tlnp 2>/dev/null | grep :$$(( $(VOLUME_PORT) + 10000 )) | awk '{print $$7}' | cut -d/ -f1 | head -5 | while read pid; do [ "$$pid" != "-" ] && kill -TERM $$pid 2>/dev/null || true; done; \ + netstat -tlnp 2>/dev/null | grep :$$(( $(FILER_PORT) + 10000 )) | awk '{print $$7}' | cut -d/ -f1 | head -5 | while read pid; do [ "$$pid" != "-" ] && kill -TERM $$pid 2>/dev/null || true; done; \ + fi + @sleep 2 + @echo "$(GREEN)SeaweedFS server safely stopped$(NC)" + +clean: + @echo "$(YELLOW)Cleaning up Parquet test artifacts...$(NC)" + @rm -rf /tmp/seaweedfs-test-parquet-* + @rm -f /tmp/seaweedfs-parquet-*.log + @rm -f /tmp/seaweedfs-parquet-s3.json + @rm -f s3_parquet_test_errors_*.log + @rm -rf $(VENV_DIR) + @echo "$(GREEN)Parquet test cleanup completed$(NC)" + +# Test with automatic server management (GitHub Actions compatible) +test-with-server: build-weed setup-python + @echo "🚀 Starting Parquet integration tests with automated server management..." + @echo "Starting SeaweedFS cluster..." + @if $(MAKE) start-seaweedfs-ci > weed-test.log 2>&1; then \ + echo "✅ SeaweedFS cluster started successfully"; \ + echo "Running Parquet integration tests..."; \ + trap '$(MAKE) -C $(TEST_DIR) stop-seaweedfs-safe || true' EXIT; \ + S3_ENDPOINT_URL=http://localhost:$(S3_PORT) \ + S3_ACCESS_KEY=$(ACCESS_KEY) \ + S3_SECRET_KEY=$(SECRET_KEY) \ + BUCKET_NAME=$(BUCKET_NAME) \ + $(VENV_DIR)/bin/$(PYTHON) $(PYTHON_TEST_SCRIPT) || exit 1; \ + echo "✅ All tests completed successfully"; \ + $(MAKE) -C $(TEST_DIR) stop-seaweedfs-safe || true; \ + else \ + echo "❌ Failed to start SeaweedFS cluster"; \ + echo "=== Server startup logs ==="; \ + tail -100 weed-test.log 2>/dev/null || echo "No startup log available"; \ + echo "=== System information ==="; \ + ps aux | grep -E "weed|make" | grep -v grep || echo "No relevant processes found"; \ + exit 1; \ + fi + +# Run tests assuming SeaweedFS is already running +test: setup-python + @echo "$(YELLOW)Running Parquet integration tests...$(NC)" + @echo "$(YELLOW)Assuming SeaweedFS is already running on localhost:$(S3_PORT)$(NC)" + @S3_ENDPOINT_URL=http://localhost:$(S3_PORT) \ + S3_ACCESS_KEY=$(ACCESS_KEY) \ + S3_SECRET_KEY=$(SECRET_KEY) \ + BUCKET_NAME=$(BUCKET_NAME) \ + $(VENV_DIR)/bin/$(PYTHON) $(PYTHON_TEST_SCRIPT) + +# Run quick tests with small files only +test-quick: setup-python + @echo "$(YELLOW)Running quick Parquet tests (small files only)...$(NC)" + @echo "$(YELLOW)Assuming SeaweedFS is already running on localhost:$(S3_PORT)$(NC)" + @S3_ENDPOINT_URL=http://localhost:$(S3_PORT) \ + S3_ACCESS_KEY=$(ACCESS_KEY) \ + S3_SECRET_KEY=$(SECRET_KEY) \ + BUCKET_NAME=$(BUCKET_NAME) \ + TEST_QUICK=1 \ + $(VENV_DIR)/bin/$(PYTHON) $(PYTHON_TEST_SCRIPT) + +# Test implicit directory fix for s3fs compatibility +test-implicit-dir: setup-python + @echo "$(YELLOW)Running implicit directory fix tests...$(NC)" + @echo "$(YELLOW)Assuming SeaweedFS is already running on localhost:$(S3_PORT)$(NC)" + @S3_ENDPOINT_URL=http://localhost:$(S3_PORT) \ + S3_ACCESS_KEY=$(ACCESS_KEY) \ + S3_SECRET_KEY=$(SECRET_KEY) \ + BUCKET_NAME=test-implicit-dir \ + $(VENV_DIR)/bin/$(PYTHON) test_implicit_directory_fix.py + +# Test implicit directory fix with automatic server management +test-implicit-dir-with-server: build-weed setup-python + @echo "🚀 Starting implicit directory fix tests with automated server management..." + @echo "Starting SeaweedFS cluster..." + @if $(MAKE) start-seaweedfs-ci > weed-test.log 2>&1; then \ + echo "✅ SeaweedFS cluster started successfully"; \ + echo "Running implicit directory fix tests..."; \ + trap '$(MAKE) -C $(TEST_DIR) stop-seaweedfs-safe || true' EXIT; \ + S3_ENDPOINT_URL=http://localhost:$(S3_PORT) \ + S3_ACCESS_KEY=$(ACCESS_KEY) \ + S3_SECRET_KEY=$(SECRET_KEY) \ + BUCKET_NAME=test-implicit-dir \ + $(VENV_DIR)/bin/$(PYTHON) test_implicit_directory_fix.py || exit 1; \ + echo "✅ All tests completed successfully"; \ + $(MAKE) -C $(TEST_DIR) stop-seaweedfs-safe || true; \ + else \ + echo "❌ Failed to start SeaweedFS cluster"; \ + echo "=== Server startup logs ==="; \ + tail -100 weed-test.log 2>/dev/null || echo "No startup log available"; \ + exit 1; \ + fi + +# Debug targets +debug-logs: + @echo "$(YELLOW)=== Master Log ===$(NC)" + @tail -n 50 /tmp/seaweedfs-parquet-master.log || echo "No master log found" + @echo "$(YELLOW)=== Volume Log ===$(NC)" + @tail -n 50 /tmp/seaweedfs-parquet-volume.log || echo "No volume log found" + @echo "$(YELLOW)=== Filer Log ===$(NC)" + @tail -n 50 /tmp/seaweedfs-parquet-filer.log || echo "No filer log found" + +debug-status: + @echo "$(YELLOW)=== Process Status ===$(NC)" + @ps aux | grep -E "(weed|seaweedfs)" | grep -v grep || echo "No SeaweedFS processes found" + @echo "$(YELLOW)=== Port Status ===$(NC)" + @netstat -an | grep -E "($(MASTER_PORT)|$(VOLUME_PORT)|$(FILER_PORT)|$(S3_PORT))" || echo "No ports in use" + +# Manual test targets for development +manual-start: start-seaweedfs + @echo "$(GREEN)SeaweedFS with S3 is now running for manual testing$(NC)" + @echo "You can now run Parquet tests manually" + @echo "Run 'make manual-stop' when finished" + +manual-stop: stop-seaweedfs clean + +# CI/CD targets +ci-test: test-with-server + diff --git a/test/s3/parquet/README.md b/test/s3/parquet/README.md new file mode 100644 index 000000000..48ce3e6fc --- /dev/null +++ b/test/s3/parquet/README.md @@ -0,0 +1,206 @@ +# PyArrow Parquet S3 Compatibility Tests + +This directory contains tests for PyArrow Parquet compatibility with SeaweedFS S3 API, including the implicit directory detection fix. + +## Overview + +**Status**: ✅ **All PyArrow methods work correctly with SeaweedFS** + +SeaweedFS implements implicit directory detection to improve compatibility with s3fs and PyArrow. When PyArrow writes datasets using `write_dataset()`, it may create directory markers that can confuse s3fs. SeaweedFS now handles these correctly by returning 404 for HEAD requests on implicit directories (directories with children), forcing s3fs to use LIST-based discovery. + +## Quick Start + +### Running Tests + +```bash +# Setup Python environment +make setup-python + +# Run all tests with server (small and large files) +make test-with-server + +# Run quick tests with small files only (faster for development) +make test-quick + +# Run implicit directory fix tests +make test-implicit-dir-with-server + +# Clean up +make clean +``` + +### Using PyArrow with SeaweedFS + +```python +import pyarrow as pa +import pyarrow.parquet as pq +import pyarrow.dataset as pads +import s3fs + +# Configure s3fs +fs = s3fs.S3FileSystem( + key='your_access_key', + secret='your_secret_key', + endpoint_url='http://localhost:8333', + use_ssl=False +) + +# Write dataset (creates directory structure) +table = pa.table({'id': [1, 2, 3], 'value': ['a', 'b', 'c']}) +pads.write_dataset(table, 'bucket/dataset', filesystem=fs) + +# Read dataset (all methods work!) +dataset = pads.dataset('bucket/dataset', filesystem=fs) # ✅ +table = pq.read_table('bucket/dataset', filesystem=fs) # ✅ +dataset = pq.ParquetDataset('bucket/dataset', filesystem=fs) # ✅ +``` + +## Test Files + +### Main Test Suite +- **`s3_parquet_test.py`** - Comprehensive PyArrow test suite + - Tests 2 write methods × 5 read methods × 2 dataset sizes = 20 combinations + - All tests pass with the implicit directory fix ✅ + +### Implicit Directory Tests +- **`test_implicit_directory_fix.py`** - Specific tests for the implicit directory fix + - Tests HEAD request behavior + - Tests s3fs directory detection + - Tests PyArrow dataset reading + - All 6 tests pass ✅ + +### Configuration +- **`Makefile`** - Build and test automation +- **`requirements.txt`** - Python dependencies (pyarrow, s3fs, boto3) +- **`.gitignore`** - Ignore patterns for test artifacts + +## Documentation + +### Technical Documentation +- **`TEST_COVERAGE.md`** - Comprehensive test coverage documentation + - Unit tests (Go): 17 test cases + - Integration tests (Python): 6 test cases + - End-to-end tests (Python): 20 test cases + +- **`FINAL_ROOT_CAUSE_ANALYSIS.md`** - Deep technical analysis + - Root cause of the s3fs compatibility issue + - How the implicit directory fix works + - Performance considerations + +- **`MINIO_DIRECTORY_HANDLING.md`** - Comparison with MinIO + - How MinIO handles directory markers + - Differences in implementation approaches + +## The Implicit Directory Fix + +### Problem +When PyArrow writes datasets with `write_dataset()`, it may create 0-byte directory markers. s3fs's `info()` method calls HEAD on these paths, and if HEAD returns 200 with size=0, s3fs incorrectly reports them as files instead of directories. This causes PyArrow to fail with "Parquet file size is 0 bytes". + +### Solution +SeaweedFS now returns 404 for HEAD requests on implicit directories (0-byte objects or directories with children, when requested without a trailing slash). This forces s3fs to fall back to LIST-based discovery, which correctly identifies directories by checking for children. + +### Implementation +The fix is implemented in `weed/s3api/s3api_object_handlers.go`: +- `HeadObjectHandler` - Returns 404 for implicit directories +- `hasChildren` - Helper function to check if a path has children + +See the source code for detailed inline documentation. + +### Test Coverage +- **Unit tests** (Go): `weed/s3api/s3api_implicit_directory_test.go` + - Run: `cd weed/s3api && go test -v -run TestImplicitDirectory` + +- **Integration tests** (Python): `test_implicit_directory_fix.py` + - Run: `cd test/s3/parquet && make test-implicit-dir-with-server` + +- **End-to-end tests** (Python): `s3_parquet_test.py` + - Run: `cd test/s3/parquet && make test-with-server` + +## Makefile Targets + +```bash +# Setup +make setup-python # Create Python virtual environment and install dependencies +make build-weed # Build SeaweedFS binary + +# Testing +make test # Run full tests (assumes server is already running) +make test-with-server # Run full PyArrow test suite with server (small + large files) +make test-quick # Run quick tests with small files only (assumes server is running) +make test-implicit-dir-with-server # Run implicit directory tests with server + +# Server Management +make start-seaweedfs-ci # Start SeaweedFS in background (CI mode) +make stop-seaweedfs-safe # Stop SeaweedFS gracefully +make clean # Clean up all test artifacts + +# Development +make help # Show all available targets +``` + +## Continuous Integration + +The tests are automatically run in GitHub Actions on every push/PR that affects S3 or filer code: + +**Workflow**: `.github/workflows/s3-parquet-tests.yml` + +**Test Matrix**: +- Python versions: 3.9, 3.11, 3.12 +- PyArrow integration tests: 20 test combinations +- Implicit directory fix tests: 6 test scenarios +- Go unit tests: 17 test cases + +**Triggers**: +- Push/PR to master (when `weed/s3api/**` or `weed/filer/**` changes) +- Manual trigger via GitHub UI (workflow_dispatch) + +## Requirements + +- Python 3.8+ +- PyArrow 22.0.0+ +- s3fs 2024.12.0+ +- boto3 1.40.0+ +- SeaweedFS (latest) + +## AWS S3 Compatibility + +The implicit directory fix makes SeaweedFS behavior more compatible with AWS S3: +- AWS S3 typically doesn't create directory markers for implicit directories +- HEAD on "dataset" (when only "dataset/file.txt" exists) returns 404 on AWS +- SeaweedFS now matches this behavior for implicit directories with children + +## Edge Cases Handled + +✅ **Implicit directories with children** → 404 (forces LIST-based discovery) +✅ **Empty files (0-byte, no children)** → 200 (legitimate empty file) +✅ **Empty directories (no children)** → 200 (legitimate empty directory) +✅ **Explicit directory requests (trailing slash)** → 200 (normal directory behavior) +✅ **Versioned buckets** → Skip implicit directory check (versioned semantics) +✅ **Regular files** → 200 (normal file behavior) + +## Performance + +The implicit directory check adds minimal overhead: +- Only triggered for 0-byte objects or directories without trailing slash +- Cost: One LIST operation with Limit=1 (~1-5ms) +- No impact on regular file operations + +## Contributing + +When adding new tests: +1. Add test cases to the appropriate test file +2. Update TEST_COVERAGE.md +3. Run the full test suite to ensure no regressions +4. Update this README if adding new functionality + +## References + +- [PyArrow Documentation](https://arrow.apache.org/docs/python/parquet.html) +- [s3fs Documentation](https://s3fs.readthedocs.io/) +- [SeaweedFS S3 API](https://github.com/seaweedfs/seaweedfs/wiki/Amazon-S3-API) +- [AWS S3 API Reference](https://docs.aws.amazon.com/AmazonS3/latest/API/) + +--- + +**Last Updated**: November 19, 2025 +**Status**: All tests passing ✅ diff --git a/test/s3/parquet/TEST_COVERAGE.md b/test/s3/parquet/TEST_COVERAGE.md new file mode 100644 index 000000000..f08a93ab9 --- /dev/null +++ b/test/s3/parquet/TEST_COVERAGE.md @@ -0,0 +1,46 @@ +# Test Coverage Documentation + +## Overview + +This document provides comprehensive test coverage documentation for the SeaweedFS S3 Parquet integration tests. + +## Test Categories + +### Unit Tests (Go) +- 17 test cases covering S3 API handlers +- Tests for implicit directory handling +- HEAD request behavior validation +- Located in: `weed/s3api/s3api_implicit_directory_test.go` + +### Integration Tests (Python) +- 6 test cases for implicit directory fix +- Tests HEAD request behavior on directory markers +- s3fs directory detection validation +- PyArrow dataset read compatibility +- Located in: `test_implicit_directory_fix.py` + +### End-to-End Tests (Python) +- 20 test cases combining write and read methods +- Small file tests (5 rows): 10 test combinations +- Large file tests (200,000 rows): 10 test combinations +- Tests multiple write methods: `pads.write_dataset`, `pq.write_table+s3fs` +- Tests multiple read methods: `pads.dataset`, `pq.ParquetDataset`, `pq.read_table`, `s3fs+direct`, `s3fs+buffered` +- Located in: `s3_parquet_test.py` + +## Coverage Summary + +| Test Type | Count | Status | +|-----------|-------|--------| +| Unit Tests (Go) | 17 | ✅ Pass | +| Integration Tests (Python) | 6 | ✅ Pass | +| End-to-End Tests (Python) | 20 | ✅ Pass | +| **Total** | **43** | **✅ All Pass** | + +## TODO + +- [ ] Add detailed test execution time metrics +- [ ] Document test data generation strategies +- [ ] Add code coverage percentages for Go tests +- [ ] Document edge cases and corner cases tested +- [ ] Add performance benchmarking results + diff --git a/test/s3/parquet/requirements.txt b/test/s3/parquet/requirements.txt new file mode 100644 index 000000000..e92a7cd70 --- /dev/null +++ b/test/s3/parquet/requirements.txt @@ -0,0 +1,7 @@ +# Python dependencies for S3 Parquet tests +# Install with: pip install -r requirements.txt + +pyarrow>=10.0.0 +s3fs>=2023.12.0 +boto3>=1.28.0 + diff --git a/test/s3/parquet/s3_parquet_test.py b/test/s3/parquet/s3_parquet_test.py new file mode 100755 index 000000000..35ff0bcde --- /dev/null +++ b/test/s3/parquet/s3_parquet_test.py @@ -0,0 +1,421 @@ +#!/usr/bin/env python3 +""" +Test script for S3-compatible storage with PyArrow Parquet files. + +This script tests different write methods (PyArrow write_dataset vs. pq.write_table to buffer) +combined with different read methods (PyArrow dataset, direct s3fs read, buffered read) to +identify which combinations work with large files that span multiple row groups. + +This test specifically addresses issues with large tables using PyArrow where files span +multiple row-groups (default row_group size is around 130,000 rows). + +Requirements: + - pyarrow>=22 + - s3fs>=2024.12.0 + +Environment Variables: + S3_ENDPOINT_URL: S3 endpoint (default: http://localhost:8333) + S3_ACCESS_KEY: S3 access key (default: some_access_key1) + S3_SECRET_KEY: S3 secret key (default: some_secret_key1) + BUCKET_NAME: S3 bucket name (default: test-parquet-bucket) + TEST_QUICK: Run only small/quick tests (default: 0, set to 1 for quick mode) + +Usage: + # Run with default environment variables + python3 s3_parquet_test.py + + # Run with custom environment variables + S3_ENDPOINT_URL=http://localhost:8333 \ + S3_ACCESS_KEY=mykey \ + S3_SECRET_KEY=mysecret \ + BUCKET_NAME=mybucket \ + python3 s3_parquet_test.py +""" + +import io +import logging +import os +import secrets +import sys +import traceback +from datetime import datetime +from typing import Tuple + +import pyarrow as pa +import pyarrow.dataset as pads +import pyarrow.parquet as pq + +try: + import s3fs +except ImportError: + logging.error("s3fs not installed. Install with: pip install s3fs") + sys.exit(1) + +logging.basicConfig(level=logging.INFO, format="%(message)s") + +# Error log file +ERROR_LOG_FILE = f"s3_parquet_test_errors_{datetime.now().strftime('%Y%m%d_%H%M%S')}.log" + +# Configuration from environment variables with defaults +S3_ENDPOINT_URL = os.environ.get("S3_ENDPOINT_URL", "http://localhost:8333") +S3_ACCESS_KEY = os.environ.get("S3_ACCESS_KEY", "some_access_key1") +S3_SECRET_KEY = os.environ.get("S3_SECRET_KEY", "some_secret_key1") +BUCKET_NAME = os.getenv("BUCKET_NAME", "test-parquet-bucket") +TEST_QUICK = os.getenv("TEST_QUICK", "0") == "1" + +# Create randomized test directory +TEST_RUN_ID = secrets.token_hex(8) +TEST_DIR = f"{BUCKET_NAME}/parquet-tests/{TEST_RUN_ID}" + +# Test file sizes +TEST_SIZES = { + "small": 5, + "large": 200_000, # This will create multiple row groups +} + +# Filter to only small tests if quick mode is enabled +if TEST_QUICK: + TEST_SIZES = {"small": TEST_SIZES["small"]} + logging.info("Quick test mode enabled - running only small tests") + + +def create_sample_table(num_rows: int = 5) -> pa.Table: + """Create a sample PyArrow table for testing.""" + return pa.table({ + "id": pa.array(range(num_rows), type=pa.int64()), + "name": pa.array([f"user_{i}" for i in range(num_rows)], type=pa.string()), + "value": pa.array([float(i) * 1.5 for i in range(num_rows)], type=pa.float64()), + "flag": pa.array([i % 2 == 0 for i in range(num_rows)], type=pa.bool_()), + }) + + +def log_error(operation: str, short_msg: str) -> None: + """Log error details to file with full traceback.""" + with open(ERROR_LOG_FILE, "a") as f: + f.write(f"\n{'='*80}\n") + f.write(f"Operation: {operation}\n") + f.write(f"Time: {datetime.now().isoformat()}\n") + f.write(f"Message: {short_msg}\n") + f.write("Full Traceback:\n") + f.write(traceback.format_exc()) + f.write(f"{'='*80}\n") + + +def init_s3fs() -> s3fs.S3FileSystem: + """Initialize and return S3FileSystem.""" + logging.info("Initializing S3FileSystem...") + logging.info(f" Endpoint: {S3_ENDPOINT_URL}") + logging.info(f" Bucket: {BUCKET_NAME}") + try: + fs = s3fs.S3FileSystem( + client_kwargs={"endpoint_url": S3_ENDPOINT_URL}, + key=S3_ACCESS_KEY, + secret=S3_SECRET_KEY, + use_listings_cache=False, + ) + logging.info("✓ S3FileSystem initialized successfully\n") + return fs + except Exception: + logging.exception("✗ Failed to initialize S3FileSystem") + raise + + +def ensure_bucket_exists(fs: s3fs.S3FileSystem) -> None: + """Ensure the test bucket exists.""" + try: + if not fs.exists(BUCKET_NAME): + logging.info(f"Creating bucket: {BUCKET_NAME}") + fs.mkdir(BUCKET_NAME) + logging.info(f"✓ Bucket created: {BUCKET_NAME}") + else: + logging.info(f"✓ Bucket exists: {BUCKET_NAME}") + except Exception: + logging.exception("✗ Failed to create/check bucket") + raise + + +# Write Methods + +def write_with_pads(table: pa.Table, path: str, fs: s3fs.S3FileSystem) -> Tuple[bool, str]: + """Write using pads.write_dataset with filesystem parameter.""" + try: + pads.write_dataset(table, path, format="parquet", filesystem=fs) + return True, "pads.write_dataset" + except Exception as e: + error_msg = f"pads.write_dataset: {type(e).__name__}" + log_error("write_with_pads", error_msg) + return False, error_msg + + +def write_with_buffer_and_s3fs(table: pa.Table, path: str, fs: s3fs.S3FileSystem) -> Tuple[bool, str]: + """Write using pq.write_table to buffer, then upload via s3fs.""" + try: + buffer = io.BytesIO() + pq.write_table(table, buffer) + buffer.seek(0) + with fs.open(path, "wb") as f: + f.write(buffer.read()) + return True, "pq.write_table+s3fs.open" + except Exception as e: + error_msg = f"pq.write_table+s3fs.open: {type(e).__name__}" + log_error("write_with_buffer_and_s3fs", error_msg) + return False, error_msg + + +# Read Methods + +def get_parquet_files(path: str, fs: s3fs.S3FileSystem) -> list: + """ + Helper to discover all parquet files for a given path. + + Args: + path: S3 path (file or directory) + fs: S3FileSystem instance + + Returns: + List of parquet file paths + + Raises: + ValueError: If no parquet files are found in a directory + """ + if fs.isdir(path): + # Find all parquet files in the directory + files = [f for f in fs.ls(path) if f.endswith('.parquet')] + if not files: + raise ValueError(f"No parquet files found in directory: {path}") + return files + else: + # Single file path + return [path] + + +def read_with_pads_dataset(path: str, fs: s3fs.S3FileSystem) -> Tuple[bool, str, int]: + """Read using pads.dataset - handles both single files and directories.""" + try: + # pads.dataset() should auto-discover parquet files in the directory + dataset = pads.dataset(path, format="parquet", filesystem=fs) + result = dataset.to_table() + return True, "pads.dataset", result.num_rows + except Exception as e: + error_msg = f"pads.dataset: {type(e).__name__}" + log_error("read_with_pads_dataset", error_msg) + return False, error_msg, 0 + + +def read_direct_s3fs(path: str, fs: s3fs.S3FileSystem) -> Tuple[bool, str, int]: + """Read directly via s3fs.open() streaming.""" + try: + # Get all parquet files (handles both single file and directory) + parquet_files = get_parquet_files(path, fs) + + # Read all parquet files and concatenate them + tables = [] + for file_path in parquet_files: + with fs.open(file_path, "rb") as f: + table = pq.read_table(f) + tables.append(table) + + # Concatenate all tables into one + if len(tables) == 1: + result = tables[0] + else: + result = pa.concat_tables(tables) + + return True, "s3fs.open+pq.read_table", result.num_rows + except Exception as e: + error_msg = f"s3fs.open+pq.read_table: {type(e).__name__}" + log_error("read_direct_s3fs", error_msg) + return False, error_msg, 0 + + +def read_buffered_s3fs(path: str, fs: s3fs.S3FileSystem) -> Tuple[bool, str, int]: + """Read via s3fs.open() into buffer, then pq.read_table.""" + try: + # Get all parquet files (handles both single file and directory) + parquet_files = get_parquet_files(path, fs) + + # Read all parquet files and concatenate them + tables = [] + for file_path in parquet_files: + with fs.open(file_path, "rb") as f: + buffer = io.BytesIO(f.read()) + buffer.seek(0) + table = pq.read_table(buffer) + tables.append(table) + + # Concatenate all tables into one + if len(tables) == 1: + result = tables[0] + else: + result = pa.concat_tables(tables) + + return True, "s3fs.open+BytesIO+pq.read_table", result.num_rows + except Exception as e: + error_msg = f"s3fs.open+BytesIO+pq.read_table: {type(e).__name__}" + log_error("read_buffered_s3fs", error_msg) + return False, error_msg, 0 + + +def read_with_parquet_dataset(path: str, fs: s3fs.S3FileSystem) -> Tuple[bool, str, int]: + """Read using pq.ParquetDataset - designed for directories.""" + try: + # ParquetDataset is specifically designed to handle directories + dataset = pq.ParquetDataset(path, filesystem=fs) + result = dataset.read() + return True, "pq.ParquetDataset", result.num_rows + except Exception as e: + error_msg = f"pq.ParquetDataset: {type(e).__name__}" + log_error("read_with_parquet_dataset", error_msg) + return False, error_msg, 0 + + +def read_with_pq_read_table(path: str, fs: s3fs.S3FileSystem) -> Tuple[bool, str, int]: + """Read using pq.read_table with filesystem parameter.""" + try: + # pq.read_table() with filesystem should handle directories + result = pq.read_table(path, filesystem=fs) + return True, "pq.read_table+filesystem", result.num_rows + except Exception as e: + error_msg = f"pq.read_table+filesystem: {type(e).__name__}" + log_error("read_with_pq_read_table", error_msg) + return False, error_msg, 0 + + +def test_combination( + fs: s3fs.S3FileSystem, + test_name: str, + write_func, + read_func, + num_rows: int, +) -> Tuple[bool, str]: + """Test a specific write/read combination.""" + table = create_sample_table(num_rows=num_rows) + path = f"{TEST_DIR}/{test_name}/data.parquet" + + # Write + write_ok, write_msg = write_func(table, path, fs) + if not write_ok: + return False, f"WRITE_FAIL: {write_msg}" + + # Read + read_ok, read_msg, rows_read = read_func(path, fs) + if not read_ok: + return False, f"READ_FAIL: {read_msg}" + + # Verify + if rows_read != num_rows: + return False, f"DATA_MISMATCH: expected {num_rows}, got {rows_read}" + + return True, f"{write_msg} + {read_msg}" + + +def cleanup_test_files(fs: s3fs.S3FileSystem) -> None: + """Clean up test files from S3.""" + try: + if fs.exists(TEST_DIR): + logging.info(f"Cleaning up test directory: {TEST_DIR}") + fs.rm(TEST_DIR, recursive=True) + logging.info("✓ Test directory cleaned up") + except Exception as e: + logging.warning(f"Failed to cleanup test directory: {e}") + + +def main(): + """Run all write/read method combinations.""" + print("=" * 80) + print("Write/Read Method Combination Tests for S3-Compatible Storage") + print("Testing PyArrow Parquet Files with Multiple Row Groups") + if TEST_QUICK: + print("*** QUICK TEST MODE - Small files only ***") + print("=" * 80 + "\n") + + print("Configuration:") + print(f" S3 Endpoint: {S3_ENDPOINT_URL}") + print(f" Bucket: {BUCKET_NAME}") + print(f" Test Directory: {TEST_DIR}") + print(f" Quick Mode: {'Yes (small files only)' if TEST_QUICK else 'No (all file sizes)'}") + print() + + try: + fs = init_s3fs() + ensure_bucket_exists(fs) + except Exception as e: + print(f"Cannot proceed without S3 connection: {e}") + return 1 + + # Define all write methods + write_methods = [ + ("pads", write_with_pads), + ("buffer+s3fs", write_with_buffer_and_s3fs), + ] + + # Define all read methods + read_methods = [ + ("pads.dataset", read_with_pads_dataset), + ("pq.ParquetDataset", read_with_parquet_dataset), + ("pq.read_table", read_with_pq_read_table), + ("s3fs+direct", read_direct_s3fs), + ("s3fs+buffered", read_buffered_s3fs), + ] + + results = [] + + # Test all combinations for each file size + for size_name, num_rows in TEST_SIZES.items(): + print(f"\n{'='*80}") + print(f"Testing with {size_name} files ({num_rows:,} rows)") + print(f"{'='*80}\n") + print(f"{'Write Method':<20} | {'Read Method':<20} | {'Result':<40}") + print("-" * 85) + + for write_name, write_func in write_methods: + for read_name, read_func in read_methods: + test_name = f"{size_name}_{write_name}_{read_name}" + success, message = test_combination( + fs, test_name, write_func, read_func, num_rows + ) + results.append((test_name, success, message)) + status = "✓ PASS" if success else "✗ FAIL" + print(f"{write_name:<20} | {read_name:<20} | {status}: {message[:35]}") + + # Summary + print("\n" + "=" * 80) + print("SUMMARY") + print("=" * 80) + passed = sum(1 for _, success, _ in results if success) + total = len(results) + print(f"\nTotal: {passed}/{total} passed\n") + + # Group results by file size + for size_name in TEST_SIZES.keys(): + size_results = [r for r in results if size_name in r[0]] + size_passed = sum(1 for _, success, _ in size_results if success) + print(f"{size_name.upper()}: {size_passed}/{len(size_results)} passed") + + print("\n" + "=" * 80) + if passed == total: + print("✓ ALL TESTS PASSED!") + else: + print(f"✗ {total - passed} test(s) failed") + print("\nFailing combinations:") + for name, success, message in results: + if not success: + parts = name.split("_") + size = parts[0] + write = parts[1] + read = "_".join(parts[2:]) + print(f" - {size:6} | {write:15} | {read:20} -> {message[:50]}") + + print("=" * 80 + "\n") + print(f"Error details logged to: {ERROR_LOG_FILE}") + print("=" * 80 + "\n") + + # Cleanup + cleanup_test_files(fs) + + return 0 if passed == total else 1 + + +if __name__ == "__main__": + sys.exit(main()) + diff --git a/test/s3/parquet/test_implicit_directory_fix.py b/test/s3/parquet/test_implicit_directory_fix.py new file mode 100755 index 000000000..9ac8f0346 --- /dev/null +++ b/test/s3/parquet/test_implicit_directory_fix.py @@ -0,0 +1,307 @@ +#!/usr/bin/env python3 +""" +Test script to verify the implicit directory fix for s3fs compatibility. + +This test verifies that: +1. Implicit directory markers (0-byte objects with children) return 404 on HEAD +2. s3fs correctly identifies them as directories via LIST fallback +3. PyArrow can read datasets created with write_dataset() + +The fix makes SeaweedFS behave like AWS S3 and improves s3fs compatibility. +""" + +import io +import logging +import os +import sys +import traceback + +import pyarrow as pa +import pyarrow.dataset as pads +import pyarrow.parquet as pq +import s3fs +import boto3 +from botocore.exceptions import ClientError + +# Configure logging +logging.basicConfig( + level=logging.INFO, + format='%(asctime)s - %(levelname)s - %(message)s' +) +logger = logging.getLogger(__name__) + +# Configuration +S3_ENDPOINT_URL = os.environ.get("S3_ENDPOINT_URL", "http://localhost:8333") +S3_ACCESS_KEY = os.environ.get("S3_ACCESS_KEY", "some_access_key1") +S3_SECRET_KEY = os.environ.get("S3_SECRET_KEY", "some_secret_key1") +BUCKET_NAME = os.getenv("BUCKET_NAME", "test-implicit-dir") + +def create_sample_table(num_rows: int = 1000) -> pa.Table: + """Create a sample PyArrow table.""" + return pa.table({ + 'id': pa.array(range(num_rows), type=pa.int64()), + 'value': pa.array([f'value_{i}' for i in range(num_rows)], type=pa.string()), + 'score': pa.array([float(i) * 1.5 for i in range(num_rows)], type=pa.float64()), + }) + +def setup_s3(): + """Set up S3 clients.""" + # s3fs client + fs = s3fs.S3FileSystem( + key=S3_ACCESS_KEY, + secret=S3_SECRET_KEY, + client_kwargs={'endpoint_url': S3_ENDPOINT_URL}, + use_ssl=False + ) + + # boto3 client for raw S3 operations + s3_client = boto3.client( + 's3', + endpoint_url=S3_ENDPOINT_URL, + aws_access_key_id=S3_ACCESS_KEY, + aws_secret_access_key=S3_SECRET_KEY, + use_ssl=False + ) + + return fs, s3_client + +def test_implicit_directory_head_behavior(fs, s3_client): + """Test that HEAD on implicit directory markers returns 404.""" + logger.info("\n" + "="*80) + logger.info("TEST 1: Implicit Directory HEAD Behavior") + logger.info("="*80) + + test_path = f"{BUCKET_NAME}/test_implicit_dir" + + # Clean up any existing data + try: + fs.rm(test_path, recursive=True) + except: + pass + + # Create a dataset using PyArrow (creates implicit directory) + logger.info(f"Creating dataset at: {test_path}") + table = create_sample_table(1000) + pads.write_dataset(table, test_path, filesystem=fs, format='parquet') + + # List what was created + logger.info("\nFiles created:") + files = fs.ls(test_path, detail=True) + for f in files: + logger.info(f" {f['name']} - size: {f['size']} bytes, type: {f['type']}") + + # Test HEAD request on the directory marker (without trailing slash) + logger.info(f"\nTesting HEAD on: {test_path}") + try: + response = s3_client.head_object(Bucket=BUCKET_NAME, Key='test_implicit_dir') + logger.info(f" HEAD response: {response['ResponseMetadata']['HTTPStatusCode']}") + logger.info(f" Content-Length: {response.get('ContentLength', 'N/A')}") + logger.info(f" Content-Type: {response.get('ContentType', 'N/A')}") + logger.warning(" ⚠️ Expected 404, but got 200 - fix may not be working") + return False + except ClientError as e: + if e.response['Error']['Code'] == '404': + logger.info(" ✓ HEAD returned 404 (expected - implicit directory)") + return True + else: + logger.error(f" ✗ Unexpected error: {e}") + return False + +def test_s3fs_directory_detection(fs): + """Test that s3fs correctly detects the directory.""" + logger.info("\n" + "="*80) + logger.info("TEST 2: s3fs Directory Detection") + logger.info("="*80) + + test_path = f"{BUCKET_NAME}/test_implicit_dir" + + # Test s3fs.info() + logger.info(f"\nTesting s3fs.info('{test_path}'):") + try: + info = fs.info(test_path) + logger.info(f" Type: {info.get('type', 'N/A')}") + logger.info(f" Size: {info.get('size', 'N/A')}") + + if info.get('type') == 'directory': + logger.info(" ✓ s3fs correctly identified as directory") + return True + else: + logger.warning(f" ⚠️ s3fs identified as: {info.get('type')}") + return False + except Exception as e: + logger.error(f" ✗ Error: {e}") + return False + +def test_s3fs_isdir(fs): + """Test that s3fs.isdir() works correctly.""" + logger.info("\n" + "="*80) + logger.info("TEST 3: s3fs.isdir() Method") + logger.info("="*80) + + test_path = f"{BUCKET_NAME}/test_implicit_dir" + + logger.info(f"\nTesting s3fs.isdir('{test_path}'):") + try: + is_dir = fs.isdir(test_path) + logger.info(f" Result: {is_dir}") + + if is_dir: + logger.info(" ✓ s3fs.isdir() correctly returned True") + return True + else: + logger.warning(" ⚠️ s3fs.isdir() returned False") + return False + except Exception as e: + logger.error(f" ✗ Error: {e}") + return False + +def test_pyarrow_dataset_read(fs): + """Test that PyArrow can read the dataset.""" + logger.info("\n" + "="*80) + logger.info("TEST 4: PyArrow Dataset Read") + logger.info("="*80) + + test_path = f"{BUCKET_NAME}/test_implicit_dir" + + logger.info(f"\nReading dataset from: {test_path}") + try: + ds = pads.dataset(test_path, filesystem=fs, format='parquet') + table = ds.to_table() + logger.info(f" ✓ Successfully read {len(table)} rows") + logger.info(f" Columns: {table.column_names}") + return True + except Exception as e: + logger.error(f" ✗ Failed to read dataset: {e}") + traceback.print_exc() + return False + +def test_explicit_directory_marker(fs, s3_client): + """Test that explicit directory markers (with trailing slash) still work.""" + logger.info("\n" + "="*80) + logger.info("TEST 5: Explicit Directory Marker (with trailing slash)") + logger.info("="*80) + + # Create an explicit directory marker + logger.info(f"\nCreating explicit directory: {BUCKET_NAME}/explicit_dir/") + try: + s3_client.put_object( + Bucket=BUCKET_NAME, + Key='explicit_dir/', + Body=b'', + ContentType='httpd/unix-directory' + ) + logger.info(" ✓ Created explicit directory marker") + except Exception as e: + logger.error(f" ✗ Failed to create: {e}") + return False + + # Test HEAD with trailing slash + logger.info(f"\nTesting HEAD on: {BUCKET_NAME}/explicit_dir/") + try: + response = s3_client.head_object(Bucket=BUCKET_NAME, Key='explicit_dir/') + logger.info(f" ✓ HEAD returned 200 (expected for explicit directory)") + logger.info(f" Content-Type: {response.get('ContentType', 'N/A')}") + return True + except ClientError as e: + logger.error(f" ✗ HEAD failed: {e}") + return False + +def test_empty_file_not_directory(fs, s3_client): + """Test that legitimate empty files are not treated as directories.""" + logger.info("\n" + "="*80) + logger.info("TEST 6: Empty File (not a directory)") + logger.info("="*80) + + # Create an empty file with text/plain mime type + logger.info(f"\nCreating empty file: {BUCKET_NAME}/empty.txt") + try: + s3_client.put_object( + Bucket=BUCKET_NAME, + Key='empty.txt', + Body=b'', + ContentType='text/plain' + ) + logger.info(" ✓ Created empty file") + except Exception as e: + logger.error(f" ✗ Failed to create: {e}") + return False + + # Test HEAD + logger.info(f"\nTesting HEAD on: {BUCKET_NAME}/empty.txt") + try: + response = s3_client.head_object(Bucket=BUCKET_NAME, Key='empty.txt') + logger.info(f" ✓ HEAD returned 200 (expected for empty file)") + logger.info(f" Content-Type: {response.get('ContentType', 'N/A')}") + + # Verify s3fs doesn't think it's a directory + info = fs.info(f"{BUCKET_NAME}/empty.txt") + if info.get('type') == 'file': + logger.info(" ✓ s3fs correctly identified as file") + return True + else: + logger.warning(f" ⚠️ s3fs identified as: {info.get('type')}") + return False + except Exception as e: + logger.error(f" ✗ Error: {e}") + return False + +def main(): + """Run all tests.""" + logger.info("="*80) + logger.info("Implicit Directory Fix Test Suite") + logger.info("="*80) + logger.info(f"Endpoint: {S3_ENDPOINT_URL}") + logger.info(f"Bucket: {BUCKET_NAME}") + logger.info("="*80) + + # Set up S3 clients + fs, s3_client = setup_s3() + + # Create bucket if it doesn't exist + try: + s3_client.create_bucket(Bucket=BUCKET_NAME) + logger.info(f"\n✓ Created bucket: {BUCKET_NAME}") + except ClientError as e: + error_code = e.response['Error']['Code'] + if error_code in ['BucketAlreadyOwnedByYou', 'BucketAlreadyExists']: + logger.info(f"\n✓ Bucket already exists: {BUCKET_NAME}") + else: + logger.error(f"\n✗ Failed to create bucket: {e}") + return 1 + + # Run tests + results = [] + + results.append(("Implicit Directory HEAD", test_implicit_directory_head_behavior(fs, s3_client))) + results.append(("s3fs Directory Detection", test_s3fs_directory_detection(fs))) + results.append(("s3fs.isdir() Method", test_s3fs_isdir(fs))) + results.append(("PyArrow Dataset Read", test_pyarrow_dataset_read(fs))) + results.append(("Explicit Directory Marker", test_explicit_directory_marker(fs, s3_client))) + results.append(("Empty File Not Directory", test_empty_file_not_directory(fs, s3_client))) + + # Print summary + logger.info("\n" + "="*80) + logger.info("TEST SUMMARY") + logger.info("="*80) + + passed = sum(1 for _, result in results if result) + total = len(results) + + for name, result in results: + status = "✓ PASS" if result else "✗ FAIL" + logger.info(f"{status}: {name}") + + logger.info("="*80) + logger.info(f"Results: {passed}/{total} tests passed") + logger.info("="*80) + + if passed == total: + logger.info("\n🎉 All tests passed! The implicit directory fix is working correctly.") + return 0 + else: + logger.warning(f"\n⚠️ {total - passed} test(s) failed. The fix may not be fully working.") + return 1 + +if __name__ == "__main__": + sys.exit(main()) + diff --git a/test/s3/sse/s3_range_headers_test.go b/test/s3/sse/s3_range_headers_test.go new file mode 100644 index 000000000..e54004eb7 --- /dev/null +++ b/test/s3/sse/s3_range_headers_test.go @@ -0,0 +1,104 @@ +package sse_test + +import ( + "bytes" + "context" + "fmt" + "io" + "testing" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/s3" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +// TestPlainObjectRangeAndHeadHeaders ensures non-SSE objects advertise correct +// Content-Length and Content-Range information for both HEAD and ranged GETs. +func TestPlainObjectRangeAndHeadHeaders(t *testing.T) { + ctx := context.Background() + + client, err := createS3Client(ctx, defaultConfig) + require.NoError(t, err, "failed to create S3 client") + + bucketName, err := createTestBucket(ctx, client, defaultConfig.BucketPrefix+"range-plain-") + require.NoError(t, err, "failed to create test bucket") + defer cleanupTestBucket(ctx, client, bucketName) + + // SeaweedFS S3 auto-chunks uploads at 8MiB (see chunkSize in putToFiler). + // Using 16MiB ensures at least two chunks without stressing CI resources. + const chunkSize = 8 * 1024 * 1024 + const objectSize = 2 * chunkSize + objectKey := "plain-range-validation" + testData := generateTestData(objectSize) + + _, err = client.PutObject(ctx, &s3.PutObjectInput{ + Bucket: aws.String(bucketName), + Key: aws.String(objectKey), + Body: bytes.NewReader(testData), + }) + require.NoError(t, err, "failed to upload test object") + + t.Run("HeadObject reports accurate Content-Length", func(t *testing.T) { + resp, err := client.HeadObject(ctx, &s3.HeadObjectInput{ + Bucket: aws.String(bucketName), + Key: aws.String(objectKey), + }) + require.NoError(t, err, "HeadObject request failed") + assert.Equal(t, int64(objectSize), resp.ContentLength, "Content-Length mismatch on HEAD") + assert.Equal(t, "bytes", aws.ToString(resp.AcceptRanges), "Accept-Ranges should advertise bytes") + }) + + t.Run("Range request across chunk boundary", func(t *testing.T) { + // Test range that spans an 8MiB chunk boundary (chunkSize - 1KB to chunkSize + 3KB) + rangeStart := int64(chunkSize - 1024) + rangeEnd := rangeStart + 4096 - 1 + rangeHeader := fmt.Sprintf("bytes=%d-%d", rangeStart, rangeEnd) + + resp, err := client.GetObject(ctx, &s3.GetObjectInput{ + Bucket: aws.String(bucketName), + Key: aws.String(objectKey), + Range: aws.String(rangeHeader), + }) + require.NoError(t, err, "GetObject range request failed") + defer resp.Body.Close() + + expectedLen := rangeEnd - rangeStart + 1 + assert.Equal(t, expectedLen, resp.ContentLength, "Content-Length must match requested range size") + assert.Equal(t, + fmt.Sprintf("bytes %d-%d/%d", rangeStart, rangeEnd, objectSize), + aws.ToString(resp.ContentRange), + "Content-Range header mismatch") + + body, err := io.ReadAll(resp.Body) + require.NoError(t, err, "failed to read range response body") + assert.Equal(t, int(expectedLen), len(body), "actual bytes read mismatch") + assert.Equal(t, testData[rangeStart:rangeEnd+1], body, "range payload mismatch") + }) + + t.Run("Suffix range request", func(t *testing.T) { + const suffixSize = 2048 + resp, err := client.GetObject(ctx, &s3.GetObjectInput{ + Bucket: aws.String(bucketName), + Key: aws.String(objectKey), + Range: aws.String(fmt.Sprintf("bytes=-%d", suffixSize)), + }) + require.NoError(t, err, "GetObject suffix range request failed") + defer resp.Body.Close() + + expectedStart := int64(objectSize - suffixSize) + expectedEnd := int64(objectSize - 1) + expectedLen := expectedEnd - expectedStart + 1 + + assert.Equal(t, expectedLen, resp.ContentLength, "suffix Content-Length mismatch") + assert.Equal(t, + fmt.Sprintf("bytes %d-%d/%d", expectedStart, expectedEnd, objectSize), + aws.ToString(resp.ContentRange), + "suffix Content-Range mismatch") + + body, err := io.ReadAll(resp.Body) + require.NoError(t, err, "failed to read suffix range response body") + assert.Equal(t, int(expectedLen), len(body), "suffix range byte count mismatch") + assert.Equal(t, testData[expectedStart:expectedEnd+1], body, "suffix range payload mismatch") + }) +} diff --git a/test/s3/sse/s3_sse_range_server_test.go b/test/s3/sse/s3_sse_range_server_test.go new file mode 100644 index 000000000..0b02ec62b --- /dev/null +++ b/test/s3/sse/s3_sse_range_server_test.go @@ -0,0 +1,445 @@ +package sse_test + +import ( + "bytes" + "context" + "crypto/sha256" + "fmt" + "io" + "net/http" + "testing" + "time" + + "github.com/aws/aws-sdk-go-v2/aws" + v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4" + "github.com/aws/aws-sdk-go-v2/service/s3" + s3types "github.com/aws/aws-sdk-go-v2/service/s3/types" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +// signRawHTTPRequest signs a raw HTTP request with AWS Signature V4 +func signRawHTTPRequest(ctx context.Context, req *http.Request, cfg *S3SSETestConfig) error { + // Create credentials + creds := aws.Credentials{ + AccessKeyID: cfg.AccessKey, + SecretAccessKey: cfg.SecretKey, + } + + // Create signer + signer := v4.NewSigner() + + // Calculate payload hash (empty for GET requests) + payloadHash := fmt.Sprintf("%x", sha256.Sum256([]byte{})) + + // Sign the request + err := signer.SignHTTP(ctx, creds, req, payloadHash, "s3", cfg.Region, time.Now()) + if err != nil { + return fmt.Errorf("failed to sign request: %w", err) + } + + return nil +} + +// TestSSECRangeRequestsServerBehavior tests that the server correctly handles Range requests +// for SSE-C encrypted objects by checking actual HTTP response (not SDK-processed response) +func TestSSECRangeRequestsServerBehavior(t *testing.T) { + ctx := context.Background() + client, err := createS3Client(ctx, defaultConfig) + require.NoError(t, err, "Failed to create S3 client") + + bucketName, err := createTestBucket(ctx, client, defaultConfig.BucketPrefix+"ssec-range-server-") + require.NoError(t, err, "Failed to create test bucket") + defer cleanupTestBucket(ctx, client, bucketName) + + sseKey := generateSSECKey() + testData := generateTestData(2048) // 2KB test file + objectKey := "test-range-server-validation" + + // Upload with SSE-C + _, err = client.PutObject(ctx, &s3.PutObjectInput{ + Bucket: aws.String(bucketName), + Key: aws.String(objectKey), + Body: bytes.NewReader(testData), + SSECustomerAlgorithm: aws.String("AES256"), + SSECustomerKey: aws.String(sseKey.KeyB64), + SSECustomerKeyMD5: aws.String(sseKey.KeyMD5), + }) + require.NoError(t, err, "Failed to upload SSE-C object") + + // Test cases for range requests + testCases := []struct { + name string + rangeHeader string + expectedStart int64 + expectedEnd int64 + expectedTotal int64 + }{ + { + name: "First 100 bytes", + rangeHeader: "bytes=0-99", + expectedStart: 0, + expectedEnd: 99, + expectedTotal: 2048, + }, + { + name: "Middle range", + rangeHeader: "bytes=500-699", + expectedStart: 500, + expectedEnd: 699, + expectedTotal: 2048, + }, + { + name: "Last 100 bytes", + rangeHeader: "bytes=1948-2047", + expectedStart: 1948, + expectedEnd: 2047, + expectedTotal: 2048, + }, + { + name: "Single byte", + rangeHeader: "bytes=1000-1000", + expectedStart: 1000, + expectedEnd: 1000, + expectedTotal: 2048, + }, + { + name: "AES block boundary crossing", + rangeHeader: "bytes=15-17", + expectedStart: 15, + expectedEnd: 17, + expectedTotal: 2048, + }, + { + name: "Open-ended range", + rangeHeader: "bytes=2000-", + expectedStart: 2000, + expectedEnd: 2047, + expectedTotal: 2048, + }, + { + name: "Suffix range (last 100 bytes)", + rangeHeader: "bytes=-100", + expectedStart: 1948, + expectedEnd: 2047, + expectedTotal: 2048, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + // Build object URL (Endpoint already includes http://) + objectURL := fmt.Sprintf("%s/%s/%s", + defaultConfig.Endpoint, + bucketName, + objectKey, + ) + + // Create raw HTTP request + req, err := http.NewRequest("GET", objectURL, nil) + require.NoError(t, err, "Failed to create HTTP request") + + // Add Range header + req.Header.Set("Range", tc.rangeHeader) + + // Add SSE-C headers + req.Header.Set("x-amz-server-side-encryption-customer-algorithm", "AES256") + req.Header.Set("x-amz-server-side-encryption-customer-key", sseKey.KeyB64) + req.Header.Set("x-amz-server-side-encryption-customer-key-MD5", sseKey.KeyMD5) + + // Sign the request with AWS Signature V4 + err = signRawHTTPRequest(ctx, req, defaultConfig) + require.NoError(t, err, "Failed to sign HTTP request") + + // Make request with raw HTTP client + httpClient := &http.Client{} + resp, err := httpClient.Do(req) + require.NoError(t, err, "Failed to execute range request") + defer resp.Body.Close() + + // CRITICAL CHECK 1: Status code must be 206 Partial Content + assert.Equal(t, http.StatusPartialContent, resp.StatusCode, + "Server must return 206 Partial Content for range request, got %d", resp.StatusCode) + + // CRITICAL CHECK 2: Content-Range header must be present and correct + expectedContentRange := fmt.Sprintf("bytes %d-%d/%d", + tc.expectedStart, tc.expectedEnd, tc.expectedTotal) + actualContentRange := resp.Header.Get("Content-Range") + assert.Equal(t, expectedContentRange, actualContentRange, + "Content-Range header mismatch") + + // CRITICAL CHECK 3: Content-Length must match requested range size + expectedLength := tc.expectedEnd - tc.expectedStart + 1 + actualLength := resp.ContentLength + assert.Equal(t, expectedLength, actualLength, + "Content-Length mismatch: expected %d, got %d", expectedLength, actualLength) + + // CRITICAL CHECK 4: Actual bytes received from network + bodyBytes, err := io.ReadAll(resp.Body) + require.NoError(t, err, "Failed to read response body") + assert.Equal(t, int(expectedLength), len(bodyBytes), + "Actual bytes received from server mismatch: expected %d, got %d", + expectedLength, len(bodyBytes)) + + // CRITICAL CHECK 5: Verify decrypted content matches expected range + expectedData := testData[tc.expectedStart : tc.expectedEnd+1] + assert.Equal(t, expectedData, bodyBytes, + "Decrypted range content doesn't match expected data") + + // Verify SSE-C headers are present in response + assert.Equal(t, "AES256", resp.Header.Get("x-amz-server-side-encryption-customer-algorithm"), + "SSE-C algorithm header missing in range response") + assert.Equal(t, sseKey.KeyMD5, resp.Header.Get("x-amz-server-side-encryption-customer-key-MD5"), + "SSE-C key MD5 header missing in range response") + }) + } +} + +// TestSSEKMSRangeRequestsServerBehavior tests server-side Range handling for SSE-KMS +func TestSSEKMSRangeRequestsServerBehavior(t *testing.T) { + ctx := context.Background() + client, err := createS3Client(ctx, defaultConfig) + require.NoError(t, err, "Failed to create S3 client") + + bucketName, err := createTestBucket(ctx, client, defaultConfig.BucketPrefix+"ssekms-range-server-") + require.NoError(t, err, "Failed to create test bucket") + defer cleanupTestBucket(ctx, client, bucketName) + + kmsKeyID := "test-range-key" + testData := generateTestData(4096) // 4KB test file + objectKey := "test-kms-range-server-validation" + + // Upload with SSE-KMS + _, err = client.PutObject(ctx, &s3.PutObjectInput{ + Bucket: aws.String(bucketName), + Key: aws.String(objectKey), + Body: bytes.NewReader(testData), + ServerSideEncryption: "aws:kms", + SSEKMSKeyId: aws.String(kmsKeyID), + }) + require.NoError(t, err, "Failed to upload SSE-KMS object") + + // Test various ranges + testCases := []struct { + name string + rangeHeader string + start int64 + end int64 + }{ + {"First KB", "bytes=0-1023", 0, 1023}, + {"Second KB", "bytes=1024-2047", 1024, 2047}, + {"Last KB", "bytes=3072-4095", 3072, 4095}, + {"Unaligned range", "bytes=100-299", 100, 299}, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + objectURL := fmt.Sprintf("%s/%s/%s", + defaultConfig.Endpoint, + bucketName, + objectKey, + ) + + req, err := http.NewRequest("GET", objectURL, nil) + require.NoError(t, err) + req.Header.Set("Range", tc.rangeHeader) + + // Sign the request with AWS Signature V4 + err = signRawHTTPRequest(ctx, req, defaultConfig) + require.NoError(t, err, "Failed to sign HTTP request") + + httpClient := &http.Client{} + resp, err := httpClient.Do(req) + require.NoError(t, err) + defer resp.Body.Close() + + // Verify 206 status + assert.Equal(t, http.StatusPartialContent, resp.StatusCode, + "SSE-KMS range request must return 206, got %d", resp.StatusCode) + + // Verify Content-Range + expectedContentRange := fmt.Sprintf("bytes %d-%d/%d", tc.start, tc.end, int64(len(testData))) + assert.Equal(t, expectedContentRange, resp.Header.Get("Content-Range")) + + // Verify actual bytes received + bodyBytes, err := io.ReadAll(resp.Body) + require.NoError(t, err) + expectedLength := tc.end - tc.start + 1 + assert.Equal(t, int(expectedLength), len(bodyBytes), + "Actual network bytes mismatch") + + // Verify content + expectedData := testData[tc.start : tc.end+1] + assert.Equal(t, expectedData, bodyBytes) + }) + } +} + +// TestSSES3RangeRequestsServerBehavior tests server-side Range handling for SSE-S3 +func TestSSES3RangeRequestsServerBehavior(t *testing.T) { + ctx := context.Background() + client, err := createS3Client(ctx, defaultConfig) + require.NoError(t, err, "Failed to create S3 client") + + bucketName, err := createTestBucket(ctx, client, "sses3-range-server") + require.NoError(t, err, "Failed to create test bucket") + defer cleanupTestBucket(ctx, client, bucketName) + + testData := generateTestData(8192) // 8KB test file + objectKey := "test-s3-range-server-validation" + + // Upload with SSE-S3 + _, err = client.PutObject(ctx, &s3.PutObjectInput{ + Bucket: aws.String(bucketName), + Key: aws.String(objectKey), + Body: bytes.NewReader(testData), + ServerSideEncryption: "AES256", + }) + require.NoError(t, err, "Failed to upload SSE-S3 object") + + // Test range request + objectURL := fmt.Sprintf("%s/%s/%s", + defaultConfig.Endpoint, + bucketName, + objectKey, + ) + + req, err := http.NewRequest("GET", objectURL, nil) + require.NoError(t, err) + req.Header.Set("Range", "bytes=1000-1999") + + // Sign the request with AWS Signature V4 + err = signRawHTTPRequest(ctx, req, defaultConfig) + require.NoError(t, err, "Failed to sign HTTP request") + + httpClient := &http.Client{} + resp, err := httpClient.Do(req) + require.NoError(t, err) + defer resp.Body.Close() + + // Verify server response + assert.Equal(t, http.StatusPartialContent, resp.StatusCode) + assert.Equal(t, "bytes 1000-1999/8192", resp.Header.Get("Content-Range")) + assert.Equal(t, int64(1000), resp.ContentLength) + + bodyBytes, err := io.ReadAll(resp.Body) + require.NoError(t, err) + assert.Equal(t, 1000, len(bodyBytes)) + assert.Equal(t, testData[1000:2000], bodyBytes) +} + +// TestSSEMultipartRangeRequestsServerBehavior tests Range requests on multipart encrypted objects +func TestSSEMultipartRangeRequestsServerBehavior(t *testing.T) { + ctx := context.Background() + client, err := createS3Client(ctx, defaultConfig) + require.NoError(t, err) + + bucketName, err := createTestBucket(ctx, client, defaultConfig.BucketPrefix+"ssec-mp-range-") + require.NoError(t, err) + defer cleanupTestBucket(ctx, client, bucketName) + + sseKey := generateSSECKey() + objectKey := "test-multipart-range-server" + + // Create 10MB test data (2 parts of 5MB each) + partSize := 5 * 1024 * 1024 + part1Data := generateTestData(partSize) + part2Data := generateTestData(partSize) + fullData := append(part1Data, part2Data...) + + // Initiate multipart upload + createResp, err := client.CreateMultipartUpload(ctx, &s3.CreateMultipartUploadInput{ + Bucket: aws.String(bucketName), + Key: aws.String(objectKey), + SSECustomerAlgorithm: aws.String("AES256"), + SSECustomerKey: aws.String(sseKey.KeyB64), + SSECustomerKeyMD5: aws.String(sseKey.KeyMD5), + }) + require.NoError(t, err) + uploadID := aws.ToString(createResp.UploadId) + + // Upload part 1 + part1Resp, err := client.UploadPart(ctx, &s3.UploadPartInput{ + Bucket: aws.String(bucketName), + Key: aws.String(objectKey), + UploadId: aws.String(uploadID), + PartNumber: aws.Int32(1), + Body: bytes.NewReader(part1Data), + SSECustomerAlgorithm: aws.String("AES256"), + SSECustomerKey: aws.String(sseKey.KeyB64), + SSECustomerKeyMD5: aws.String(sseKey.KeyMD5), + }) + require.NoError(t, err) + + // Upload part 2 + part2Resp, err := client.UploadPart(ctx, &s3.UploadPartInput{ + Bucket: aws.String(bucketName), + Key: aws.String(objectKey), + UploadId: aws.String(uploadID), + PartNumber: aws.Int32(2), + Body: bytes.NewReader(part2Data), + SSECustomerAlgorithm: aws.String("AES256"), + SSECustomerKey: aws.String(sseKey.KeyB64), + SSECustomerKeyMD5: aws.String(sseKey.KeyMD5), + }) + require.NoError(t, err) + + // Complete multipart upload + _, err = client.CompleteMultipartUpload(ctx, &s3.CompleteMultipartUploadInput{ + Bucket: aws.String(bucketName), + Key: aws.String(objectKey), + UploadId: aws.String(uploadID), + MultipartUpload: &s3types.CompletedMultipartUpload{ + Parts: []s3types.CompletedPart{ + {PartNumber: aws.Int32(1), ETag: part1Resp.ETag}, + {PartNumber: aws.Int32(2), ETag: part2Resp.ETag}, + }, + }, + }) + require.NoError(t, err) + + // Test range that crosses part boundary + objectURL := fmt.Sprintf("%s/%s/%s", + defaultConfig.Endpoint, + bucketName, + objectKey, + ) + + // Range spanning across the part boundary + start := int64(partSize - 1000) + end := int64(partSize + 1000) + + req, err := http.NewRequest("GET", objectURL, nil) + require.NoError(t, err) + req.Header.Set("Range", fmt.Sprintf("bytes=%d-%d", start, end)) + req.Header.Set("x-amz-server-side-encryption-customer-algorithm", "AES256") + req.Header.Set("x-amz-server-side-encryption-customer-key", sseKey.KeyB64) + req.Header.Set("x-amz-server-side-encryption-customer-key-MD5", sseKey.KeyMD5) + + // Sign the request with AWS Signature V4 + err = signRawHTTPRequest(ctx, req, defaultConfig) + require.NoError(t, err, "Failed to sign HTTP request") + + httpClient := &http.Client{} + resp, err := httpClient.Do(req) + require.NoError(t, err) + defer resp.Body.Close() + + // Verify server behavior for cross-part range + assert.Equal(t, http.StatusPartialContent, resp.StatusCode, + "Multipart range request must return 206") + + expectedLength := end - start + 1 + assert.Equal(t, expectedLength, resp.ContentLength, + "Content-Length for cross-part range") + + bodyBytes, err := io.ReadAll(resp.Body) + require.NoError(t, err) + assert.Equal(t, int(expectedLength), len(bodyBytes), + "Actual bytes for cross-part range") + + // Verify content spans the part boundary correctly + expectedData := fullData[start : end+1] + assert.Equal(t, expectedData, bodyBytes, + "Cross-part range content must be correctly decrypted and assembled") +} diff --git a/weed/filer/filer_notify.go b/weed/filer/filer_notify.go index 2921d709b..845a0678e 100644 --- a/weed/filer/filer_notify.go +++ b/weed/filer/filer_notify.go @@ -83,7 +83,9 @@ func (f *Filer) logMetaEvent(ctx context.Context, fullpath string, eventNotifica return } - f.LocalMetaLogBuffer.AddDataToBuffer([]byte(dir), data, event.TsNs) + if err := f.LocalMetaLogBuffer.AddDataToBuffer([]byte(dir), data, event.TsNs); err != nil { + glog.Errorf("failed to add data to log buffer for %s: %v", dir, err) + } } diff --git a/weed/filer/meta_aggregator.go b/weed/filer/meta_aggregator.go index 1ea334224..0fc64a947 100644 --- a/weed/filer/meta_aggregator.go +++ b/weed/filer/meta_aggregator.go @@ -172,7 +172,10 @@ func (ma *MetaAggregator) doSubscribeToOneFiler(f *Filer, self pb.ServerAddress, } dir := event.Directory // println("received meta change", dir, "size", len(data)) - ma.MetaLogBuffer.AddDataToBuffer([]byte(dir), data, event.TsNs) + if err := ma.MetaLogBuffer.AddDataToBuffer([]byte(dir), data, event.TsNs); err != nil { + glog.Errorf("failed to add data to log buffer for %s: %v", dir, err) + return err + } if maybeReplicateMetadataChange != nil { maybeReplicateMetadataChange(event) } diff --git a/weed/mq/broker/broker_grpc_pub_follow.go b/weed/mq/broker/broker_grpc_pub_follow.go index 117dc4f87..d8f472249 100644 --- a/weed/mq/broker/broker_grpc_pub_follow.go +++ b/weed/mq/broker/broker_grpc_pub_follow.go @@ -53,7 +53,11 @@ func (b *MessageQueueBroker) PublishFollowMe(stream mq_pb.SeaweedMessaging_Publi // TODO: change this to DataMessage // log the message - logBuffer.AddToBuffer(dataMessage) + if addErr := logBuffer.AddToBuffer(dataMessage); addErr != nil { + err = fmt.Errorf("failed to add message to log buffer: %w", addErr) + glog.Errorf("Failed to add message to log buffer: %v", addErr) + break + } // send back the ack if err := stream.Send(&mq_pb.PublishFollowMeResponse{ diff --git a/weed/mq/broker/broker_log_buffer_offset.go b/weed/mq/broker/broker_log_buffer_offset.go index aeb8fad1b..104722af1 100644 --- a/weed/mq/broker/broker_log_buffer_offset.go +++ b/weed/mq/broker/broker_log_buffer_offset.go @@ -8,7 +8,6 @@ import ( "github.com/seaweedfs/seaweedfs/weed/pb/mq_pb" "github.com/seaweedfs/seaweedfs/weed/util" "github.com/seaweedfs/seaweedfs/weed/util/log_buffer" - "google.golang.org/protobuf/proto" ) // OffsetAssignmentFunc is a function type for assigning offsets to messages @@ -30,13 +29,9 @@ func (b *MessageQueueBroker) AddToBufferWithOffset( } // PERFORMANCE OPTIMIZATION: Pre-process expensive operations OUTSIDE the lock - var ts time.Time processingTsNs := message.TsNs if processingTsNs == 0 { - ts = time.Now() - processingTsNs = ts.UnixNano() - } else { - ts = time.Unix(0, processingTsNs) + processingTsNs = time.Now().UnixNano() } // Create LogEntry with assigned offset @@ -48,33 +43,21 @@ func (b *MessageQueueBroker) AddToBufferWithOffset( Offset: offset, // Add the assigned offset } - logEntryData, err := proto.Marshal(logEntry) - if err != nil { - return err - } - // Use the existing LogBuffer infrastructure for the rest // TODO: This is a workaround - ideally LogBuffer should handle offset assignment // For now, we'll add the message with the pre-assigned offset - return b.addLogEntryToBuffer(logBuffer, logEntry, logEntryData, ts) + return b.addLogEntryToBuffer(logBuffer, logEntry) } // addLogEntryToBuffer adds a pre-constructed LogEntry to the buffer -// This is a helper function that mimics LogBuffer.AddDataToBuffer but with a pre-built LogEntry +// This is a helper function that directly uses LogBuffer.AddLogEntryToBuffer func (b *MessageQueueBroker) addLogEntryToBuffer( logBuffer *log_buffer.LogBuffer, logEntry *filer_pb.LogEntry, - logEntryData []byte, - ts time.Time, ) error { - // TODO: This is a simplified version of LogBuffer.AddDataToBuffer - // ASSUMPTION: We're bypassing some of the LogBuffer's internal logic - // This should be properly integrated when LogBuffer is modified - - // Use the new AddLogEntryToBuffer method to preserve offset information + // Use the AddLogEntryToBuffer method to preserve offset information // This ensures the offset is maintained throughout the entire data flow - logBuffer.AddLogEntryToBuffer(logEntry) - return nil + return logBuffer.AddLogEntryToBuffer(logEntry) } // GetPartitionOffsetInfoInternal returns offset information for a partition (internal method) diff --git a/weed/mq/topic/local_partition.go b/weed/mq/topic/local_partition.go index 5f5c2278f..f03bca2f5 100644 --- a/weed/mq/topic/local_partition.go +++ b/weed/mq/topic/local_partition.go @@ -68,7 +68,9 @@ func NewLocalPartition(partition Partition, logFlushInterval int, logFlushFn log } func (p *LocalPartition) Publish(message *mq_pb.DataMessage) error { - p.LogBuffer.AddToBuffer(message) + if err := p.LogBuffer.AddToBuffer(message); err != nil { + return fmt.Errorf("failed to add message to log buffer: %w", err) + } p.UpdateActivity() // Track publish activity for idle cleanup // maybe send to the follower @@ -107,11 +109,17 @@ func (p *LocalPartition) Subscribe(clientName string, startPosition log_buffer.M return eachMessageFn(logEntry) } + // Wrap eachMessageFn for disk reads to also update activity + eachMessageWithActivityFn := func(logEntry *filer_pb.LogEntry) (bool, error) { + p.UpdateActivity() // Track disk read activity for idle cleanup + return eachMessageFn(logEntry) + } + // Always attempt initial disk read for historical data // This is fast if no data on disk, and ensures we don't miss old data // The memory read loop below handles new data with instant notifications glog.V(2).Infof("%s reading historical data from disk starting at offset %d", clientName, startPosition.Offset) - processedPosition, isDone, readPersistedLogErr = p.LogBuffer.ReadFromDiskFn(startPosition, 0, eachMessageFn) + processedPosition, isDone, readPersistedLogErr = p.LogBuffer.ReadFromDiskFn(startPosition, 0, eachMessageWithActivityFn) if readPersistedLogErr != nil { glog.V(2).Infof("%s read %v persisted log: %v", clientName, p.Partition, readPersistedLogErr) return readPersistedLogErr @@ -145,7 +153,7 @@ func (p *LocalPartition) Subscribe(clientName string, startPosition log_buffer.M // Read from disk ONCE to catch up, then continue with in-memory buffer if readInMemoryLogErr == log_buffer.ResumeFromDiskError { glog.V(4).Infof("SUBSCRIBE: ResumeFromDiskError - reading flushed data from disk for %s at offset %d", clientName, startPosition.Offset) - processedPosition, isDone, readPersistedLogErr = p.LogBuffer.ReadFromDiskFn(startPosition, 0, eachMessageFn) + processedPosition, isDone, readPersistedLogErr = p.LogBuffer.ReadFromDiskFn(startPosition, 0, eachMessageWithActivityFn) if readPersistedLogErr != nil { glog.V(2).Infof("%s read %v persisted log after flush: %v", clientName, p.Partition, readPersistedLogErr) return readPersistedLogErr @@ -175,8 +183,14 @@ func (p *LocalPartition) Subscribe(clientName string, startPosition log_buffer.M } // Original timestamp-based subscription logic + // Wrap eachMessageFn for disk reads to also update activity + eachMessageWithActivityFn := func(logEntry *filer_pb.LogEntry) (bool, error) { + p.UpdateActivity() // Track disk read activity for idle cleanup + return eachMessageFn(logEntry) + } + for { - processedPosition, isDone, readPersistedLogErr = p.LogBuffer.ReadFromDiskFn(startPosition, 0, eachMessageFn) + processedPosition, isDone, readPersistedLogErr = p.LogBuffer.ReadFromDiskFn(startPosition, 0, eachMessageWithActivityFn) if readPersistedLogErr != nil { glog.V(0).Infof("%s read %v persisted log: %v", clientName, p.Partition, readPersistedLogErr) return readPersistedLogErr diff --git a/weed/mq/topic/local_partition_offset.go b/weed/mq/topic/local_partition_offset.go index e15234ca0..9c8a2dac4 100644 --- a/weed/mq/topic/local_partition_offset.go +++ b/weed/mq/topic/local_partition_offset.go @@ -28,6 +28,9 @@ func (p *LocalPartition) PublishWithOffset(message *mq_pb.DataMessage, assignOff return 0, fmt.Errorf("failed to add message to buffer: %w", err) } + // Track publish activity for idle cleanup (consistent with Publish method) + p.UpdateActivity() + // Send to follower if needed (same logic as original Publish) if p.publishFolloweMeStream != nil { if followErr := p.publishFolloweMeStream.Send(&mq_pb.PublishFollowMeRequest{ @@ -62,7 +65,9 @@ func (p *LocalPartition) addToBufferWithOffset(message *mq_pb.DataMessage, offse } // Add the entry to the buffer in a way that preserves offset on disk and in-memory - p.LogBuffer.AddLogEntryToBuffer(logEntry) + if err := p.LogBuffer.AddLogEntryToBuffer(logEntry); err != nil { + return fmt.Errorf("failed to add log entry to buffer: %w", err) + } return nil } diff --git a/weed/operation/upload_chunked.go b/weed/operation/upload_chunked.go new file mode 100644 index 000000000..352b329f8 --- /dev/null +++ b/weed/operation/upload_chunked.go @@ -0,0 +1,267 @@ +package operation + +import ( + "bytes" + "context" + "crypto/md5" + "fmt" + "hash" + "io" + "sort" + "sync" + "time" + + "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" + "github.com/seaweedfs/seaweedfs/weed/security" +) + +// ChunkedUploadResult contains the result of a chunked upload +type ChunkedUploadResult struct { + FileChunks []*filer_pb.FileChunk + Md5Hash hash.Hash + TotalSize int64 + SmallContent []byte // For files smaller than threshold +} + +// ChunkedUploadOption contains options for chunked uploads +type ChunkedUploadOption struct { + ChunkSize int32 + SmallFileLimit int64 + Collection string + Replication string + DataCenter string + SaveSmallInline bool + Jwt security.EncodedJwt + MimeType string + AssignFunc func(ctx context.Context, count int) (*VolumeAssignRequest, *AssignResult, error) + UploadFunc func(ctx context.Context, data []byte, option *UploadOption) (*UploadResult, error) // Optional: for testing +} + +var chunkBufferPool = sync.Pool{ + New: func() interface{} { + return new(bytes.Buffer) + }, +} + +// UploadReaderInChunks reads from reader and uploads in chunks to volume servers +// This prevents OOM by processing the stream in fixed-size chunks +// Returns file chunks, MD5 hash, total size, and any small content stored inline +func UploadReaderInChunks(ctx context.Context, reader io.Reader, opt *ChunkedUploadOption) (*ChunkedUploadResult, error) { + + md5Hash := md5.New() + var partReader = io.TeeReader(reader, md5Hash) + + var fileChunks []*filer_pb.FileChunk + var fileChunksLock sync.Mutex + var uploadErr error + var uploadErrLock sync.Mutex + var chunkOffset int64 = 0 + + var wg sync.WaitGroup + const bytesBufferCounter = 4 + bytesBufferLimitChan := make(chan struct{}, bytesBufferCounter) + +uploadLoop: + for { + // Throttle buffer usage + bytesBufferLimitChan <- struct{}{} + + // Check for errors from parallel uploads + uploadErrLock.Lock() + if uploadErr != nil { + <-bytesBufferLimitChan + uploadErrLock.Unlock() + break + } + uploadErrLock.Unlock() + + // Check for context cancellation + select { + case <-ctx.Done(): + <-bytesBufferLimitChan + uploadErrLock.Lock() + if uploadErr == nil { + uploadErr = ctx.Err() + } + uploadErrLock.Unlock() + break uploadLoop + default: + } + + // Get buffer from pool + bytesBuffer := chunkBufferPool.Get().(*bytes.Buffer) + limitedReader := io.LimitReader(partReader, int64(opt.ChunkSize)) + bytesBuffer.Reset() + + // Read one chunk + dataSize, err := bytesBuffer.ReadFrom(limitedReader) + if err != nil { + glog.V(2).Infof("UploadReaderInChunks: read error at offset %d: %v", chunkOffset, err) + chunkBufferPool.Put(bytesBuffer) + <-bytesBufferLimitChan + uploadErrLock.Lock() + if uploadErr == nil { + uploadErr = err + } + uploadErrLock.Unlock() + break + } + // If no data was read, we've reached EOF + // Only break if we've already read some data (chunkOffset > 0) or if this is truly EOF + if dataSize == 0 { + if chunkOffset == 0 { + glog.Warningf("UploadReaderInChunks: received 0 bytes on first read - creating empty file") + } + chunkBufferPool.Put(bytesBuffer) + <-bytesBufferLimitChan + // If we've already read some chunks, this is normal EOF + // If we haven't read anything yet (chunkOffset == 0), this could be an empty file + // which is valid (e.g., touch command creates 0-byte files) + break + } + + // For small files at offset 0, store inline instead of uploading + if chunkOffset == 0 && opt.SaveSmallInline && dataSize < opt.SmallFileLimit { + smallContent := make([]byte, dataSize) + n, readErr := io.ReadFull(bytesBuffer, smallContent) + chunkBufferPool.Put(bytesBuffer) + <-bytesBufferLimitChan + + if readErr != nil { + return nil, fmt.Errorf("failed to read small content: read %d of %d bytes: %w", n, dataSize, readErr) + } + + return &ChunkedUploadResult{ + FileChunks: nil, + Md5Hash: md5Hash, + TotalSize: dataSize, + SmallContent: smallContent, + }, nil + } + + // Upload chunk in parallel goroutine + wg.Add(1) + go func(offset int64, buf *bytes.Buffer) { + defer func() { + chunkBufferPool.Put(buf) + <-bytesBufferLimitChan + wg.Done() + }() + + // Assign volume for this chunk + _, assignResult, assignErr := opt.AssignFunc(ctx, 1) + if assignErr != nil { + uploadErrLock.Lock() + if uploadErr == nil { + uploadErr = fmt.Errorf("assign volume: %w", assignErr) + } + uploadErrLock.Unlock() + return + } + + // Upload chunk data + uploadUrl := fmt.Sprintf("http://%s/%s", assignResult.Url, assignResult.Fid) + + // Use per-assignment JWT if present, otherwise fall back to the original JWT + // This is critical for secured clusters where each volume assignment has its own JWT + jwt := opt.Jwt + if assignResult.Auth != "" { + jwt = assignResult.Auth + } + + uploadOption := &UploadOption{ + UploadUrl: uploadUrl, + Cipher: false, + IsInputCompressed: false, + MimeType: opt.MimeType, + PairMap: nil, + Jwt: jwt, + } + + var uploadResult *UploadResult + var uploadResultErr error + + // Use mock upload function if provided (for testing), otherwise use real uploader + if opt.UploadFunc != nil { + uploadResult, uploadResultErr = opt.UploadFunc(ctx, buf.Bytes(), uploadOption) + } else { + uploader, uploaderErr := NewUploader() + if uploaderErr != nil { + uploadErrLock.Lock() + if uploadErr == nil { + uploadErr = fmt.Errorf("create uploader: %w", uploaderErr) + } + uploadErrLock.Unlock() + return + } + uploadResult, uploadResultErr = uploader.UploadData(ctx, buf.Bytes(), uploadOption) + } + + if uploadResultErr != nil { + uploadErrLock.Lock() + if uploadErr == nil { + uploadErr = fmt.Errorf("upload chunk: %w", uploadResultErr) + } + uploadErrLock.Unlock() + return + } + + // Create chunk entry + // Set ModifiedTsNs to current time (nanoseconds) to track when upload completed + // This is critical for multipart uploads where the same part may be uploaded multiple times + // The part with the latest ModifiedTsNs is selected as the authoritative version + fid, _ := filer_pb.ToFileIdObject(assignResult.Fid) + chunk := &filer_pb.FileChunk{ + FileId: assignResult.Fid, + Offset: offset, + Size: uint64(uploadResult.Size), + ModifiedTsNs: time.Now().UnixNano(), + ETag: uploadResult.ContentMd5, + Fid: fid, + CipherKey: uploadResult.CipherKey, + } + + fileChunksLock.Lock() + fileChunks = append(fileChunks, chunk) + glog.V(4).Infof("uploaded chunk %d to %s [%d,%d)", len(fileChunks), chunk.FileId, offset, offset+int64(chunk.Size)) + fileChunksLock.Unlock() + + }(chunkOffset, bytesBuffer) + + // Update offset for next chunk + chunkOffset += dataSize + + // If this was a partial chunk, we're done + if dataSize < int64(opt.ChunkSize) { + break + } + } + + // Wait for all uploads to complete + wg.Wait() + + // Sort chunks by offset (do this even if there's an error, for cleanup purposes) + sort.Slice(fileChunks, func(i, j int) bool { + return fileChunks[i].Offset < fileChunks[j].Offset + }) + + // Check for errors - return partial results for cleanup + if uploadErr != nil { + glog.Errorf("chunked upload failed: %v (returning %d partial chunks for cleanup)", uploadErr, len(fileChunks)) + // IMPORTANT: Return partial results even on error so caller can cleanup orphaned chunks + return &ChunkedUploadResult{ + FileChunks: fileChunks, + Md5Hash: md5Hash, + TotalSize: chunkOffset, + SmallContent: nil, + }, uploadErr + } + + return &ChunkedUploadResult{ + FileChunks: fileChunks, + Md5Hash: md5Hash, + TotalSize: chunkOffset, + SmallContent: nil, + }, nil +} diff --git a/weed/operation/upload_chunked_test.go b/weed/operation/upload_chunked_test.go new file mode 100644 index 000000000..ec7ffbba2 --- /dev/null +++ b/weed/operation/upload_chunked_test.go @@ -0,0 +1,312 @@ +package operation + +import ( + "bytes" + "context" + "errors" + "io" + "testing" +) + +// TestUploadReaderInChunksReturnsPartialResultsOnError verifies that when +// UploadReaderInChunks fails mid-upload, it returns partial results containing +// the chunks that were successfully uploaded before the error occurred. +// This allows the caller to cleanup orphaned chunks and prevent resource leaks. +func TestUploadReaderInChunksReturnsPartialResultsOnError(t *testing.T) { + // Create test data larger than one chunk to force multiple chunk uploads + testData := bytes.Repeat([]byte("test data for chunk upload failure testing"), 1000) // ~40KB + reader := bytes.NewReader(testData) + + uploadAttempts := 0 + + // Create a mock assign function that succeeds for first chunk, then fails + assignFunc := func(ctx context.Context, count int) (*VolumeAssignRequest, *AssignResult, error) { + uploadAttempts++ + + if uploadAttempts == 1 { + // First chunk succeeds + return nil, &AssignResult{ + Fid: "test-fid-1,1234", + Url: "http://test-volume-1:8080", + PublicUrl: "http://test-volume-1:8080", + Count: 1, + }, nil + } + + // Second chunk fails (simulating volume server down or network error) + return nil, nil, errors.New("simulated volume assignment failure") + } + + // Mock upload function that simulates successful upload + uploadFunc := func(ctx context.Context, data []byte, option *UploadOption) (*UploadResult, error) { + return &UploadResult{ + Name: "test-file", + Size: uint32(len(data)), + ContentMd5: "mock-md5-hash", + Error: "", + }, nil + } + + // Attempt upload with small chunk size to trigger multiple uploads + result, err := UploadReaderInChunks(context.Background(), reader, &ChunkedUploadOption{ + ChunkSize: 8 * 1024, // 8KB chunks + SmallFileLimit: 256, + Collection: "test", + DataCenter: "", + SaveSmallInline: false, + AssignFunc: assignFunc, + UploadFunc: uploadFunc, + }) + + // VERIFICATION 1: Error should be returned + if err == nil { + t.Fatal("Expected error from UploadReaderInChunks, got nil") + } + t.Logf("✓ Got expected error: %v", err) + + // VERIFICATION 2: Result should NOT be nil (this is the fix) + if result == nil { + t.Fatal("CRITICAL: UploadReaderInChunks returned nil result on error - caller cannot cleanup orphaned chunks!") + } + t.Log("✓ Result is not nil (partial results returned)") + + // VERIFICATION 3: Result should contain partial chunks from successful uploads + // Note: In reality, the first chunk upload would succeed before assignment fails for chunk 2 + // But in this test, assignment fails immediately for chunk 2, so we may have 0 chunks + // The important thing is that the result struct is returned, not that it has chunks + t.Logf("✓ Result contains %d chunks (may be 0 if all assignments failed)", len(result.FileChunks)) + + // VERIFICATION 4: MD5 hash should be available even on partial failure + if result.Md5Hash == nil { + t.Error("Expected Md5Hash to be non-nil") + } else { + t.Log("✓ Md5Hash is available for partial data") + } + + // VERIFICATION 5: TotalSize should reflect bytes read before failure + if result.TotalSize < 0 { + t.Errorf("Expected non-negative TotalSize, got %d", result.TotalSize) + } else { + t.Logf("✓ TotalSize = %d bytes read before failure", result.TotalSize) + } +} + +// TestUploadReaderInChunksSuccessPath verifies normal successful upload behavior +func TestUploadReaderInChunksSuccessPath(t *testing.T) { + testData := []byte("small test data") + reader := bytes.NewReader(testData) + + // Mock assign function that always succeeds + assignFunc := func(ctx context.Context, count int) (*VolumeAssignRequest, *AssignResult, error) { + return nil, &AssignResult{ + Fid: "test-fid,1234", + Url: "http://test-volume:8080", + PublicUrl: "http://test-volume:8080", + Count: 1, + }, nil + } + + // Mock upload function that simulates successful upload + uploadFunc := func(ctx context.Context, data []byte, option *UploadOption) (*UploadResult, error) { + return &UploadResult{ + Name: "test-file", + Size: uint32(len(data)), + ContentMd5: "mock-md5-hash", + Error: "", + }, nil + } + + result, err := UploadReaderInChunks(context.Background(), reader, &ChunkedUploadOption{ + ChunkSize: 8 * 1024, + SmallFileLimit: 256, + Collection: "test", + DataCenter: "", + SaveSmallInline: false, + AssignFunc: assignFunc, + UploadFunc: uploadFunc, + }) + + // VERIFICATION 1: No error should occur + if err != nil { + t.Fatalf("Expected successful upload, got error: %v", err) + } + t.Log("✓ Upload completed without error") + + // VERIFICATION 2: Result should not be nil + if result == nil { + t.Fatal("Expected non-nil result") + } + t.Log("✓ Result is not nil") + + // VERIFICATION 3: Should have file chunks + if len(result.FileChunks) == 0 { + t.Error("Expected at least one file chunk") + } else { + t.Logf("✓ Result contains %d file chunk(s)", len(result.FileChunks)) + } + + // VERIFICATION 4: Total size should match input data + if result.TotalSize != int64(len(testData)) { + t.Errorf("Expected TotalSize=%d, got %d", len(testData), result.TotalSize) + } else { + t.Logf("✓ TotalSize=%d matches input data", result.TotalSize) + } + + // VERIFICATION 5: MD5 hash should be available + if result.Md5Hash == nil { + t.Error("Expected non-nil Md5Hash") + } else { + t.Log("✓ Md5Hash is available") + } + + // VERIFICATION 6: Chunk should have expected properties + if len(result.FileChunks) > 0 { + chunk := result.FileChunks[0] + if chunk.FileId != "test-fid,1234" { + t.Errorf("Expected chunk FileId='test-fid,1234', got '%s'", chunk.FileId) + } + if chunk.Offset != 0 { + t.Errorf("Expected chunk Offset=0, got %d", chunk.Offset) + } + if chunk.Size != uint64(len(testData)) { + t.Errorf("Expected chunk Size=%d, got %d", len(testData), chunk.Size) + } + t.Logf("✓ Chunk properties validated: FileId=%s, Offset=%d, Size=%d", + chunk.FileId, chunk.Offset, chunk.Size) + } +} + +// TestUploadReaderInChunksContextCancellation verifies behavior when context is cancelled +func TestUploadReaderInChunksContextCancellation(t *testing.T) { + testData := bytes.Repeat([]byte("test data"), 10000) // ~80KB + reader := bytes.NewReader(testData) + + // Create a context that we'll cancel + ctx, cancel := context.WithCancel(context.Background()) + + // Cancel immediately to trigger cancellation handling + cancel() + + assignFunc := func(ctx context.Context, count int) (*VolumeAssignRequest, *AssignResult, error) { + return nil, &AssignResult{ + Fid: "test-fid,1234", + Url: "http://test-volume:8080", + PublicUrl: "http://test-volume:8080", + Count: 1, + }, nil + } + + // Mock upload function that simulates successful upload + uploadFunc := func(ctx context.Context, data []byte, option *UploadOption) (*UploadResult, error) { + return &UploadResult{ + Name: "test-file", + Size: uint32(len(data)), + ContentMd5: "mock-md5-hash", + Error: "", + }, nil + } + + result, err := UploadReaderInChunks(ctx, reader, &ChunkedUploadOption{ + ChunkSize: 8 * 1024, + SmallFileLimit: 256, + Collection: "test", + DataCenter: "", + SaveSmallInline: false, + AssignFunc: assignFunc, + UploadFunc: uploadFunc, + }) + + // Should get context cancelled error + if err == nil { + t.Error("Expected context cancellation error") + } + + // Should still get partial results for cleanup + if result == nil { + t.Error("Expected non-nil result even on context cancellation") + } else { + t.Logf("✓ Got partial result on cancellation: chunks=%d", len(result.FileChunks)) + } +} + +// mockFailingReader simulates a reader that fails after reading some data +type mockFailingReader struct { + data []byte + pos int + failAfter int +} + +func (m *mockFailingReader) Read(p []byte) (n int, err error) { + if m.pos >= m.failAfter { + return 0, errors.New("simulated read failure") + } + + remaining := m.failAfter - m.pos + toRead := len(p) + if toRead > remaining { + toRead = remaining + } + if toRead > len(m.data)-m.pos { + toRead = len(m.data) - m.pos + } + + if toRead == 0 { + return 0, io.EOF + } + + copy(p, m.data[m.pos:m.pos+toRead]) + m.pos += toRead + return toRead, nil +} + +// TestUploadReaderInChunksReaderFailure verifies behavior when reader fails mid-read +func TestUploadReaderInChunksReaderFailure(t *testing.T) { + testData := bytes.Repeat([]byte("test"), 5000) // 20KB + failingReader := &mockFailingReader{ + data: testData, + pos: 0, + failAfter: 10000, // Fail after 10KB + } + + assignFunc := func(ctx context.Context, count int) (*VolumeAssignRequest, *AssignResult, error) { + return nil, &AssignResult{ + Fid: "test-fid,1234", + Url: "http://test-volume:8080", + PublicUrl: "http://test-volume:8080", + Count: 1, + }, nil + } + + // Mock upload function that simulates successful upload + uploadFunc := func(ctx context.Context, data []byte, option *UploadOption) (*UploadResult, error) { + return &UploadResult{ + Name: "test-file", + Size: uint32(len(data)), + ContentMd5: "mock-md5-hash", + Error: "", + }, nil + } + + result, err := UploadReaderInChunks(context.Background(), failingReader, &ChunkedUploadOption{ + ChunkSize: 8 * 1024, // 8KB chunks + SmallFileLimit: 256, + Collection: "test", + DataCenter: "", + SaveSmallInline: false, + AssignFunc: assignFunc, + UploadFunc: uploadFunc, + }) + + // Should get read error + if err == nil { + t.Error("Expected read failure error") + } + + // Should still get partial results + if result == nil { + t.Fatal("Expected non-nil result on read failure") + } + + t.Logf("✓ Got partial result on read failure: chunks=%d, totalSize=%d", + len(result.FileChunks), result.TotalSize) +} diff --git a/weed/pb/filer_pb/filer_pb_helper.go b/weed/pb/filer_pb/filer_pb_helper.go index c8dd19d59..c776f83d7 100644 --- a/weed/pb/filer_pb/filer_pb_helper.go +++ b/weed/pb/filer_pb/filer_pb_helper.go @@ -39,7 +39,7 @@ func (entry *Entry) GetExpiryTime() (expiryTime int64) { return expiryTime } } - + // Regular TTL expiration: base on creation time only expiryTime = entry.Attributes.Crtime + int64(entry.Attributes.TtlSec) return expiryTime diff --git a/weed/s3api/auth_credentials.go b/weed/s3api/auth_credentials.go index 54293e95a..289fbd556 100644 --- a/weed/s3api/auth_credentials.go +++ b/weed/s3api/auth_credentials.go @@ -53,7 +53,7 @@ type IdentityAccessManagement struct { // IAM Integration for advanced features iamIntegration *S3IAMIntegration - + // Bucket policy engine for evaluating bucket policies policyEngine *BucketPolicyEngine } @@ -178,7 +178,7 @@ func NewIdentityAccessManagementWithStore(option *S3ApiServerOption, explicitSto secretAccessKey := os.Getenv("AWS_SECRET_ACCESS_KEY") if accessKeyId != "" && secretAccessKey != "" { - glog.V(0).Infof("No S3 configuration found, using AWS environment variables as fallback") + glog.V(1).Infof("No S3 configuration found, using AWS environment variables as fallback") // Create environment variable identity name identityNameSuffix := accessKeyId @@ -210,7 +210,7 @@ func NewIdentityAccessManagementWithStore(option *S3ApiServerOption, explicitSto } iam.m.Unlock() - glog.V(0).Infof("Added admin identity from AWS environment variables: %s", envIdentity.Name) + glog.V(1).Infof("Added admin identity from AWS environment variables: %s", envIdentity.Name) } } @@ -464,7 +464,7 @@ func (iam *IdentityAccessManagement) authRequest(r *http.Request, action Action) identity, s3Err = iam.authenticateJWTWithIAM(r) authType = "Jwt" } else { - glog.V(0).Infof("IAM integration is nil, returning ErrNotImplemented") + glog.V(2).Infof("IAM integration is nil, returning ErrNotImplemented") return identity, s3err.ErrNotImplemented } case authTypeAnonymous: @@ -501,7 +501,7 @@ func (iam *IdentityAccessManagement) authRequest(r *http.Request, action Action) // For ListBuckets, authorization is performed in the handler by iterating // through buckets and checking permissions for each. Skip the global check here. policyAllows := false - + if action == s3_constants.ACTION_LIST && bucket == "" { // ListBuckets operation - authorization handled per-bucket in the handler } else { @@ -515,7 +515,7 @@ func (iam *IdentityAccessManagement) authRequest(r *http.Request, action Action) principal := buildPrincipalARN(identity) // Use context-aware policy evaluation to get the correct S3 action allowed, evaluated, err := iam.policyEngine.EvaluatePolicyWithContext(bucket, object, string(action), principal, r) - + if err != nil { // SECURITY: Fail-close on policy evaluation errors // If we can't evaluate the policy, deny access rather than falling through to IAM @@ -537,7 +537,7 @@ func (iam *IdentityAccessManagement) authRequest(r *http.Request, action Action) } // If not evaluated (no policy or no matching statements), fall through to IAM/identity checks } - + // Only check IAM if bucket policy didn't explicitly allow // This ensures bucket policies can independently grant access (AWS semantics) if !policyAllows { @@ -617,26 +617,26 @@ func buildPrincipalARN(identity *Identity) string { if identity == nil { return "*" // Anonymous } - + // Check if this is the anonymous user identity (authenticated as anonymous) // S3 policies expect Principal: "*" for anonymous access - if identity.Name == s3_constants.AccountAnonymousId || - (identity.Account != nil && identity.Account.Id == s3_constants.AccountAnonymousId) { + if identity.Name == s3_constants.AccountAnonymousId || + (identity.Account != nil && identity.Account.Id == s3_constants.AccountAnonymousId) { return "*" // Anonymous user } - + // Build an AWS-compatible principal ARN // Format: arn:aws:iam::account-id:user/user-name accountId := identity.Account.Id if accountId == "" { accountId = "000000000000" // Default account ID } - + userName := identity.Name if userName == "" { userName = "unknown" } - + return fmt.Sprintf("arn:aws:iam::%s:user/%s", accountId, userName) } diff --git a/weed/s3api/auth_credentials_subscribe.go b/weed/s3api/auth_credentials_subscribe.go index 00df259a2..ffb99fe2c 100644 --- a/weed/s3api/auth_credentials_subscribe.go +++ b/weed/s3api/auth_credentials_subscribe.go @@ -52,7 +52,7 @@ func (s3a *S3ApiServer) subscribeMetaEvents(clientName string, lastTsNs int64, p metadataFollowOption.ClientEpoch++ return pb.WithFilerClientFollowMetadata(s3a, metadataFollowOption, processEventFn) }, func(err error) bool { - glog.V(0).Infof("iam follow metadata changes: %v", err) + glog.V(1).Infof("iam follow metadata changes: %v", err) return true }) } @@ -63,7 +63,7 @@ func (s3a *S3ApiServer) onIamConfigUpdate(dir, filename string, content []byte) if err := s3a.iam.LoadS3ApiConfigurationFromBytes(content); err != nil { return err } - glog.V(0).Infof("updated %s/%s", dir, filename) + glog.V(1).Infof("updated %s/%s", dir, filename) } return nil } @@ -74,7 +74,7 @@ func (s3a *S3ApiServer) onCircuitBreakerConfigUpdate(dir, filename string, conte if err := s3a.cb.LoadS3ApiConfigurationFromBytes(content); err != nil { return err } - glog.V(0).Infof("updated %s/%s", dir, filename) + glog.V(1).Infof("updated %s/%s", dir, filename) } return nil } @@ -85,14 +85,14 @@ func (s3a *S3ApiServer) onBucketMetadataChange(dir string, oldEntry *filer_pb.En if newEntry != nil { // Update bucket registry (existing functionality) s3a.bucketRegistry.LoadBucketMetadata(newEntry) - glog.V(0).Infof("updated bucketMetadata %s/%s", dir, newEntry.Name) + glog.V(1).Infof("updated bucketMetadata %s/%s", dir, newEntry.Name) // Update bucket configuration cache with new entry s3a.updateBucketConfigCacheFromEntry(newEntry) } else if oldEntry != nil { // Remove from bucket registry (existing functionality) s3a.bucketRegistry.RemoveBucketMetadata(oldEntry) - glog.V(0).Infof("remove bucketMetadata %s/%s", dir, oldEntry.Name) + glog.V(1).Infof("remove bucketMetadata %s/%s", dir, oldEntry.Name) // Remove from bucket configuration cache s3a.invalidateBucketConfigCache(oldEntry.Name) @@ -145,7 +145,7 @@ func (s3a *S3ApiServer) updateBucketConfigCacheFromEntry(entry *filer_pb.Entry) } else { glog.V(3).Infof("updateBucketConfigCacheFromEntry: no Object Lock configuration found for bucket %s", bucket) } - + // Load bucket policy if present (for performance optimization) config.BucketPolicy = loadBucketPolicyFromExtended(entry, bucket) } diff --git a/weed/s3api/custom_types.go b/weed/s3api/custom_types.go index ea769ac4f..3d7a06ffa 100644 --- a/weed/s3api/custom_types.go +++ b/weed/s3api/custom_types.go @@ -10,6 +10,6 @@ const s3TimeFormat = "2006-01-02T15:04:05.999Z07:00" // ConditionalHeaderResult holds the result of conditional header checking type ConditionalHeaderResult struct { ErrorCode s3err.ErrorCode - ETag string // ETag of the object (for 304 responses) - Entry *filer_pb.Entry // Entry fetched during conditional check (nil if not fetched or object doesn't exist) + ETag string // ETag of the object (for 304 responses) + Entry *filer_pb.Entry // Entry fetched during conditional check (nil if not fetched or object doesn't exist) } diff --git a/weed/s3api/filer_multipart.go b/weed/s3api/filer_multipart.go index c4c07f0c7..4b8fbaa62 100644 --- a/weed/s3api/filer_multipart.go +++ b/weed/s3api/filer_multipart.go @@ -5,7 +5,9 @@ import ( "crypto/rand" "encoding/base64" "encoding/hex" + "encoding/json" "encoding/xml" + "errors" "fmt" "math" "path/filepath" @@ -71,7 +73,7 @@ func (s3a *S3ApiServer) createMultipartUpload(r *http.Request, input *s3.CreateM // Prepare and apply encryption configuration within directory creation // This ensures encryption resources are only allocated if directory creation succeeds - encryptionConfig, prepErr := s3a.prepareMultipartEncryptionConfig(r, uploadIdString) + encryptionConfig, prepErr := s3a.prepareMultipartEncryptionConfig(r, *input.Bucket, uploadIdString) if prepErr != nil { encryptionError = prepErr return // Exit callback, letting mkdir handle the error @@ -118,6 +120,36 @@ type CompleteMultipartUploadResult struct { VersionId *string `xml:"-"` } +// copySSEHeadersFromFirstPart copies all SSE-related headers from the first part to the destination entry +// This is critical for detectPrimarySSEType to work correctly and ensures encryption metadata is preserved +func copySSEHeadersFromFirstPart(dst *filer_pb.Entry, firstPart *filer_pb.Entry, context string) { + if firstPart == nil || firstPart.Extended == nil { + return + } + + // Copy ALL SSE-related headers (not just SeaweedFSSSEKMSKey) + sseKeys := []string{ + // SSE-C headers + s3_constants.SeaweedFSSSEIV, + s3_constants.AmzServerSideEncryptionCustomerAlgorithm, + s3_constants.AmzServerSideEncryptionCustomerKeyMD5, + // SSE-KMS headers + s3_constants.SeaweedFSSSEKMSKey, + s3_constants.AmzServerSideEncryptionAwsKmsKeyId, + // SSE-S3 headers + s3_constants.SeaweedFSSSES3Key, + // Common SSE header (for SSE-KMS and SSE-S3) + s3_constants.AmzServerSideEncryption, + } + + for _, key := range sseKeys { + if value, exists := firstPart.Extended[key]; exists { + dst.Extended[key] = value + glog.V(4).Infof("completeMultipartUpload: copied SSE header %s from first part (%s)", key, context) + } + } +} + func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.CompleteMultipartUploadInput, parts *CompleteMultipartUpload) (output *CompleteMultipartUploadResult, code s3err.ErrorCode) { glog.V(2).Infof("completeMultipartUpload input %v", input) @@ -231,6 +263,16 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl mime := pentry.Attributes.Mime var finalParts []*filer_pb.FileChunk var offset int64 + + // Track part boundaries for later retrieval with PartNumber parameter + type PartBoundary struct { + PartNumber int `json:"part"` + StartChunk int `json:"start"` + EndChunk int `json:"end"` // exclusive + ETag string `json:"etag"` + } + var partBoundaries []PartBoundary + for _, partNumber := range completedPartNumbers { partEntriesByNumber, ok := partEntries[partNumber] if !ok { @@ -251,42 +293,18 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl continue } - // Track within-part offset for SSE-KMS IV calculation - var withinPartOffset int64 = 0 + // Record the start chunk index for this part + partStartChunk := len(finalParts) + + // Calculate the part's ETag (for GetObject with PartNumber) + partETag := filer.ETag(entry) for _, chunk := range entry.GetChunks() { - // Update SSE metadata with correct within-part offset (unified approach for KMS and SSE-C) - sseKmsMetadata := chunk.SseMetadata - - if chunk.SseType == filer_pb.SSEType_SSE_KMS && len(chunk.SseMetadata) > 0 { - // Deserialize, update offset, and re-serialize SSE-KMS metadata - if kmsKey, err := DeserializeSSEKMSMetadata(chunk.SseMetadata); err == nil { - kmsKey.ChunkOffset = withinPartOffset - if updatedMetadata, serErr := SerializeSSEKMSMetadata(kmsKey); serErr == nil { - sseKmsMetadata = updatedMetadata - glog.V(4).Infof("Updated SSE-KMS metadata for chunk in part %d: withinPartOffset=%d", partNumber, withinPartOffset) - } - } - } else if chunk.SseType == filer_pb.SSEType_SSE_C { - // For SSE-C chunks, create per-chunk metadata using the part's IV - if ivData, exists := entry.Extended[s3_constants.SeaweedFSSSEIV]; exists { - // Get keyMD5 from entry metadata if available - var keyMD5 string - if keyMD5Data, keyExists := entry.Extended[s3_constants.AmzServerSideEncryptionCustomerKeyMD5]; keyExists { - keyMD5 = string(keyMD5Data) - } - - // Create SSE-C metadata with the part's IV and this chunk's within-part offset - if ssecMetadata, serErr := SerializeSSECMetadata(ivData, keyMD5, withinPartOffset); serErr == nil { - sseKmsMetadata = ssecMetadata // Reuse the same field for unified handling - glog.V(4).Infof("Created SSE-C metadata for chunk in part %d: withinPartOffset=%d", partNumber, withinPartOffset) - } else { - glog.Errorf("Failed to serialize SSE-C metadata for chunk in part %d: %v", partNumber, serErr) - } - } else { - glog.Errorf("SSE-C chunk in part %d missing IV in entry metadata", partNumber) - } - } + // CRITICAL: Do NOT modify SSE metadata offsets during assembly! + // The encrypted data was created with the offset stored in chunk.SseMetadata. + // Changing the offset here would cause decryption to fail because CTR mode + // uses the offset to initialize the counter. We must decrypt with the same + // offset that was used during encryption. p := &filer_pb.FileChunk{ FileId: chunk.GetFileIdString(), @@ -296,14 +314,23 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl CipherKey: chunk.CipherKey, ETag: chunk.ETag, IsCompressed: chunk.IsCompressed, - // Preserve SSE metadata with updated within-part offset + // Preserve SSE metadata UNCHANGED - do not modify the offset! SseType: chunk.SseType, - SseMetadata: sseKmsMetadata, + SseMetadata: chunk.SseMetadata, } finalParts = append(finalParts, p) offset += int64(chunk.Size) - withinPartOffset += int64(chunk.Size) } + + // Record the part boundary + partEndChunk := len(finalParts) + partBoundaries = append(partBoundaries, PartBoundary{ + PartNumber: partNumber, + StartChunk: partStartChunk, + EndChunk: partEndChunk, + ETag: partETag, + }) + found = true } } @@ -325,6 +352,12 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl } versionEntry.Extended[s3_constants.ExtVersionIdKey] = []byte(versionId) versionEntry.Extended[s3_constants.SeaweedFSUploadId] = []byte(*input.UploadId) + // Store parts count for x-amz-mp-parts-count header + versionEntry.Extended[s3_constants.SeaweedFSMultipartPartsCount] = []byte(fmt.Sprintf("%d", len(completedPartNumbers))) + // Store part boundaries for GetObject with PartNumber + if partBoundariesJSON, err := json.Marshal(partBoundaries); err == nil { + versionEntry.Extended[s3_constants.SeaweedFSMultipartPartBoundaries] = partBoundariesJSON + } // Set object owner for versioned multipart objects amzAccountId := r.Header.Get(s3_constants.AmzAccountId) @@ -338,17 +371,11 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl } } - // Preserve SSE-KMS metadata from the first part (if any) - // SSE-KMS metadata is stored in individual parts, not the upload directory + // Preserve ALL SSE metadata from the first part (if any) + // SSE metadata is stored in individual parts, not the upload directory if len(completedPartNumbers) > 0 && len(partEntries[completedPartNumbers[0]]) > 0 { firstPartEntry := partEntries[completedPartNumbers[0]][0] - if firstPartEntry.Extended != nil { - // Copy SSE-KMS metadata from the first part - if kmsMetadata, exists := firstPartEntry.Extended[s3_constants.SeaweedFSSSEKMSKey]; exists { - versionEntry.Extended[s3_constants.SeaweedFSSSEKMSKey] = kmsMetadata - glog.V(3).Infof("completeMultipartUpload: preserved SSE-KMS metadata from first part (versioned)") - } - } + copySSEHeadersFromFirstPart(versionEntry, firstPartEntry, "versioned") } if pentry.Attributes.Mime != "" { versionEntry.Attributes.Mime = pentry.Attributes.Mime @@ -387,6 +414,12 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl entry.Extended = make(map[string][]byte) } entry.Extended[s3_constants.ExtVersionIdKey] = []byte("null") + // Store parts count for x-amz-mp-parts-count header + entry.Extended[s3_constants.SeaweedFSMultipartPartsCount] = []byte(fmt.Sprintf("%d", len(completedPartNumbers))) + // Store part boundaries for GetObject with PartNumber + if partBoundariesJSON, jsonErr := json.Marshal(partBoundaries); jsonErr == nil { + entry.Extended[s3_constants.SeaweedFSMultipartPartBoundaries] = partBoundariesJSON + } // Set object owner for suspended versioning multipart objects amzAccountId := r.Header.Get(s3_constants.AmzAccountId) @@ -400,17 +433,11 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl } } - // Preserve SSE-KMS metadata from the first part (if any) - // SSE-KMS metadata is stored in individual parts, not the upload directory + // Preserve ALL SSE metadata from the first part (if any) + // SSE metadata is stored in individual parts, not the upload directory if len(completedPartNumbers) > 0 && len(partEntries[completedPartNumbers[0]]) > 0 { firstPartEntry := partEntries[completedPartNumbers[0]][0] - if firstPartEntry.Extended != nil { - // Copy SSE-KMS metadata from the first part - if kmsMetadata, exists := firstPartEntry.Extended[s3_constants.SeaweedFSSSEKMSKey]; exists { - entry.Extended[s3_constants.SeaweedFSSSEKMSKey] = kmsMetadata - glog.V(3).Infof("completeMultipartUpload: preserved SSE-KMS metadata from first part (suspended versioning)") - } - } + copySSEHeadersFromFirstPart(entry, firstPartEntry, "suspended versioning") } if pentry.Attributes.Mime != "" { entry.Attributes.Mime = pentry.Attributes.Mime @@ -440,6 +467,12 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl entry.Extended = make(map[string][]byte) } entry.Extended[s3_constants.SeaweedFSUploadId] = []byte(*input.UploadId) + // Store parts count for x-amz-mp-parts-count header + entry.Extended[s3_constants.SeaweedFSMultipartPartsCount] = []byte(fmt.Sprintf("%d", len(completedPartNumbers))) + // Store part boundaries for GetObject with PartNumber + if partBoundariesJSON, err := json.Marshal(partBoundaries); err == nil { + entry.Extended[s3_constants.SeaweedFSMultipartPartBoundaries] = partBoundariesJSON + } // Set object owner for non-versioned multipart objects amzAccountId := r.Header.Get(s3_constants.AmzAccountId) @@ -453,17 +486,11 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl } } - // Preserve SSE-KMS metadata from the first part (if any) - // SSE-KMS metadata is stored in individual parts, not the upload directory + // Preserve ALL SSE metadata from the first part (if any) + // SSE metadata is stored in individual parts, not the upload directory if len(completedPartNumbers) > 0 && len(partEntries[completedPartNumbers[0]]) > 0 { firstPartEntry := partEntries[completedPartNumbers[0]][0] - if firstPartEntry.Extended != nil { - // Copy SSE-KMS metadata from the first part - if kmsMetadata, exists := firstPartEntry.Extended[s3_constants.SeaweedFSSSEKMSKey]; exists { - entry.Extended[s3_constants.SeaweedFSSSEKMSKey] = kmsMetadata - glog.V(3).Infof("completeMultipartUpload: preserved SSE-KMS metadata from first part") - } - } + copySSEHeadersFromFirstPart(entry, firstPartEntry, "non-versioned") } if pentry.Attributes.Mime != "" { entry.Attributes.Mime = pentry.Attributes.Mime @@ -510,15 +537,11 @@ func (s3a *S3ApiServer) getEntryNameAndDir(input *s3.CompleteMultipartUploadInpu if dirName == "." { dirName = "" } - if strings.HasPrefix(dirName, "/") { - dirName = dirName[1:] - } + dirName = strings.TrimPrefix(dirName, "/") dirName = fmt.Sprintf("%s/%s/%s", s3a.option.BucketsPath, *input.Bucket, dirName) // remove suffix '/' - if strings.HasSuffix(dirName, "/") { - dirName = dirName[:len(dirName)-1] - } + dirName = strings.TrimSuffix(dirName, "/") return entryName, dirName } @@ -664,18 +687,23 @@ func (s3a *S3ApiServer) listObjectParts(input *s3.ListPartsInput) (output *ListP glog.Errorf("listObjectParts %s %s parse %s: %v", *input.Bucket, *input.UploadId, entry.Name, err) continue } - output.Part = append(output.Part, &s3.Part{ + partETag := filer.ETag(entry) + part := &s3.Part{ PartNumber: aws.Int64(int64(partNumber)), LastModified: aws.Time(time.Unix(entry.Attributes.Mtime, 0).UTC()), Size: aws.Int64(int64(filer.FileSize(entry))), - ETag: aws.String("\"" + filer.ETag(entry) + "\""), - }) + ETag: aws.String("\"" + partETag + "\""), + } + output.Part = append(output.Part, part) + glog.V(3).Infof("listObjectParts: Added part %d, size=%d, etag=%s", + partNumber, filer.FileSize(entry), partETag) if !isLast { output.NextPartNumberMarker = aws.Int64(int64(partNumber)) } } } + glog.V(2).Infof("listObjectParts: Returning %d parts for uploadId=%s", len(output.Part), *input.UploadId) return } @@ -704,11 +732,16 @@ type MultipartEncryptionConfig struct { // prepareMultipartEncryptionConfig prepares encryption configuration with proper error handling // This eliminates the need for criticalError variable in callback functions -func (s3a *S3ApiServer) prepareMultipartEncryptionConfig(r *http.Request, uploadIdString string) (*MultipartEncryptionConfig, error) { +// Updated to support bucket-default encryption (matches putToFiler behavior) +func (s3a *S3ApiServer) prepareMultipartEncryptionConfig(r *http.Request, bucket string, uploadIdString string) (*MultipartEncryptionConfig, error) { config := &MultipartEncryptionConfig{} - // Prepare SSE-KMS configuration - if IsSSEKMSRequest(r) { + // Check for explicit encryption headers first (priority over bucket defaults) + hasExplicitSSEKMS := IsSSEKMSRequest(r) + hasExplicitSSES3 := IsSSES3RequestInternal(r) + + // Prepare SSE-KMS configuration (explicit request headers) + if hasExplicitSSEKMS { config.IsSSEKMS = true config.KMSKeyID = r.Header.Get(s3_constants.AmzServerSideEncryptionAwsKmsKeyId) config.BucketKeyEnabled = strings.ToLower(r.Header.Get(s3_constants.AmzServerSideEncryptionBucketKeyEnabled)) == "true" @@ -721,11 +754,11 @@ func (s3a *S3ApiServer) prepareMultipartEncryptionConfig(r *http.Request, upload return nil, fmt.Errorf("failed to generate secure IV for SSE-KMS multipart upload: %v (read %d/%d bytes)", err, n, len(baseIV)) } config.KMSBaseIVEncoded = base64.StdEncoding.EncodeToString(baseIV) - glog.V(4).Infof("Generated base IV %x for SSE-KMS multipart upload %s", baseIV[:8], uploadIdString) + glog.V(4).Infof("Generated base IV %x for explicit SSE-KMS multipart upload %s", baseIV[:8], uploadIdString) } - // Prepare SSE-S3 configuration - if IsSSES3RequestInternal(r) { + // Prepare SSE-S3 configuration (explicit request headers) + if hasExplicitSSES3 { config.IsSSES3 = true // Generate and encode base IV with proper error handling @@ -735,7 +768,7 @@ func (s3a *S3ApiServer) prepareMultipartEncryptionConfig(r *http.Request, upload return nil, fmt.Errorf("failed to generate secure IV for SSE-S3 multipart upload: %v (read %d/%d bytes)", err, n, len(baseIV)) } config.S3BaseIVEncoded = base64.StdEncoding.EncodeToString(baseIV) - glog.V(4).Infof("Generated base IV %x for SSE-S3 multipart upload %s", baseIV[:8], uploadIdString) + glog.V(4).Infof("Generated base IV %x for explicit SSE-S3 multipart upload %s", baseIV[:8], uploadIdString) // Generate and serialize SSE-S3 key with proper error handling keyManager := GetSSES3KeyManager() @@ -753,7 +786,77 @@ func (s3a *S3ApiServer) prepareMultipartEncryptionConfig(r *http.Request, upload // Store key in manager for later retrieval keyManager.StoreKey(sseS3Key) - glog.V(4).Infof("Stored SSE-S3 key %s for multipart upload %s", sseS3Key.KeyID, uploadIdString) + glog.V(4).Infof("Stored SSE-S3 key %s for explicit multipart upload %s", sseS3Key.KeyID, uploadIdString) + } + + // If no explicit encryption headers, check bucket-default encryption + // This matches AWS S3 behavior and putToFiler() implementation + if !hasExplicitSSEKMS && !hasExplicitSSES3 { + encryptionConfig, err := s3a.GetBucketEncryptionConfig(bucket) + if err != nil { + // Check if this is just "no encryption configured" vs a real error + if !errors.Is(err, ErrNoEncryptionConfig) { + // Real error - propagate to prevent silent encryption bypass + return nil, fmt.Errorf("failed to read bucket encryption config for multipart upload: %v", err) + } + // No default encryption configured, continue without encryption + } else if encryptionConfig != nil && encryptionConfig.SseAlgorithm != "" { + glog.V(3).Infof("prepareMultipartEncryptionConfig: applying bucket-default encryption %s for bucket %s, upload %s", + encryptionConfig.SseAlgorithm, bucket, uploadIdString) + + switch encryptionConfig.SseAlgorithm { + case EncryptionTypeKMS: + // Apply SSE-KMS as bucket default + config.IsSSEKMS = true + config.KMSKeyID = encryptionConfig.KmsKeyId + config.BucketKeyEnabled = encryptionConfig.BucketKeyEnabled + // No encryption context for bucket defaults + + // Generate and encode base IV + baseIV := make([]byte, s3_constants.AESBlockSize) + n, readErr := rand.Read(baseIV) + if readErr != nil || n != len(baseIV) { + return nil, fmt.Errorf("failed to generate secure IV for bucket-default SSE-KMS multipart upload: %v (read %d/%d bytes)", readErr, n, len(baseIV)) + } + config.KMSBaseIVEncoded = base64.StdEncoding.EncodeToString(baseIV) + glog.V(4).Infof("Generated base IV %x for bucket-default SSE-KMS multipart upload %s", baseIV[:8], uploadIdString) + + case EncryptionTypeAES256: + // Apply SSE-S3 (AES256) as bucket default + config.IsSSES3 = true + + // Generate and encode base IV + baseIV := make([]byte, s3_constants.AESBlockSize) + n, readErr := rand.Read(baseIV) + if readErr != nil || n != len(baseIV) { + return nil, fmt.Errorf("failed to generate secure IV for bucket-default SSE-S3 multipart upload: %v (read %d/%d bytes)", readErr, n, len(baseIV)) + } + config.S3BaseIVEncoded = base64.StdEncoding.EncodeToString(baseIV) + glog.V(4).Infof("Generated base IV %x for bucket-default SSE-S3 multipart upload %s", baseIV[:8], uploadIdString) + + // Generate and serialize SSE-S3 key + keyManager := GetSSES3KeyManager() + sseS3Key, keyErr := keyManager.GetOrCreateKey("") + if keyErr != nil { + return nil, fmt.Errorf("failed to generate SSE-S3 key for bucket-default multipart upload: %v", keyErr) + } + + keyData, serErr := SerializeSSES3Metadata(sseS3Key) + if serErr != nil { + return nil, fmt.Errorf("failed to serialize SSE-S3 metadata for bucket-default multipart upload: %v", serErr) + } + + config.S3KeyDataEncoded = base64.StdEncoding.EncodeToString(keyData) + + // Store key in manager for later retrieval + keyManager.StoreKey(sseS3Key) + glog.V(4).Infof("Stored SSE-S3 key %s for bucket-default multipart upload %s", sseS3Key.KeyID, uploadIdString) + + default: + glog.V(3).Infof("prepareMultipartEncryptionConfig: unsupported bucket-default encryption algorithm %s for bucket %s", + encryptionConfig.SseAlgorithm, bucket) + } + } } return config, nil diff --git a/weed/s3api/filer_util.go b/weed/s3api/filer_util.go index ef7396996..10afab106 100644 --- a/weed/s3api/filer_util.go +++ b/weed/s3api/filer_util.go @@ -68,7 +68,7 @@ func doDeleteEntry(client filer_pb.SeaweedFilerClient, parentDirectoryPath strin glog.V(1).Infof("delete entry %v/%v: %v", parentDirectoryPath, entryName, request) if resp, err := client.DeleteEntry(context.Background(), request); err != nil { - glog.V(0).Infof("delete entry %v: %v", request, err) + glog.V(1).Infof("delete entry %v: %v", request, err) return fmt.Errorf("delete entry %s/%s: %v", parentDirectoryPath, entryName, err) } else { if resp.Error != "" { @@ -137,9 +137,9 @@ func (s3a *S3ApiServer) updateEntriesTTL(parentDirectoryPath string, ttlSec int3 } // processDirectoryTTL processes a single directory in paginated batches -func (s3a *S3ApiServer) processDirectoryTTL(ctx context.Context, client filer_pb.SeaweedFilerClient, +func (s3a *S3ApiServer) processDirectoryTTL(ctx context.Context, client filer_pb.SeaweedFilerClient, dir string, ttlSec int32, dirsToProcess *[]string, updateErrors *[]error) error { - + const batchSize = filer.PaginationSize startFrom := "" diff --git a/weed/s3api/policy_conversion.go b/weed/s3api/policy_conversion.go index 27a8d7560..e22827e3a 100644 --- a/weed/s3api/policy_conversion.go +++ b/weed/s3api/policy_conversion.go @@ -140,13 +140,13 @@ func convertPrincipal(principal interface{}) (*policy_engine.StringOrStringSlice // Handle AWS-style principal with service/user keys // Example: {"AWS": "arn:aws:iam::123456789012:user/Alice"} // Only AWS principals are supported for now. Other types like Service or Federated need special handling. - + awsPrincipals, ok := p["AWS"] if !ok || len(p) != 1 { glog.Warningf("unsupported principal map, only a single 'AWS' key is supported: %v", p) return nil, fmt.Errorf("unsupported principal map, only a single 'AWS' key is supported, got keys: %v", getMapKeys(p)) } - + // Recursively convert the AWS principal value res, err := convertPrincipal(awsPrincipals) if err != nil { @@ -236,4 +236,3 @@ func getMapKeys(m map[string]interface{}) []string { } return keys } - diff --git a/weed/s3api/policy_conversion_test.go b/weed/s3api/policy_conversion_test.go index e7a77126f..ef98c9fbc 100644 --- a/weed/s3api/policy_conversion_test.go +++ b/weed/s3api/policy_conversion_test.go @@ -13,10 +13,10 @@ func TestConvertPolicyDocumentWithMixedTypes(t *testing.T) { Version: "2012-10-17", Statement: []policy.Statement{ { - Sid: "TestMixedTypes", - Effect: "Allow", - Action: []string{"s3:GetObject"}, - Resource: []string{"arn:aws:s3:::bucket/*"}, + Sid: "TestMixedTypes", + Effect: "Allow", + Action: []string{"s3:GetObject"}, + Resource: []string{"arn:aws:s3:::bucket/*"}, Principal: []interface{}{"user1", 123, true}, // Mixed types Condition: map[string]map[string]interface{}{ "NumericEquals": { @@ -90,7 +90,7 @@ func TestConvertPolicyDocumentWithMixedTypes(t *testing.T) { } } - // Check StringEquals condition + // Check StringEquals condition stringCond, ok := stmt.Condition["StringEquals"] if !ok { t.Fatal("Expected StringEquals condition") @@ -116,7 +116,7 @@ func TestConvertPrincipalWithMapAndMixedTypes(t *testing.T) { principalMap := map[string]interface{}{ "AWS": []interface{}{ "arn:aws:iam::123456789012:user/Alice", - 456, // User ID as number + 456, // User ID as number true, // Some boolean value }, } @@ -125,7 +125,7 @@ func TestConvertPrincipalWithMapAndMixedTypes(t *testing.T) { if err != nil { t.Fatalf("Unexpected error: %v", err) } - + if result == nil { t.Fatal("Expected non-nil result") } @@ -230,7 +230,7 @@ func TestConvertPrincipalWithNilValues(t *testing.T) { if err != nil { t.Fatalf("Unexpected error: %v", err) } - + if result == nil { t.Fatal("Expected non-nil result") } @@ -296,7 +296,7 @@ func TestConvertPrincipalMapWithNilValues(t *testing.T) { if err != nil { t.Fatalf("Unexpected error: %v", err) } - + if result == nil { t.Fatal("Expected non-nil result") } @@ -322,11 +322,11 @@ func TestConvertPrincipalMapWithNilValues(t *testing.T) { func TestConvertToStringUnsupportedType(t *testing.T) { // Test that unsupported types (e.g., nested maps/slices) return empty string // This should trigger a warning log and return an error - + type customStruct struct { Field string } - + testCases := []struct { name string input interface{} @@ -494,7 +494,7 @@ func TestConvertPrincipalEmptyStrings(t *testing.T) { func TestConvertStatementWithUnsupportedFields(t *testing.T) { // Test that errors are returned for unsupported fields // These fields are critical for policy semantics and ignoring them would be a security risk - + testCases := []struct { name string statement *policy.Statement @@ -544,7 +544,7 @@ func TestConvertStatementWithUnsupportedFields(t *testing.T) { } else if !strings.Contains(err.Error(), tc.wantError) { t.Errorf("Expected error containing %q, got: %v", tc.wantError, err) } - + // Verify zero-value struct is returned on error if result.Sid != "" || result.Effect != "" { t.Error("Expected zero-value struct on error") @@ -611,4 +611,3 @@ func TestConvertPolicyDocumentWithId(t *testing.T) { t.Errorf("Expected 1 statement, got %d", len(dest.Statement)) } } - diff --git a/weed/s3api/s3_bucket_encryption.go b/weed/s3api/s3_bucket_encryption.go index 3166fb81f..0d54c2cd5 100644 --- a/weed/s3api/s3_bucket_encryption.go +++ b/weed/s3api/s3_bucket_encryption.go @@ -2,6 +2,7 @@ package s3api import ( "encoding/xml" + "errors" "fmt" "io" "net/http" @@ -12,6 +13,9 @@ import ( "github.com/seaweedfs/seaweedfs/weed/s3api/s3err" ) +// ErrNoEncryptionConfig is returned when a bucket has no encryption configuration +var ErrNoEncryptionConfig = errors.New("no encryption configuration found") + // ServerSideEncryptionConfiguration represents the bucket encryption configuration type ServerSideEncryptionConfiguration struct { XMLName xml.Name `xml:"ServerSideEncryptionConfiguration"` @@ -186,7 +190,7 @@ func (s3a *S3ApiServer) GetBucketEncryptionConfig(bucket string) (*s3_pb.Encrypt config, errCode := s3a.getEncryptionConfiguration(bucket) if errCode != s3err.ErrNone { if errCode == s3err.ErrNoSuchBucketEncryptionConfiguration { - return nil, fmt.Errorf("no encryption configuration found") + return nil, ErrNoEncryptionConfig } return nil, fmt.Errorf("failed to get encryption configuration") } @@ -251,7 +255,11 @@ func (s3a *S3ApiServer) removeEncryptionConfiguration(bucket string) s3err.Error // IsDefaultEncryptionEnabled checks if default encryption is enabled for a bucket func (s3a *S3ApiServer) IsDefaultEncryptionEnabled(bucket string) bool { config, err := s3a.GetBucketEncryptionConfig(bucket) - if err != nil || config == nil { + if err != nil { + glog.V(4).Infof("IsDefaultEncryptionEnabled: failed to get encryption config for bucket %s: %v", bucket, err) + return false + } + if config == nil { return false } return config.SseAlgorithm != "" @@ -260,7 +268,11 @@ func (s3a *S3ApiServer) IsDefaultEncryptionEnabled(bucket string) bool { // GetDefaultEncryptionHeaders returns the default encryption headers for a bucket func (s3a *S3ApiServer) GetDefaultEncryptionHeaders(bucket string) map[string]string { config, err := s3a.GetBucketEncryptionConfig(bucket) - if err != nil || config == nil { + if err != nil { + glog.V(4).Infof("GetDefaultEncryptionHeaders: failed to get encryption config for bucket %s: %v", bucket, err) + return nil + } + if config == nil { return nil } diff --git a/weed/s3api/s3_constants/header.go b/weed/s3api/s3_constants/header.go index 77ed310d9..e4c0ad77b 100644 --- a/weed/s3api/s3_constants/header.go +++ b/weed/s3api/s3_constants/header.go @@ -39,10 +39,13 @@ const ( AmzObjectTaggingDirective = "X-Amz-Tagging-Directive" AmzTagCount = "x-amz-tagging-count" - SeaweedFSIsDirectoryKey = "X-Seaweedfs-Is-Directory-Key" - SeaweedFSPartNumber = "X-Seaweedfs-Part-Number" - SeaweedFSUploadId = "X-Seaweedfs-Upload-Id" - SeaweedFSExpiresS3 = "X-Seaweedfs-Expires-S3" + SeaweedFSIsDirectoryKey = "X-Seaweedfs-Is-Directory-Key" + SeaweedFSPartNumber = "X-Seaweedfs-Part-Number" + SeaweedFSUploadId = "X-Seaweedfs-Upload-Id" + SeaweedFSMultipartPartsCount = "X-Seaweedfs-Multipart-Parts-Count" + SeaweedFSMultipartPartBoundaries = "X-Seaweedfs-Multipart-Part-Boundaries" // JSON: [{part:1,start:0,end:2,etag:"abc"},{part:2,start:2,end:3,etag:"def"}] + SeaweedFSExpiresS3 = "X-Seaweedfs-Expires-S3" + AmzMpPartsCount = "x-amz-mp-parts-count" // S3 ACL headers AmzCannedAcl = "X-Amz-Acl" @@ -70,8 +73,6 @@ const ( AmzCopySourceIfModifiedSince = "X-Amz-Copy-Source-If-Modified-Since" AmzCopySourceIfUnmodifiedSince = "X-Amz-Copy-Source-If-Unmodified-Since" - AmzMpPartsCount = "X-Amz-Mp-Parts-Count" - // S3 Server-Side Encryption with Customer-provided Keys (SSE-C) AmzServerSideEncryptionCustomerAlgorithm = "X-Amz-Server-Side-Encryption-Customer-Algorithm" AmzServerSideEncryptionCustomerKey = "X-Amz-Server-Side-Encryption-Customer-Key" diff --git a/weed/s3api/s3_iam_middleware.go b/weed/s3api/s3_iam_middleware.go index 4cb14490a..22e7b2233 100644 --- a/weed/s3api/s3_iam_middleware.go +++ b/weed/s3api/s3_iam_middleware.go @@ -452,7 +452,7 @@ func minInt(a, b int) int { func (s3a *S3ApiServer) SetIAMIntegration(iamManager *integration.IAMManager) { if s3a.iam != nil { s3a.iam.iamIntegration = NewS3IAMIntegration(iamManager, "localhost:8888") - glog.V(0).Infof("IAM integration successfully set on S3ApiServer") + glog.V(1).Infof("IAM integration successfully set on S3ApiServer") } else { glog.Errorf("Cannot set IAM integration: s3a.iam is nil") } diff --git a/weed/s3api/s3_multipart_iam.go b/weed/s3api/s3_multipart_iam.go index a9d6c7ccf..9b56efc07 100644 --- a/weed/s3api/s3_multipart_iam.go +++ b/weed/s3api/s3_multipart_iam.go @@ -83,7 +83,7 @@ func (iam *IdentityAccessManagement) ValidateMultipartOperationWithIAM(r *http.R // This header is set during initial authentication and contains the correct assumed role ARN principalArn := r.Header.Get("X-SeaweedFS-Principal") if principalArn == "" { - glog.V(0).Info("IAM authorization for multipart operation failed: missing principal ARN in request header") + glog.V(2).Info("IAM authorization for multipart operation failed: missing principal ARN in request header") return s3err.ErrAccessDenied } diff --git a/weed/s3api/s3_sse_c.go b/weed/s3api/s3_sse_c.go index 733ae764e..3394a3ba6 100644 --- a/weed/s3api/s3_sse_c.go +++ b/weed/s3api/s3_sse_c.go @@ -16,6 +16,20 @@ import ( "github.com/seaweedfs/seaweedfs/weed/s3api/s3err" ) +// decryptReaderCloser wraps a cipher.StreamReader with proper Close() support +// This ensures the underlying io.ReadCloser (like http.Response.Body) is properly closed +type decryptReaderCloser struct { + io.Reader + underlyingCloser io.Closer +} + +func (d *decryptReaderCloser) Close() error { + if d.underlyingCloser != nil { + return d.underlyingCloser.Close() + } + return nil +} + // SSECCopyStrategy represents different strategies for copying SSE-C objects type SSECCopyStrategy int @@ -197,8 +211,17 @@ func CreateSSECDecryptedReader(r io.Reader, customerKey *SSECustomerKey, iv []by // Create CTR mode cipher using the IV from metadata stream := cipher.NewCTR(block, iv) + decryptReader := &cipher.StreamReader{S: stream, R: r} + + // Wrap with closer if the underlying reader implements io.Closer + if closer, ok := r.(io.Closer); ok { + return &decryptReaderCloser{ + Reader: decryptReader, + underlyingCloser: closer, + }, nil + } - return &cipher.StreamReader{S: stream, R: r}, nil + return decryptReader, nil } // CreateSSECEncryptedReaderWithOffset creates an encrypted reader with a specific counter offset diff --git a/weed/s3api/s3_sse_ctr_test.go b/weed/s3api/s3_sse_ctr_test.go new file mode 100644 index 000000000..81bbaf003 --- /dev/null +++ b/weed/s3api/s3_sse_ctr_test.go @@ -0,0 +1,307 @@ +package s3api + +import ( + "bytes" + "crypto/aes" + "crypto/cipher" + "crypto/rand" + "io" + "testing" +) + +// TestCalculateIVWithOffset tests the calculateIVWithOffset function +func TestCalculateIVWithOffset(t *testing.T) { + baseIV := make([]byte, 16) + rand.Read(baseIV) + + tests := []struct { + name string + offset int64 + expectedSkip int + expectedBlock int64 + }{ + {"BlockAligned_0", 0, 0, 0}, + {"BlockAligned_16", 16, 0, 1}, + {"BlockAligned_32", 32, 0, 2}, + {"BlockAligned_48", 48, 0, 3}, + {"NonAligned_1", 1, 1, 0}, + {"NonAligned_5", 5, 5, 0}, + {"NonAligned_10", 10, 10, 0}, + {"NonAligned_15", 15, 15, 0}, + {"NonAligned_17", 17, 1, 1}, + {"NonAligned_21", 21, 5, 1}, + {"NonAligned_33", 33, 1, 2}, + {"NonAligned_47", 47, 15, 2}, + {"LargeOffset", 1000, 1000 % 16, 1000 / 16}, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + adjustedIV, skip := calculateIVWithOffset(baseIV, tt.offset) + + // Verify skip is correct + if skip != tt.expectedSkip { + t.Errorf("calculateIVWithOffset(%d) skip = %d, want %d", tt.offset, skip, tt.expectedSkip) + } + + // Verify IV length is preserved + if len(adjustedIV) != 16 { + t.Errorf("calculateIVWithOffset(%d) IV length = %d, want 16", tt.offset, len(adjustedIV)) + } + + // Verify IV was adjusted correctly (last 8 bytes incremented by blockOffset) + if tt.expectedBlock == 0 { + if !bytes.Equal(adjustedIV, baseIV) { + t.Errorf("calculateIVWithOffset(%d) IV changed when blockOffset=0", tt.offset) + } + } else { + // IV should be different for non-zero block offsets + if bytes.Equal(adjustedIV, baseIV) { + t.Errorf("calculateIVWithOffset(%d) IV not changed when blockOffset=%d", tt.offset, tt.expectedBlock) + } + } + }) + } +} + +// TestCTRDecryptionWithNonBlockAlignedOffset tests that CTR decryption works correctly +// for non-block-aligned offsets (the critical bug fix) +func TestCTRDecryptionWithNonBlockAlignedOffset(t *testing.T) { + // Generate test data + plaintext := make([]byte, 1024) + for i := range plaintext { + plaintext[i] = byte(i % 256) + } + + // Generate random key and IV + key := make([]byte, 32) // AES-256 + iv := make([]byte, 16) + rand.Read(key) + rand.Read(iv) + + // Encrypt the entire plaintext + block, err := aes.NewCipher(key) + if err != nil { + t.Fatalf("Failed to create cipher: %v", err) + } + + ciphertext := make([]byte, len(plaintext)) + stream := cipher.NewCTR(block, iv) + stream.XORKeyStream(ciphertext, plaintext) + + // Test various offsets (both block-aligned and non-block-aligned) + testOffsets := []int64{0, 1, 5, 10, 15, 16, 17, 21, 32, 33, 47, 48, 100, 500} + + for _, offset := range testOffsets { + t.Run(string(rune('A'+offset)), func(t *testing.T) { + // Calculate adjusted IV and skip + adjustedIV, skip := calculateIVWithOffset(iv, offset) + + // CRITICAL: Start from the block-aligned offset, not the user offset + // CTR mode works on 16-byte blocks, so we need to decrypt from the block start + blockAlignedOffset := offset - int64(skip) + + // Decrypt from the block-aligned offset + decryptBlock, err := aes.NewCipher(key) + if err != nil { + t.Fatalf("Failed to create decrypt cipher: %v", err) + } + + decryptStream := cipher.NewCTR(decryptBlock, adjustedIV) + + // Create a reader for the ciphertext starting at block-aligned offset + ciphertextFromBlockStart := ciphertext[blockAlignedOffset:] + decryptedFromBlockStart := make([]byte, len(ciphertextFromBlockStart)) + decryptStream.XORKeyStream(decryptedFromBlockStart, ciphertextFromBlockStart) + + // CRITICAL: Skip the intra-block bytes to get to the user-requested offset + if skip > 0 { + if skip > len(decryptedFromBlockStart) { + t.Fatalf("Skip %d exceeds decrypted data length %d", skip, len(decryptedFromBlockStart)) + } + decryptedFromBlockStart = decryptedFromBlockStart[skip:] + } + + // Rename for consistency + decryptedFromOffset := decryptedFromBlockStart + + // Verify decrypted data matches original plaintext + expectedPlaintext := plaintext[offset:] + if !bytes.Equal(decryptedFromOffset, expectedPlaintext) { + t.Errorf("Decryption mismatch at offset %d (skip=%d)", offset, skip) + previewLen := 32 + if len(expectedPlaintext) < previewLen { + previewLen = len(expectedPlaintext) + } + t.Errorf(" Expected first 32 bytes: %x", expectedPlaintext[:previewLen]) + previewLen2 := 32 + if len(decryptedFromOffset) < previewLen2 { + previewLen2 = len(decryptedFromOffset) + } + t.Errorf(" Got first 32 bytes: %x", decryptedFromOffset[:previewLen2]) + + // Find first mismatch + for i := 0; i < len(expectedPlaintext) && i < len(decryptedFromOffset); i++ { + if expectedPlaintext[i] != decryptedFromOffset[i] { + t.Errorf(" First mismatch at byte %d: expected %02x, got %02x", i, expectedPlaintext[i], decryptedFromOffset[i]) + break + } + } + } + }) + } +} + +// TestCTRRangeRequestSimulation simulates a real-world S3 range request scenario +func TestCTRRangeRequestSimulation(t *testing.T) { + // Simulate uploading a 5MB object + objectSize := 5 * 1024 * 1024 + plaintext := make([]byte, objectSize) + for i := range plaintext { + plaintext[i] = byte(i % 256) + } + + // Encrypt the object + key := make([]byte, 32) + iv := make([]byte, 16) + rand.Read(key) + rand.Read(iv) + + block, err := aes.NewCipher(key) + if err != nil { + t.Fatalf("Failed to create cipher: %v", err) + } + + ciphertext := make([]byte, len(plaintext)) + stream := cipher.NewCTR(block, iv) + stream.XORKeyStream(ciphertext, plaintext) + + // Simulate various S3 range requests + rangeTests := []struct { + name string + start int64 + end int64 + }{ + {"First byte", 0, 0}, + {"First 100 bytes", 0, 99}, + {"Mid-block range", 5, 100}, // Critical: starts at non-aligned offset + {"Single mid-block byte", 17, 17}, // Critical: single byte at offset 17 + {"Cross-block range", 10, 50}, // Spans multiple blocks + {"Large range", 1000, 10000}, + {"Tail range", int64(objectSize - 1000), int64(objectSize - 1)}, + } + + for _, rt := range rangeTests { + t.Run(rt.name, func(t *testing.T) { + rangeSize := rt.end - rt.start + 1 + + // Calculate adjusted IV and skip for the range start + adjustedIV, skip := calculateIVWithOffset(iv, rt.start) + + // CRITICAL: Start decryption from block-aligned offset + blockAlignedStart := rt.start - int64(skip) + + // Create decryption stream + decryptBlock, err := aes.NewCipher(key) + if err != nil { + t.Fatalf("Failed to create decrypt cipher: %v", err) + } + + decryptStream := cipher.NewCTR(decryptBlock, adjustedIV) + + // Decrypt from block-aligned start through the end of range + ciphertextFromBlock := ciphertext[blockAlignedStart : rt.end+1] + decryptedFromBlock := make([]byte, len(ciphertextFromBlock)) + decryptStream.XORKeyStream(decryptedFromBlock, ciphertextFromBlock) + + // CRITICAL: Skip intra-block bytes to get to user-requested start + if skip > 0 { + decryptedFromBlock = decryptedFromBlock[skip:] + } + + decryptedRange := decryptedFromBlock + + // Verify decrypted range matches original plaintext + expectedPlaintext := plaintext[rt.start : rt.end+1] + if !bytes.Equal(decryptedRange, expectedPlaintext) { + t.Errorf("Range decryption mismatch for %s (offset=%d, size=%d, skip=%d)", + rt.name, rt.start, rangeSize, skip) + previewLen := 64 + if len(expectedPlaintext) < previewLen { + previewLen = len(expectedPlaintext) + } + t.Errorf(" Expected: %x", expectedPlaintext[:previewLen]) + previewLen2 := previewLen + if len(decryptedRange) < previewLen2 { + previewLen2 = len(decryptedRange) + } + t.Errorf(" Got: %x", decryptedRange[:previewLen2]) + } + }) + } +} + +// TestCTRDecryptionWithIOReader tests the integration with io.Reader +func TestCTRDecryptionWithIOReader(t *testing.T) { + plaintext := []byte("Hello, World! This is a test of CTR mode decryption with non-aligned offsets.") + + key := make([]byte, 32) + iv := make([]byte, 16) + rand.Read(key) + rand.Read(iv) + + // Encrypt + block, err := aes.NewCipher(key) + if err != nil { + t.Fatalf("Failed to create cipher: %v", err) + } + + ciphertext := make([]byte, len(plaintext)) + stream := cipher.NewCTR(block, iv) + stream.XORKeyStream(ciphertext, plaintext) + + // Test reading from various offsets using io.Reader + testOffsets := []int64{0, 5, 10, 16, 17, 30} + + for _, offset := range testOffsets { + t.Run(string(rune('A'+offset)), func(t *testing.T) { + // Calculate adjusted IV and skip + adjustedIV, skip := calculateIVWithOffset(iv, offset) + + // CRITICAL: Start reading from block-aligned offset in ciphertext + blockAlignedOffset := offset - int64(skip) + + // Create decrypted reader + decryptBlock, err := aes.NewCipher(key) + if err != nil { + t.Fatalf("Failed to create decrypt cipher: %v", err) + } + + decryptStream := cipher.NewCTR(decryptBlock, adjustedIV) + ciphertextReader := bytes.NewReader(ciphertext[blockAlignedOffset:]) + decryptedReader := &cipher.StreamReader{S: decryptStream, R: ciphertextReader} + + // Skip intra-block bytes to get to user-requested offset + if skip > 0 { + _, err := io.CopyN(io.Discard, decryptedReader, int64(skip)) + if err != nil { + t.Fatalf("Failed to skip %d bytes: %v", skip, err) + } + } + + // Read decrypted data + decryptedData, err := io.ReadAll(decryptedReader) + if err != nil { + t.Fatalf("Failed to read decrypted data: %v", err) + } + + // Verify + expectedPlaintext := plaintext[offset:] + if !bytes.Equal(decryptedData, expectedPlaintext) { + t.Errorf("Decryption mismatch at offset %d (skip=%d)", offset, skip) + t.Errorf(" Expected: %q", expectedPlaintext) + t.Errorf(" Got: %q", decryptedData) + } + }) + } +} diff --git a/weed/s3api/s3_sse_kms.go b/weed/s3api/s3_sse_kms.go index 3b721aa26..fa9451a8f 100644 --- a/weed/s3api/s3_sse_kms.go +++ b/weed/s3api/s3_sse_kms.go @@ -164,7 +164,8 @@ func CreateSSEKMSEncryptedReaderWithBaseIVAndOffset(r io.Reader, keyID string, e defer clearKMSDataKey(dataKeyResult) // Calculate unique IV using base IV and offset to prevent IV reuse in multipart uploads - iv := calculateIVWithOffset(baseIV, offset) + // Skip is not used here because we're encrypting from the start (not reading a range) + iv, _ := calculateIVWithOffset(baseIV, offset) // Create CTR mode cipher stream stream := cipher.NewCTR(dataKeyResult.Block, iv) @@ -420,9 +421,11 @@ func CreateSSEKMSDecryptedReader(r io.Reader, sseKey *SSEKMSKey) (io.Reader, err } // Calculate the correct IV for this chunk's offset within the original part + // Note: The skip bytes must be discarded by the caller before reading from the returned reader var iv []byte if sseKey.ChunkOffset > 0 { - iv = calculateIVWithOffset(sseKey.IV, sseKey.ChunkOffset) + iv, _ = calculateIVWithOffset(sseKey.IV, sseKey.ChunkOffset) + // Skip value is ignored here; caller must handle intra-block byte skipping } else { iv = sseKey.IV } @@ -436,9 +439,18 @@ func CreateSSEKMSDecryptedReader(r io.Reader, sseKey *SSEKMSKey) (io.Reader, err // Create CTR mode cipher stream for decryption // Note: AES-CTR is used for object data decryption to match the encryption mode stream := cipher.NewCTR(block, iv) + decryptReader := &cipher.StreamReader{S: stream, R: r} + + // Wrap with closer if the underlying reader implements io.Closer + if closer, ok := r.(io.Closer); ok { + return &decryptReaderCloser{ + Reader: decryptReader, + underlyingCloser: closer, + }, nil + } // Return the decrypted reader - return &cipher.StreamReader{S: stream, R: r}, nil + return decryptReader, nil } // ParseSSEKMSHeaders parses SSE-KMS headers from an HTTP request diff --git a/weed/s3api/s3_sse_s3.go b/weed/s3api/s3_sse_s3.go index bc648205e..22292bb9b 100644 --- a/weed/s3api/s3_sse_s3.go +++ b/weed/s3api/s3_sse_s3.go @@ -109,8 +109,17 @@ func CreateSSES3DecryptedReader(reader io.Reader, key *SSES3Key, iv []byte) (io. // Create CTR mode cipher with the provided IV stream := cipher.NewCTR(block, iv) + decryptReader := &cipher.StreamReader{S: stream, R: reader} - return &cipher.StreamReader{S: stream, R: reader}, nil + // Wrap with closer if the underlying reader implements io.Closer + if closer, ok := reader.(io.Closer); ok { + return &decryptReaderCloser{ + Reader: decryptReader, + underlyingCloser: closer, + }, nil + } + + return decryptReader, nil } // GetSSES3Headers returns the headers for SSE-S3 encrypted objects @@ -531,7 +540,8 @@ func CreateSSES3EncryptedReaderWithBaseIV(reader io.Reader, key *SSES3Key, baseI // Calculate the proper IV with offset to ensure unique IV per chunk/part // This prevents the severe security vulnerability of IV reuse in CTR mode - iv := calculateIVWithOffset(baseIV, offset) + // Skip is not used here because we're encrypting from the start (not reading a range) + iv, _ := calculateIVWithOffset(baseIV, offset) stream := cipher.NewCTR(block, iv) encryptedReader := &cipher.StreamReader{S: stream, R: reader} diff --git a/weed/s3api/s3_sse_s3_multipart_test.go b/weed/s3api/s3_sse_s3_multipart_test.go new file mode 100644 index 000000000..88f20d0e9 --- /dev/null +++ b/weed/s3api/s3_sse_s3_multipart_test.go @@ -0,0 +1,266 @@ +package s3api + +import ( + "bytes" + "crypto/aes" + "crypto/cipher" + "crypto/rand" + "testing" + + "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" +) + +// TestSSES3MultipartChunkViewDecryption tests that multipart SSE-S3 objects use per-chunk IVs +func TestSSES3MultipartChunkViewDecryption(t *testing.T) { + // Generate test key and base IV + key := make([]byte, 32) + rand.Read(key) + baseIV := make([]byte, 16) + rand.Read(baseIV) + + // Create test plaintext + plaintext := []byte("This is test data for SSE-S3 multipart encryption testing") + + // Simulate multipart upload with 2 parts at different offsets + testCases := []struct { + name string + partNumber int + partOffset int64 + data []byte + }{ + {"Part 1", 1, 0, plaintext[:30]}, + {"Part 2", 2, 5 * 1024 * 1024, plaintext[30:]}, // 5MB offset + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + // Calculate IV with offset (simulating upload encryption) + adjustedIV, _ := calculateIVWithOffset(baseIV, tc.partOffset) + + // Encrypt the part data + block, err := aes.NewCipher(key) + if err != nil { + t.Fatalf("Failed to create cipher: %v", err) + } + + ciphertext := make([]byte, len(tc.data)) + stream := cipher.NewCTR(block, adjustedIV) + stream.XORKeyStream(ciphertext, tc.data) + + // SSE-S3 stores the offset-adjusted IV directly in chunk metadata + // (unlike SSE-C which stores base IV + PartOffset) + chunkIV := adjustedIV + + // Verify the IV is offset-adjusted for non-zero offsets + if tc.partOffset == 0 { + if !bytes.Equal(chunkIV, baseIV) { + t.Error("IV should equal base IV when offset is 0") + } + } else { + if bytes.Equal(chunkIV, baseIV) { + t.Error("Chunk IV should be offset-adjusted, not base IV") + } + } + + // Verify decryption works with the chunk's IV + decryptedData := make([]byte, len(ciphertext)) + decryptBlock, err := aes.NewCipher(key) + if err != nil { + t.Fatalf("Failed to create decrypt cipher: %v", err) + } + decryptStream := cipher.NewCTR(decryptBlock, chunkIV) + decryptStream.XORKeyStream(decryptedData, ciphertext) + + if !bytes.Equal(decryptedData, tc.data) { + t.Errorf("Decryption failed: expected %q, got %q", tc.data, decryptedData) + } + }) + } +} + +// TestSSES3SinglePartChunkViewDecryption tests single-part SSE-S3 objects use object-level IV +func TestSSES3SinglePartChunkViewDecryption(t *testing.T) { + // Generate test key and IV + key := make([]byte, 32) + rand.Read(key) + iv := make([]byte, 16) + rand.Read(iv) + + // Create test plaintext + plaintext := []byte("This is test data for SSE-S3 single-part encryption testing") + + // Encrypt the data + block, err := aes.NewCipher(key) + if err != nil { + t.Fatalf("Failed to create cipher: %v", err) + } + + ciphertext := make([]byte, len(plaintext)) + stream := cipher.NewCTR(block, iv) + stream.XORKeyStream(ciphertext, plaintext) + + // Create a mock file chunk WITHOUT per-chunk metadata (single-part path) + fileChunk := &filer_pb.FileChunk{ + FileId: "test-file-id", + Offset: 0, + Size: uint64(len(ciphertext)), + SseType: filer_pb.SSEType_SSE_S3, + SseMetadata: nil, // No per-chunk metadata for single-part + } + + // Verify the chunk does NOT have per-chunk metadata + if len(fileChunk.GetSseMetadata()) > 0 { + t.Error("Single-part chunk should not have per-chunk metadata") + } + + // For single-part, the object-level IV is used + objectLevelIV := iv + + // Verify decryption works with the object-level IV + decryptedData := make([]byte, len(ciphertext)) + decryptBlock, _ := aes.NewCipher(key) + decryptStream := cipher.NewCTR(decryptBlock, objectLevelIV) + decryptStream.XORKeyStream(decryptedData, ciphertext) + + if !bytes.Equal(decryptedData, plaintext) { + t.Errorf("Decryption failed: expected %q, got %q", plaintext, decryptedData) + } +} + +// TestSSES3IVOffsetCalculation verifies IV offset calculation for multipart uploads +func TestSSES3IVOffsetCalculation(t *testing.T) { + baseIV := make([]byte, 16) + rand.Read(baseIV) + + testCases := []struct { + name string + partNumber int + partSize int64 + offset int64 + }{ + {"Part 1", 1, 5 * 1024 * 1024, 0}, + {"Part 2", 2, 5 * 1024 * 1024, 5 * 1024 * 1024}, + {"Part 3", 3, 5 * 1024 * 1024, 10 * 1024 * 1024}, + {"Part 10", 10, 5 * 1024 * 1024, 45 * 1024 * 1024}, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + // Calculate IV with offset + adjustedIV, skip := calculateIVWithOffset(baseIV, tc.offset) + + // Verify IV is different from base (except for offset 0) + if tc.offset == 0 { + if !bytes.Equal(adjustedIV, baseIV) { + t.Error("IV should equal base IV when offset is 0") + } + if skip != 0 { + t.Errorf("Skip should be 0 when offset is 0, got %d", skip) + } + } else { + if bytes.Equal(adjustedIV, baseIV) { + t.Error("IV should be different from base IV when offset > 0") + } + } + + // Verify skip is calculated correctly + expectedSkip := int(tc.offset % 16) + if skip != expectedSkip { + t.Errorf("Skip mismatch: expected %d, got %d", expectedSkip, skip) + } + + // Verify IV adjustment is deterministic + adjustedIV2, skip2 := calculateIVWithOffset(baseIV, tc.offset) + if !bytes.Equal(adjustedIV, adjustedIV2) || skip != skip2 { + t.Error("IV calculation is not deterministic") + } + }) + } +} + +// TestSSES3ChunkMetadataDetection tests detection of per-chunk vs object-level metadata +func TestSSES3ChunkMetadataDetection(t *testing.T) { + // Test data for multipart chunk + mockMetadata := []byte("mock-serialized-metadata") + + testCases := []struct { + name string + chunk *filer_pb.FileChunk + expectedMultipart bool + }{ + { + name: "Multipart chunk with metadata", + chunk: &filer_pb.FileChunk{ + SseType: filer_pb.SSEType_SSE_S3, + SseMetadata: mockMetadata, + }, + expectedMultipart: true, + }, + { + name: "Single-part chunk without metadata", + chunk: &filer_pb.FileChunk{ + SseType: filer_pb.SSEType_SSE_S3, + SseMetadata: nil, + }, + expectedMultipart: false, + }, + { + name: "Non-SSE-S3 chunk", + chunk: &filer_pb.FileChunk{ + SseType: filer_pb.SSEType_NONE, + SseMetadata: nil, + }, + expectedMultipart: false, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + hasPerChunkMetadata := tc.chunk.GetSseType() == filer_pb.SSEType_SSE_S3 && len(tc.chunk.GetSseMetadata()) > 0 + + if hasPerChunkMetadata != tc.expectedMultipart { + t.Errorf("Expected multipart=%v, got hasPerChunkMetadata=%v", tc.expectedMultipart, hasPerChunkMetadata) + } + }) + } +} + +// TestSSES3EncryptionConsistency verifies encryption/decryption roundtrip +func TestSSES3EncryptionConsistency(t *testing.T) { + plaintext := []byte("Test data for SSE-S3 encryption consistency verification") + + key := make([]byte, 32) + rand.Read(key) + iv := make([]byte, 16) + rand.Read(iv) + + // Encrypt + block, err := aes.NewCipher(key) + if err != nil { + t.Fatalf("Failed to create cipher: %v", err) + } + + ciphertext := make([]byte, len(plaintext)) + encryptStream := cipher.NewCTR(block, iv) + encryptStream.XORKeyStream(ciphertext, plaintext) + + // Decrypt + decrypted := make([]byte, len(ciphertext)) + decryptBlock, _ := aes.NewCipher(key) + decryptStream := cipher.NewCTR(decryptBlock, iv) + decryptStream.XORKeyStream(decrypted, ciphertext) + + // Verify + if !bytes.Equal(decrypted, plaintext) { + t.Errorf("Decryption mismatch: expected %q, got %q", plaintext, decrypted) + } + + // Verify idempotency - decrypt again should give garbage + decrypted2 := make([]byte, len(ciphertext)) + decryptStream2 := cipher.NewCTR(decryptBlock, iv) + decryptStream2.XORKeyStream(decrypted2, ciphertext) + + if !bytes.Equal(decrypted2, plaintext) { + t.Error("Second decryption should also work with fresh stream") + } +} diff --git a/weed/s3api/s3_sse_utils.go b/weed/s3api/s3_sse_utils.go index 848bc61ea..c902dc423 100644 --- a/weed/s3api/s3_sse_utils.go +++ b/weed/s3api/s3_sse_utils.go @@ -4,19 +4,22 @@ import "github.com/seaweedfs/seaweedfs/weed/glog" // calculateIVWithOffset calculates a unique IV by combining a base IV with an offset. // This ensures each chunk/part uses a unique IV, preventing CTR mode IV reuse vulnerabilities. +// Returns the adjusted IV and the number of bytes to skip from the decrypted stream. +// The skip is needed because CTR mode operates on 16-byte blocks, but the offset may not be block-aligned. // This function is shared between SSE-KMS and SSE-S3 implementations for consistency. -func calculateIVWithOffset(baseIV []byte, offset int64) []byte { +func calculateIVWithOffset(baseIV []byte, offset int64) ([]byte, int) { if len(baseIV) != 16 { glog.Errorf("Invalid base IV length: expected 16, got %d", len(baseIV)) - return baseIV // Return original IV as fallback + return baseIV, 0 // Return original IV as fallback } // Create a copy of the base IV to avoid modifying the original iv := make([]byte, 16) copy(iv, baseIV) - // Calculate the block offset (AES block size is 16 bytes) + // Calculate the block offset (AES block size is 16 bytes) and intra-block skip blockOffset := offset / 16 + skip := int(offset % 16) originalBlockOffset := blockOffset // Add the block offset to the IV counter (last 8 bytes, big-endian) @@ -36,7 +39,7 @@ func calculateIVWithOffset(baseIV []byte, offset int64) []byte { } // Single consolidated debug log to avoid performance impact in high-throughput scenarios - glog.V(4).Infof("calculateIVWithOffset: baseIV=%x, offset=%d, blockOffset=%d, derivedIV=%x", - baseIV, offset, originalBlockOffset, iv) - return iv + glog.V(4).Infof("calculateIVWithOffset: baseIV=%x, offset=%d, blockOffset=%d, skip=%d, derivedIV=%x", + baseIV, offset, originalBlockOffset, skip, iv) + return iv, skip } diff --git a/weed/s3api/s3api_bucket_config.go b/weed/s3api/s3api_bucket_config.go index c71069d08..00449d80a 100644 --- a/weed/s3api/s3api_bucket_config.go +++ b/weed/s3api/s3api_bucket_config.go @@ -290,8 +290,8 @@ func (bcc *BucketConfigCache) Clear() { // IsNegativelyCached checks if a bucket is in the negative cache (doesn't exist) func (bcc *BucketConfigCache) IsNegativelyCached(bucket string) bool { - bcc.mutex.RLock() - defer bcc.mutex.RUnlock() + bcc.mutex.Lock() + defer bcc.mutex.Unlock() if cachedTime, exists := bcc.negativeCache[bucket]; exists { // Check if the negative cache entry is still valid @@ -400,7 +400,7 @@ func (s3a *S3ApiServer) getBucketConfig(bucket string) (*BucketConfig, s3err.Err } else { glog.V(3).Infof("getBucketConfig: no Object Lock config found in extended attributes for bucket %s", bucket) } - + // Load bucket policy if present (for performance optimization) config.BucketPolicy = loadBucketPolicyFromExtended(entry, bucket) } @@ -479,7 +479,6 @@ func (s3a *S3ApiServer) updateBucketConfig(bucket string, updateFn func(*BucketC glog.V(3).Infof("updateBucketConfig: saved entry to filer for bucket %s", bucket) // Update cache - glog.V(3).Infof("updateBucketConfig: updating cache for bucket %s, ObjectLockConfig=%+v", bucket, config.ObjectLockConfig) s3a.bucketConfigCache.Set(bucket, config) return s3err.ErrNone @@ -522,6 +521,7 @@ func (s3a *S3ApiServer) getVersioningState(bucket string) (string, error) { if errCode == s3err.ErrNoSuchBucket { return "", nil } + glog.Errorf("getVersioningState: failed to get bucket config for %s: %v", bucket, errCode) return "", fmt.Errorf("failed to get bucket config: %v", errCode) } @@ -548,10 +548,11 @@ func (s3a *S3ApiServer) getBucketVersioningStatus(bucket string) (string, s3err. // setBucketVersioningStatus sets the versioning status for a bucket func (s3a *S3ApiServer) setBucketVersioningStatus(bucket, status string) s3err.ErrorCode { - return s3a.updateBucketConfig(bucket, func(config *BucketConfig) error { + errCode := s3a.updateBucketConfig(bucket, func(config *BucketConfig) error { config.Versioning = status return nil }) + return errCode } // getBucketOwnership returns the ownership setting for a bucket diff --git a/weed/s3api/s3api_bucket_handlers.go b/weed/s3api/s3api_bucket_handlers.go index 5ebb06b21..7bda07d97 100644 --- a/weed/s3api/s3api_bucket_handlers.go +++ b/weed/s3api/s3api_bucket_handlers.go @@ -1159,6 +1159,7 @@ func (s3a *S3ApiServer) PutBucketVersioningHandler(w http.ResponseWriter, r *htt status := *versioningConfig.Status if status != s3_constants.VersioningEnabled && status != s3_constants.VersioningSuspended { + glog.Errorf("PutBucketVersioningHandler: invalid status '%s' for bucket %s", status, bucket) s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRequest) return } @@ -1176,7 +1177,7 @@ func (s3a *S3ApiServer) PutBucketVersioningHandler(w http.ResponseWriter, r *htt // Update bucket versioning configuration using new bucket config system if errCode := s3a.setBucketVersioningStatus(bucket, status); errCode != s3err.ErrNone { - glog.Errorf("PutBucketVersioningHandler save config: %d", errCode) + glog.Errorf("PutBucketVersioningHandler save config: bucket=%s, status='%s', errCode=%d", bucket, status, errCode) s3err.WriteErrorResponse(w, r, errCode) return } diff --git a/weed/s3api/s3api_bucket_policy_arn_test.go b/weed/s3api/s3api_bucket_policy_arn_test.go index ef8946918..7e25afba6 100644 --- a/weed/s3api/s3api_bucket_policy_arn_test.go +++ b/weed/s3api/s3api_bucket_policy_arn_test.go @@ -2,7 +2,7 @@ package s3api import ( "testing" - + "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" ) @@ -123,4 +123,3 @@ func TestBuildPrincipalARN(t *testing.T) { }) } } - diff --git a/weed/s3api/s3api_bucket_policy_engine.go b/weed/s3api/s3api_bucket_policy_engine.go index 278e3e1ae..fc674e12f 100644 --- a/weed/s3api/s3api_bucket_policy_engine.go +++ b/weed/s3api/s3api_bucket_policy_engine.go @@ -64,7 +64,7 @@ func (bpe *BucketPolicyEngine) LoadBucketPolicyFromCache(bucket string, policyDo glog.Errorf("Failed to convert bucket policy for %s: %v", bucket, err) return fmt.Errorf("failed to convert bucket policy: %w", err) } - + // Marshal the converted policy to JSON for storage in the engine policyJSON, err := json.Marshal(enginePolicyDoc) if err != nil { @@ -152,7 +152,7 @@ func (bpe *BucketPolicyEngine) EvaluatePolicyWithContext(bucket, object, action, // Build resource ARN resource := buildResourceARN(bucket, object) - glog.V(4).Infof("EvaluatePolicyWithContext: bucket=%s, resource=%s, action=%s (from %s), principal=%s", + glog.V(4).Infof("EvaluatePolicyWithContext: bucket=%s, resource=%s, action=%s (from %s), principal=%s", bucket, resource, s3Action, action, principal) // Evaluate using the policy engine diff --git a/weed/s3api/s3api_bucket_policy_handlers.go b/weed/s3api/s3api_bucket_policy_handlers.go index 355fe0957..d52bf1289 100644 --- a/weed/s3api/s3api_bucket_policy_handlers.go +++ b/weed/s3api/s3api_bucket_policy_handlers.go @@ -3,6 +3,7 @@ package s3api import ( "context" "encoding/json" + "errors" "fmt" "io" "net/http" @@ -18,17 +19,37 @@ import ( // Bucket policy metadata key for storing policies in filer const BUCKET_POLICY_METADATA_KEY = "s3-bucket-policy" +// Sentinel errors for bucket policy operations +var ( + ErrPolicyNotFound = errors.New("bucket policy not found") + // ErrBucketNotFound is already defined in s3api_object_retention.go +) + // GetBucketPolicyHandler handles GET bucket?policy requests func (s3a *S3ApiServer) GetBucketPolicyHandler(w http.ResponseWriter, r *http.Request) { bucket, _ := s3_constants.GetBucketAndObject(r) glog.V(3).Infof("GetBucketPolicyHandler: bucket=%s", bucket) + // Validate bucket exists first for correct error mapping + _, err := s3a.getEntry(s3a.option.BucketsPath, bucket) + if err != nil { + if errors.Is(err, filer_pb.ErrNotFound) { + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchBucket) + } else { + glog.Errorf("Failed to check bucket existence for %s: %v", bucket, err) + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) + } + return + } + // Get bucket policy from filer metadata policyDocument, err := s3a.getBucketPolicy(bucket) if err != nil { - if strings.Contains(err.Error(), "not found") { + if errors.Is(err, ErrPolicyNotFound) { s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchBucketPolicy) + } else if errors.Is(err, ErrBucketNotFound) { + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchBucket) } else { glog.Errorf("Failed to get bucket policy for %s: %v", bucket, err) s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) @@ -89,6 +110,15 @@ func (s3a *S3ApiServer) PutBucketPolicyHandler(w http.ResponseWriter, r *http.Re return } + // Immediately load into policy engine to avoid race condition + // (The subscription system will also do this async, but we want immediate effect) + if s3a.policyEngine != nil { + if err := s3a.policyEngine.LoadBucketPolicyFromCache(bucket, &policyDoc); err != nil { + glog.Warningf("Failed to immediately load bucket policy into engine for %s: %v", bucket, err) + // Don't fail the request since the subscription will eventually sync it + } + } + // Update IAM integration with new bucket policy if s3a.iam.iamIntegration != nil { if err := s3a.updateBucketPolicyInIAM(bucket, &policyDoc); err != nil { @@ -106,10 +136,24 @@ func (s3a *S3ApiServer) DeleteBucketPolicyHandler(w http.ResponseWriter, r *http glog.V(3).Infof("DeleteBucketPolicyHandler: bucket=%s", bucket) + // Validate bucket exists first for correct error mapping + _, err := s3a.getEntry(s3a.option.BucketsPath, bucket) + if err != nil { + if errors.Is(err, filer_pb.ErrNotFound) { + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchBucket) + } else { + glog.Errorf("Failed to check bucket existence for %s: %v", bucket, err) + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) + } + return + } + // Check if bucket policy exists if _, err := s3a.getBucketPolicy(bucket); err != nil { - if strings.Contains(err.Error(), "not found") { + if errors.Is(err, ErrPolicyNotFound) { s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchBucketPolicy) + } else if errors.Is(err, ErrBucketNotFound) { + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchBucket) } else { s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) } @@ -123,6 +167,15 @@ func (s3a *S3ApiServer) DeleteBucketPolicyHandler(w http.ResponseWriter, r *http return } + // Immediately remove from policy engine to avoid race condition + // (The subscription system will also do this async, but we want immediate effect) + if s3a.policyEngine != nil { + if err := s3a.policyEngine.DeleteBucketPolicy(bucket); err != nil { + glog.Warningf("Failed to immediately remove bucket policy from engine for %s: %v", bucket, err) + // Don't fail the request since the subscription will eventually sync it + } + } + // Update IAM integration to remove bucket policy if s3a.iam.iamIntegration != nil { if err := s3a.removeBucketPolicyFromIAM(bucket); err != nil { @@ -146,16 +199,17 @@ func (s3a *S3ApiServer) getBucketPolicy(bucket string) (*policy.PolicyDocument, Name: bucket, }) if err != nil { - return fmt.Errorf("bucket not found: %v", err) + // Return sentinel error for bucket not found + return fmt.Errorf("%w: %v", ErrBucketNotFound, err) } if resp.Entry == nil { - return fmt.Errorf("bucket policy not found: no entry") + return ErrPolicyNotFound } policyJSON, exists := resp.Entry.Extended[BUCKET_POLICY_METADATA_KEY] if !exists || len(policyJSON) == 0 { - return fmt.Errorf("bucket policy not found: no policy metadata") + return ErrPolicyNotFound } if err := json.Unmarshal(policyJSON, &policyDoc); err != nil { diff --git a/weed/s3api/s3api_implicit_directory_test.go b/weed/s3api/s3api_implicit_directory_test.go new file mode 100644 index 000000000..e7c3633fc --- /dev/null +++ b/weed/s3api/s3api_implicit_directory_test.go @@ -0,0 +1,285 @@ +package s3api + +import ( + "io" + "testing" + + "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" +) + +// TestImplicitDirectoryBehaviorLogic tests the core logic for implicit directory detection +// This tests the decision logic without requiring a full S3 server setup +func TestImplicitDirectoryBehaviorLogic(t *testing.T) { + tests := []struct { + name string + objectPath string + hasTrailingSlash bool + fileSize uint64 + isDirectory bool + hasChildren bool + versioningEnabled bool + shouldReturn404 bool + description string + }{ + { + name: "Implicit directory: 0-byte file with children, no trailing slash", + objectPath: "dataset", + hasTrailingSlash: false, + fileSize: 0, + isDirectory: false, + hasChildren: true, + versioningEnabled: false, + shouldReturn404: true, + description: "Should return 404 to force s3fs LIST-based discovery", + }, + { + name: "Implicit directory: actual directory with children, no trailing slash", + objectPath: "dataset", + hasTrailingSlash: false, + fileSize: 0, + isDirectory: true, + hasChildren: true, + versioningEnabled: false, + shouldReturn404: true, + description: "Should return 404 for directory with children", + }, + { + name: "Explicit directory request: trailing slash", + objectPath: "dataset/", + hasTrailingSlash: true, + fileSize: 0, + isDirectory: true, + hasChildren: true, + versioningEnabled: false, + shouldReturn404: false, + description: "Should return 200 for explicit directory request (trailing slash)", + }, + { + name: "Empty file: 0-byte file without children", + objectPath: "empty.txt", + hasTrailingSlash: false, + fileSize: 0, + isDirectory: false, + hasChildren: false, + versioningEnabled: false, + shouldReturn404: false, + description: "Should return 200 for legitimate empty file", + }, + { + name: "Empty directory: 0-byte directory without children", + objectPath: "empty-dir", + hasTrailingSlash: false, + fileSize: 0, + isDirectory: true, + hasChildren: false, + versioningEnabled: false, + shouldReturn404: false, + description: "Should return 200 for empty directory", + }, + { + name: "Regular file: non-zero size", + objectPath: "file.txt", + hasTrailingSlash: false, + fileSize: 100, + isDirectory: false, + hasChildren: false, + versioningEnabled: false, + shouldReturn404: false, + description: "Should return 200 for regular file with content", + }, + { + name: "Versioned bucket: implicit directory should return 200", + objectPath: "dataset", + hasTrailingSlash: false, + fileSize: 0, + isDirectory: false, + hasChildren: true, + versioningEnabled: true, + shouldReturn404: false, + description: "Should return 200 for versioned buckets (skip implicit dir check)", + }, + { + name: "PyArrow directory marker: 0-byte with children", + objectPath: "dataset", + hasTrailingSlash: false, + fileSize: 0, + isDirectory: false, + hasChildren: true, + versioningEnabled: false, + shouldReturn404: true, + description: "Should return 404 for PyArrow-created directory markers", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + // Test the logic: should we return 404? + // Logic from HeadObjectHandler: + // if !versioningConfigured && !strings.HasSuffix(object, "/") { + // if isZeroByteFile || isActualDirectory { + // if hasChildren { + // return 404 + // } + // } + // } + + isZeroByteFile := tt.fileSize == 0 && !tt.isDirectory + isActualDirectory := tt.isDirectory + + shouldReturn404 := false + if !tt.versioningEnabled && !tt.hasTrailingSlash { + if isZeroByteFile || isActualDirectory { + if tt.hasChildren { + shouldReturn404 = true + } + } + } + + if shouldReturn404 != tt.shouldReturn404 { + t.Errorf("Logic mismatch for %s:\n Expected shouldReturn404=%v\n Got shouldReturn404=%v\n Description: %s", + tt.name, tt.shouldReturn404, shouldReturn404, tt.description) + } else { + t.Logf("✓ %s: correctly returns %d", tt.name, map[bool]int{true: 404, false: 200}[shouldReturn404]) + } + }) + } +} + +// TestHasChildrenLogic tests the hasChildren helper function logic +func TestHasChildrenLogic(t *testing.T) { + tests := []struct { + name string + bucket string + prefix string + listResponse *filer_pb.ListEntriesResponse + listError error + expectedResult bool + description string + }{ + { + name: "Directory with children", + bucket: "test-bucket", + prefix: "dataset", + listResponse: &filer_pb.ListEntriesResponse{ + Entry: &filer_pb.Entry{ + Name: "file.parquet", + IsDirectory: false, + }, + }, + listError: nil, + expectedResult: true, + description: "Should return true when at least one child exists", + }, + { + name: "Empty directory", + bucket: "test-bucket", + prefix: "empty-dir", + listResponse: nil, + listError: io.EOF, + expectedResult: false, + description: "Should return false when no children exist (EOF)", + }, + { + name: "Directory with leading slash in prefix", + bucket: "test-bucket", + prefix: "/dataset", + listResponse: &filer_pb.ListEntriesResponse{ + Entry: &filer_pb.Entry{ + Name: "file.parquet", + IsDirectory: false, + }, + }, + listError: nil, + expectedResult: true, + description: "Should handle leading slashes correctly", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + // Test the hasChildren logic: + // 1. It should trim leading slashes from prefix + // 2. It should list with Limit=1 + // 3. It should return true if any entry is received + // 4. It should return false if EOF is received + + hasChildren := false + if tt.listError == nil && tt.listResponse != nil { + hasChildren = true + } else if tt.listError == io.EOF { + hasChildren = false + } + + if hasChildren != tt.expectedResult { + t.Errorf("hasChildren logic mismatch for %s:\n Expected: %v\n Got: %v\n Description: %s", + tt.name, tt.expectedResult, hasChildren, tt.description) + } else { + t.Logf("✓ %s: correctly returns %v", tt.name, hasChildren) + } + }) + } +} + +// TestImplicitDirectoryEdgeCases tests edge cases in the implicit directory detection +func TestImplicitDirectoryEdgeCases(t *testing.T) { + tests := []struct { + name string + scenario string + expectation string + }{ + { + name: "PyArrow write_dataset creates 0-byte files", + scenario: "PyArrow creates 'dataset' as 0-byte file, then writes 'dataset/file.parquet'", + expectation: "HEAD dataset → 404 (has children), s3fs uses LIST → correctly identifies as directory", + }, + { + name: "Filer creates actual directories", + scenario: "Filer creates 'dataset' as actual directory with IsDirectory=true", + expectation: "HEAD dataset → 404 (has children), s3fs uses LIST → correctly identifies as directory", + }, + { + name: "Empty file edge case", + scenario: "User creates 'empty.txt' as 0-byte file with no children", + expectation: "HEAD empty.txt → 200 (no children), s3fs correctly reports as file", + }, + { + name: "Explicit directory request", + scenario: "User requests 'dataset/' with trailing slash", + expectation: "HEAD dataset/ → 200 (explicit directory request), normal directory behavior", + }, + { + name: "Versioned bucket", + scenario: "Bucket has versioning enabled", + expectation: "HEAD dataset → 200 (skip implicit dir check), versioned semantics apply", + }, + { + name: "AWS S3 compatibility", + scenario: "Only 'dataset/file.txt' exists, no marker at 'dataset'", + expectation: "HEAD dataset → 404 (object doesn't exist), matches AWS S3 behavior", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Logf("Scenario: %s", tt.scenario) + t.Logf("Expected: %s", tt.expectation) + }) + } +} + +// TestImplicitDirectoryIntegration is an integration test placeholder +// Run with: cd test/s3/parquet && make test-implicit-dir-with-server +func TestImplicitDirectoryIntegration(t *testing.T) { + if testing.Short() { + t.Skip("Skipping integration test in short mode") + } + + t.Skip("Integration test - run manually with: cd test/s3/parquet && make test-implicit-dir-with-server") +} + +// Benchmark for hasChildren performance +func BenchmarkHasChildrenCheck(b *testing.B) { + // This benchmark would measure the performance impact of the hasChildren check + // Expected: ~1-5ms per call (one gRPC LIST request with Limit=1) + b.Skip("Benchmark - requires full filer setup") +} diff --git a/weed/s3api/s3api_object_handlers.go b/weed/s3api/s3api_object_handlers.go index 98d0ffede..ce2772981 100644 --- a/weed/s3api/s3api_object_handlers.go +++ b/weed/s3api/s3api_object_handlers.go @@ -2,12 +2,17 @@ package s3api import ( "bytes" + "context" "encoding/base64" + "encoding/json" "errors" "fmt" "io" + "math" + "mime" "net/http" "net/url" + "path/filepath" "sort" "strconv" "strings" @@ -15,13 +20,15 @@ import ( "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" + "github.com/seaweedfs/seaweedfs/weed/security" + "github.com/seaweedfs/seaweedfs/weed/wdclient" "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" "github.com/seaweedfs/seaweedfs/weed/s3api/s3err" + util_http "github.com/seaweedfs/seaweedfs/weed/util/http" "github.com/seaweedfs/seaweedfs/weed/util/mem" "github.com/seaweedfs/seaweedfs/weed/glog" - util_http "github.com/seaweedfs/seaweedfs/weed/util/http" ) // corsHeaders defines the CORS headers that need to be preserved @@ -35,6 +42,113 @@ var corsHeaders = []string{ "Access-Control-Allow-Credentials", } +// zeroBuf is a reusable buffer of zero bytes for padding operations +// Package-level to avoid per-call allocations in writeZeroBytes +var zeroBuf = make([]byte, 32*1024) + +// adjustRangeForPart adjusts a client's Range header to absolute offsets within a part. +// Parameters: +// - partStartOffset: the absolute start offset of the part in the object +// - partEndOffset: the absolute end offset of the part in the object +// - clientRangeHeader: the Range header value from the client (e.g., "bytes=0-99") +// +// Returns: +// - adjustedStart: the adjusted absolute start offset +// - adjustedEnd: the adjusted absolute end offset +// - error: nil on success, error if the range is invalid +func adjustRangeForPart(partStartOffset, partEndOffset int64, clientRangeHeader string) (adjustedStart, adjustedEnd int64, err error) { + // If no range header, return the full part + if clientRangeHeader == "" || !strings.HasPrefix(clientRangeHeader, "bytes=") { + return partStartOffset, partEndOffset, nil + } + + // Parse client's range request (relative to the part) + rangeSpec := clientRangeHeader[6:] // Remove "bytes=" prefix + parts := strings.Split(rangeSpec, "-") + + if len(parts) != 2 { + return 0, 0, fmt.Errorf("invalid range format") + } + + partSize := partEndOffset - partStartOffset + 1 + var clientStart, clientEnd int64 + + // Parse start offset + if parts[0] != "" { + clientStart, err = strconv.ParseInt(parts[0], 10, 64) + if err != nil { + return 0, 0, fmt.Errorf("invalid range start: %w", err) + } + } + + // Parse end offset + if parts[1] != "" { + clientEnd, err = strconv.ParseInt(parts[1], 10, 64) + if err != nil { + return 0, 0, fmt.Errorf("invalid range end: %w", err) + } + } else { + // No end specified, read to end of part + clientEnd = partSize - 1 + } + + // Handle suffix-range (e.g., "bytes=-100" means last 100 bytes) + if parts[0] == "" { + // suffix-range: clientEnd is actually the suffix length + suffixLength := clientEnd + if suffixLength > partSize { + suffixLength = partSize + } + clientStart = partSize - suffixLength + clientEnd = partSize - 1 + } + + // Validate range is within part boundaries + if clientStart < 0 || clientStart >= partSize { + return 0, 0, fmt.Errorf("range start %d out of bounds for part size %d", clientStart, partSize) + } + if clientEnd >= partSize { + clientEnd = partSize - 1 + } + if clientStart > clientEnd { + return 0, 0, fmt.Errorf("range start %d > end %d", clientStart, clientEnd) + } + + // Adjust to absolute offsets in the object + adjustedStart = partStartOffset + clientStart + adjustedEnd = partStartOffset + clientEnd + + return adjustedStart, adjustedEnd, nil +} + +// StreamError is returned when streaming functions encounter errors. +// It tracks whether an HTTP response has already been written to prevent +// double WriteHeader calls that would create malformed S3 error responses. +type StreamError struct { + // Err is the underlying error + Err error + // ResponseWritten indicates if HTTP headers/status have been written to ResponseWriter + ResponseWritten bool +} + +func (e *StreamError) Error() string { + return e.Err.Error() +} + +func (e *StreamError) Unwrap() error { + return e.Err +} + +// newStreamError creates a StreamError for cases where response hasn't been written yet +func newStreamError(err error) *StreamError { + return &StreamError{Err: err, ResponseWritten: false} +} + +// newStreamErrorWithResponse creates a StreamError for cases where response was already written +func newStreamErrorWithResponse(err error) *StreamError { + return &StreamError{Err: err, ResponseWritten: true} +} + func mimeDetect(r *http.Request, dataReader io.Reader) io.ReadCloser { mimeBuffer := make([]byte, 512) size, _ := dataReader.Read(mimeBuffer) @@ -88,6 +202,62 @@ func removeDuplicateSlashes(object string) string { return result.String() } +// hasChildren checks if a path has any child objects (is a directory with contents) +// +// This helper function is used to distinguish implicit directories from regular files or empty directories. +// An implicit directory is one that exists only because it has children, not because it was explicitly created. +// +// Implementation: +// - Lists the directory with Limit=1 to check for at least one child +// - Returns true if any child exists, false otherwise +// - Efficient: only fetches one entry to minimize overhead +// +// Used by HeadObjectHandler to implement AWS S3-compatible implicit directory behavior: +// - If a 0-byte object or directory has children → it's an implicit directory → HEAD returns 404 +// - If a 0-byte object or directory has no children → it's empty → HEAD returns 200 +// +// Examples: +// +// hasChildren("bucket", "dataset") where "dataset/file.txt" exists → true +// hasChildren("bucket", "empty-dir") where no children exist → false +// +// Performance: ~1-5ms per call (one gRPC LIST request with Limit=1) +func (s3a *S3ApiServer) hasChildren(bucket, prefix string) bool { + // Clean up prefix: remove leading slashes + cleanPrefix := strings.TrimPrefix(prefix, "/") + + // The directory to list is bucketDir + cleanPrefix + bucketDir := s3a.option.BucketsPath + "/" + bucket + fullPath := bucketDir + "/" + cleanPrefix + + // Try to list one child object in the directory + err := s3a.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error { + request := &filer_pb.ListEntriesRequest{ + Directory: fullPath, + Limit: 1, + InclusiveStartFrom: true, + } + + stream, err := client.ListEntries(context.Background(), request) + if err != nil { + return err + } + + // Check if we got at least one entry + _, err = stream.Recv() + if err == io.EOF { + return io.EOF // No children + } + if err != nil { + return err + } + return nil + }) + + // If we got an entry (not EOF), then it has children + return err == nil +} + // checkDirectoryObject checks if the object is a directory object (ends with "/") and if it exists // Returns: (entry, isDirectoryObject, error) // - entry: the directory entry if found and is a directory @@ -123,6 +293,13 @@ func (s3a *S3ApiServer) checkDirectoryObject(bucket, object string) (*filer_pb.E // serveDirectoryContent serves the content of a directory object directly func (s3a *S3ApiServer) serveDirectoryContent(w http.ResponseWriter, r *http.Request, entry *filer_pb.Entry) { + // Defensive nil checks - entry and attributes should never be nil, but guard against it + if entry == nil || entry.Attributes == nil { + glog.Errorf("serveDirectoryContent: entry or attributes is nil") + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) + return + } + // Set content type - use stored MIME type or default contentType := entry.Attributes.Mime if contentType == "" { @@ -272,13 +449,29 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) bucket, object := s3_constants.GetBucketAndObject(r) glog.V(3).Infof("GetObjectHandler %s %s", bucket, object) + // TTFB Profiling: Track all stages until first byte + tStart := time.Now() + var ( + conditionalHeadersTime time.Duration + versioningCheckTime time.Duration + entryFetchTime time.Duration + streamTime time.Duration + ) + defer func() { + totalTime := time.Since(tStart) + glog.V(2).Infof("GET TTFB PROFILE %s/%s: total=%v | conditional=%v, versioning=%v, entryFetch=%v, stream=%v", + bucket, object, totalTime, conditionalHeadersTime, versioningCheckTime, entryFetchTime, streamTime) + }() + // Handle directory objects with shared logic if s3a.handleDirectoryObjectRequest(w, r, bucket, object, "GetObjectHandler") { return // Directory object request was handled } // Check conditional headers and handle early return if conditions fail + tConditional := time.Now() result, handled := s3a.processConditionalHeaders(w, r, bucket, object, "GetObjectHandler") + conditionalHeadersTime = time.Since(tConditional) if handled { return } @@ -287,13 +480,13 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) versionId := r.URL.Query().Get("versionId") var ( - destUrl string entry *filer_pb.Entry // Declare entry at function scope for SSE processing versioningConfigured bool err error ) // Check if versioning is configured for the bucket (Enabled or Suspended) + tVersioning := time.Now() // Note: We need to check this even if versionId is empty, because versioned buckets // handle even "get latest version" requests differently (through .versions directory) versioningConfigured, err = s3a.isVersioningConfigured(bucket) @@ -306,15 +499,15 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) return } - glog.V(1).Infof("GetObject: bucket %s, object %s, versioningConfigured=%v, versionId=%s", bucket, object, versioningConfigured, versionId) + glog.V(3).Infof("GetObject: bucket %s, object %s, versioningConfigured=%v, versionId=%s", bucket, object, versioningConfigured, versionId) if versioningConfigured { - // Handle versioned GET - all versions are stored in .versions directory + // Handle versioned GET - check if specific version requested var targetVersionId string if versionId != "" { - // Request for specific version - glog.V(2).Infof("GetObject: requesting specific version %s for %s%s", versionId, bucket, object) + // Request for specific version - must look in .versions directory + glog.V(3).Infof("GetObject: requesting specific version %s for %s%s", versionId, bucket, object) entry, err = s3a.getSpecificObjectVersion(bucket, object, versionId) if err != nil { glog.Errorf("Failed to get specific version %s: %v", versionId, err) @@ -323,22 +516,61 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) } targetVersionId = versionId } else { - // Request for latest version - glog.V(1).Infof("GetObject: requesting latest version for %s%s", bucket, object) - entry, err = s3a.getLatestObjectVersion(bucket, object) - if err != nil { - glog.Errorf("GetObject: Failed to get latest version for %s%s: %v", bucket, object, err) - s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) - return - } - if entry.Extended != nil { - if versionIdBytes, exists := entry.Extended[s3_constants.ExtVersionIdKey]; exists { - targetVersionId = string(versionIdBytes) + // Request for latest version - OPTIMIZATION: + // Check if .versions/ directory exists quickly (no retries) to decide path + // - If .versions/ exists: real versions available, use getLatestObjectVersion + // - If .versions/ doesn't exist (ErrNotFound): only null version at regular path, use it directly + // - If transient error: fall back to getLatestObjectVersion which has retry logic + bucketDir := s3a.option.BucketsPath + "/" + bucket + normalizedObject := removeDuplicateSlashes(object) + versionsDir := normalizedObject + s3_constants.VersionsFolder + + // Quick check (no retries) for .versions/ directory + versionsEntry, versionsErr := s3a.getEntry(bucketDir, versionsDir) + + if versionsErr == nil && versionsEntry != nil { + // .versions/ exists, meaning real versions are stored there + // Use getLatestObjectVersion which will properly find the newest version + entry, err = s3a.getLatestObjectVersion(bucket, object) + if err != nil { + glog.Errorf("GetObject: Failed to get latest version for %s%s: %v", bucket, object, err) + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) + return + } + } else if errors.Is(versionsErr, filer_pb.ErrNotFound) { + // .versions/ doesn't exist (confirmed not found), check regular path for null version + regularEntry, regularErr := s3a.getEntry(bucketDir, normalizedObject) + if regularErr == nil && regularEntry != nil { + // Found object at regular path - this is the null version + entry = regularEntry + targetVersionId = "null" + } else { + // No object at regular path either - object doesn't exist + glog.Errorf("GetObject: object not found at regular path or .versions for %s%s", bucket, object) + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) + return + } + } else { + // Transient error checking .versions/, fall back to getLatestObjectVersion with retries + glog.V(2).Infof("GetObject: transient error checking .versions for %s%s: %v, falling back to getLatestObjectVersion", bucket, object, versionsErr) + entry, err = s3a.getLatestObjectVersion(bucket, object) + if err != nil { + glog.Errorf("GetObject: Failed to get latest version for %s%s: %v", bucket, object, err) + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) + return } } - // If no version ID found in entry, this is a pre-versioning object + // Extract version ID if not already set if targetVersionId == "" { - targetVersionId = "null" + if entry.Extended != nil { + if versionIdBytes, exists := entry.Extended[s3_constants.ExtVersionIdKey]; exists { + targetVersionId = string(versionIdBytes) + } + } + // If no version ID found in entry, this is a pre-versioning object + if targetVersionId == "" { + targetVersionId = "null" + } } } @@ -350,16 +582,11 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) } } - // Determine the actual file path based on whether this is a versioned or pre-versioning object + // For versioned objects, log the target version if targetVersionId == "null" { - // Pre-versioning object - stored as regular file - destUrl = s3a.toFilerUrl(bucket, object) - glog.V(2).Infof("GetObject: pre-versioning object URL: %s", destUrl) + glog.V(2).Infof("GetObject: pre-versioning object %s/%s", bucket, object) } else { - // Versioned object - stored in .versions directory - versionObjectPath := object + ".versions/" + s3a.getVersionFileName(targetVersionId) - destUrl = s3a.toFilerUrl(bucket, versionObjectPath) - glog.V(2).Infof("GetObject: version %s URL: %s", targetVersionId, destUrl) + glog.V(2).Infof("GetObject: version %s for %s/%s", targetVersionId, bucket, object) } // Set version ID in response header @@ -367,16 +594,14 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) // Add object lock metadata to response headers if present s3a.addObjectLockHeadersToResponse(w, entry) - } else { - // Handle regular GET (non-versioned) - destUrl = s3a.toFilerUrl(bucket, object) } + versioningCheckTime = time.Since(tVersioning) + // Fetch the correct entry for SSE processing (respects versionId) // This consolidates entry lookups to avoid multiple filer calls + tEntryFetch := time.Now() var objectEntryForSSE *filer_pb.Entry - originalRangeHeader := r.Header.Get("Range") - var sseObject = false // Optimization: Reuse already-fetched entry to avoid redundant metadata fetches if versioningConfigured { @@ -397,7 +622,7 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) var fetchErr error objectEntryForSSE, fetchErr = s3a.fetchObjectEntry(bucket, object) if fetchErr != nil { - glog.Errorf("GetObjectHandler: failed to get entry for SSE check: %v", fetchErr) + glog.Warningf("GetObjectHandler: failed to get entry for %s/%s: %v", bucket, object, fetchErr) s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) return } @@ -408,285 +633,1724 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) } } } + entryFetchTime = time.Since(tEntryFetch) - // Check if this is an SSE object for Range request handling - // This applies to both versioned and non-versioned objects - if originalRangeHeader != "" && objectEntryForSSE != nil { - primarySSEType := s3a.detectPrimarySSEType(objectEntryForSSE) - if primarySSEType == s3_constants.SSETypeC || primarySSEType == s3_constants.SSETypeKMS { - sseObject = true - // Temporarily remove Range header to get full encrypted data from filer - r.Header.Del("Range") - } + // Check if PartNumber query parameter is present (for multipart GET requests) + partNumberStr := r.URL.Query().Get("partNumber") + if partNumberStr == "" { + partNumberStr = r.URL.Query().Get("PartNumber") } - s3a.proxyToFiler(w, r, destUrl, false, func(proxyResponse *http.Response, w http.ResponseWriter) (statusCode int, bytesTransferred int64) { - // Restore the original Range header for SSE processing - if sseObject && originalRangeHeader != "" { - r.Header.Set("Range", originalRangeHeader) - } - - // Add SSE metadata headers based on object metadata before SSE processing - if objectEntryForSSE != nil { - s3a.addSSEHeadersToResponse(proxyResponse, objectEntryForSSE) - } + // If PartNumber is specified, set headers and modify Range to read only that part + // This replicates the filer handler logic + if partNumberStr != "" { + if partNumber, parseErr := strconv.Atoi(partNumberStr); parseErr == nil && partNumber > 0 { + // Get actual parts count from metadata (not chunk count) + partsCount, partInfo := s3a.getMultipartInfo(objectEntryForSSE, partNumber) - // Handle SSE decryption (both SSE-C and SSE-KMS) if needed - return s3a.handleSSEResponse(r, proxyResponse, w, objectEntryForSSE) - }) -} + // Validate part number + if partNumber > partsCount { + glog.Warningf("GetObject: Invalid part number %d, object has %d parts", partNumber, partsCount) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidPart) + return + } -func (s3a *S3ApiServer) HeadObjectHandler(w http.ResponseWriter, r *http.Request) { + // Set parts count header + w.Header().Set(s3_constants.AmzMpPartsCount, strconv.Itoa(partsCount)) + glog.V(3).Infof("GetObject: Set PartsCount=%d for multipart GET with PartNumber=%d", partsCount, partNumber) + + // Calculate the byte range for this part + var startOffset, endOffset int64 + if partInfo != nil { + // Use part boundaries from metadata (accurate for multi-chunk parts) + startOffset = objectEntryForSSE.Chunks[partInfo.StartChunk].Offset + lastChunk := objectEntryForSSE.Chunks[partInfo.EndChunk-1] + endOffset = lastChunk.Offset + int64(lastChunk.Size) - 1 + + // Override ETag with the part's ETag from metadata + w.Header().Set("ETag", "\""+partInfo.ETag+"\"") + glog.V(3).Infof("GetObject: Override ETag with part %d ETag: %s (from metadata)", partNumber, partInfo.ETag) + } else { + // Fallback: assume 1:1 part-to-chunk mapping (backward compatibility) + chunkIndex := partNumber - 1 + if chunkIndex >= len(objectEntryForSSE.Chunks) { + glog.Warningf("GetObject: Part %d chunk index %d out of range (chunks: %d)", partNumber, chunkIndex, len(objectEntryForSSE.Chunks)) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidPart) + return + } + partChunk := objectEntryForSSE.Chunks[chunkIndex] + startOffset = partChunk.Offset + endOffset = partChunk.Offset + int64(partChunk.Size) - 1 + + // Override ETag with chunk's ETag (fallback) + if partChunk.ETag != "" { + if md5Bytes, decodeErr := base64.StdEncoding.DecodeString(partChunk.ETag); decodeErr == nil { + partETag := fmt.Sprintf("%x", md5Bytes) + w.Header().Set("ETag", "\""+partETag+"\"") + glog.V(3).Infof("GetObject: Override ETag with part %d ETag: %s (fallback from chunk)", partNumber, partETag) + } + } + } - bucket, object := s3_constants.GetBucketAndObject(r) - glog.V(3).Infof("HeadObjectHandler %s %s", bucket, object) + // Check if client supplied a Range header - if so, apply it within the part's boundaries + // S3 allows both partNumber and Range together, where Range applies within the selected part + clientRangeHeader := r.Header.Get("Range") + if clientRangeHeader != "" { + adjustedStart, adjustedEnd, rangeErr := adjustRangeForPart(startOffset, endOffset, clientRangeHeader) + if rangeErr != nil { + glog.Warningf("GetObject: Invalid Range for part %d: %v", partNumber, rangeErr) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRange) + return + } + startOffset = adjustedStart + endOffset = adjustedEnd + glog.V(3).Infof("GetObject: Client Range %s applied to part %d, adjusted to bytes=%d-%d", clientRangeHeader, partNumber, startOffset, endOffset) + } - // Handle directory objects with shared logic - if s3a.handleDirectoryObjectRequest(w, r, bucket, object, "HeadObjectHandler") { - return // Directory object request was handled + // Set Range header to read the requested bytes (full part or client-specified range within part) + rangeHeader := fmt.Sprintf("bytes=%d-%d", startOffset, endOffset) + r.Header.Set("Range", rangeHeader) + glog.V(3).Infof("GetObject: Set Range header for part %d: %s", partNumber, rangeHeader) + } } - // Check conditional headers and handle early return if conditions fail - result, handled := s3a.processConditionalHeaders(w, r, bucket, object, "HeadObjectHandler") - if handled { + // NEW OPTIMIZATION: Stream directly from volume servers, bypassing filer proxy + // This eliminates the 19ms filer proxy overhead + // SSE decryption is handled inline during streaming + + // Safety check: entry must be valid before streaming + if objectEntryForSSE == nil { + glog.Errorf("GetObjectHandler: objectEntryForSSE is nil for %s/%s (should not happen)", bucket, object) + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) return } - // Check for specific version ID in query parameters - versionId := r.URL.Query().Get("versionId") - - var ( - destUrl string - entry *filer_pb.Entry // Declare entry at function scope for SSE processing - versioningConfigured bool - err error - ) + // Detect SSE encryption type + primarySSEType := s3a.detectPrimarySSEType(objectEntryForSSE) - // Check if versioning is configured for the bucket (Enabled or Suspended) - // Note: We need to check this even if versionId is empty, because versioned buckets - // handle even "get latest version" requests differently (through .versions directory) - versioningConfigured, err = s3a.isVersioningConfigured(bucket) + // Stream directly from volume servers with SSE support + tStream := time.Now() + err = s3a.streamFromVolumeServersWithSSE(w, r, objectEntryForSSE, primarySSEType) + streamTime = time.Since(tStream) if err != nil { - if err == filer_pb.ErrNotFound { - s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchBucket) + glog.Errorf("GetObjectHandler: failed to stream from volume servers: %v", err) + // Check if the streaming function already wrote an HTTP response + var streamErr *StreamError + if errors.As(err, &streamErr) && streamErr.ResponseWritten { + // Response already written (headers + status code), don't write again + // to avoid "superfluous response.WriteHeader call" and malformed S3 error bodies return } - glog.Errorf("Error checking versioning status for bucket %s: %v", bucket, err) + // Response not yet written - safe to write S3 error response s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) return } +} - if versioningConfigured { - // Handle versioned HEAD - all versions are stored in .versions directory - var targetVersionId string +// streamFromVolumeServers streams object data directly from volume servers, bypassing filer proxy +// This eliminates the ~19ms filer proxy overhead by reading chunks directly +func (s3a *S3ApiServer) streamFromVolumeServers(w http.ResponseWriter, r *http.Request, entry *filer_pb.Entry, sseType string) error { + // Profiling: Track overall and stage timings + t0 := time.Now() + var ( + rangeParseTime time.Duration + headerSetTime time.Duration + chunkResolveTime time.Duration + streamPrepTime time.Duration + streamExecTime time.Duration + ) + defer func() { + totalTime := time.Since(t0) + glog.V(2).Infof(" └─ streamFromVolumeServers: total=%v, rangeParse=%v, headerSet=%v, chunkResolve=%v, streamPrep=%v, streamExec=%v", + totalTime, rangeParseTime, headerSetTime, chunkResolveTime, streamPrepTime, streamExecTime) + }() + + if entry == nil { + // Early validation error: write S3-compliant XML error response + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) + return newStreamErrorWithResponse(fmt.Errorf("entry is nil")) + } - if versionId != "" { - // Request for specific version - glog.V(2).Infof("HeadObject: requesting specific version %s for %s%s", versionId, bucket, object) - entry, err = s3a.getSpecificObjectVersion(bucket, object, versionId) - if err != nil { - glog.Errorf("Failed to get specific version %s: %v", versionId, err) - s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) - return - } - targetVersionId = versionId - } else { - // Request for latest version - glog.V(2).Infof("HeadObject: requesting latest version for %s%s", bucket, object) - entry, err = s3a.getLatestObjectVersion(bucket, object) - if err != nil { - glog.Errorf("Failed to get latest version: %v", err) - s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) - return - } - if entry.Extended != nil { - if versionIdBytes, exists := entry.Extended[s3_constants.ExtVersionIdKey]; exists { - targetVersionId = string(versionIdBytes) + // Get file size + totalSize := int64(filer.FileSize(entry)) + + // Parse Range header if present + tRangeParse := time.Now() + var offset int64 = 0 + var size int64 = totalSize + rangeHeader := r.Header.Get("Range") + isRangeRequest := false + + if rangeHeader != "" && strings.HasPrefix(rangeHeader, "bytes=") { + rangeSpec := rangeHeader[6:] + parts := strings.Split(rangeSpec, "-") + if len(parts) == 2 { + var startOffset, endOffset int64 + + // Handle different Range formats: + // 1. "bytes=0-499" - first 500 bytes (parts[0]="0", parts[1]="499") + // 2. "bytes=500-" - from byte 500 to end (parts[0]="500", parts[1]="") + // 3. "bytes=-500" - last 500 bytes (parts[0]="", parts[1]="500") + + if parts[0] == "" && parts[1] != "" { + // Suffix range: bytes=-N (last N bytes) + if suffixLen, err := strconv.ParseInt(parts[1], 10, 64); err == nil { + // RFC 7233: suffix range on empty object or zero-length suffix is unsatisfiable + if totalSize == 0 || suffixLen <= 0 { + w.Header().Set("Content-Range", fmt.Sprintf("bytes */%d", totalSize)) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRange) + return newStreamErrorWithResponse(fmt.Errorf("invalid suffix range for empty object")) + } + if suffixLen > totalSize { + suffixLen = totalSize + } + startOffset = totalSize - suffixLen + endOffset = totalSize - 1 + } else { + // Set header BEFORE WriteHeader + w.Header().Set("Content-Range", fmt.Sprintf("bytes */%d", totalSize)) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRange) + return newStreamErrorWithResponse(fmt.Errorf("invalid suffix range")) } - } - // If no version ID found in entry, this is a pre-versioning object - if targetVersionId == "" { - targetVersionId = "null" - } - } + } else { + // Regular range or open-ended range + startOffset = 0 + endOffset = totalSize - 1 - // Check if this is a delete marker - if entry.Extended != nil { - if deleteMarker, exists := entry.Extended[s3_constants.ExtDeleteMarkerKey]; exists && string(deleteMarker) == "true" { - s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) - return - } - } + if parts[0] != "" { + if parsed, err := strconv.ParseInt(parts[0], 10, 64); err == nil { + startOffset = parsed + } + } + if parts[1] != "" { + if parsed, err := strconv.ParseInt(parts[1], 10, 64); err == nil { + endOffset = parsed + } + } - // Determine the actual file path based on whether this is a versioned or pre-versioning object - if targetVersionId == "null" { - // Pre-versioning object - stored as regular file - destUrl = s3a.toFilerUrl(bucket, object) - glog.V(2).Infof("HeadObject: pre-versioning object URL: %s", destUrl) - } else { - // Versioned object - stored in .versions directory - versionObjectPath := object + ".versions/" + s3a.getVersionFileName(targetVersionId) - destUrl = s3a.toFilerUrl(bucket, versionObjectPath) - glog.V(2).Infof("HeadObject: version %s URL: %s", targetVersionId, destUrl) - } + // Validate range + if startOffset < 0 || startOffset >= totalSize { + // Set header BEFORE WriteHeader + w.Header().Set("Content-Range", fmt.Sprintf("bytes */%d", totalSize)) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRange) + return newStreamErrorWithResponse(fmt.Errorf("invalid range start")) + } - // Set version ID in response header - w.Header().Set("x-amz-version-id", targetVersionId) + if endOffset >= totalSize { + endOffset = totalSize - 1 + } - // Add object lock metadata to response headers if present - s3a.addObjectLockHeadersToResponse(w, entry) - } else { - // Handle regular HEAD (non-versioned) - destUrl = s3a.toFilerUrl(bucket, object) + if endOffset < startOffset { + // Set header BEFORE WriteHeader + w.Header().Set("Content-Range", fmt.Sprintf("bytes */%d", totalSize)) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRange) + return newStreamErrorWithResponse(fmt.Errorf("invalid range: end before start")) + } + } + + offset = startOffset + size = endOffset - startOffset + 1 + isRangeRequest = true + } } + rangeParseTime = time.Since(tRangeParse) - // Fetch the correct entry for SSE processing (respects versionId) - // For versioned objects, reuse already-fetched entry; for non-versioned, try to reuse from conditional check - var objectEntryForSSE *filer_pb.Entry - if versioningConfigured { - objectEntryForSSE = entry - } else { - // For non-versioned objects, try to reuse entry from conditional header check - if result.Entry != nil { - // Reuse entry fetched during conditional header check (optimization) - objectEntryForSSE = result.Entry - glog.V(3).Infof("HeadObjectHandler: Reusing entry from conditional header check for %s/%s", bucket, object) - } else { - // Fetch entry for SSE processing - // This is needed for all SSE types (SSE-C, SSE-KMS, SSE-S3) to: - // 1. Detect encryption from object metadata (SSE-KMS/SSE-S3 don't send headers on HEAD) - // 2. Add proper response headers - var fetchErr error - objectEntryForSSE, fetchErr = s3a.fetchObjectEntry(bucket, object) - if fetchErr != nil { - glog.Errorf("HeadObjectHandler: failed to get entry for SSE check: %v", fetchErr) - s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) - return + // For small files stored inline in entry.Content - validate BEFORE setting headers + if len(entry.Content) > 0 && totalSize == int64(len(entry.Content)) { + if isRangeRequest { + // Safely convert int64 to int for slice indexing - validate BEFORE WriteHeader + // Use MaxInt32 for portability across 32-bit and 64-bit platforms + if offset < 0 || offset > int64(math.MaxInt32) || size < 0 || size > int64(math.MaxInt32) { + // Early validation error: write S3-compliant error response + w.Header().Set("Content-Range", fmt.Sprintf("bytes */%d", totalSize)) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRange) + return newStreamErrorWithResponse(fmt.Errorf("range too large for platform: offset=%d, size=%d", offset, size)) } - if objectEntryForSSE == nil { - // Not found, return error early to avoid another lookup in proxyToFiler - s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) - return + start := int(offset) + end := start + int(size) + // Bounds check (should already be validated, but double-check) - BEFORE WriteHeader + if start < 0 || start > len(entry.Content) || end > len(entry.Content) || end < start { + // Early validation error: write S3-compliant error response + w.Header().Set("Content-Range", fmt.Sprintf("bytes */%d", totalSize)) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRange) + return newStreamErrorWithResponse(fmt.Errorf("invalid range for inline content: start=%d, end=%d, len=%d", start, end, len(entry.Content))) } - } + // Validation passed - now set headers and write + s3a.setResponseHeaders(w, entry, totalSize) + w.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", offset, offset+size-1, totalSize)) + w.Header().Set("Content-Length", strconv.FormatInt(size, 10)) + w.WriteHeader(http.StatusPartialContent) + _, err := w.Write(entry.Content[start:end]) + return err + } + // Non-range request for inline content + s3a.setResponseHeaders(w, entry, totalSize) + w.WriteHeader(http.StatusOK) + _, err := w.Write(entry.Content) + return err } - s3a.proxyToFiler(w, r, destUrl, false, func(proxyResponse *http.Response, w http.ResponseWriter) (statusCode int, bytesTransferred int64) { - // Handle SSE validation (both SSE-C and SSE-KMS) for HEAD requests - return s3a.handleSSEResponse(r, proxyResponse, w, objectEntryForSSE) - }) -} - -func (s3a *S3ApiServer) proxyToFiler(w http.ResponseWriter, r *http.Request, destUrl string, isWrite bool, responseFn func(proxyResponse *http.Response, w http.ResponseWriter) (statusCode int, bytesTransferred int64)) { - - glog.V(3).Infof("s3 proxying %s to %s", r.Method, destUrl) - start := time.Now() - - proxyReq, err := http.NewRequest(r.Method, destUrl, r.Body) - - if err != nil { - glog.Errorf("NewRequest %s: %v", destUrl, err) - s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) - return + // Get chunks and validate BEFORE setting headers + chunks := entry.GetChunks() + glog.V(4).Infof("streamFromVolumeServers: entry has %d chunks, totalSize=%d, isRange=%v, offset=%d, size=%d", + len(chunks), totalSize, isRangeRequest, offset, size) + + if len(chunks) == 0 { + // BUG FIX: If totalSize > 0 but no chunks and no content, this is a data integrity issue + if totalSize > 0 && len(entry.Content) == 0 { + glog.Errorf("streamFromVolumeServers: Data integrity error - entry reports size %d but has no content or chunks", totalSize) + // Write S3-compliant XML error response + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) + return newStreamErrorWithResponse(fmt.Errorf("data integrity error: size %d reported but no content available", totalSize)) + } + // Empty object - set headers and write status + s3a.setResponseHeaders(w, entry, totalSize) + w.WriteHeader(http.StatusOK) + return nil } - proxyReq.Header.Set("X-Forwarded-For", r.RemoteAddr) - proxyReq.Header.Set("Accept-Encoding", "identity") - for k, v := range r.URL.Query() { - if _, ok := s3_constants.PassThroughHeaders[strings.ToLower(k)]; ok { - proxyReq.Header[k] = v - } - if k == "partNumber" { - proxyReq.Header[s3_constants.SeaweedFSPartNumber] = v + // Log chunk details (verbose only - high frequency) + if glog.V(4) { + for i, chunk := range chunks { + glog.Infof(" GET Chunk[%d]: fid=%s, offset=%d, size=%d", i, chunk.GetFileIdString(), chunk.Offset, chunk.Size) } } - for header, values := range r.Header { - proxyReq.Header[header] = values - } - if proxyReq.ContentLength == 0 && r.ContentLength != 0 { - proxyReq.ContentLength = r.ContentLength - } - // ensure that the Authorization header is overriding any previous - // Authorization header which might be already present in proxyReq - s3a.maybeAddFilerJwtAuthorization(proxyReq, isWrite) - resp, postErr := s3a.client.Do(proxyReq) + // CRITICAL: Resolve chunks and prepare stream BEFORE WriteHeader + // This ensures we can write proper error responses if these operations fail + ctx := r.Context() + lookupFileIdFn := s3a.createLookupFileIdFunction() - if postErr != nil { - glog.Errorf("post to filer: %v", postErr) + // Resolve chunk manifests with the requested range + tChunkResolve := time.Now() + resolvedChunks, _, err := filer.ResolveChunkManifest(ctx, lookupFileIdFn, chunks, offset, offset+size) + chunkResolveTime = time.Since(tChunkResolve) + if err != nil { + glog.Errorf("streamFromVolumeServers: failed to resolve chunks: %v", err) + // Write S3-compliant XML error response s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) - return + return newStreamErrorWithResponse(fmt.Errorf("failed to resolve chunks: %v", err)) + } + + // Prepare streaming function with simple master client wrapper + tStreamPrep := time.Now() + masterClient := &simpleMasterClient{lookupFn: lookupFileIdFn} + streamFn, err := filer.PrepareStreamContentWithThrottler( + ctx, + masterClient, + func(fileId string) string { + // Use volume server JWT (not filer JWT) for direct volume reads + return string(security.GenJwtForVolumeServer(s3a.filerGuard.ReadSigningKey, s3a.filerGuard.ReadExpiresAfterSec, fileId)) + }, + resolvedChunks, + offset, + size, + 0, // no throttling + ) + streamPrepTime = time.Since(tStreamPrep) + if err != nil { + glog.Errorf("streamFromVolumeServers: failed to prepare stream: %v", err) + // Write S3-compliant XML error response + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) + return newStreamErrorWithResponse(fmt.Errorf("failed to prepare stream: %v", err)) } - defer util_http.CloseResponse(resp) - if resp.StatusCode == http.StatusPreconditionFailed { - s3err.WriteErrorResponse(w, r, s3err.ErrPreconditionFailed) - return - } + // All validation and preparation successful - NOW set headers and write status + tHeaderSet := time.Now() + s3a.setResponseHeaders(w, entry, totalSize) - if resp.StatusCode == http.StatusRequestedRangeNotSatisfiable { - s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRange) - return + // Override/add range-specific headers if this is a range request + if isRangeRequest { + w.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", offset, offset+size-1, totalSize)) + w.Header().Set("Content-Length", strconv.FormatInt(size, 10)) } + headerSetTime = time.Since(tHeaderSet) - if r.Method == http.MethodDelete { - if resp.StatusCode == http.StatusNotFound { - // this is normal - responseStatusCode, _ := responseFn(resp, w) - s3err.PostLog(r, responseStatusCode, s3err.ErrNone) - return - } - } - if resp.StatusCode == http.StatusNotFound { - s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) - return + // Now write status code (headers are all set, stream is ready) + if isRangeRequest { + w.WriteHeader(http.StatusPartialContent) + } else { + w.WriteHeader(http.StatusOK) } - TimeToFirstByte(r.Method, start, r) - if resp.Header.Get(s3_constants.SeaweedFSIsDirectoryKey) == "true" { - responseStatusCode, _ := responseFn(resp, w) - s3err.PostLog(r, responseStatusCode, s3err.ErrNone) - return + // Stream directly to response + tStreamExec := time.Now() + glog.V(4).Infof("streamFromVolumeServers: starting streamFn, offset=%d, size=%d", offset, size) + err = streamFn(w) + streamExecTime = time.Since(tStreamExec) + if err != nil { + glog.Errorf("streamFromVolumeServers: streamFn failed: %v", err) + // Streaming error after WriteHeader was called - response already partially written + return newStreamErrorWithResponse(err) } + glog.V(4).Infof("streamFromVolumeServers: streamFn completed successfully") + return nil +} - if resp.StatusCode == http.StatusInternalServerError { - s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) - return +// Shared HTTP client for volume server requests (connection pooling) +var volumeServerHTTPClient = &http.Client{ + Timeout: 5 * time.Minute, + Transport: &http.Transport{ + MaxIdleConns: 100, + MaxIdleConnsPerHost: 10, + IdleConnTimeout: 90 * time.Second, + }, +} + +// createLookupFileIdFunction creates a reusable lookup function for resolving volume URLs +func (s3a *S3ApiServer) createLookupFileIdFunction() func(context.Context, string) ([]string, error) { + return func(ctx context.Context, fileId string) ([]string, error) { + var urls []string + err := s3a.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error { + vid := filer.VolumeId(fileId) + resp, err := client.LookupVolume(ctx, &filer_pb.LookupVolumeRequest{ + VolumeIds: []string{vid}, + }) + if err != nil { + return err + } + if locs, found := resp.LocationsMap[vid]; found { + for _, loc := range locs.Locations { + // Build complete URL with volume server address and fileId + // The fileId parameter contains the full "volumeId,fileKey" identifier (e.g., "3,01637037d6") + // This constructs URLs like: http://127.0.0.1:8080/3,01637037d6 (or https:// if configured) + // NormalizeUrl ensures the proper scheme (http:// or https://) is used based on configuration + normalizedUrl, err := util_http.NormalizeUrl(loc.Url) + if err != nil { + glog.Warningf("Failed to normalize URL for %s: %v", loc.Url, err) + continue + } + urls = append(urls, normalizedUrl+"/"+fileId) + } + } + return nil + }) + glog.V(3).Infof("createLookupFileIdFunction: fileId=%s, resolved urls=%v", fileId, urls) + return urls, err } +} - // when HEAD a directory, it should be reported as no such key - // https://github.com/seaweedfs/seaweedfs/issues/3457 - if resp.ContentLength == -1 && resp.StatusCode != http.StatusNotModified { - s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) - return +// streamFromVolumeServersWithSSE handles streaming with inline SSE decryption +func (s3a *S3ApiServer) streamFromVolumeServersWithSSE(w http.ResponseWriter, r *http.Request, entry *filer_pb.Entry, sseType string) error { + // If not encrypted, use fast path without decryption + if sseType == "" || sseType == "None" { + return s3a.streamFromVolumeServers(w, r, entry, sseType) } - if resp.StatusCode == http.StatusBadRequest { - resp_body, _ := io.ReadAll(resp.Body) - switch string(resp_body) { - case "InvalidPart": - s3err.WriteErrorResponse(w, r, s3err.ErrInvalidPart) - default: - s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRequest) - } - resp.Body.Close() - return + // Profiling: Track SSE decryption stages + t0 := time.Now() + var ( + rangeParseTime time.Duration + keyValidateTime time.Duration + headerSetTime time.Duration + streamFetchTime time.Duration + decryptSetupTime time.Duration + copyTime time.Duration + ) + defer func() { + totalTime := time.Since(t0) + glog.V(2).Infof(" └─ streamFromVolumeServersWithSSE (%s): total=%v, rangeParse=%v, keyValidate=%v, headerSet=%v, streamFetch=%v, decryptSetup=%v, copy=%v", + sseType, totalTime, rangeParseTime, keyValidateTime, headerSetTime, streamFetchTime, decryptSetupTime, copyTime) + }() + + glog.V(2).Infof("streamFromVolumeServersWithSSE: Handling %s encrypted object with inline decryption", sseType) + + // Parse Range header BEFORE key validation + totalSize := int64(filer.FileSize(entry)) + tRangeParse := time.Now() + var offset int64 = 0 + var size int64 = totalSize + rangeHeader := r.Header.Get("Range") + isRangeRequest := false + + if rangeHeader != "" && strings.HasPrefix(rangeHeader, "bytes=") { + rangeSpec := rangeHeader[6:] + parts := strings.Split(rangeSpec, "-") + if len(parts) == 2 { + var startOffset, endOffset int64 + + if parts[0] == "" && parts[1] != "" { + // Suffix range: bytes=-N (last N bytes) + if suffixLen, err := strconv.ParseInt(parts[1], 10, 64); err == nil { + // RFC 7233: suffix range on empty object or zero-length suffix is unsatisfiable + if totalSize == 0 || suffixLen <= 0 { + w.Header().Set("Content-Range", fmt.Sprintf("bytes */%d", totalSize)) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRange) + return newStreamErrorWithResponse(fmt.Errorf("invalid suffix range for empty object")) + } + if suffixLen > totalSize { + suffixLen = totalSize + } + startOffset = totalSize - suffixLen + endOffset = totalSize - 1 + } else { + // Set header BEFORE WriteHeader + w.Header().Set("Content-Range", fmt.Sprintf("bytes */%d", totalSize)) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRange) + return newStreamErrorWithResponse(fmt.Errorf("invalid suffix range")) + } + } else { + // Regular range or open-ended range + startOffset = 0 + endOffset = totalSize - 1 + + if parts[0] != "" { + if parsed, err := strconv.ParseInt(parts[0], 10, 64); err == nil { + startOffset = parsed + } + } + if parts[1] != "" { + if parsed, err := strconv.ParseInt(parts[1], 10, 64); err == nil { + endOffset = parsed + } + } + + // Validate range + if startOffset < 0 || startOffset >= totalSize { + // Set header BEFORE WriteHeader + w.Header().Set("Content-Range", fmt.Sprintf("bytes */%d", totalSize)) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRange) + return newStreamErrorWithResponse(fmt.Errorf("invalid range start")) + } + + if endOffset >= totalSize { + endOffset = totalSize - 1 + } + + if endOffset < startOffset { + // Set header BEFORE WriteHeader + w.Header().Set("Content-Range", fmt.Sprintf("bytes */%d", totalSize)) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRange) + return newStreamErrorWithResponse(fmt.Errorf("invalid range: end before start")) + } + } + + offset = startOffset + size = endOffset - startOffset + 1 + isRangeRequest = true + glog.V(2).Infof("streamFromVolumeServersWithSSE: Range request bytes %d-%d/%d (size=%d)", startOffset, endOffset, totalSize, size) + } + } + rangeParseTime = time.Since(tRangeParse) + + // Validate SSE keys BEFORE streaming + tKeyValidate := time.Now() + var decryptionKey interface{} + switch sseType { + case s3_constants.SSETypeC: + customerKey, err := ParseSSECHeaders(r) + if err != nil { + s3err.WriteErrorResponse(w, r, MapSSECErrorToS3Error(err)) + return newStreamErrorWithResponse(err) + } + if customerKey == nil { + s3err.WriteErrorResponse(w, r, s3err.ErrSSECustomerKeyMissing) + return newStreamErrorWithResponse(fmt.Errorf("SSE-C key required")) + } + // Validate key MD5 + if entry.Extended != nil { + storedKeyMD5 := string(entry.Extended[s3_constants.AmzServerSideEncryptionCustomerKeyMD5]) + if storedKeyMD5 != "" && customerKey.KeyMD5 != storedKeyMD5 { + s3err.WriteErrorResponse(w, r, s3err.ErrAccessDenied) + return newStreamErrorWithResponse(fmt.Errorf("SSE-C key mismatch")) + } + } + decryptionKey = customerKey + case s3_constants.SSETypeKMS: + // Extract KMS key from metadata (stored as raw bytes, matching filer behavior) + if entry.Extended == nil { + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) + return newStreamErrorWithResponse(fmt.Errorf("no SSE-KMS metadata")) + } + kmsMetadataBytes := entry.Extended[s3_constants.SeaweedFSSSEKMSKey] + sseKMSKey, err := DeserializeSSEKMSMetadata(kmsMetadataBytes) + if err != nil { + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) + return newStreamErrorWithResponse(err) + } + decryptionKey = sseKMSKey + case s3_constants.SSETypeS3: + // Extract S3 key from metadata (stored as raw bytes, matching filer behavior) + if entry.Extended == nil { + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) + return newStreamErrorWithResponse(fmt.Errorf("no SSE-S3 metadata")) + } + keyData := entry.Extended[s3_constants.SeaweedFSSSES3Key] + keyManager := GetSSES3KeyManager() + sseS3Key, err := DeserializeSSES3Metadata(keyData, keyManager) + if err != nil { + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) + return newStreamErrorWithResponse(err) + } + decryptionKey = sseS3Key + } + keyValidateTime = time.Since(tKeyValidate) + + // Set response headers + // IMPORTANT: Set ALL headers BEFORE calling WriteHeader (headers are ignored after WriteHeader) + tHeaderSet := time.Now() + s3a.setResponseHeaders(w, entry, totalSize) + s3a.addSSEResponseHeadersFromEntry(w, r, entry, sseType) + + // Override/add range-specific headers if this is a range request + if isRangeRequest { + w.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", offset, offset+size-1, totalSize)) + w.Header().Set("Content-Length", strconv.FormatInt(size, 10)) + } + headerSetTime = time.Since(tHeaderSet) + + // Now write status code (headers are all set) + if isRangeRequest { + w.WriteHeader(http.StatusPartialContent) + } + + // Full Range Optimization: Use ViewFromChunks to only fetch/decrypt needed chunks + tDecryptSetup := time.Now() + + // Use range-aware chunk resolution (like filer does) + if isRangeRequest { + glog.V(2).Infof("Using range-aware SSE decryption for offset=%d size=%d", offset, size) + streamFetchTime = 0 // No full stream fetch in range-aware path + err := s3a.streamDecryptedRangeFromChunks(r.Context(), w, entry, offset, size, sseType, decryptionKey) + decryptSetupTime = time.Since(tDecryptSetup) + copyTime = decryptSetupTime // Streaming is included in decrypt setup for range-aware path + if err != nil { + // Error after WriteHeader - response already written + return newStreamErrorWithResponse(err) + } + return nil + } + + // Full object path: Optimize multipart vs single-part + var decryptedReader io.Reader + var err error + + switch sseType { + case s3_constants.SSETypeC: + customerKey := decryptionKey.(*SSECustomerKey) + + // Check if this is a multipart object (multiple chunks with SSE-C metadata) + isMultipartSSEC := false + ssecChunks := 0 + for _, chunk := range entry.GetChunks() { + if chunk.GetSseType() == filer_pb.SSEType_SSE_C && len(chunk.GetSseMetadata()) > 0 { + ssecChunks++ + } + } + isMultipartSSEC = ssecChunks > 1 + glog.V(3).Infof("SSE-C decryption: KeyMD5=%s, entry has %d chunks, isMultipart=%v, ssecChunks=%d", + customerKey.KeyMD5, len(entry.GetChunks()), isMultipartSSEC, ssecChunks) + + if isMultipartSSEC { + // For multipart, skip getEncryptedStreamFromVolumes and fetch chunks directly + // This saves one filer lookup/pipe creation + decryptedReader, err = s3a.createMultipartSSECDecryptedReaderDirect(r.Context(), nil, customerKey, entry) + glog.V(2).Infof("Using multipart SSE-C decryption for object with %d chunks (no prefetch)", len(entry.GetChunks())) + } else { + // For single-part, get encrypted stream and decrypt + tStreamFetch := time.Now() + encryptedReader, streamErr := s3a.getEncryptedStreamFromVolumes(r.Context(), entry) + streamFetchTime = time.Since(tStreamFetch) + if streamErr != nil { + // Error after WriteHeader - response already written + return newStreamErrorWithResponse(streamErr) + } + defer encryptedReader.Close() + + iv := entry.Extended[s3_constants.SeaweedFSSSEIV] + if len(iv) == 0 { + // Error after WriteHeader - response already written + return newStreamErrorWithResponse(fmt.Errorf("SSE-C IV not found in entry metadata")) + } + glog.V(2).Infof("SSE-C decryption: IV length=%d, KeyMD5=%s", len(iv), customerKey.KeyMD5) + decryptedReader, err = CreateSSECDecryptedReader(encryptedReader, customerKey, iv) + } + + case s3_constants.SSETypeKMS: + sseKMSKey := decryptionKey.(*SSEKMSKey) + + // Check if this is a multipart object (multiple chunks with SSE-KMS metadata) + isMultipartSSEKMS := false + ssekmsChunks := 0 + for _, chunk := range entry.GetChunks() { + if chunk.GetSseType() == filer_pb.SSEType_SSE_KMS && len(chunk.GetSseMetadata()) > 0 { + ssekmsChunks++ + } + } + isMultipartSSEKMS = ssekmsChunks > 1 + glog.V(3).Infof("SSE-KMS decryption: isMultipart=%v, ssekmsChunks=%d", isMultipartSSEKMS, ssekmsChunks) + + if isMultipartSSEKMS { + // For multipart, skip getEncryptedStreamFromVolumes and fetch chunks directly + decryptedReader, err = s3a.createMultipartSSEKMSDecryptedReaderDirect(r.Context(), nil, entry) + glog.V(2).Infof("Using multipart SSE-KMS decryption for object with %d chunks (no prefetch)", len(entry.GetChunks())) + } else { + // For single-part, get encrypted stream and decrypt + tStreamFetch := time.Now() + encryptedReader, streamErr := s3a.getEncryptedStreamFromVolumes(r.Context(), entry) + streamFetchTime = time.Since(tStreamFetch) + if streamErr != nil { + // Error after WriteHeader - response already written + return newStreamErrorWithResponse(streamErr) + } + defer encryptedReader.Close() + + glog.V(2).Infof("SSE-KMS decryption: KeyID=%s, IV length=%d", sseKMSKey.KeyID, len(sseKMSKey.IV)) + decryptedReader, err = CreateSSEKMSDecryptedReader(encryptedReader, sseKMSKey) + } + + case s3_constants.SSETypeS3: + sseS3Key := decryptionKey.(*SSES3Key) + + // Check if this is a multipart object (multiple chunks with SSE-S3 metadata) + isMultipartSSES3 := false + sses3Chunks := 0 + for _, chunk := range entry.GetChunks() { + if chunk.GetSseType() == filer_pb.SSEType_SSE_S3 && len(chunk.GetSseMetadata()) > 0 { + sses3Chunks++ + } + } + isMultipartSSES3 = sses3Chunks > 1 + glog.V(3).Infof("SSE-S3 decryption: isMultipart=%v, sses3Chunks=%d", isMultipartSSES3, sses3Chunks) + + if isMultipartSSES3 { + // For multipart, skip getEncryptedStreamFromVolumes and fetch chunks directly + decryptedReader, err = s3a.createMultipartSSES3DecryptedReaderDirect(r.Context(), nil, entry) + glog.V(2).Infof("Using multipart SSE-S3 decryption for object with %d chunks (no prefetch)", len(entry.GetChunks())) + } else { + // For single-part, get encrypted stream and decrypt + tStreamFetch := time.Now() + encryptedReader, streamErr := s3a.getEncryptedStreamFromVolumes(r.Context(), entry) + streamFetchTime = time.Since(tStreamFetch) + if streamErr != nil { + // Error after WriteHeader - response already written + return newStreamErrorWithResponse(streamErr) + } + defer encryptedReader.Close() + + keyManager := GetSSES3KeyManager() + iv, ivErr := GetSSES3IV(entry, sseS3Key, keyManager) + if ivErr != nil { + // Error after WriteHeader - response already written + return newStreamErrorWithResponse(fmt.Errorf("failed to get SSE-S3 IV: %w", ivErr)) + } + glog.V(2).Infof("SSE-S3 decryption: KeyID=%s, IV length=%d", sseS3Key.KeyID, len(iv)) + decryptedReader, err = CreateSSES3DecryptedReader(encryptedReader, sseS3Key, iv) + } + } + decryptSetupTime = time.Since(tDecryptSetup) + + if err != nil { + glog.Errorf("SSE decryption error (%s): %v", sseType, err) + // Error after WriteHeader - response already written + return newStreamErrorWithResponse(fmt.Errorf("failed to create decrypted reader: %w", err)) + } + + // Close the decrypted reader to avoid leaking HTTP bodies + if closer, ok := decryptedReader.(io.Closer); ok { + defer func() { + if closeErr := closer.Close(); closeErr != nil { + glog.V(3).Infof("Error closing decrypted reader: %v", closeErr) + } + }() + } + + // Stream full decrypted object to client + tCopy := time.Now() + buf := make([]byte, 128*1024) + copied, copyErr := io.CopyBuffer(w, decryptedReader, buf) + copyTime = time.Since(tCopy) + if copyErr != nil { + glog.Errorf("Failed to copy full object: copied %d bytes: %v", copied, copyErr) + // Error after WriteHeader - response already written + return newStreamErrorWithResponse(copyErr) + } + glog.V(3).Infof("Full object request: copied %d bytes", copied) + return nil +} + +// streamDecryptedRangeFromChunks streams a range of decrypted data by only fetching needed chunks +// This implements the filer's ViewFromChunks approach for optimal range performance +func (s3a *S3ApiServer) streamDecryptedRangeFromChunks(ctx context.Context, w io.Writer, entry *filer_pb.Entry, offset int64, size int64, sseType string, decryptionKey interface{}) error { + // Use filer's ViewFromChunks to resolve only needed chunks for the range + lookupFileIdFn := s3a.createLookupFileIdFunction() + chunkViews := filer.ViewFromChunks(ctx, lookupFileIdFn, entry.GetChunks(), offset, size) + + totalWritten := int64(0) + targetOffset := offset + + // Stream each chunk view + for x := chunkViews.Front(); x != nil; x = x.Next { + chunkView := x.Value + + // Handle gaps between chunks (write zeros) + if targetOffset < chunkView.ViewOffset { + gap := chunkView.ViewOffset - targetOffset + glog.V(4).Infof("Writing %d zero bytes for gap [%d,%d)", gap, targetOffset, chunkView.ViewOffset) + if err := writeZeroBytes(w, gap); err != nil { + return fmt.Errorf("failed to write zero padding: %w", err) + } + totalWritten += gap + targetOffset = chunkView.ViewOffset + } + + // Find the corresponding FileChunk for this chunkView + var fileChunk *filer_pb.FileChunk + for _, chunk := range entry.GetChunks() { + if chunk.GetFileIdString() == chunkView.FileId { + fileChunk = chunk + break + } + } + if fileChunk == nil { + return fmt.Errorf("chunk %s not found in entry", chunkView.FileId) + } + + // Fetch and decrypt this chunk view + var decryptedChunkReader io.Reader + var err error + + switch sseType { + case s3_constants.SSETypeC: + decryptedChunkReader, err = s3a.decryptSSECChunkView(ctx, fileChunk, chunkView, decryptionKey.(*SSECustomerKey)) + case s3_constants.SSETypeKMS: + decryptedChunkReader, err = s3a.decryptSSEKMSChunkView(ctx, fileChunk, chunkView) + case s3_constants.SSETypeS3: + decryptedChunkReader, err = s3a.decryptSSES3ChunkView(ctx, fileChunk, chunkView, entry) + default: + // Non-encrypted chunk + decryptedChunkReader, err = s3a.fetchChunkViewData(ctx, chunkView) + } + + if err != nil { + return fmt.Errorf("failed to decrypt chunk view %s: %w", chunkView.FileId, err) + } + + // Copy the decrypted chunk data + written, copyErr := io.Copy(w, decryptedChunkReader) + if closer, ok := decryptedChunkReader.(io.Closer); ok { + closeErr := closer.Close() + if closeErr != nil { + glog.Warningf("streamDecryptedRangeFromChunks: failed to close decrypted chunk reader: %v", closeErr) + } + } + if copyErr != nil { + glog.Errorf("streamDecryptedRangeFromChunks: copy error after writing %d bytes (expected %d): %v", written, chunkView.ViewSize, copyErr) + return fmt.Errorf("failed to copy decrypted chunk data: %w", copyErr) + } + + if written != int64(chunkView.ViewSize) { + glog.Errorf("streamDecryptedRangeFromChunks: size mismatch - wrote %d bytes but expected %d", written, chunkView.ViewSize) + return fmt.Errorf("size mismatch: wrote %d bytes but expected %d for chunk %s", written, chunkView.ViewSize, chunkView.FileId) + } + + totalWritten += written + targetOffset += written + glog.V(2).Infof("streamDecryptedRangeFromChunks: Wrote %d bytes from chunk %s [%d,%d), totalWritten=%d, targetSize=%d", written, chunkView.FileId, chunkView.ViewOffset, chunkView.ViewOffset+int64(chunkView.ViewSize), totalWritten, size) + } + + // Handle trailing zeros if needed + remaining := size - totalWritten + if remaining > 0 { + glog.V(4).Infof("Writing %d trailing zero bytes", remaining) + if err := writeZeroBytes(w, remaining); err != nil { + return fmt.Errorf("failed to write trailing zeros: %w", err) + } + } + + glog.V(3).Infof("Completed range-aware SSE decryption: wrote %d bytes for range [%d,%d)", totalWritten, offset, offset+size) + return nil +} + +// writeZeroBytes writes n zero bytes to writer using the package-level zero buffer +func writeZeroBytes(w io.Writer, n int64) error { + for n > 0 { + toWrite := min(n, int64(len(zeroBuf))) + written, err := w.Write(zeroBuf[:toWrite]) + if err != nil { + return err + } + n -= int64(written) + } + return nil +} + +// decryptSSECChunkView decrypts a specific chunk view with SSE-C +// +// IV Handling for SSE-C: +// ---------------------- +// SSE-C multipart encryption (see lines 2772-2781) differs fundamentally from SSE-KMS/SSE-S3: +// +// 1. Encryption: CreateSSECEncryptedReader generates a RANDOM IV per part/chunk +// - Each part starts with a fresh random IV +// - CTR counter starts from 0 for each part: counter₀, counter₁, counter₂, ... +// - PartOffset is stored in metadata but NOT applied during encryption +// +// 2. Decryption: Use the stored IV directly WITHOUT offset adjustment +// - The stored IV already represents the start of this part's encryption +// - Applying calculateIVWithOffset would shift to counterₙ, misaligning the keystream +// - Result: XOR with wrong keystream = corrupted plaintext +// +// This contrasts with SSE-KMS/SSE-S3 which use: base IV + calculateIVWithOffset(ChunkOffset) +func (s3a *S3ApiServer) decryptSSECChunkView(ctx context.Context, fileChunk *filer_pb.FileChunk, chunkView *filer.ChunkView, customerKey *SSECustomerKey) (io.Reader, error) { + // For multipart SSE-C, each chunk has its own IV in chunk.SseMetadata + if fileChunk.GetSseType() == filer_pb.SSEType_SSE_C && len(fileChunk.GetSseMetadata()) > 0 { + ssecMetadata, err := DeserializeSSECMetadata(fileChunk.GetSseMetadata()) + if err != nil { + return nil, fmt.Errorf("failed to deserialize SSE-C metadata: %w", err) + } + chunkIV, err := base64.StdEncoding.DecodeString(ssecMetadata.IV) + if err != nil { + return nil, fmt.Errorf("failed to decode IV: %w", err) + } + + // Fetch FULL encrypted chunk + // Note: Fetching full chunk is necessary for proper CTR decryption stream + fullChunkReader, err := s3a.fetchFullChunk(ctx, chunkView.FileId) + if err != nil { + return nil, fmt.Errorf("failed to fetch full chunk: %w", err) + } + + // CRITICAL: Use stored IV directly WITHOUT offset adjustment + // The stored IV is the random IV used at encryption time for this specific part + // SSE-C does NOT apply calculateIVWithOffset during encryption, so we must not apply it during decryption + // (See documentation above and at lines 2772-2781 for detailed explanation) + decryptedReader, decryptErr := CreateSSECDecryptedReader(fullChunkReader, customerKey, chunkIV) + if decryptErr != nil { + fullChunkReader.Close() + return nil, fmt.Errorf("failed to create decrypted reader: %w", decryptErr) + } + + // Skip to the position we need in the decrypted stream + if chunkView.OffsetInChunk > 0 { + _, err = io.CopyN(io.Discard, decryptedReader, chunkView.OffsetInChunk) + if err != nil { + if closer, ok := decryptedReader.(io.Closer); ok { + closer.Close() + } + return nil, fmt.Errorf("failed to skip to offset %d: %w", chunkView.OffsetInChunk, err) + } + } + + // Return a reader that only reads ViewSize bytes with proper cleanup + limitedReader := io.LimitReader(decryptedReader, int64(chunkView.ViewSize)) + return &rc{Reader: limitedReader, Closer: fullChunkReader}, nil + } + + // Single-part SSE-C: use object-level IV (should not hit this in range path, but handle it) + encryptedReader, err := s3a.fetchChunkViewData(ctx, chunkView) + if err != nil { + return nil, err + } + // For single-part, the IV is stored at object level, already handled in non-range path + return encryptedReader, nil +} + +// decryptSSEKMSChunkView decrypts a specific chunk view with SSE-KMS +// +// IV Handling for SSE-KMS: +// ------------------------ +// SSE-KMS (and SSE-S3) use a fundamentally different IV scheme than SSE-C: +// +// 1. Encryption: Uses a BASE IV + offset calculation +// - Base IV is generated once for the entire object +// - For each chunk at position N: adjustedIV = calculateIVWithOffset(baseIV, N) +// - This shifts the CTR counter to counterₙ where n = N/16 +// - ChunkOffset is stored in metadata and IS applied during encryption +// +// 2. Decryption: Apply the same offset calculation +// - Use calculateIVWithOffset(baseIV, ChunkOffset) to reconstruct the encryption IV +// - Also handle ivSkip for non-block-aligned offsets (intra-block positioning) +// - This ensures decryption uses the same CTR counter sequence as encryption +// +// This contrasts with SSE-C which uses random IVs without offset calculation. +func (s3a *S3ApiServer) decryptSSEKMSChunkView(ctx context.Context, fileChunk *filer_pb.FileChunk, chunkView *filer.ChunkView) (io.Reader, error) { + if fileChunk.GetSseType() == filer_pb.SSEType_SSE_KMS && len(fileChunk.GetSseMetadata()) > 0 { + sseKMSKey, err := DeserializeSSEKMSMetadata(fileChunk.GetSseMetadata()) + if err != nil { + return nil, fmt.Errorf("failed to deserialize SSE-KMS metadata: %w", err) + } + + // Fetch FULL encrypted chunk + fullChunkReader, err := s3a.fetchFullChunk(ctx, chunkView.FileId) + if err != nil { + return nil, fmt.Errorf("failed to fetch full chunk: %w", err) + } + + // IMPORTANT: Calculate adjusted IV using ChunkOffset + // SSE-KMS uses base IV + offset calculation (unlike SSE-C which uses random IVs) + // This reconstructs the same IV that was used during encryption + var adjustedIV []byte + var ivSkip int + if sseKMSKey.ChunkOffset > 0 { + adjustedIV, ivSkip = calculateIVWithOffset(sseKMSKey.IV, sseKMSKey.ChunkOffset) + } else { + adjustedIV = sseKMSKey.IV + ivSkip = 0 + } + + adjustedKey := &SSEKMSKey{ + KeyID: sseKMSKey.KeyID, + EncryptedDataKey: sseKMSKey.EncryptedDataKey, + EncryptionContext: sseKMSKey.EncryptionContext, + BucketKeyEnabled: sseKMSKey.BucketKeyEnabled, + IV: adjustedIV, + ChunkOffset: sseKMSKey.ChunkOffset, + } + + decryptedReader, decryptErr := CreateSSEKMSDecryptedReader(fullChunkReader, adjustedKey) + if decryptErr != nil { + fullChunkReader.Close() + return nil, fmt.Errorf("failed to create KMS decrypted reader: %w", decryptErr) + } + + // CRITICAL: Skip intra-block bytes from CTR decryption (non-block-aligned offset handling) + if ivSkip > 0 { + _, err = io.CopyN(io.Discard, decryptedReader, int64(ivSkip)) + if err != nil { + if closer, ok := decryptedReader.(io.Closer); ok { + closer.Close() + } + return nil, fmt.Errorf("failed to skip intra-block bytes (%d): %w", ivSkip, err) + } + } + + // Skip to position and limit to ViewSize + if chunkView.OffsetInChunk > 0 { + _, err = io.CopyN(io.Discard, decryptedReader, chunkView.OffsetInChunk) + if err != nil { + if closer, ok := decryptedReader.(io.Closer); ok { + closer.Close() + } + return nil, fmt.Errorf("failed to skip to offset: %w", err) + } + } + + limitedReader := io.LimitReader(decryptedReader, int64(chunkView.ViewSize)) + return &rc{Reader: limitedReader, Closer: fullChunkReader}, nil + } + + // Non-KMS encrypted chunk + return s3a.fetchChunkViewData(ctx, chunkView) +} + +// decryptSSES3ChunkView decrypts a specific chunk view with SSE-S3 +// +// IV Handling for SSE-S3: +// ----------------------- +// SSE-S3 uses the same BASE IV + offset scheme as SSE-KMS, but with a subtle difference: +// +// 1. Encryption: Uses BASE IV + offset, but stores the ADJUSTED IV +// - Base IV is generated once for the entire object +// - For each chunk at position N: adjustedIV, skip = calculateIVWithOffset(baseIV, N) +// - The ADJUSTED IV (not base IV) is stored in chunk metadata +// - ChunkOffset calculation is performed during encryption +// +// 2. Decryption: Use the stored adjusted IV directly +// - The stored IV is already block-aligned and ready to use +// - No need to call calculateIVWithOffset again (unlike SSE-KMS) +// - Decrypt full chunk from start, then skip to OffsetInChunk in plaintext +// +// This differs from: +// - SSE-C: Uses random IV per chunk, no offset calculation +// - SSE-KMS: Stores base IV, requires calculateIVWithOffset during decryption +func (s3a *S3ApiServer) decryptSSES3ChunkView(ctx context.Context, fileChunk *filer_pb.FileChunk, chunkView *filer.ChunkView, entry *filer_pb.Entry) (io.Reader, error) { + // For multipart SSE-S3, each chunk has its own IV in chunk.SseMetadata + if fileChunk.GetSseType() == filer_pb.SSEType_SSE_S3 && len(fileChunk.GetSseMetadata()) > 0 { + keyManager := GetSSES3KeyManager() + + // Deserialize per-chunk SSE-S3 metadata to get chunk-specific IV + chunkSSES3Metadata, err := DeserializeSSES3Metadata(fileChunk.GetSseMetadata(), keyManager) + if err != nil { + return nil, fmt.Errorf("failed to deserialize chunk SSE-S3 metadata: %w", err) + } + + // Fetch FULL encrypted chunk (necessary for proper CTR decryption stream) + fullChunkReader, err := s3a.fetchFullChunk(ctx, chunkView.FileId) + if err != nil { + return nil, fmt.Errorf("failed to fetch full chunk: %w", err) + } + + // IMPORTANT: Use the stored IV directly - it's already block-aligned + // During encryption, CreateSSES3EncryptedReaderWithBaseIV called: + // adjustedIV, skip := calculateIVWithOffset(baseIV, partOffset) + // and stored the adjustedIV in metadata. We use it as-is for decryption. + // No need to call calculateIVWithOffset again (unlike SSE-KMS which stores base IV). + iv := chunkSSES3Metadata.IV + + glog.V(4).Infof("Decrypting multipart SSE-S3 chunk %s with chunk-specific IV length=%d", + chunkView.FileId, len(iv)) + + // Decrypt the full chunk starting from offset 0 + decryptedReader, decryptErr := CreateSSES3DecryptedReader(fullChunkReader, chunkSSES3Metadata, iv) + if decryptErr != nil { + fullChunkReader.Close() + return nil, fmt.Errorf("failed to create SSE-S3 decrypted reader: %w", decryptErr) + } + + // Skip to position within the decrypted chunk (plaintext offset, not ciphertext offset) + if chunkView.OffsetInChunk > 0 { + _, err = io.CopyN(io.Discard, decryptedReader, chunkView.OffsetInChunk) + if err != nil { + if closer, ok := decryptedReader.(io.Closer); ok { + closer.Close() + } + return nil, fmt.Errorf("failed to skip to offset %d: %w", chunkView.OffsetInChunk, err) + } + } + + limitedReader := io.LimitReader(decryptedReader, int64(chunkView.ViewSize)) + return &rc{Reader: limitedReader, Closer: fullChunkReader}, nil + } + + // Single-part SSE-S3: use object-level IV and key (fallback path) + keyData := entry.Extended[s3_constants.SeaweedFSSSES3Key] + keyManager := GetSSES3KeyManager() + sseS3Key, err := DeserializeSSES3Metadata(keyData, keyManager) + if err != nil { + return nil, fmt.Errorf("failed to deserialize SSE-S3 metadata: %w", err) + } + + // Fetch FULL encrypted chunk + fullChunkReader, err := s3a.fetchFullChunk(ctx, chunkView.FileId) + if err != nil { + return nil, fmt.Errorf("failed to fetch full chunk: %w", err) + } + + // Get base IV for single-part object + iv, err := GetSSES3IV(entry, sseS3Key, keyManager) + if err != nil { + fullChunkReader.Close() + return nil, fmt.Errorf("failed to get SSE-S3 IV: %w", err) + } + + glog.V(4).Infof("Decrypting single-part SSE-S3 chunk %s with entry-level IV length=%d", + chunkView.FileId, len(iv)) + + decryptedReader, decryptErr := CreateSSES3DecryptedReader(fullChunkReader, sseS3Key, iv) + if decryptErr != nil { + fullChunkReader.Close() + return nil, fmt.Errorf("failed to create S3 decrypted reader: %w", decryptErr) + } + + // Skip to position and limit to ViewSize + if chunkView.OffsetInChunk > 0 { + _, err = io.CopyN(io.Discard, decryptedReader, chunkView.OffsetInChunk) + if err != nil { + if closer, ok := decryptedReader.(io.Closer); ok { + closer.Close() + } + return nil, fmt.Errorf("failed to skip to offset: %w", err) + } + } + + limitedReader := io.LimitReader(decryptedReader, int64(chunkView.ViewSize)) + return &rc{Reader: limitedReader, Closer: fullChunkReader}, nil +} + +// fetchFullChunk fetches the complete encrypted chunk from volume server +func (s3a *S3ApiServer) fetchFullChunk(ctx context.Context, fileId string) (io.ReadCloser, error) { + // Lookup the volume server URLs for this chunk + lookupFileIdFn := s3a.createLookupFileIdFunction() + urlStrings, err := lookupFileIdFn(ctx, fileId) + if err != nil || len(urlStrings) == 0 { + return nil, fmt.Errorf("failed to lookup chunk %s: %w", fileId, err) + } + + // Use the first URL + chunkUrl := urlStrings[0] + + // Generate JWT for volume server authentication + jwt := security.GenJwtForVolumeServer(s3a.filerGuard.ReadSigningKey, s3a.filerGuard.ReadExpiresAfterSec, fileId) + + // Create request WITHOUT Range header to get full chunk + req, err := http.NewRequestWithContext(ctx, "GET", chunkUrl, nil) + if err != nil { + return nil, fmt.Errorf("failed to create request: %w", err) + } + + // Set JWT for authentication + if jwt != "" { + req.Header.Set("Authorization", "BEARER "+string(jwt)) + } + + // Use shared HTTP client + resp, err := volumeServerHTTPClient.Do(req) + if err != nil { + return nil, fmt.Errorf("failed to fetch chunk: %w", err) + } + + if resp.StatusCode != http.StatusOK { + resp.Body.Close() + return nil, fmt.Errorf("unexpected status code %d for chunk %s", resp.StatusCode, fileId) + } + + return resp.Body, nil +} + +// fetchChunkViewData fetches encrypted data for a chunk view (with range) +func (s3a *S3ApiServer) fetchChunkViewData(ctx context.Context, chunkView *filer.ChunkView) (io.ReadCloser, error) { + // Lookup the volume server URLs for this chunk + lookupFileIdFn := s3a.createLookupFileIdFunction() + urlStrings, err := lookupFileIdFn(ctx, chunkView.FileId) + if err != nil || len(urlStrings) == 0 { + return nil, fmt.Errorf("failed to lookup chunk %s: %w", chunkView.FileId, err) + } + + // Use the first URL (already contains complete URL with fileId) + chunkUrl := urlStrings[0] + + // Generate JWT for volume server authentication + jwt := security.GenJwtForVolumeServer(s3a.filerGuard.ReadSigningKey, s3a.filerGuard.ReadExpiresAfterSec, chunkView.FileId) + + // Create request with Range header for the chunk view + // chunkUrl already contains the complete URL including fileId + req, err := http.NewRequestWithContext(ctx, "GET", chunkUrl, nil) + if err != nil { + return nil, fmt.Errorf("failed to create request: %w", err) + } + + // Set Range header to fetch only the needed portion of the chunk + if !chunkView.IsFullChunk() { + rangeEnd := chunkView.OffsetInChunk + int64(chunkView.ViewSize) - 1 + req.Header.Set("Range", fmt.Sprintf("bytes=%d-%d", chunkView.OffsetInChunk, rangeEnd)) + } + + // Set JWT for authentication + if jwt != "" { + req.Header.Set("Authorization", "BEARER "+string(jwt)) + } + + // Use shared HTTP client with connection pooling + resp, err := volumeServerHTTPClient.Do(req) + if err != nil { + return nil, fmt.Errorf("failed to fetch chunk: %w", err) + } + + if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusPartialContent { + resp.Body.Close() + return nil, fmt.Errorf("unexpected status code %d for chunk %s", resp.StatusCode, chunkView.FileId) + } + + return resp.Body, nil +} + +// getEncryptedStreamFromVolumes gets raw encrypted data stream from volume servers +func (s3a *S3ApiServer) getEncryptedStreamFromVolumes(ctx context.Context, entry *filer_pb.Entry) (io.ReadCloser, error) { + // Handle inline content + if len(entry.Content) > 0 { + return io.NopCloser(bytes.NewReader(entry.Content)), nil + } + + // Handle empty files + chunks := entry.GetChunks() + if len(chunks) == 0 { + return io.NopCloser(bytes.NewReader([]byte{})), nil + } + + // Reuse shared lookup function to keep volume lookup logic in one place + lookupFileIdFn := s3a.createLookupFileIdFunction() + + // Resolve chunks + totalSize := int64(filer.FileSize(entry)) + resolvedChunks, _, err := filer.ResolveChunkManifest(ctx, lookupFileIdFn, chunks, 0, totalSize) + if err != nil { + return nil, err + } + + // Create streaming reader + masterClient := &simpleMasterClient{lookupFn: lookupFileIdFn} + streamFn, err := filer.PrepareStreamContentWithThrottler( + ctx, + masterClient, + func(fileId string) string { + // Use volume server JWT (not filer JWT) for direct volume reads + return string(security.GenJwtForVolumeServer(s3a.filerGuard.ReadSigningKey, s3a.filerGuard.ReadExpiresAfterSec, fileId)) + }, + resolvedChunks, + 0, + totalSize, + 0, + ) + if err != nil { + return nil, err + } + + // Create a pipe to get io.ReadCloser + pipeReader, pipeWriter := io.Pipe() + go func() { + defer pipeWriter.Close() + if err := streamFn(pipeWriter); err != nil { + glog.Errorf("getEncryptedStreamFromVolumes: streaming error: %v", err) + pipeWriter.CloseWithError(err) + } + }() + + return pipeReader, nil +} + +// addSSEResponseHeadersFromEntry adds appropriate SSE response headers based on entry metadata +func (s3a *S3ApiServer) addSSEResponseHeadersFromEntry(w http.ResponseWriter, r *http.Request, entry *filer_pb.Entry, sseType string) { + if entry == nil || entry.Extended == nil { + return + } + + switch sseType { + case s3_constants.SSETypeC: + // SSE-C: Echo back algorithm and key MD5 + if algo, exists := entry.Extended[s3_constants.AmzServerSideEncryptionCustomerAlgorithm]; exists { + w.Header().Set(s3_constants.AmzServerSideEncryptionCustomerAlgorithm, string(algo)) + } + if keyMD5, exists := entry.Extended[s3_constants.AmzServerSideEncryptionCustomerKeyMD5]; exists { + w.Header().Set(s3_constants.AmzServerSideEncryptionCustomerKeyMD5, string(keyMD5)) + } + + case s3_constants.SSETypeKMS: + // SSE-KMS: Return algorithm and key ID + w.Header().Set(s3_constants.AmzServerSideEncryption, "aws:kms") + if kmsMetadataBytes, exists := entry.Extended[s3_constants.SeaweedFSSSEKMSKey]; exists { + sseKMSKey, err := DeserializeSSEKMSMetadata(kmsMetadataBytes) + if err == nil { + AddSSEKMSResponseHeaders(w, sseKMSKey) + } + } + + case s3_constants.SSETypeS3: + // SSE-S3: Return algorithm + w.Header().Set(s3_constants.AmzServerSideEncryption, s3_constants.SSEAlgorithmAES256) + } +} + +// setResponseHeaders sets all standard HTTP response headers from entry metadata +func (s3a *S3ApiServer) setResponseHeaders(w http.ResponseWriter, entry *filer_pb.Entry, totalSize int64) { + // Safety check: entry must be valid + if entry == nil { + glog.Errorf("setResponseHeaders: entry is nil") + return + } + + // Set content length and accept ranges + w.Header().Set("Content-Length", strconv.FormatInt(totalSize, 10)) + w.Header().Set("Accept-Ranges", "bytes") + + // Set ETag (but don't overwrite if already set, e.g., for part-specific GET requests) + if w.Header().Get("ETag") == "" { + etag := filer.ETag(entry) + if etag != "" { + w.Header().Set("ETag", "\""+etag+"\"") + } + } + + // Set Last-Modified in RFC1123 format + if entry.Attributes != nil { + modTime := time.Unix(entry.Attributes.Mtime, 0).UTC() + w.Header().Set("Last-Modified", modTime.Format(http.TimeFormat)) + } + + // Set Content-Type + mimeType := "" + if entry.Attributes != nil && entry.Attributes.Mime != "" { + mimeType = entry.Attributes.Mime + } + if mimeType == "" { + // Try to detect from entry name + if entry.Name != "" { + ext := filepath.Ext(entry.Name) + if ext != "" { + mimeType = mime.TypeByExtension(ext) + } + } + } + if mimeType != "" { + w.Header().Set("Content-Type", mimeType) + } else { + w.Header().Set("Content-Type", "application/octet-stream") + } + + // Set custom headers from entry.Extended (user metadata) + // Use direct map assignment to preserve original header casing (matches proxy behavior) + if entry.Extended != nil { + for k, v := range entry.Extended { + // Skip internal SeaweedFS headers + if !strings.HasPrefix(k, "xattr-") && !s3_constants.IsSeaweedFSInternalHeader(k) { + // Support backward compatibility: migrate old non-canonical format to canonical format + // OLD: "x-amz-meta-foo" → NEW: "X-Amz-Meta-foo" (preserving suffix case) + headerKey := k + if len(k) >= 11 && strings.EqualFold(k[:11], "x-amz-meta-") { + // Normalize to AWS S3 format: "X-Amz-Meta-" prefix with lowercase suffix + // AWS S3 returns user metadata with the suffix in lowercase + suffix := k[len("x-amz-meta-"):] + headerKey = s3_constants.AmzUserMetaPrefix + strings.ToLower(suffix) + if glog.V(4) && k != headerKey { + glog.Infof("Normalizing user metadata header %q to %q in response", k, headerKey) + } + } + w.Header()[headerKey] = []string{string(v)} + } + } + } + + // Set tag count header (matches filer logic) + if entry.Extended != nil { + tagCount := 0 + for k := range entry.Extended { + if strings.HasPrefix(k, s3_constants.AmzObjectTagging+"-") { + tagCount++ + } + } + if tagCount > 0 { + w.Header().Set(s3_constants.AmzTagCount, strconv.Itoa(tagCount)) + } + } +} + +// simpleMasterClient implements the minimal interface for streaming +type simpleMasterClient struct { + lookupFn func(ctx context.Context, fileId string) ([]string, error) +} + +func (s *simpleMasterClient) GetLookupFileIdFunction() wdclient.LookupFileIdFunctionType { + return s.lookupFn +} + +// HeadObjectHandler handles S3 HEAD object requests +// +// Special behavior for implicit directories: +// When a HEAD request is made on a path without a trailing slash, and that path represents +// a directory with children (either a 0-byte file marker or an actual directory), this handler +// returns 404 Not Found instead of 200 OK. This behavior improves compatibility with s3fs and +// matches AWS S3's handling of implicit directories. +// +// Rationale: +// - AWS S3 typically doesn't create directory markers when files are uploaded (e.g., uploading +// "dataset/file.txt" doesn't create a marker at "dataset") +// - Some S3 clients (like PyArrow with s3fs) create directory markers, which can confuse s3fs +// - s3fs's info() method calls HEAD first; if it succeeds with size=0, s3fs incorrectly reports +// the object as a file instead of checking for children +// - By returning 404 for implicit directories, we force s3fs to fall back to LIST-based discovery, +// which correctly identifies directories by checking for children +// +// Examples: +// +// HEAD /bucket/dataset (no trailing slash, has children) → 404 Not Found (implicit directory) +// HEAD /bucket/dataset/ (trailing slash) → 200 OK (explicit directory request) +// HEAD /bucket/empty.txt (0-byte file, no children) → 200 OK (legitimate empty file) +// HEAD /bucket/file.txt (regular file) → 200 OK (normal operation) +// +// This behavior only applies to: +// - Non-versioned buckets (versioned buckets use different semantics) +// - Paths without trailing slashes (trailing slash indicates explicit directory request) +// - Objects that are either 0-byte files or actual directories +// - Objects that have at least one child (checked via hasChildren) +func (s3a *S3ApiServer) HeadObjectHandler(w http.ResponseWriter, r *http.Request) { + + bucket, object := s3_constants.GetBucketAndObject(r) + glog.V(3).Infof("HeadObjectHandler %s %s", bucket, object) + + // Handle directory objects with shared logic + if s3a.handleDirectoryObjectRequest(w, r, bucket, object, "HeadObjectHandler") { + return // Directory object request was handled + } + + // Check conditional headers and handle early return if conditions fail + result, handled := s3a.processConditionalHeaders(w, r, bucket, object, "HeadObjectHandler") + if handled { + return + } + + // Check for specific version ID in query parameters + versionId := r.URL.Query().Get("versionId") + + var ( + entry *filer_pb.Entry // Declare entry at function scope for SSE processing + versioningConfigured bool + err error + ) + + // Check if versioning is configured for the bucket (Enabled or Suspended) + // Note: We need to check this even if versionId is empty, because versioned buckets + // handle even "get latest version" requests differently (through .versions directory) + versioningConfigured, err = s3a.isVersioningConfigured(bucket) + if err != nil { + if err == filer_pb.ErrNotFound { + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchBucket) + return + } + glog.Errorf("Error checking versioning status for bucket %s: %v", bucket, err) + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) + return + } + + if versioningConfigured { + // Handle versioned HEAD - all versions are stored in .versions directory + var targetVersionId string + + if versionId != "" { + // Request for specific version + glog.V(2).Infof("HeadObject: requesting specific version %s for %s%s", versionId, bucket, object) + entry, err = s3a.getSpecificObjectVersion(bucket, object, versionId) + if err != nil { + glog.Errorf("Failed to get specific version %s: %v", versionId, err) + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) + return + } + targetVersionId = versionId + } else { + // Request for latest version - OPTIMIZATION: + // Check if .versions/ directory exists quickly (no retries) to decide path + // - If .versions/ exists: real versions available, use getLatestObjectVersion + // - If .versions/ doesn't exist (ErrNotFound): only null version at regular path, use it directly + // - If transient error: fall back to getLatestObjectVersion which has retry logic + bucketDir := s3a.option.BucketsPath + "/" + bucket + normalizedObject := removeDuplicateSlashes(object) + versionsDir := normalizedObject + s3_constants.VersionsFolder + + // Quick check (no retries) for .versions/ directory + versionsEntry, versionsErr := s3a.getEntry(bucketDir, versionsDir) + + if versionsErr == nil && versionsEntry != nil { + // .versions/ exists, meaning real versions are stored there + // Use getLatestObjectVersion which will properly find the newest version + entry, err = s3a.getLatestObjectVersion(bucket, object) + if err != nil { + glog.Errorf("HeadObject: Failed to get latest version for %s%s: %v", bucket, object, err) + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) + return + } + } else if errors.Is(versionsErr, filer_pb.ErrNotFound) { + // .versions/ doesn't exist (confirmed not found), check regular path for null version + regularEntry, regularErr := s3a.getEntry(bucketDir, normalizedObject) + if regularErr == nil && regularEntry != nil { + // Found object at regular path - this is the null version + entry = regularEntry + targetVersionId = "null" + } else { + // No object at regular path either - object doesn't exist + glog.Errorf("HeadObject: object not found at regular path or .versions for %s%s", bucket, object) + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) + return + } + } else { + // Transient error checking .versions/, fall back to getLatestObjectVersion with retries + glog.V(2).Infof("HeadObject: transient error checking .versions for %s%s: %v, falling back to getLatestObjectVersion", bucket, object, versionsErr) + entry, err = s3a.getLatestObjectVersion(bucket, object) + if err != nil { + glog.Errorf("HeadObject: Failed to get latest version for %s%s: %v", bucket, object, err) + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) + return + } + } + // Extract version ID if not already set + if targetVersionId == "" { + if entry.Extended != nil { + if versionIdBytes, exists := entry.Extended[s3_constants.ExtVersionIdKey]; exists { + targetVersionId = string(versionIdBytes) + } + } + // If no version ID found in entry, this is a pre-versioning object + if targetVersionId == "" { + targetVersionId = "null" + } + } + } + + // Check if this is a delete marker + if entry.Extended != nil { + if deleteMarker, exists := entry.Extended[s3_constants.ExtDeleteMarkerKey]; exists && string(deleteMarker) == "true" { + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) + return + } + } + + // For versioned objects, log the target version + if targetVersionId == "null" { + glog.V(2).Infof("HeadObject: pre-versioning object %s/%s", bucket, object) + } else { + glog.V(2).Infof("HeadObject: version %s for %s/%s", targetVersionId, bucket, object) + } + + // Set version ID in response header + w.Header().Set("x-amz-version-id", targetVersionId) + + // Add object lock metadata to response headers if present + s3a.addObjectLockHeadersToResponse(w, entry) + } + + // Fetch the correct entry for SSE processing (respects versionId) + // For versioned objects, reuse already-fetched entry; for non-versioned, try to reuse from conditional check + var objectEntryForSSE *filer_pb.Entry + if versioningConfigured { + objectEntryForSSE = entry + } else { + // For non-versioned objects, try to reuse entry from conditional header check + if result.Entry != nil { + // Reuse entry fetched during conditional header check (optimization) + objectEntryForSSE = result.Entry + glog.V(3).Infof("HeadObjectHandler: Reusing entry from conditional header check for %s/%s", bucket, object) + } else { + // Fetch entry for SSE processing + // This is needed for all SSE types (SSE-C, SSE-KMS, SSE-S3) to: + // 1. Detect encryption from object metadata (SSE-KMS/SSE-S3 don't send headers on HEAD) + // 2. Add proper response headers + var fetchErr error + objectEntryForSSE, fetchErr = s3a.fetchObjectEntry(bucket, object) + if fetchErr != nil { + glog.Warningf("HeadObjectHandler: failed to get entry for %s/%s: %v", bucket, object, fetchErr) + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) + return + } + if objectEntryForSSE == nil { + // Not found, return error early to avoid another lookup in proxyToFiler + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) + return + } + } + } + + // Safety check: entry must be valid + if objectEntryForSSE == nil { + glog.Errorf("HeadObjectHandler: objectEntryForSSE is nil for %s/%s (should not happen)", bucket, object) + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) + return + } + + // Implicit Directory Handling for s3fs Compatibility + // ==================================================== + // + // Background: + // Some S3 clients (like PyArrow with s3fs) create directory markers when writing datasets. + // These can be either: + // 1. 0-byte files with directory MIME type (e.g., "application/octet-stream") + // 2. Actual directories in the filer (created by PyArrow's write_dataset) + // + // Problem: + // s3fs's info() method calls HEAD on the path. If HEAD returns 200 with size=0, + // s3fs incorrectly reports it as a file (type='file', size=0) instead of checking + // for children. This causes PyArrow to fail with "Parquet file size is 0 bytes". + // + // Solution: + // For non-versioned objects without trailing slash, if the object is a 0-byte file + // or directory AND has children, return 404 instead of 200. This forces s3fs to + // fall back to LIST-based discovery, which correctly identifies it as a directory. + // + // AWS S3 Compatibility: + // AWS S3 typically doesn't create directory markers for implicit directories, so + // HEAD on "dataset" (when only "dataset/file.txt" exists) returns 404. Our behavior + // matches this by returning 404 for implicit directories with children. + // + // Edge Cases Handled: + // - Empty files (0-byte, no children) → 200 OK (legitimate empty file) + // - Empty directories (no children) → 200 OK (legitimate empty directory) + // - Explicit directory requests (trailing slash) → 200 OK (handled earlier) + // - Versioned objects → Skip this check (different semantics) + // + // Performance: + // Only adds overhead for 0-byte files or directories without trailing slash. + // Cost: One LIST operation with Limit=1 (~1-5ms). + // + if !versioningConfigured && !strings.HasSuffix(object, "/") { + // Check if this is an implicit directory (either a 0-byte file or actual directory with children) + // PyArrow may create 0-byte files when writing datasets, or the filer may have actual directories + if objectEntryForSSE.Attributes != nil { + isZeroByteFile := objectEntryForSSE.Attributes.FileSize == 0 && !objectEntryForSSE.IsDirectory + isActualDirectory := objectEntryForSSE.IsDirectory + + if isZeroByteFile || isActualDirectory { + // Check if it has children (making it an implicit directory) + if s3a.hasChildren(bucket, object) { + // This is an implicit directory with children + // Return 404 to force clients (like s3fs) to use LIST-based discovery + s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) + return + } + } + } + } + + // For HEAD requests, we already have all metadata - just set headers directly + totalSize := int64(filer.FileSize(objectEntryForSSE)) + s3a.setResponseHeaders(w, objectEntryForSSE, totalSize) + + // Check if PartNumber query parameter is present (for multipart objects) + // This logic matches the filer handler for consistency + partNumberStr := r.URL.Query().Get("partNumber") + if partNumberStr == "" { + partNumberStr = r.URL.Query().Get("PartNumber") } - setUserMetadataKeyToLowercase(resp) - responseStatusCode, bytesTransferred := responseFn(resp, w) - BucketTrafficSent(bytesTransferred, r) + // If PartNumber is specified, set headers (matching filer logic) + if partNumberStr != "" { + if partNumber, parseErr := strconv.Atoi(partNumberStr); parseErr == nil && partNumber > 0 { + // Get actual parts count from metadata (not chunk count) + partsCount, partInfo := s3a.getMultipartInfo(objectEntryForSSE, partNumber) - s3err.PostLog(r, responseStatusCode, s3err.ErrNone) -} + // Validate part number + if partNumber > partsCount { + glog.Warningf("HeadObject: Invalid part number %d, object has %d parts", partNumber, partsCount) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidPart) + return + } + + // Set parts count header + w.Header().Set(s3_constants.AmzMpPartsCount, strconv.Itoa(partsCount)) + glog.V(3).Infof("HeadObject: Set PartsCount=%d for part %d", partsCount, partNumber) + + // Override ETag with the part's ETag + if partInfo != nil { + // Use part ETag from metadata (accurate for multi-chunk parts) + w.Header().Set("ETag", "\""+partInfo.ETag+"\"") + glog.V(3).Infof("HeadObject: Override ETag with part %d ETag: %s (from metadata)", partNumber, partInfo.ETag) + } else { + // Fallback: use chunk's ETag (backward compatibility) + chunkIndex := partNumber - 1 + if chunkIndex >= len(objectEntryForSSE.Chunks) { + glog.Warningf("HeadObject: Part %d chunk index %d out of range (chunks: %d)", partNumber, chunkIndex, len(objectEntryForSSE.Chunks)) + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidPart) + return + } + partChunk := objectEntryForSSE.Chunks[chunkIndex] + if partChunk.ETag != "" { + if md5Bytes, decodeErr := base64.StdEncoding.DecodeString(partChunk.ETag); decodeErr == nil { + partETag := fmt.Sprintf("%x", md5Bytes) + w.Header().Set("ETag", "\""+partETag+"\"") + glog.V(3).Infof("HeadObject: Override ETag with part %d ETag: %s (fallback from chunk)", partNumber, partETag) + } + } + } + } + } -func setUserMetadataKeyToLowercase(resp *http.Response) { - for key, value := range resp.Header { - if strings.HasPrefix(key, s3_constants.AmzUserMetaPrefix) { - resp.Header[strings.ToLower(key)] = value - delete(resp.Header, key) + // Detect and handle SSE + glog.V(3).Infof("HeadObjectHandler: Retrieved entry for %s%s - %d chunks", bucket, object, len(objectEntryForSSE.Chunks)) + sseType := s3a.detectPrimarySSEType(objectEntryForSSE) + glog.V(2).Infof("HeadObjectHandler: Detected SSE type: %s", sseType) + if sseType != "" && sseType != "None" { + // Validate SSE headers for encrypted objects + switch sseType { + case s3_constants.SSETypeC: + customerKey, err := ParseSSECHeaders(r) + if err != nil { + s3err.WriteErrorResponse(w, r, MapSSECErrorToS3Error(err)) + return + } + if customerKey == nil { + s3err.WriteErrorResponse(w, r, s3err.ErrSSECustomerKeyMissing) + return + } + // Validate key MD5 + if objectEntryForSSE.Extended != nil { + storedKeyMD5 := string(objectEntryForSSE.Extended[s3_constants.AmzServerSideEncryptionCustomerKeyMD5]) + if storedKeyMD5 != "" && customerKey.KeyMD5 != storedKeyMD5 { + s3err.WriteErrorResponse(w, r, s3err.ErrAccessDenied) + return + } + } } + // Add SSE response headers + s3a.addSSEResponseHeadersFromEntry(w, r, objectEntryForSSE, sseType) } + + w.WriteHeader(http.StatusOK) } func captureCORSHeaders(w http.ResponseWriter, headersToCapture []string) map[string]string { @@ -934,247 +2598,6 @@ func (s3a *S3ApiServer) handleSSECResponse(r *http.Request, proxyResponse *http. } } -// handleSSEResponse handles both SSE-C and SSE-KMS decryption/validation and response processing -// The objectEntry parameter should be the correct entry for the requested version (if versioned) -func (s3a *S3ApiServer) handleSSEResponse(r *http.Request, proxyResponse *http.Response, w http.ResponseWriter, objectEntry *filer_pb.Entry) (statusCode int, bytesTransferred int64) { - // Check what the client is expecting based on request headers - clientExpectsSSEC := IsSSECRequest(r) - - // Check what the stored object has in headers (may be conflicting after copy) - kmsMetadataHeader := proxyResponse.Header.Get(s3_constants.SeaweedFSSSEKMSKeyHeader) - - // Detect actual object SSE type from the provided entry (respects versionId) - actualObjectType := "Unknown" - if objectEntry != nil { - actualObjectType = s3a.detectPrimarySSEType(objectEntry) - } - - // If objectEntry is nil, we cannot determine SSE type from chunks - // This should only happen for 404s which will be handled by the proxy - if objectEntry == nil { - glog.V(4).Infof("Object entry not available for SSE routing, passing through") - return passThroughResponse(proxyResponse, w) - } - - // Route based on ACTUAL object type (from chunks) rather than conflicting headers - if actualObjectType == s3_constants.SSETypeC && clientExpectsSSEC { - // Object is SSE-C and client expects SSE-C → SSE-C handler - return s3a.handleSSECResponse(r, proxyResponse, w, objectEntry) - } else if actualObjectType == s3_constants.SSETypeKMS && !clientExpectsSSEC { - // Object is SSE-KMS and client doesn't expect SSE-C → SSE-KMS handler - return s3a.handleSSEKMSResponse(r, proxyResponse, w, objectEntry, kmsMetadataHeader) - } else if actualObjectType == s3_constants.SSETypeS3 && !clientExpectsSSEC { - // Object is SSE-S3 and client doesn't expect SSE-C → SSE-S3 handler - return s3a.handleSSES3Response(r, proxyResponse, w, objectEntry) - } else if actualObjectType == "None" && !clientExpectsSSEC { - // Object is unencrypted and client doesn't expect SSE-C → pass through - return passThroughResponse(proxyResponse, w) - } else if actualObjectType == s3_constants.SSETypeC && !clientExpectsSSEC { - // Object is SSE-C but client doesn't provide SSE-C headers → Error - s3err.WriteErrorResponse(w, r, s3err.ErrSSECustomerKeyMissing) - return http.StatusBadRequest, 0 - } else if actualObjectType == s3_constants.SSETypeKMS && clientExpectsSSEC { - // Object is SSE-KMS but client provides SSE-C headers → Error - s3err.WriteErrorResponse(w, r, s3err.ErrSSECustomerKeyMissing) - return http.StatusBadRequest, 0 - } else if actualObjectType == s3_constants.SSETypeS3 && clientExpectsSSEC { - // Object is SSE-S3 but client provides SSE-C headers → Error (mismatched encryption) - s3err.WriteErrorResponse(w, r, s3err.ErrSSEEncryptionTypeMismatch) - return http.StatusBadRequest, 0 - } else if actualObjectType == "None" && clientExpectsSSEC { - // Object is unencrypted but client provides SSE-C headers → Error - s3err.WriteErrorResponse(w, r, s3err.ErrSSECustomerKeyMissing) - return http.StatusBadRequest, 0 - } - - // Unknown state - pass through and let proxy handle it - glog.V(4).Infof("Unknown SSE state: objectType=%s, clientExpectsSSEC=%v", actualObjectType, clientExpectsSSEC) - return passThroughResponse(proxyResponse, w) -} - -// handleSSEKMSResponse handles SSE-KMS decryption and response processing -func (s3a *S3ApiServer) handleSSEKMSResponse(r *http.Request, proxyResponse *http.Response, w http.ResponseWriter, entry *filer_pb.Entry, kmsMetadataHeader string) (statusCode int, bytesTransferred int64) { - // Deserialize SSE-KMS metadata - kmsMetadataBytes, err := base64.StdEncoding.DecodeString(kmsMetadataHeader) - if err != nil { - glog.Errorf("Failed to decode SSE-KMS metadata: %v", err) - s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) - return http.StatusInternalServerError, 0 - } - - sseKMSKey, err := DeserializeSSEKMSMetadata(kmsMetadataBytes) - if err != nil { - glog.Errorf("Failed to deserialize SSE-KMS metadata: %v", err) - s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) - return http.StatusInternalServerError, 0 - } - - // For HEAD requests, we don't need to decrypt the body, just add response headers - if r.Method == "HEAD" { - // Capture existing CORS headers that may have been set by middleware - capturedCORSHeaders := captureCORSHeaders(w, corsHeaders) - - // Copy headers from proxy response (excluding internal SeaweedFS headers) - copyResponseHeaders(w, proxyResponse, false) - - // Add SSE-KMS response headers - AddSSEKMSResponseHeaders(w, sseKMSKey) - - return writeFinalResponse(w, proxyResponse, proxyResponse.Body, capturedCORSHeaders) - } - - // For GET requests, check if this is a multipart SSE-KMS object - // We need to check the object structure to determine if it's multipart encrypted - isMultipartSSEKMS := false - - if sseKMSKey != nil && entry != nil { - // Use the entry parameter passed from the caller (avoids redundant lookup) - // Check for multipart SSE-KMS - sseKMSChunks := 0 - for _, chunk := range entry.GetChunks() { - if chunk.GetSseType() == filer_pb.SSEType_SSE_KMS && len(chunk.GetSseMetadata()) > 0 { - sseKMSChunks++ - } - } - isMultipartSSEKMS = sseKMSChunks > 1 - } - - var decryptedReader io.Reader - if isMultipartSSEKMS { - // Handle multipart SSE-KMS objects - each chunk needs independent decryption - multipartReader, decErr := s3a.createMultipartSSEKMSDecryptedReader(r, proxyResponse, entry) - if decErr != nil { - glog.Errorf("Failed to create multipart SSE-KMS decrypted reader: %v", decErr) - s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) - return http.StatusInternalServerError, 0 - } - decryptedReader = multipartReader - glog.V(3).Infof("Using multipart SSE-KMS decryption for object") - } else { - // Handle single-part SSE-KMS objects - singlePartReader, decErr := CreateSSEKMSDecryptedReader(proxyResponse.Body, sseKMSKey) - if decErr != nil { - glog.Errorf("Failed to create SSE-KMS decrypted reader: %v", decErr) - s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) - return http.StatusInternalServerError, 0 - } - decryptedReader = singlePartReader - glog.V(3).Infof("Using single-part SSE-KMS decryption for object") - } - - // Capture existing CORS headers that may have been set by middleware - capturedCORSHeaders := captureCORSHeaders(w, corsHeaders) - - // Copy headers from proxy response (excluding body-related headers that might change and internal SeaweedFS headers) - copyResponseHeaders(w, proxyResponse, true) - - // Set correct Content-Length for SSE-KMS - if proxyResponse.Header.Get("Content-Range") == "" { - // For full object requests, encrypted length equals original length - if contentLengthStr := proxyResponse.Header.Get("Content-Length"); contentLengthStr != "" { - w.Header().Set("Content-Length", contentLengthStr) - } - } - - // Add SSE-KMS response headers - AddSSEKMSResponseHeaders(w, sseKMSKey) - - return writeFinalResponse(w, proxyResponse, decryptedReader, capturedCORSHeaders) -} - -// handleSSES3Response handles SSE-S3 decryption and response processing -func (s3a *S3ApiServer) handleSSES3Response(r *http.Request, proxyResponse *http.Response, w http.ResponseWriter, entry *filer_pb.Entry) (statusCode int, bytesTransferred int64) { - - // For HEAD requests, we don't need to decrypt the body, just add response headers - if r.Method == "HEAD" { - // Capture existing CORS headers that may have been set by middleware - capturedCORSHeaders := captureCORSHeaders(w, corsHeaders) - - // Copy headers from proxy response (excluding internal SeaweedFS headers) - copyResponseHeaders(w, proxyResponse, false) - - // Add SSE-S3 response headers - w.Header().Set(s3_constants.AmzServerSideEncryption, SSES3Algorithm) - - return writeFinalResponse(w, proxyResponse, proxyResponse.Body, capturedCORSHeaders) - } - - // For GET requests, check if this is a multipart SSE-S3 object - isMultipartSSES3 := false - sses3Chunks := 0 - for _, chunk := range entry.GetChunks() { - if chunk.GetSseType() == filer_pb.SSEType_SSE_S3 && len(chunk.GetSseMetadata()) > 0 { - sses3Chunks++ - } - } - isMultipartSSES3 = sses3Chunks > 1 - - var decryptedReader io.Reader - if isMultipartSSES3 { - // Handle multipart SSE-S3 objects - each chunk needs independent decryption - multipartReader, decErr := s3a.createMultipartSSES3DecryptedReader(r, entry) - if decErr != nil { - glog.Errorf("Failed to create multipart SSE-S3 decrypted reader: %v", decErr) - s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) - return http.StatusInternalServerError, 0 - } - decryptedReader = multipartReader - glog.V(3).Infof("Using multipart SSE-S3 decryption for object") - } else { - // Handle single-part SSE-S3 objects - // Extract SSE-S3 key from metadata - keyManager := GetSSES3KeyManager() - if keyData, exists := entry.Extended[s3_constants.SeaweedFSSSES3Key]; !exists { - glog.Errorf("SSE-S3 key metadata not found in object entry") - s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) - return http.StatusInternalServerError, 0 - } else { - sseS3Key, err := DeserializeSSES3Metadata(keyData, keyManager) - if err != nil { - glog.Errorf("Failed to deserialize SSE-S3 metadata: %v", err) - s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) - return http.StatusInternalServerError, 0 - } - - // Extract IV from metadata using helper function - iv, err := GetSSES3IV(entry, sseS3Key, keyManager) - if err != nil { - glog.Errorf("Failed to get SSE-S3 IV: %v", err) - s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) - return http.StatusInternalServerError, 0 - } - - singlePartReader, decErr := CreateSSES3DecryptedReader(proxyResponse.Body, sseS3Key, iv) - if decErr != nil { - glog.Errorf("Failed to create SSE-S3 decrypted reader: %v", decErr) - s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) - return http.StatusInternalServerError, 0 - } - decryptedReader = singlePartReader - glog.V(3).Infof("Using single-part SSE-S3 decryption for object") - } - } - - // Capture existing CORS headers that may have been set by middleware - capturedCORSHeaders := captureCORSHeaders(w, corsHeaders) - - // Copy headers from proxy response (excluding body-related headers that might change and internal SeaweedFS headers) - copyResponseHeaders(w, proxyResponse, true) - - // Set correct Content-Length for SSE-S3 - if proxyResponse.Header.Get("Content-Range") == "" { - // For full object requests, encrypted length equals original length - if contentLengthStr := proxyResponse.Header.Get("Content-Length"); contentLengthStr != "" { - w.Header().Set("Content-Length", contentLengthStr) - } - } - - // Add SSE-S3 response headers - w.Header().Set(s3_constants.AmzServerSideEncryption, SSES3Algorithm) - - return writeFinalResponse(w, proxyResponse, decryptedReader, capturedCORSHeaders) -} - // addObjectLockHeadersToResponse extracts object lock metadata from entry Extended attributes // and adds the appropriate S3 headers to the response func (s3a *S3ApiServer) addObjectLockHeadersToResponse(w http.ResponseWriter, entry *filer_pb.Entry) { @@ -1266,6 +2689,11 @@ func (s3a *S3ApiServer) addSSEHeadersToResponse(proxyResponse *http.Response, en // detectPrimarySSEType determines the primary SSE type by examining chunk metadata func (s3a *S3ApiServer) detectPrimarySSEType(entry *filer_pb.Entry) string { + // Safety check: handle nil entry + if entry == nil { + return "None" + } + if len(entry.GetChunks()) == 0 { // No chunks - check object-level metadata only (single objects or smallContent) hasSSEC := entry.Extended[s3_constants.AmzServerSideEncryptionCustomerAlgorithm] != nil @@ -1346,10 +2774,95 @@ func (s3a *S3ApiServer) detectPrimarySSEType(entry *filer_pb.Entry) string { return "None" } -// createMultipartSSEKMSDecryptedReader creates a reader that decrypts each chunk independently for multipart SSE-KMS objects -func (s3a *S3ApiServer) createMultipartSSEKMSDecryptedReader(r *http.Request, proxyResponse *http.Response, entry *filer_pb.Entry) (io.Reader, error) { - // Entry is passed from caller to avoid redundant filer lookup +// createMultipartSSECDecryptedReaderDirect creates a reader that decrypts each chunk independently for multipart SSE-C objects (direct volume path) +// Note: encryptedStream parameter is unused (always nil) as this function fetches chunks directly to avoid double I/O. +// It's kept in the signature for API consistency with non-Direct versions. +func (s3a *S3ApiServer) createMultipartSSECDecryptedReaderDirect(ctx context.Context, encryptedStream io.ReadCloser, customerKey *SSECustomerKey, entry *filer_pb.Entry) (io.Reader, error) { + // Sort chunks by offset to ensure correct order + chunks := entry.GetChunks() + sort.Slice(chunks, func(i, j int) bool { + return chunks[i].GetOffset() < chunks[j].GetOffset() + }) + + // Create readers for each chunk, decrypting them independently + var readers []io.Reader + + for _, chunk := range chunks { + // Get this chunk's encrypted data + chunkReader, err := s3a.createEncryptedChunkReader(ctx, chunk) + if err != nil { + return nil, fmt.Errorf("failed to create chunk reader: %v", err) + } + + // Handle based on chunk's encryption type + if chunk.GetSseType() == filer_pb.SSEType_SSE_C { + // Check if this chunk has per-chunk SSE-C metadata + if len(chunk.GetSseMetadata()) == 0 { + chunkReader.Close() + return nil, fmt.Errorf("SSE-C chunk %s missing per-chunk metadata", chunk.GetFileIdString()) + } + + // Deserialize the SSE-C metadata + ssecMetadata, err := DeserializeSSECMetadata(chunk.GetSseMetadata()) + if err != nil { + chunkReader.Close() + return nil, fmt.Errorf("failed to deserialize SSE-C metadata for chunk %s: %v", chunk.GetFileIdString(), err) + } + // Decode the IV from the metadata + chunkIV, err := base64.StdEncoding.DecodeString(ssecMetadata.IV) + if err != nil { + chunkReader.Close() + return nil, fmt.Errorf("failed to decode IV for SSE-C chunk %s: %v", chunk.GetFileIdString(), err) + } + + glog.V(4).Infof("Decrypting SSE-C chunk %s with IV=%x, PartOffset=%d", + chunk.GetFileIdString(), chunkIV[:8], ssecMetadata.PartOffset) + + // Note: SSE-C multipart behavior (differs from SSE-KMS/SSE-S3): + // - Upload: CreateSSECEncryptedReader generates RANDOM IV per part (no base IV + offset) + // - Metadata: PartOffset is stored but not used during encryption + // - Decryption: Use stored random IV directly (no offset adjustment needed) + // + // This differs from: + // - SSE-KMS/SSE-S3: Use base IV + calculateIVWithOffset(partOffset) during encryption + // - CopyObject: Applies calculateIVWithOffset to SSE-C (which may be incorrect) + // + // TODO: Investigate CopyObject SSE-C PartOffset handling for consistency + decryptedChunkReader, decErr := CreateSSECDecryptedReader(chunkReader, customerKey, chunkIV) + if decErr != nil { + chunkReader.Close() + return nil, fmt.Errorf("failed to decrypt chunk: %v", decErr) + } + + // Use the streaming decrypted reader directly + readers = append(readers, struct { + io.Reader + io.Closer + }{ + Reader: decryptedChunkReader, + Closer: chunkReader, + }) + glog.V(4).Infof("Added streaming decrypted reader for SSE-C chunk %s", chunk.GetFileIdString()) + } else { + // Non-SSE-C chunk, use as-is + readers = append(readers, chunkReader) + glog.V(4).Infof("Added non-encrypted reader for chunk %s", chunk.GetFileIdString()) + } + } + + // Close the original encrypted stream since we're reading chunks individually + if encryptedStream != nil { + encryptedStream.Close() + } + + return NewMultipartSSEReader(readers), nil +} + +// createMultipartSSEKMSDecryptedReaderDirect creates a reader that decrypts each chunk independently for multipart SSE-KMS objects (direct volume path) +// Note: encryptedStream parameter is unused (always nil) as this function fetches chunks directly to avoid double I/O. +// It's kept in the signature for API consistency with non-Direct versions. +func (s3a *S3ApiServer) createMultipartSSEKMSDecryptedReaderDirect(ctx context.Context, encryptedStream io.ReadCloser, entry *filer_pb.Entry) (io.Reader, error) { // Sort chunks by offset to ensure correct order chunks := entry.GetChunks() sort.Slice(chunks, func(i, j int) bool { @@ -1361,55 +2874,64 @@ func (s3a *S3ApiServer) createMultipartSSEKMSDecryptedReader(r *http.Request, pr for _, chunk := range chunks { // Get this chunk's encrypted data - chunkReader, err := s3a.createEncryptedChunkReader(chunk) + chunkReader, err := s3a.createEncryptedChunkReader(ctx, chunk) if err != nil { return nil, fmt.Errorf("failed to create chunk reader: %v", err) } - // Get SSE-KMS metadata for this chunk - var chunkSSEKMSKey *SSEKMSKey + // Handle based on chunk's encryption type + if chunk.GetSseType() == filer_pb.SSEType_SSE_KMS { + // Check if this chunk has per-chunk SSE-KMS metadata + if len(chunk.GetSseMetadata()) == 0 { + chunkReader.Close() + return nil, fmt.Errorf("SSE-KMS chunk %s missing per-chunk metadata", chunk.GetFileIdString()) + } - // Check if this chunk has per-chunk SSE-KMS metadata (new architecture) - if chunk.GetSseType() == filer_pb.SSEType_SSE_KMS && len(chunk.GetSseMetadata()) > 0 { // Use the per-chunk SSE-KMS metadata kmsKey, err := DeserializeSSEKMSMetadata(chunk.GetSseMetadata()) if err != nil { - glog.Errorf("Failed to deserialize per-chunk SSE-KMS metadata for chunk %s: %v", chunk.GetFileIdString(), err) - } else { - // ChunkOffset is already set from the stored metadata (PartOffset) - chunkSSEKMSKey = kmsKey + chunkReader.Close() + return nil, fmt.Errorf("failed to deserialize SSE-KMS metadata for chunk %s: %v", chunk.GetFileIdString(), err) } - } - // Note: No fallback to object-level metadata for multipart objects - // Each chunk in a multipart SSE-KMS object must have its own unique IV - // Falling back to object-level metadata could lead to IV reuse or incorrect decryption + glog.V(4).Infof("Decrypting SSE-KMS chunk %s with KeyID=%s", + chunk.GetFileIdString(), kmsKey.KeyID) - if chunkSSEKMSKey == nil { - return nil, fmt.Errorf("no SSE-KMS metadata found for chunk %s in multipart object", chunk.GetFileIdString()) - } + // Create decrypted reader for this chunk + decryptedChunkReader, decErr := CreateSSEKMSDecryptedReader(chunkReader, kmsKey) + if decErr != nil { + chunkReader.Close() + return nil, fmt.Errorf("failed to decrypt chunk: %v", decErr) + } - // Create decrypted reader for this chunk - decryptedChunkReader, decErr := CreateSSEKMSDecryptedReader(chunkReader, chunkSSEKMSKey) - if decErr != nil { - chunkReader.Close() // Close the chunk reader if decryption fails - return nil, fmt.Errorf("failed to decrypt chunk: %v", decErr) + // Use the streaming decrypted reader directly + readers = append(readers, struct { + io.Reader + io.Closer + }{ + Reader: decryptedChunkReader, + Closer: chunkReader, + }) + glog.V(4).Infof("Added streaming decrypted reader for SSE-KMS chunk %s", chunk.GetFileIdString()) + } else { + // Non-SSE-KMS chunk, use as-is + readers = append(readers, chunkReader) + glog.V(4).Infof("Added non-encrypted reader for chunk %s", chunk.GetFileIdString()) } - - // Use the streaming decrypted reader directly instead of reading into memory - readers = append(readers, decryptedChunkReader) - glog.V(4).Infof("Added streaming decrypted reader for chunk %s in multipart SSE-KMS object", chunk.GetFileIdString()) } - // Combine all decrypted chunk readers into a single stream with proper resource management - multiReader := NewMultipartSSEReader(readers) - glog.V(3).Infof("Created multipart SSE-KMS decrypted reader with %d chunks", len(readers)) + // Close the original encrypted stream since we're reading chunks individually + if encryptedStream != nil { + encryptedStream.Close() + } - return multiReader, nil + return NewMultipartSSEReader(readers), nil } -// createMultipartSSES3DecryptedReader creates a reader for multipart SSE-S3 objects -func (s3a *S3ApiServer) createMultipartSSES3DecryptedReader(r *http.Request, entry *filer_pb.Entry) (io.Reader, error) { +// createMultipartSSES3DecryptedReaderDirect creates a reader that decrypts each chunk independently for multipart SSE-S3 objects (direct volume path) +// Note: encryptedStream parameter is unused (always nil) as this function fetches chunks directly to avoid double I/O. +// It's kept in the signature for API consistency with non-Direct versions. +func (s3a *S3ApiServer) createMultipartSSES3DecryptedReaderDirect(ctx context.Context, encryptedStream io.ReadCloser, entry *filer_pb.Entry) (io.Reader, error) { // Sort chunks by offset to ensure correct order chunks := entry.GetChunks() sort.Slice(chunks, func(i, j int) bool { @@ -1418,54 +2940,50 @@ func (s3a *S3ApiServer) createMultipartSSES3DecryptedReader(r *http.Request, ent // Create readers for each chunk, decrypting them independently var readers []io.Reader + + // Get key manager and SSE-S3 key from entry metadata keyManager := GetSSES3KeyManager() + keyData := entry.Extended[s3_constants.SeaweedFSSSES3Key] + sseS3Key, err := DeserializeSSES3Metadata(keyData, keyManager) + if err != nil { + return nil, fmt.Errorf("failed to deserialize SSE-S3 key from entry metadata: %v", err) + } for _, chunk := range chunks { // Get this chunk's encrypted data - chunkReader, err := s3a.createEncryptedChunkReader(chunk) + chunkReader, err := s3a.createEncryptedChunkReader(ctx, chunk) if err != nil { return nil, fmt.Errorf("failed to create chunk reader: %v", err) } // Handle based on chunk's encryption type if chunk.GetSseType() == filer_pb.SSEType_SSE_S3 { - var chunkSSES3Key *SSES3Key - // Check if this chunk has per-chunk SSE-S3 metadata - if len(chunk.GetSseMetadata()) > 0 { - // Use the per-chunk SSE-S3 metadata - sseKey, err := DeserializeSSES3Metadata(chunk.GetSseMetadata(), keyManager) - if err != nil { - glog.Errorf("Failed to deserialize per-chunk SSE-S3 metadata for chunk %s: %v", chunk.GetFileIdString(), err) - chunkReader.Close() - return nil, fmt.Errorf("failed to deserialize SSE-S3 metadata: %v", err) - } - chunkSSES3Key = sseKey - } - - // Note: No fallback to object-level metadata for multipart objects - // Each chunk in a multipart SSE-S3 object must have its own unique IV - // Falling back to object-level metadata could lead to IV reuse or incorrect decryption - - if chunkSSES3Key == nil { + if len(chunk.GetSseMetadata()) == 0 { chunkReader.Close() - return nil, fmt.Errorf("no SSE-S3 metadata found for chunk %s in multipart object", chunk.GetFileIdString()) + return nil, fmt.Errorf("SSE-S3 chunk %s missing per-chunk metadata", chunk.GetFileIdString()) } - // Extract IV from chunk metadata - if len(chunkSSES3Key.IV) == 0 { + // Deserialize the per-chunk SSE-S3 metadata to get the IV + chunkSSES3Metadata, err := DeserializeSSES3Metadata(chunk.GetSseMetadata(), keyManager) + if err != nil { chunkReader.Close() - return nil, fmt.Errorf("no IV found in SSE-S3 metadata for chunk %s", chunk.GetFileIdString()) + return nil, fmt.Errorf("failed to deserialize SSE-S3 metadata for chunk %s: %v", chunk.GetFileIdString(), err) } + // Use the IV from the chunk metadata + iv := chunkSSES3Metadata.IV + glog.V(4).Infof("Decrypting SSE-S3 chunk %s with KeyID=%s, IV length=%d", + chunk.GetFileIdString(), sseS3Key.KeyID, len(iv)) + // Create decrypted reader for this chunk - decryptedChunkReader, decErr := CreateSSES3DecryptedReader(chunkReader, chunkSSES3Key, chunkSSES3Key.IV) + decryptedChunkReader, decErr := CreateSSES3DecryptedReader(chunkReader, sseS3Key, iv) if decErr != nil { chunkReader.Close() - return nil, fmt.Errorf("failed to decrypt chunk: %v", decErr) + return nil, fmt.Errorf("failed to decrypt SSE-S3 chunk: %v", decErr) } - // Use the streaming decrypted reader directly, ensuring the underlying chunkReader can be closed + // Use the streaming decrypted reader directly readers = append(readers, struct { io.Reader io.Closer @@ -1473,37 +2991,45 @@ func (s3a *S3ApiServer) createMultipartSSES3DecryptedReader(r *http.Request, ent Reader: decryptedChunkReader, Closer: chunkReader, }) - glog.V(4).Infof("Added streaming decrypted reader for chunk %s in multipart SSE-S3 object", chunk.GetFileIdString()) + glog.V(4).Infof("Added streaming decrypted reader for SSE-S3 chunk %s", chunk.GetFileIdString()) } else { - // Non-SSE-S3 chunk (unencrypted or other encryption type), use as-is + // Non-SSE-S3 chunk, use as-is readers = append(readers, chunkReader) - glog.V(4).Infof("Added passthrough reader for non-SSE-S3 chunk %s (type: %v)", chunk.GetFileIdString(), chunk.GetSseType()) + glog.V(4).Infof("Added non-encrypted reader for chunk %s", chunk.GetFileIdString()) } } - // Combine all decrypted chunk readers into a single stream - multiReader := NewMultipartSSEReader(readers) - glog.V(3).Infof("Created multipart SSE-S3 decrypted reader with %d chunks", len(readers)) + // Close the original encrypted stream since we're reading chunks individually + if encryptedStream != nil { + encryptedStream.Close() + } - return multiReader, nil + return NewMultipartSSEReader(readers), nil } // createEncryptedChunkReader creates a reader for a single encrypted chunk -func (s3a *S3ApiServer) createEncryptedChunkReader(chunk *filer_pb.FileChunk) (io.ReadCloser, error) { +// Context propagation ensures cancellation if the S3 client disconnects +func (s3a *S3ApiServer) createEncryptedChunkReader(ctx context.Context, chunk *filer_pb.FileChunk) (io.ReadCloser, error) { // Get chunk URL srcUrl, err := s3a.lookupVolumeUrl(chunk.GetFileIdString()) if err != nil { return nil, fmt.Errorf("lookup volume URL for chunk %s: %v", chunk.GetFileIdString(), err) } - // Create HTTP request for chunk data - req, err := http.NewRequest("GET", srcUrl, nil) + // Create HTTP request with context for cancellation propagation + req, err := http.NewRequestWithContext(ctx, "GET", srcUrl, nil) if err != nil { return nil, fmt.Errorf("create HTTP request for chunk: %v", err) } - // Execute request - resp, err := http.DefaultClient.Do(req) + // Attach volume server JWT for authentication (matches filer behavior) + jwt := security.GenJwtForVolumeServer(s3a.filerGuard.ReadSigningKey, s3a.filerGuard.ReadExpiresAfterSec, chunk.GetFileIdString()) + if jwt != "" { + req.Header.Set("Authorization", "BEARER "+string(jwt)) + } + + // Use shared HTTP client with connection pooling + resp, err := volumeServerHTTPClient.Do(req) if err != nil { return nil, fmt.Errorf("execute HTTP request for chunk: %v", err) } @@ -1525,9 +3051,10 @@ type MultipartSSEReader struct { // SSERangeReader applies range logic to an underlying reader type SSERangeReader struct { reader io.Reader - offset int64 // bytes to skip from the beginning - remaining int64 // bytes remaining to read (-1 for unlimited) - skipped int64 // bytes already skipped + offset int64 // bytes to skip from the beginning + remaining int64 // bytes remaining to read (-1 for unlimited) + skipped int64 // bytes already skipped + skipBuf []byte // reusable buffer for skipping bytes (avoids per-call allocation) } // NewMultipartSSEReader creates a new multipart reader that can properly close all underlying readers @@ -1559,21 +3086,34 @@ func (m *MultipartSSEReader) Close() error { // Read implements the io.Reader interface for SSERangeReader func (r *SSERangeReader) Read(p []byte) (n int, err error) { - - // If we need to skip bytes and haven't skipped enough yet - if r.skipped < r.offset { + // Skip bytes iteratively (no recursion) until we reach the offset + for r.skipped < r.offset { skipNeeded := r.offset - r.skipped - skipBuf := make([]byte, min(int64(len(p)), skipNeeded)) - skipRead, skipErr := r.reader.Read(skipBuf) + + // Lazily allocate skip buffer on first use, reuse thereafter + if r.skipBuf == nil { + // Use a fixed 32KB buffer for skipping (avoids per-call allocation) + r.skipBuf = make([]byte, 32*1024) + } + + // Determine how much to skip in this iteration + bufSize := int64(len(r.skipBuf)) + if skipNeeded < bufSize { + bufSize = skipNeeded + } + + skipRead, skipErr := r.reader.Read(r.skipBuf[:bufSize]) r.skipped += int64(skipRead) if skipErr != nil { return 0, skipErr } - // If we still need to skip more, recurse - if r.skipped < r.offset { - return r.Read(p) + // Guard against infinite loop: io.Reader may return (0, nil) + // which is permitted by the interface contract for non-empty buffers. + // If we get zero bytes without an error, treat it as an unexpected EOF. + if skipRead == 0 { + return 0, io.ErrUnexpectedEOF } } @@ -1600,6 +3140,8 @@ func (r *SSERangeReader) Read(p []byte) (n int, err error) { // createMultipartSSECDecryptedReader creates a decrypted reader for multipart SSE-C objects // Each chunk has its own IV and encryption key from the original multipart parts func (s3a *S3ApiServer) createMultipartSSECDecryptedReader(r *http.Request, proxyResponse *http.Response, entry *filer_pb.Entry) (io.Reader, error) { + ctx := r.Context() + // Parse SSE-C headers from the request for decryption key customerKey, err := ParseSSECHeaders(r) if err != nil { @@ -1659,7 +3201,7 @@ func (s3a *S3ApiServer) createMultipartSSECDecryptedReader(r *http.Request, prox for _, chunk := range neededChunks { // Get this chunk's encrypted data - chunkReader, err := s3a.createEncryptedChunkReader(chunk) + chunkReader, err := s3a.createEncryptedChunkReader(ctx, chunk) if err != nil { return nil, fmt.Errorf("failed to create chunk reader: %v", err) } @@ -1679,13 +3221,10 @@ func (s3a *S3ApiServer) createMultipartSSECDecryptedReader(r *http.Request, prox return nil, fmt.Errorf("failed to decode IV for SSE-C chunk %s: %v", chunk.GetFileIdString(), ivErr) } - // Calculate the correct IV for this chunk using within-part offset - var chunkIV []byte - if ssecMetadata.PartOffset > 0 { - chunkIV = calculateIVWithOffset(iv, ssecMetadata.PartOffset) - } else { - chunkIV = iv - } + // Note: For multipart SSE-C, each part was encrypted with offset=0 + // So we use the stored IV directly without offset adjustment + // PartOffset is stored for informational purposes, but encryption uses offset=0 + chunkIV := iv decryptedReader, decErr := CreateSSECDecryptedReader(chunkReader, customerKey, chunkIV) if decErr != nil { @@ -1725,3 +3264,55 @@ func (s3a *S3ApiServer) createMultipartSSECDecryptedReader(r *http.Request, prox return multiReader, nil } + +// PartBoundaryInfo holds information about a part's chunk boundaries +type PartBoundaryInfo struct { + PartNumber int `json:"part"` + StartChunk int `json:"start"` + EndChunk int `json:"end"` // exclusive + ETag string `json:"etag"` +} + +// rc is a helper type that wraps a Reader and Closer for proper resource cleanup +type rc struct { + io.Reader + io.Closer +} + +// getMultipartInfo retrieves multipart metadata for a given part number +// Returns: (partsCount, partInfo) +// - partsCount: total number of parts in the multipart object +// - partInfo: boundary information for the requested part (nil if not found or not a multipart object) +func (s3a *S3ApiServer) getMultipartInfo(entry *filer_pb.Entry, partNumber int) (int, *PartBoundaryInfo) { + if entry == nil { + return 0, nil + } + if entry.Extended == nil { + // Not a multipart object or no metadata + return len(entry.GetChunks()), nil + } + + // Try to get parts count from metadata + partsCount := len(entry.GetChunks()) // default fallback + if partsCountBytes, exists := entry.Extended[s3_constants.SeaweedFSMultipartPartsCount]; exists { + if count, err := strconv.Atoi(string(partsCountBytes)); err == nil && count > 0 { + partsCount = count + } + } + + // Try to get part boundaries from metadata + if boundariesJSON, exists := entry.Extended[s3_constants.SeaweedFSMultipartPartBoundaries]; exists { + var boundaries []PartBoundaryInfo + if err := json.Unmarshal(boundariesJSON, &boundaries); err == nil { + // Find the requested part + for i := range boundaries { + if boundaries[i].PartNumber == partNumber { + return partsCount, &boundaries[i] + } + } + } + } + + // No part boundaries metadata or part not found + return partsCount, nil +} diff --git a/weed/s3api/s3api_object_handlers_copy.go b/weed/s3api/s3api_object_handlers_copy.go index f04522ca6..86a7bc74b 100644 --- a/weed/s3api/s3api_object_handlers_copy.go +++ b/weed/s3api/s3api_object_handlers_copy.go @@ -36,13 +36,14 @@ func (s3a *S3ApiServer) CopyObjectHandler(w http.ResponseWriter, r *http.Request dstBucket, dstObject := s3_constants.GetBucketAndObject(r) // Copy source path. - cpSrcPath, err := url.QueryUnescape(r.Header.Get("X-Amz-Copy-Source")) + rawCopySource := r.Header.Get("X-Amz-Copy-Source") + cpSrcPath, err := url.QueryUnescape(rawCopySource) if err != nil { // Save unescaped string as is. - cpSrcPath = r.Header.Get("X-Amz-Copy-Source") + cpSrcPath = rawCopySource } - srcBucket, srcObject, srcVersionId := pathToBucketObjectAndVersion(cpSrcPath) + srcBucket, srcObject, srcVersionId := pathToBucketObjectAndVersion(rawCopySource, cpSrcPath) glog.V(3).Infof("CopyObjectHandler %s %s (version: %s) => %s %s", srcBucket, srcObject, srcVersionId, dstBucket, dstObject) @@ -84,7 +85,7 @@ func (s3a *S3ApiServer) CopyObjectHandler(w http.ResponseWriter, r *http.Request return } writeSuccessResponseXML(w, r, CopyObjectResult{ - ETag: fmt.Sprintf("%x", entry.Attributes.Md5), + ETag: filer.ETag(entry), LastModified: time.Now().UTC(), }) return @@ -339,23 +340,46 @@ func (s3a *S3ApiServer) CopyObjectHandler(w http.ResponseWriter, r *http.Request } func pathToBucketAndObject(path string) (bucket, object string) { + // Remove leading slash if present path = strings.TrimPrefix(path, "/") + + // Split by first slash to separate bucket and object parts := strings.SplitN(path, "/", 2) if len(parts) == 2 { - return parts[0], "/" + parts[1] - } - return parts[0], "/" + bucket = parts[0] + object = "/" + parts[1] + return bucket, object + } else if len(parts) == 1 && parts[0] != "" { + // Only bucket provided, no object + return parts[0], "" + } + // Empty path + return "", "" } -func pathToBucketObjectAndVersion(path string) (bucket, object, versionId string) { - // Parse versionId from query string if present - // Format: /bucket/object?versionId=version-id - if idx := strings.Index(path, "?versionId="); idx != -1 { - versionId = path[idx+len("?versionId="):] // dynamically calculate length - path = path[:idx] +func pathToBucketObjectAndVersion(rawPath, decodedPath string) (bucket, object, versionId string) { + pathForBucket := decodedPath + + if rawPath != "" { + if idx := strings.Index(rawPath, "?"); idx != -1 { + queryPart := rawPath[idx+1:] + if values, err := url.ParseQuery(queryPart); err == nil && values.Has("versionId") { + versionId = values.Get("versionId") + + rawPathNoQuery := rawPath[:idx] + if unescaped, err := url.QueryUnescape(rawPathNoQuery); err == nil { + pathForBucket = unescaped + } else { + pathForBucket = rawPathNoQuery + } + + bucket, object = pathToBucketAndObject(pathForBucket) + return bucket, object, versionId + } + } } - bucket, object = pathToBucketAndObject(path) + bucket, object = pathToBucketAndObject(pathForBucket) return bucket, object, versionId } @@ -370,15 +394,28 @@ func (s3a *S3ApiServer) CopyObjectPartHandler(w http.ResponseWriter, r *http.Req dstBucket, dstObject := s3_constants.GetBucketAndObject(r) // Copy source path. - cpSrcPath, err := url.QueryUnescape(r.Header.Get("X-Amz-Copy-Source")) + rawCopySource := r.Header.Get("X-Amz-Copy-Source") + + glog.V(4).Infof("CopyObjectPart: Raw copy source header=%q", rawCopySource) + + // Try URL unescaping - AWS SDK sends URL-encoded copy sources + cpSrcPath, err := url.QueryUnescape(rawCopySource) if err != nil { - // Save unescaped string as is. - cpSrcPath = r.Header.Get("X-Amz-Copy-Source") + // If unescaping fails, log and use original + glog.V(4).Infof("CopyObjectPart: Failed to unescape copy source %q: %v, using as-is", rawCopySource, err) + cpSrcPath = rawCopySource } - srcBucket, srcObject, srcVersionId := pathToBucketObjectAndVersion(cpSrcPath) + srcBucket, srcObject, srcVersionId := pathToBucketObjectAndVersion(rawCopySource, cpSrcPath) + + glog.V(4).Infof("CopyObjectPart: Parsed srcBucket=%q, srcObject=%q, srcVersionId=%q", + srcBucket, srcObject, srcVersionId) + // If source object is empty or bucket is empty, reply back invalid copy source. + // Note: srcObject can be "/" for root-level objects, but empty string means parsing failed if srcObject == "" || srcBucket == "" { + glog.Errorf("CopyObjectPart: Invalid copy source - srcBucket=%q, srcObject=%q (original header: %q)", + srcBucket, srcObject, r.Header.Get("X-Amz-Copy-Source")) s3err.WriteErrorResponse(w, r, s3err.ErrInvalidCopySource) return } @@ -471,9 +508,15 @@ func (s3a *S3ApiServer) CopyObjectPartHandler(w http.ResponseWriter, r *http.Req } // Create new entry for the part + // Calculate part size, avoiding underflow for invalid ranges + partSize := uint64(0) + if endOffset >= startOffset { + partSize = uint64(endOffset - startOffset + 1) + } + dstEntry := &filer_pb.Entry{ Attributes: &filer_pb.FuseAttributes{ - FileSize: uint64(endOffset - startOffset + 1), + FileSize: partSize, Mtime: time.Now().Unix(), Crtime: time.Now().Unix(), Mime: entry.Attributes.Mime, @@ -483,7 +526,8 @@ func (s3a *S3ApiServer) CopyObjectPartHandler(w http.ResponseWriter, r *http.Req // Handle zero-size files or empty ranges if entry.Attributes.FileSize == 0 || endOffset < startOffset { - // For zero-size files or invalid ranges, create an empty part + // For zero-size files or invalid ranges, create an empty part with size 0 + dstEntry.Attributes.FileSize = 0 dstEntry.Chunks = nil } else { // Copy chunks that overlap with the range @@ -660,15 +704,37 @@ func processMetadataBytes(reqHeader http.Header, existing map[string][]byte, rep if replaceMeta { for header, values := range reqHeader { if strings.HasPrefix(header, s3_constants.AmzUserMetaPrefix) { + // Go's HTTP server canonicalizes headers (e.g., x-amz-meta-foo → X-Amz-Meta-Foo) + // We store them as they come in (after canonicalization) to preserve the user's intent for _, value := range values { metadata[header] = []byte(value) } } } } else { + // Copy existing metadata as-is + // Note: Metadata should already be normalized during storage (X-Amz-Meta-*), + // but we handle legacy non-canonical formats for backward compatibility for k, v := range existing { if strings.HasPrefix(k, s3_constants.AmzUserMetaPrefix) { + // Already in canonical format metadata[k] = v + } else if len(k) >= 11 && strings.EqualFold(k[:11], "x-amz-meta-") { + // Backward compatibility: migrate old non-canonical format to canonical format + // This ensures gradual migration of metadata to consistent format + suffix := k[11:] // Extract suffix after "x-amz-meta-" + canonicalKey := s3_constants.AmzUserMetaPrefix + suffix + + if glog.V(3) { + glog.Infof("Migrating legacy user metadata key %q to canonical format %q during copy", k, canonicalKey) + } + + // Check for collision with canonical key + if _, exists := metadata[canonicalKey]; exists { + glog.Warningf("User metadata key collision during copy migration: canonical key %q already exists, skipping legacy key %q", canonicalKey, k) + } else { + metadata[canonicalKey] = v + } } } } @@ -1272,6 +1338,7 @@ func (s3a *S3ApiServer) copyMultipartSSEKMSChunk(chunk *filer_pb.FileChunk, dest } // Encrypt with destination key + originalSize := len(finalData) encryptedReader, destSSEKey, encErr := CreateSSEKMSEncryptedReaderWithBucketKey(bytes.NewReader(finalData), destKeyID, encryptionContext, bucketKeyEnabled) if encErr != nil { return nil, fmt.Errorf("create SSE-KMS encrypted reader: %w", encErr) @@ -1296,7 +1363,7 @@ func (s3a *S3ApiServer) copyMultipartSSEKMSChunk(chunk *filer_pb.FileChunk, dest dstChunk.SseType = filer_pb.SSEType_SSE_KMS dstChunk.SseMetadata = kmsMetadata - glog.V(4).Infof("Re-encrypted multipart SSE-KMS chunk: %d bytes → %d bytes", len(finalData)-len(reencryptedData)+len(finalData), len(finalData)) + glog.V(4).Infof("Re-encrypted multipart SSE-KMS chunk: %d bytes → %d bytes", originalSize, len(finalData)) } // Upload the final data @@ -1360,10 +1427,12 @@ func (s3a *S3ApiServer) copyMultipartSSECChunk(chunk *filer_pb.FileChunk, copySo // Calculate the correct IV for this chunk using within-part offset var chunkIV []byte + var ivSkip int if ssecMetadata.PartOffset > 0 { - chunkIV = calculateIVWithOffset(chunkBaseIV, ssecMetadata.PartOffset) + chunkIV, ivSkip = calculateIVWithOffset(chunkBaseIV, ssecMetadata.PartOffset) } else { chunkIV = chunkBaseIV + ivSkip = 0 } // Decrypt the chunk data @@ -1372,6 +1441,14 @@ func (s3a *S3ApiServer) copyMultipartSSECChunk(chunk *filer_pb.FileChunk, copySo return nil, nil, fmt.Errorf("create decrypted reader: %w", decErr) } + // CRITICAL: Skip intra-block bytes from CTR decryption (non-block-aligned offset handling) + if ivSkip > 0 { + _, skipErr := io.CopyN(io.Discard, decryptedReader, int64(ivSkip)) + if skipErr != nil { + return nil, nil, fmt.Errorf("failed to skip intra-block bytes (%d): %w", ivSkip, skipErr) + } + } + decryptedData, readErr := io.ReadAll(decryptedReader) if readErr != nil { return nil, nil, fmt.Errorf("decrypt chunk data: %w", readErr) @@ -1393,6 +1470,7 @@ func (s3a *S3ApiServer) copyMultipartSSECChunk(chunk *filer_pb.FileChunk, copySo destIV = newIV // Encrypt with new key and IV + originalSize := len(finalData) encryptedReader, iv, encErr := CreateSSECEncryptedReader(bytes.NewReader(finalData), destKey) if encErr != nil { return nil, nil, fmt.Errorf("create encrypted reader: %w", encErr) @@ -1415,7 +1493,7 @@ func (s3a *S3ApiServer) copyMultipartSSECChunk(chunk *filer_pb.FileChunk, copySo dstChunk.SseType = filer_pb.SSEType_SSE_C dstChunk.SseMetadata = ssecMetadata // Use unified metadata field - glog.V(4).Infof("Re-encrypted multipart SSE-C chunk: %d bytes → %d bytes", len(finalData)-len(reencryptedData)+len(finalData), len(finalData)) + glog.V(4).Infof("Re-encrypted multipart SSE-C chunk: %d bytes → %d bytes", originalSize, len(finalData)) } // Upload the final data @@ -1580,10 +1658,12 @@ func (s3a *S3ApiServer) copyCrossEncryptionChunk(chunk *filer_pb.FileChunk, sour // Calculate the correct IV for this chunk using within-part offset var chunkIV []byte + var ivSkip int if ssecMetadata.PartOffset > 0 { - chunkIV = calculateIVWithOffset(chunkBaseIV, ssecMetadata.PartOffset) + chunkIV, ivSkip = calculateIVWithOffset(chunkBaseIV, ssecMetadata.PartOffset) } else { chunkIV = chunkBaseIV + ivSkip = 0 } decryptedReader, decErr := CreateSSECDecryptedReader(bytes.NewReader(encryptedData), sourceSSECKey, chunkIV) @@ -1591,6 +1671,14 @@ func (s3a *S3ApiServer) copyCrossEncryptionChunk(chunk *filer_pb.FileChunk, sour return nil, fmt.Errorf("create SSE-C decrypted reader: %w", decErr) } + // CRITICAL: Skip intra-block bytes from CTR decryption (non-block-aligned offset handling) + if ivSkip > 0 { + _, skipErr := io.CopyN(io.Discard, decryptedReader, int64(ivSkip)) + if skipErr != nil { + return nil, fmt.Errorf("failed to skip intra-block bytes (%d): %w", ivSkip, skipErr) + } + } + decryptedData, readErr := io.ReadAll(decryptedReader) if readErr != nil { return nil, fmt.Errorf("decrypt SSE-C chunk data: %w", readErr) diff --git a/weed/s3api/s3api_object_handlers_list.go b/weed/s3api/s3api_object_handlers_list.go index 9e6376a0e..3edbc9522 100644 --- a/weed/s3api/s3api_object_handlers_list.go +++ b/weed/s3api/s3api_object_handlers_list.go @@ -7,6 +7,7 @@ import ( "io" "net/http" "net/url" + "sort" "strconv" "strings" @@ -206,13 +207,15 @@ func (s3a *S3ApiServer) listFilerEntries(bucket string, originalPrefix string, m nextMarker, doErr = s3a.doListFilerEntries(client, reqDir, prefix, cursor, marker, delimiter, false, func(dir string, entry *filer_pb.Entry) { empty = false - dirName, entryName, prefixName := entryUrlEncode(dir, entry.Name, encodingTypeUrl) + dirName, entryName, _ := entryUrlEncode(dir, entry.Name, encodingTypeUrl) if entry.IsDirectory { // When delimiter is specified, apply delimiter logic to directory key objects too if delimiter != "" && entry.IsDirectoryKeyObject() { // Apply the same delimiter logic as for regular files var delimiterFound bool - undelimitedPath := fmt.Sprintf("%s/%s/", dirName, entryName)[len(bucketPrefix):] + // Use raw dir and entry.Name (not encoded) to ensure consistent handling + // Encoding will be applied after sorting if encodingTypeUrl is set + undelimitedPath := fmt.Sprintf("%s/%s/", dir, entry.Name)[len(bucketPrefix):] // take into account a prefix if supplied while delimiting. undelimitedPath = strings.TrimPrefix(undelimitedPath, originalPrefix) @@ -257,8 +260,10 @@ func (s3a *S3ApiServer) listFilerEntries(bucket string, originalPrefix string, m lastEntryWasCommonPrefix = false // https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html } else if delimiter == "/" { // A response can contain CommonPrefixes only if you specify a delimiter. + // Use raw dir and entry.Name (not encoded) to ensure consistent handling + // Encoding will be applied after sorting if encodingTypeUrl is set commonPrefixes = append(commonPrefixes, PrefixEntry{ - Prefix: fmt.Sprintf("%s/%s/", dirName, prefixName)[len(bucketPrefix):], + Prefix: fmt.Sprintf("%s/%s/", dir, entry.Name)[len(bucketPrefix):], }) //All of the keys (up to 1,000) rolled up into a common prefix count as a single return when calculating the number of returns. cursor.maxKeys-- @@ -350,10 +355,21 @@ func (s3a *S3ApiServer) listFilerEntries(bucket string, originalPrefix string, m Contents: contents, CommonPrefixes: commonPrefixes, } + // Sort CommonPrefixes to match AWS S3 behavior + // AWS S3 treats the delimiter character specially for sorting common prefixes. + // For example, with delimiter '/', 'foo/' should come before 'foo+1/' even though '+' (ASCII 43) < '/' (ASCII 47). + // This custom comparison ensures correct S3-compatible lexicographical ordering. + sort.Slice(response.CommonPrefixes, func(i, j int) bool { + return compareWithDelimiter(response.CommonPrefixes[i].Prefix, response.CommonPrefixes[j].Prefix, delimiter) + }) + + // URL-encode CommonPrefixes AFTER sorting (if EncodingType=url) + // This ensures proper sort order (on decoded values) and correct encoding in response if encodingTypeUrl { - // Todo used for pass test_bucket_listv2_encoding_basic - // sort.Slice(response.CommonPrefixes, func(i, j int) bool { return response.CommonPrefixes[i].Prefix < response.CommonPrefixes[j].Prefix }) response.EncodingType = s3.EncodingTypeUrl + for i := range response.CommonPrefixes { + response.CommonPrefixes[i].Prefix = urlPathEscape(response.CommonPrefixes[i].Prefix) + } } return nil }) @@ -728,6 +744,57 @@ func (s3a *S3ApiServer) getLatestVersionEntryForListOperation(bucket, object str return logicalEntry, nil } +// compareWithDelimiter compares two strings for sorting, treating the delimiter character +// as having lower precedence than other characters to match AWS S3 behavior. +// For example, with delimiter '/', 'foo/' should come before 'foo+1/' even though '+' < '/' in ASCII. +// Note: This function assumes delimiter is a single character. Multi-character delimiters will fall back to standard comparison. +func compareWithDelimiter(a, b, delimiter string) bool { + if delimiter == "" { + return a < b + } + + // Multi-character delimiters are not supported by AWS S3 in practice, + // but if encountered, fall back to standard byte-wise comparison + if len(delimiter) != 1 { + return a < b + } + + delimByte := delimiter[0] + minLen := len(a) + if len(b) < minLen { + minLen = len(b) + } + + // Compare character by character + for i := 0; i < minLen; i++ { + charA := a[i] + charB := b[i] + + if charA == charB { + continue + } + + // Check if either character is the delimiter + isDelimA := charA == delimByte + isDelimB := charB == delimByte + + if isDelimA && !isDelimB { + // Delimiter in 'a' should come first + return true + } + if !isDelimA && isDelimB { + // Delimiter in 'b' should come first + return false + } + + // Neither or both are delimiters, use normal comparison + return charA < charB + } + + // If we get here, one string is a prefix of the other + return len(a) < len(b) +} + // adjustMarkerForDelimiter handles delimiter-ending markers by incrementing them to skip entries with that prefix. // For example, when continuation token is "boo/", this returns "boo~" to skip all "boo/*" entries // but still finds any "bop" or later entries. We add a high ASCII character rather than incrementing diff --git a/weed/s3api/s3api_object_handlers_multipart.go b/weed/s3api/s3api_object_handlers_multipart.go index ef1182fc2..3ea709b31 100644 --- a/weed/s3api/s3api_object_handlers_multipart.go +++ b/weed/s3api/s3api_object_handlers_multipart.go @@ -1,7 +1,6 @@ package s3api import ( - "crypto/rand" "crypto/sha1" "encoding/base64" "encoding/json" @@ -308,6 +307,7 @@ func (s3a *S3ApiServer) PutObjectPartHandler(w http.ResponseWriter, r *http.Requ dataReader, s3ErrCode := getRequestDataReader(s3a, r) if s3ErrCode != s3err.ErrNone { + glog.Errorf("PutObjectPartHandler: getRequestDataReader failed with code %v", s3ErrCode) s3err.WriteErrorResponse(w, r, s3ErrCode) return } @@ -349,21 +349,19 @@ func (s3a *S3ApiServer) PutObjectPartHandler(w http.ResponseWriter, r *http.Requ if baseIVBytes, exists := uploadEntry.Extended[s3_constants.SeaweedFSSSEKMSBaseIV]; exists { // Decode the base64 encoded base IV decodedIV, decodeErr := base64.StdEncoding.DecodeString(string(baseIVBytes)) - if decodeErr == nil && len(decodedIV) == 16 { + if decodeErr == nil && len(decodedIV) == s3_constants.AESBlockSize { baseIV = decodedIV glog.V(4).Infof("Using stored base IV %x for multipart upload %s", baseIV[:8], uploadID) } else { - glog.Errorf("Failed to decode base IV for multipart upload %s: %v", uploadID, decodeErr) + glog.Errorf("Failed to decode base IV for multipart upload %s: %v (expected %d bytes, got %d)", uploadID, decodeErr, s3_constants.AESBlockSize, len(decodedIV)) } } + // Base IV is required for SSE-KMS multipart uploads - fail if missing or invalid if len(baseIV) == 0 { - glog.Errorf("No valid base IV found for SSE-KMS multipart upload %s", uploadID) - // Generate a new base IV as fallback - baseIV = make([]byte, 16) - if _, err := rand.Read(baseIV); err != nil { - glog.Errorf("Failed to generate fallback base IV: %v", err) - } + glog.Errorf("No valid base IV found for SSE-KMS multipart upload %s - cannot proceed with encryption", uploadID) + s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) + return } // Add SSE-KMS headers to the request for putToFiler to handle encryption @@ -390,7 +388,9 @@ func (s3a *S3ApiServer) PutObjectPartHandler(w http.ResponseWriter, r *http.Requ } } } - } else { + } else if !errors.Is(err, filer_pb.ErrNotFound) { + // Log unexpected errors (but not "not found" which is normal for non-SSE uploads) + glog.V(3).Infof("Could not retrieve upload entry for %s/%s: %v (may be non-SSE upload)", bucket, uploadID, err) } } @@ -399,16 +399,26 @@ func (s3a *S3ApiServer) PutObjectPartHandler(w http.ResponseWriter, r *http.Requ if partID == 1 && r.Header.Get("Content-Type") == "" { dataReader = mimeDetect(r, dataReader) } - destination := fmt.Sprintf("%s/%s%s", s3a.option.BucketsPath, bucket, object) - etag, errCode, _ := s3a.putToFiler(r, uploadUrl, dataReader, destination, bucket, partID) + glog.V(2).Infof("PutObjectPart: bucket=%s, object=%s, uploadId=%s, partNumber=%d, size=%d", + bucket, object, uploadID, partID, r.ContentLength) + + etag, errCode, sseMetadata := s3a.putToFiler(r, uploadUrl, dataReader, bucket, partID) if errCode != s3err.ErrNone { + glog.Errorf("PutObjectPart: putToFiler failed with error code %v for bucket=%s, object=%s, partNumber=%d", + errCode, bucket, object, partID) s3err.WriteErrorResponse(w, r, errCode) return } + glog.V(2).Infof("PutObjectPart: SUCCESS - bucket=%s, object=%s, partNumber=%d, etag=%s, sseType=%s", + bucket, object, partID, etag, sseMetadata.SSEType) + setEtag(w, etag) + // Set SSE response headers for multipart uploads + s3a.setSSEResponseHeaders(w, r, sseMetadata) + writeSuccessResponseEmpty(w, r) } diff --git a/weed/s3api/s3api_object_handlers_postpolicy.go b/weed/s3api/s3api_object_handlers_postpolicy.go index da986cf87..ecb2ac8d1 100644 --- a/weed/s3api/s3api_object_handlers_postpolicy.go +++ b/weed/s3api/s3api_object_handlers_postpolicy.go @@ -136,7 +136,7 @@ func (s3a *S3ApiServer) PostPolicyBucketHandler(w http.ResponseWriter, r *http.R } } - etag, errCode, _ := s3a.putToFiler(r, uploadUrl, fileBody, "", bucket, 1) + etag, errCode, sseMetadata := s3a.putToFiler(r, uploadUrl, fileBody, bucket, 1) if errCode != s3err.ErrNone { s3err.WriteErrorResponse(w, r, errCode) @@ -152,6 +152,8 @@ func (s3a *S3ApiServer) PostPolicyBucketHandler(w http.ResponseWriter, r *http.R } setEtag(w, etag) + // Include SSE response headers (important for bucket-default encryption) + s3a.setSSEResponseHeaders(w, r, sseMetadata) // Decide what http response to send depending on success_action_status parameter switch successStatus { diff --git a/weed/s3api/s3api_object_handlers_put.go b/weed/s3api/s3api_object_handlers_put.go index 6ce48429f..f7105052e 100644 --- a/weed/s3api/s3api_object_handlers_put.go +++ b/weed/s3api/s3api_object_handlers_put.go @@ -1,25 +1,28 @@ package s3api import ( - "crypto/md5" + "context" "encoding/base64" "encoding/json" "errors" "fmt" "io" "net/http" + "net/url" + "path/filepath" "strconv" "strings" "time" "github.com/pquerna/cachecontrol/cacheobject" + "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/operation" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/pb/s3_pb" "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" "github.com/seaweedfs/seaweedfs/weed/s3api/s3err" "github.com/seaweedfs/seaweedfs/weed/security" - weed_server "github.com/seaweedfs/seaweedfs/weed/server" stats_collect "github.com/seaweedfs/seaweedfs/weed/stats" "github.com/seaweedfs/seaweedfs/weed/util/constants" ) @@ -60,6 +63,13 @@ type BucketDefaultEncryptionResult struct { SSEKMSKey *SSEKMSKey } +// SSEResponseMetadata holds encryption metadata needed for HTTP response headers +type SSEResponseMetadata struct { + SSEType string + KMSKeyID string + BucketKeyEnabled bool +} + func (s3a *S3ApiServer) PutObjectHandler(w http.ResponseWriter, r *http.Request) { // http://docs.aws.amazon.com/AmazonS3/latest/dev/UploadingObjects.html @@ -135,7 +145,7 @@ func (s3a *S3ApiServer) PutObjectHandler(w http.ResponseWriter, r *http.Request) versioningEnabled := (versioningState == s3_constants.VersioningEnabled) versioningConfigured := (versioningState != "") - glog.V(2).Infof("PutObjectHandler: bucket=%s, object=%s, versioningState='%s', versioningEnabled=%v, versioningConfigured=%v", bucket, object, versioningState, versioningEnabled, versioningConfigured) + glog.V(3).Infof("PutObjectHandler: bucket=%s, object=%s, versioningState='%s', versioningEnabled=%v, versioningConfigured=%v", bucket, object, versioningState, versioningEnabled, versioningConfigured) // Validate object lock headers before processing if err := s3a.validateObjectLockHeaders(r, versioningEnabled); err != nil { @@ -158,29 +168,34 @@ func (s3a *S3ApiServer) PutObjectHandler(w http.ResponseWriter, r *http.Request) switch versioningState { case s3_constants.VersioningEnabled: // Handle enabled versioning - create new versions with real version IDs - glog.V(0).Infof("PutObjectHandler: ENABLED versioning detected for %s/%s, calling putVersionedObject", bucket, object) - versionId, etag, errCode := s3a.putVersionedObject(r, bucket, object, dataReader, objectContentType) + glog.V(3).Infof("PutObjectHandler: ENABLED versioning detected for %s/%s, calling putVersionedObject", bucket, object) + versionId, etag, errCode, sseMetadata := s3a.putVersionedObject(r, bucket, object, dataReader, objectContentType) if errCode != s3err.ErrNone { glog.Errorf("PutObjectHandler: putVersionedObject failed with errCode=%v for %s/%s", errCode, bucket, object) s3err.WriteErrorResponse(w, r, errCode) return } - glog.V(0).Infof("PutObjectHandler: putVersionedObject returned versionId=%s, etag=%s for %s/%s", versionId, etag, bucket, object) + glog.V(3).Infof("PutObjectHandler: putVersionedObject returned versionId=%s, etag=%s for %s/%s", versionId, etag, bucket, object) // Set version ID in response header if versionId != "" { w.Header().Set("x-amz-version-id", versionId) - glog.V(0).Infof("PutObjectHandler: set x-amz-version-id header to %s for %s/%s", versionId, bucket, object) + glog.V(3).Infof("PutObjectHandler: set x-amz-version-id header to %s for %s/%s", versionId, bucket, object) } else { glog.Errorf("PutObjectHandler: CRITICAL - versionId is EMPTY for versioned bucket %s, object %s", bucket, object) } // Set ETag in response setEtag(w, etag) + + // Set SSE response headers for versioned objects + s3a.setSSEResponseHeaders(w, r, sseMetadata) + case s3_constants.VersioningSuspended: // Handle suspended versioning - overwrite with "null" version ID but preserve existing versions - etag, errCode := s3a.putSuspendedVersioningObject(r, bucket, object, dataReader, objectContentType) + glog.V(3).Infof("PutObjectHandler: SUSPENDED versioning detected for %s/%s, calling putSuspendedVersioningObject", bucket, object) + etag, errCode, sseMetadata := s3a.putSuspendedVersioningObject(r, bucket, object, dataReader, objectContentType) if errCode != s3err.ErrNone { s3err.WriteErrorResponse(w, r, errCode) return @@ -191,6 +206,9 @@ func (s3a *S3ApiServer) PutObjectHandler(w http.ResponseWriter, r *http.Request) // Set ETag in response setEtag(w, etag) + + // Set SSE response headers for suspended versioning + s3a.setSSEResponseHeaders(w, r, sseMetadata) default: // Handle regular PUT (never configured versioning) uploadUrl := s3a.toFilerUrl(bucket, object) @@ -198,7 +216,7 @@ func (s3a *S3ApiServer) PutObjectHandler(w http.ResponseWriter, r *http.Request) dataReader = mimeDetect(r, dataReader) } - etag, errCode, sseType := s3a.putToFiler(r, uploadUrl, dataReader, "", bucket, 1) + etag, errCode, sseMetadata := s3a.putToFiler(r, uploadUrl, dataReader, bucket, 1) if errCode != s3err.ErrNone { s3err.WriteErrorResponse(w, r, errCode) @@ -209,9 +227,7 @@ func (s3a *S3ApiServer) PutObjectHandler(w http.ResponseWriter, r *http.Request) setEtag(w, etag) // Set SSE response headers based on encryption type used - if sseType == s3_constants.SSETypeS3 { - w.Header().Set(s3_constants.AmzServerSideEncryption, s3_constants.SSEAlgorithmAES256) - } + s3a.setSSEResponseHeaders(w, r, sseMetadata) } } stats_collect.RecordBucketActiveTime(bucket) @@ -220,15 +236,18 @@ func (s3a *S3ApiServer) PutObjectHandler(w http.ResponseWriter, r *http.Request) writeSuccessResponseEmpty(w, r) } -func (s3a *S3ApiServer) putToFiler(r *http.Request, uploadUrl string, dataReader io.Reader, destination string, bucket string, partNumber int) (etag string, code s3err.ErrorCode, sseType string) { - // Calculate unique offset for each part to prevent IV reuse in multipart uploads - // This is critical for CTR mode encryption security - partOffset := calculatePartOffset(partNumber) +func (s3a *S3ApiServer) putToFiler(r *http.Request, uploadUrl string, dataReader io.Reader, bucket string, partNumber int) (etag string, code s3err.ErrorCode, sseMetadata SSEResponseMetadata) { + // NEW OPTIMIZATION: Write directly to volume servers, bypassing filer proxy + // This eliminates the filer proxy overhead for PUT operations + + // For SSE, encrypt with offset=0 for all parts + // Each part is encrypted independently, then decrypted using metadata during GET + partOffset := int64(0) - // Handle all SSE encryption types in a unified manner to eliminate repetitive dataReader assignments + // Handle all SSE encryption types in a unified manner sseResult, sseErrorCode := s3a.handleAllSSEEncryption(r, dataReader, partOffset) if sseErrorCode != s3err.ErrNone { - return "", sseErrorCode, "" + return "", sseErrorCode, SSEResponseMetadata{} } // Extract results from unified SSE handling @@ -239,6 +258,7 @@ func (s3a *S3ApiServer) putToFiler(r *http.Request, uploadUrl string, dataReader sseKMSMetadata := sseResult.SSEKMSMetadata sseS3Key := sseResult.SSES3Key sseS3Metadata := sseResult.SSES3Metadata + sseType := sseResult.SSEType // Apply bucket default encryption if no explicit encryption was provided // This implements AWS S3 behavior where bucket default encryption automatically applies @@ -249,7 +269,7 @@ func (s3a *S3ApiServer) putToFiler(r *http.Request, uploadUrl string, dataReader encryptionResult, applyErr := s3a.applyBucketDefaultEncryption(bucket, r, dataReader) if applyErr != nil { glog.Errorf("Failed to apply bucket default encryption: %v", applyErr) - return "", s3err.ErrInternalError, "" + return "", s3err.ErrInternalError, SSEResponseMetadata{} } // Update variables based on the result @@ -257,121 +277,357 @@ func (s3a *S3ApiServer) putToFiler(r *http.Request, uploadUrl string, dataReader sseS3Key = encryptionResult.SSES3Key sseKMSKey = encryptionResult.SSEKMSKey + // If bucket-default encryption selected an algorithm, reflect it in SSE type + if sseType == "" { + if sseS3Key != nil { + sseType = s3_constants.SSETypeS3 + } else if sseKMSKey != nil { + sseType = s3_constants.SSETypeKMS + } + } + // If SSE-S3 was applied by bucket default, prepare metadata (if not already done) if sseS3Key != nil && len(sseS3Metadata) == 0 { var metaErr error sseS3Metadata, metaErr = SerializeSSES3Metadata(sseS3Key) if metaErr != nil { glog.Errorf("Failed to serialize SSE-S3 metadata for bucket default encryption: %v", metaErr) - return "", s3err.ErrInternalError, "" + return "", s3err.ErrInternalError, SSEResponseMetadata{} } } } else { glog.V(4).Infof("putToFiler: explicit encryption already applied, skipping bucket default encryption") } - hash := md5.New() - var body = io.TeeReader(dataReader, hash) + // Parse the upload URL to extract the file path + // uploadUrl format: http://filer:8888/path/to/bucket/object (or https://, IPv6, etc.) + // Use proper URL parsing instead of string manipulation for robustness + parsedUrl, parseErr := url.Parse(uploadUrl) + if parseErr != nil { + glog.Errorf("putToFiler: failed to parse uploadUrl %q: %v", uploadUrl, parseErr) + return "", s3err.ErrInternalError, SSEResponseMetadata{} + } + + // Use parsedUrl.Path directly - it's already decoded by url.Parse() + // Per Go documentation: "Path is stored in decoded form: /%47%6f%2f becomes /Go/" + // Calling PathUnescape again would double-decode and fail on keys like "b%ar" + filePath := parsedUrl.Path - proxyReq, err := http.NewRequest(http.MethodPut, uploadUrl, body) + // Step 1 & 2: Use auto-chunking to handle large files without OOM + // This splits large uploads into 8MB chunks, preventing memory issues on both S3 API and volume servers + const chunkSize = 8 * 1024 * 1024 // 8MB chunks (S3 standard) + const smallFileLimit = 256 * 1024 // 256KB - store inline in filer + collection := "" + if s3a.option.FilerGroup != "" { + collection = s3a.getCollectionName(bucket) + } + + // Create assign function for chunked upload + assignFunc := func(ctx context.Context, count int) (*operation.VolumeAssignRequest, *operation.AssignResult, error) { + var assignResult *filer_pb.AssignVolumeResponse + err := s3a.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error { + resp, err := client.AssignVolume(ctx, &filer_pb.AssignVolumeRequest{ + Count: int32(count), + Replication: "", + Collection: collection, + DiskType: "", + DataCenter: s3a.option.DataCenter, + Path: filePath, + }) + if err != nil { + return fmt.Errorf("assign volume: %w", err) + } + if resp.Error != "" { + return fmt.Errorf("assign volume: %v", resp.Error) + } + assignResult = resp + return nil + }) + if err != nil { + return nil, nil, err + } + + // Convert filer_pb.AssignVolumeResponse to operation.AssignResult + return nil, &operation.AssignResult{ + Fid: assignResult.FileId, + Url: assignResult.Location.Url, + PublicUrl: assignResult.Location.PublicUrl, + Count: uint64(count), + Auth: security.EncodedJwt(assignResult.Auth), + }, nil + } + + // Upload with auto-chunking + // Use context.Background() to ensure chunk uploads complete even if HTTP request is cancelled + // This prevents partial uploads and data corruption + chunkResult, err := operation.UploadReaderInChunks(context.Background(), dataReader, &operation.ChunkedUploadOption{ + ChunkSize: chunkSize, + SmallFileLimit: smallFileLimit, + Collection: collection, + DataCenter: s3a.option.DataCenter, + SaveSmallInline: false, // S3 API always creates chunks, never stores inline + MimeType: r.Header.Get("Content-Type"), + AssignFunc: assignFunc, + }) if err != nil { - glog.Errorf("NewRequest %s: %v", uploadUrl, err) - return "", s3err.ErrInternalError, "" - } + glog.Errorf("putToFiler: chunked upload failed: %v", err) + + // CRITICAL: Cleanup orphaned chunks before returning error + // UploadReaderInChunks now returns partial results even on error, + // allowing us to cleanup any chunks that were successfully uploaded + // before the failure occurred + if chunkResult != nil && len(chunkResult.FileChunks) > 0 { + glog.Warningf("putToFiler: Upload failed, attempting to cleanup %d orphaned chunks", len(chunkResult.FileChunks)) + s3a.deleteOrphanedChunks(chunkResult.FileChunks) + } - proxyReq.Header.Set("X-Forwarded-For", r.RemoteAddr) - if destination != "" { - proxyReq.Header.Set(s3_constants.SeaweedStorageDestinationHeader, destination) + if strings.Contains(err.Error(), s3err.ErrMsgPayloadChecksumMismatch) { + return "", s3err.ErrInvalidDigest, SSEResponseMetadata{} + } + return "", s3err.ErrInternalError, SSEResponseMetadata{} } - if s3a.option.FilerGroup != "" { - query := proxyReq.URL.Query() - query.Add("collection", s3a.getCollectionName(bucket)) - proxyReq.URL.RawQuery = query.Encode() - } + // Step 3: Calculate MD5 hash and add SSE metadata to chunks + md5Sum := chunkResult.Md5Hash.Sum(nil) - for header, values := range r.Header { - for _, value := range values { - proxyReq.Header.Add(header, value) + glog.V(4).Infof("putToFiler: Chunked upload SUCCESS - path=%s, chunks=%d, size=%d", + filePath, len(chunkResult.FileChunks), chunkResult.TotalSize) + + // Log chunk details for debugging (verbose only - high frequency) + if glog.V(4) { + for i, chunk := range chunkResult.FileChunks { + glog.Infof(" PUT Chunk[%d]: fid=%s, offset=%d, size=%d", i, chunk.GetFileIdString(), chunk.Offset, chunk.Size) } } - // Log version ID header for debugging - if versionIdHeader := proxyReq.Header.Get(s3_constants.ExtVersionIdKey); versionIdHeader != "" { - glog.V(0).Infof("putToFiler: version ID header set: %s=%s for %s", s3_constants.ExtVersionIdKey, versionIdHeader, uploadUrl) + // Add SSE metadata to all chunks if present + for _, chunk := range chunkResult.FileChunks { + switch { + case customerKey != nil: + // SSE-C: Create per-chunk metadata (matches filer logic) + chunk.SseType = filer_pb.SSEType_SSE_C + if len(sseIV) > 0 { + // PartOffset tracks position within the encrypted stream + // Since ALL uploads (single-part and multipart parts) encrypt starting from offset 0, + // PartOffset = chunk.Offset represents where this chunk is in that encrypted stream + // - Single-part: chunk.Offset is position in the file's encrypted stream + // - Multipart: chunk.Offset is position in this part's encrypted stream + ssecMetadataStruct := struct { + Algorithm string `json:"algorithm"` + IV string `json:"iv"` + KeyMD5 string `json:"keyMD5"` + PartOffset int64 `json:"partOffset"` + }{ + Algorithm: "AES256", + IV: base64.StdEncoding.EncodeToString(sseIV), + KeyMD5: customerKey.KeyMD5, + PartOffset: chunk.Offset, // Position within the encrypted stream (always encrypted from 0) + } + if ssecMetadata, serErr := json.Marshal(ssecMetadataStruct); serErr == nil { + chunk.SseMetadata = ssecMetadata + } + } + case sseKMSKey != nil: + // SSE-KMS: Create per-chunk metadata with chunk-specific offsets + // Each chunk needs its own metadata with ChunkOffset set for proper IV calculation during decryption + chunk.SseType = filer_pb.SSEType_SSE_KMS + + // Create a copy of the SSE-KMS key with chunk-specific offset + chunkSSEKey := &SSEKMSKey{ + KeyID: sseKMSKey.KeyID, + EncryptedDataKey: sseKMSKey.EncryptedDataKey, + EncryptionContext: sseKMSKey.EncryptionContext, + BucketKeyEnabled: sseKMSKey.BucketKeyEnabled, + IV: sseKMSKey.IV, + ChunkOffset: chunk.Offset, // Set chunk-specific offset for IV calculation + } + + // Serialize per-chunk metadata + if chunkMetadata, serErr := SerializeSSEKMSMetadata(chunkSSEKey); serErr == nil { + chunk.SseMetadata = chunkMetadata + } else { + glog.Errorf("Failed to serialize SSE-KMS metadata for chunk at offset %d: %v", chunk.Offset, serErr) + } + case sseS3Key != nil: + // SSE-S3: Create per-chunk metadata with chunk-specific IVs + // Each chunk needs its own IV calculated from the base IV + chunk offset + chunk.SseType = filer_pb.SSEType_SSE_S3 + + // Calculate chunk-specific IV using base IV and chunk offset + chunkIV, _ := calculateIVWithOffset(sseS3Key.IV, chunk.Offset) + + // Create a copy of the SSE-S3 key with chunk-specific IV + chunkSSEKey := &SSES3Key{ + Key: sseS3Key.Key, + KeyID: sseS3Key.KeyID, + Algorithm: sseS3Key.Algorithm, + IV: chunkIV, // Use chunk-specific IV + } + + // Serialize per-chunk metadata + if chunkMetadata, serErr := SerializeSSES3Metadata(chunkSSEKey); serErr == nil { + chunk.SseMetadata = chunkMetadata + } else { + glog.Errorf("Failed to serialize SSE-S3 metadata for chunk at offset %d: %v", chunk.Offset, serErr) + } + } } - // Set object owner header for filer to extract + // Step 4: Create metadata entry + now := time.Now() + mimeType := r.Header.Get("Content-Type") + if mimeType == "" { + mimeType = "application/octet-stream" + } + + // Create entry + entry := &filer_pb.Entry{ + Name: filepath.Base(filePath), + IsDirectory: false, + Attributes: &filer_pb.FuseAttributes{ + Crtime: now.Unix(), + Mtime: now.Unix(), + FileMode: 0660, + Uid: 0, + Gid: 0, + Mime: mimeType, + FileSize: uint64(chunkResult.TotalSize), + }, + Chunks: chunkResult.FileChunks, // All chunks from auto-chunking + Extended: make(map[string][]byte), + } + + // Set Md5 attribute based on context: + // 1. For multipart upload PARTS (stored in .uploads/ directory): ALWAYS set Md5 + // - Parts must use simple MD5 ETags, never composite format + // - Even if a part has multiple chunks internally, its ETag is MD5 of entire part + // 2. For regular object uploads: only set Md5 for single-chunk uploads + // - Multi-chunk regular objects use composite "md5-count" format + isMultipartPart := strings.Contains(filePath, "/"+s3_constants.MultipartUploadsFolder+"/") + if isMultipartPart || len(chunkResult.FileChunks) == 1 { + entry.Attributes.Md5 = md5Sum + } + + // Calculate ETag using the same logic as GET to ensure consistency + // For single chunk: uses entry.Attributes.Md5 + // For multiple chunks: uses filer.ETagChunks() which returns "-" + etag = filer.ETag(entry) + glog.V(4).Infof("putToFiler: Calculated ETag=%s for %d chunks", etag, len(chunkResult.FileChunks)) + + // Set object owner amzAccountId := r.Header.Get(s3_constants.AmzAccountId) if amzAccountId != "" { - proxyReq.Header.Set(s3_constants.ExtAmzOwnerKey, amzAccountId) - glog.V(2).Infof("putToFiler: setting owner header %s for object %s", amzAccountId, uploadUrl) + entry.Extended[s3_constants.ExtAmzOwnerKey] = []byte(amzAccountId) + glog.V(2).Infof("putToFiler: setting owner %s for object %s", amzAccountId, filePath) + } + + // Set version ID if present + if versionIdHeader := r.Header.Get(s3_constants.ExtVersionIdKey); versionIdHeader != "" { + entry.Extended[s3_constants.ExtVersionIdKey] = []byte(versionIdHeader) + glog.V(3).Infof("putToFiler: setting version ID %s for object %s", versionIdHeader, filePath) + } + + // Set TTL-based S3 expiry flag only if object has a TTL + if entry.Attributes.TtlSec > 0 { + entry.Extended[s3_constants.SeaweedFSExpiresS3] = []byte("true") + } + + // Copy user metadata and standard headers + for k, v := range r.Header { + if len(v) > 0 && len(v[0]) > 0 { + if strings.HasPrefix(k, s3_constants.AmzUserMetaPrefix) { + // Go's HTTP server canonicalizes headers (e.g., x-amz-meta-foo → X-Amz-Meta-Foo) + // We store them as they come in (after canonicalization) to preserve the user's intent + entry.Extended[k] = []byte(v[0]) + } else if k == "Cache-Control" || k == "Expires" || k == "Content-Disposition" { + entry.Extended[k] = []byte(v[0]) + } + if k == "Response-Content-Disposition" { + entry.Extended["Content-Disposition"] = []byte(v[0]) + } + } } - // Set SSE-C metadata headers for the filer if encryption was applied + // Set SSE-C metadata if customerKey != nil && len(sseIV) > 0 { - proxyReq.Header.Set(s3_constants.AmzServerSideEncryptionCustomerAlgorithm, "AES256") - proxyReq.Header.Set(s3_constants.AmzServerSideEncryptionCustomerKeyMD5, customerKey.KeyMD5) - // Store IV in a custom header that the filer can use to store in entry metadata - proxyReq.Header.Set(s3_constants.SeaweedFSSSEIVHeader, base64.StdEncoding.EncodeToString(sseIV)) + // Store IV as RAW bytes (matches filer behavior - filer decodes base64 headers and stores raw bytes) + entry.Extended[s3_constants.SeaweedFSSSEIV] = sseIV + entry.Extended[s3_constants.AmzServerSideEncryptionCustomerAlgorithm] = []byte("AES256") + entry.Extended[s3_constants.AmzServerSideEncryptionCustomerKeyMD5] = []byte(customerKey.KeyMD5) + glog.V(3).Infof("putToFiler: storing SSE-C metadata - IV len=%d", len(sseIV)) } - // Set SSE-KMS metadata headers for the filer if KMS encryption was applied + // Set SSE-KMS metadata if sseKMSKey != nil { - // Use already-serialized SSE-KMS metadata from helper function - // Store serialized KMS metadata in a custom header that the filer can use - proxyReq.Header.Set(s3_constants.SeaweedFSSSEKMSKeyHeader, base64.StdEncoding.EncodeToString(sseKMSMetadata)) - - glog.V(3).Infof("putToFiler: storing SSE-KMS metadata for object %s with keyID %s", uploadUrl, sseKMSKey.KeyID) - } else { - glog.V(4).Infof("putToFiler: no SSE-KMS encryption detected") + // Store metadata as RAW bytes (matches filer behavior - filer decodes base64 headers and stores raw bytes) + entry.Extended[s3_constants.SeaweedFSSSEKMSKey] = sseKMSMetadata + // Set standard SSE headers for detection + entry.Extended[s3_constants.AmzServerSideEncryption] = []byte("aws:kms") + entry.Extended[s3_constants.AmzServerSideEncryptionAwsKmsKeyId] = []byte(sseKMSKey.KeyID) + glog.V(3).Infof("putToFiler: storing SSE-KMS metadata - keyID=%s, raw len=%d", sseKMSKey.KeyID, len(sseKMSMetadata)) } - // Set SSE-S3 metadata headers for the filer if S3 encryption was applied + // Set SSE-S3 metadata if sseS3Key != nil && len(sseS3Metadata) > 0 { - // Store serialized S3 metadata in a custom header that the filer can use - proxyReq.Header.Set(s3_constants.SeaweedFSSSES3Key, base64.StdEncoding.EncodeToString(sseS3Metadata)) - glog.V(3).Infof("putToFiler: storing SSE-S3 metadata for object %s with keyID %s", uploadUrl, sseS3Key.KeyID) - } - // Set TTL-based S3 expiry (modification time) - proxyReq.Header.Set(s3_constants.SeaweedFSExpiresS3, "true") - // ensure that the Authorization header is overriding any previous - // Authorization header which might be already present in proxyReq - s3a.maybeAddFilerJwtAuthorization(proxyReq, true) - resp, postErr := s3a.client.Do(proxyReq) - - if postErr != nil { - glog.Errorf("post to filer: %v", postErr) - if strings.Contains(postErr.Error(), s3err.ErrMsgPayloadChecksumMismatch) { - return "", s3err.ErrInvalidDigest, "" + // Store metadata as RAW bytes (matches filer behavior - filer decodes base64 headers and stores raw bytes) + entry.Extended[s3_constants.SeaweedFSSSES3Key] = sseS3Metadata + // Set standard SSE header for detection + entry.Extended[s3_constants.AmzServerSideEncryption] = []byte("AES256") + glog.V(3).Infof("putToFiler: storing SSE-S3 metadata - keyID=%s, raw len=%d", sseS3Key.KeyID, len(sseS3Metadata)) + } + + // Step 4: Save metadata to filer via gRPC + // Use context.Background() to ensure metadata save completes even if HTTP request is cancelled + // This matches the chunk upload behavior and prevents orphaned chunks + glog.V(3).Infof("putToFiler: About to create entry - dir=%s, name=%s, chunks=%d, extended keys=%d", + filepath.Dir(filePath), filepath.Base(filePath), len(entry.Chunks), len(entry.Extended)) + createErr := s3a.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error { + req := &filer_pb.CreateEntryRequest{ + Directory: filepath.Dir(filePath), + Entry: entry, + } + glog.V(3).Infof("putToFiler: Calling CreateEntry for %s", filePath) + _, err := client.CreateEntry(context.Background(), req) + if err != nil { + glog.Errorf("putToFiler: CreateEntry returned error: %v", err) } - return "", s3err.ErrInternalError, "" + return err + }) + if createErr != nil { + glog.Errorf("putToFiler: failed to create entry for %s: %v", filePath, createErr) + + // CRITICAL: Cleanup orphaned chunks before returning error + // If CreateEntry fails, the uploaded chunks are orphaned and must be deleted + // to prevent resource leaks and wasted storage + if len(chunkResult.FileChunks) > 0 { + glog.Warningf("putToFiler: CreateEntry failed, attempting to cleanup %d orphaned chunks", len(chunkResult.FileChunks)) + s3a.deleteOrphanedChunks(chunkResult.FileChunks) + } + + return "", filerErrorToS3Error(createErr.Error()), SSEResponseMetadata{} } - defer resp.Body.Close() + glog.V(3).Infof("putToFiler: CreateEntry SUCCESS for %s", filePath) - etag = fmt.Sprintf("%x", hash.Sum(nil)) + glog.V(2).Infof("putToFiler: Metadata saved SUCCESS - path=%s, etag(hex)=%s, size=%d, partNumber=%d", + filePath, etag, entry.Attributes.FileSize, partNumber) - resp_body, ra_err := io.ReadAll(resp.Body) - if ra_err != nil { - glog.Errorf("upload to filer response read %d: %v", resp.StatusCode, ra_err) - return etag, s3err.ErrInternalError, "" - } - var ret weed_server.FilerPostResult - unmarshal_err := json.Unmarshal(resp_body, &ret) - if unmarshal_err != nil { - glog.Errorf("failing to read upload to %s : %v", uploadUrl, string(resp_body)) - return "", s3err.ErrInternalError, "" - } - if ret.Error != "" { - glog.Errorf("upload to filer error: %v", ret.Error) - return "", filerErrorToS3Error(ret.Error), "" + BucketTrafficReceived(chunkResult.TotalSize, r) + + // Build SSE response metadata with encryption details + responseMetadata := SSEResponseMetadata{ + SSEType: sseType, } - BucketTrafficReceived(ret.Size, r) + // For SSE-KMS, include key ID and bucket-key-enabled flag from stored metadata + if sseKMSKey != nil { + responseMetadata.KMSKeyID = sseKMSKey.KeyID + responseMetadata.BucketKeyEnabled = sseKMSKey.BucketKeyEnabled + glog.V(4).Infof("putToFiler: returning SSE-KMS metadata - keyID=%s, bucketKeyEnabled=%v", + sseKMSKey.KeyID, sseKMSKey.BucketKeyEnabled) + } - // Return the SSE type determined by the unified handler - return etag, s3err.ErrNone, sseResult.SSEType + return etag, s3err.ErrNone, responseMetadata } func setEtag(w http.ResponseWriter, etag string) { @@ -384,6 +640,43 @@ func setEtag(w http.ResponseWriter, etag string) { } } +// setSSEResponseHeaders sets appropriate SSE response headers based on encryption type +func (s3a *S3ApiServer) setSSEResponseHeaders(w http.ResponseWriter, r *http.Request, sseMetadata SSEResponseMetadata) { + switch sseMetadata.SSEType { + case s3_constants.SSETypeS3: + // SSE-S3: Return the encryption algorithm + w.Header().Set(s3_constants.AmzServerSideEncryption, s3_constants.SSEAlgorithmAES256) + + case s3_constants.SSETypeC: + // SSE-C: Echo back the customer-provided algorithm and key MD5 + if algo := r.Header.Get(s3_constants.AmzServerSideEncryptionCustomerAlgorithm); algo != "" { + w.Header().Set(s3_constants.AmzServerSideEncryptionCustomerAlgorithm, algo) + } + if keyMD5 := r.Header.Get(s3_constants.AmzServerSideEncryptionCustomerKeyMD5); keyMD5 != "" { + w.Header().Set(s3_constants.AmzServerSideEncryptionCustomerKeyMD5, keyMD5) + } + + case s3_constants.SSETypeKMS: + // SSE-KMS: Return the KMS key ID and algorithm + w.Header().Set(s3_constants.AmzServerSideEncryption, "aws:kms") + + // Use metadata from stored encryption config (for bucket-default encryption) + // or fall back to request headers (for explicit encryption) + if sseMetadata.KMSKeyID != "" { + w.Header().Set(s3_constants.AmzServerSideEncryptionAwsKmsKeyId, sseMetadata.KMSKeyID) + } else if keyID := r.Header.Get(s3_constants.AmzServerSideEncryptionAwsKmsKeyId); keyID != "" { + w.Header().Set(s3_constants.AmzServerSideEncryptionAwsKmsKeyId, keyID) + } + + // Set bucket-key-enabled header if it was enabled + if sseMetadata.BucketKeyEnabled { + w.Header().Set(s3_constants.AmzServerSideEncryptionBucketKeyEnabled, "true") + } else if bucketKeyEnabled := r.Header.Get(s3_constants.AmzServerSideEncryptionBucketKeyEnabled); bucketKeyEnabled == "true" { + w.Header().Set(s3_constants.AmzServerSideEncryptionBucketKeyEnabled, "true") + } + } +} + func filerErrorToS3Error(errString string) s3err.ErrorCode { switch { case errString == constants.ErrMsgBadDigest: @@ -400,26 +693,6 @@ func filerErrorToS3Error(errString string) s3err.ErrorCode { } } -func (s3a *S3ApiServer) maybeAddFilerJwtAuthorization(r *http.Request, isWrite bool) { - encodedJwt := s3a.maybeGetFilerJwtAuthorizationToken(isWrite) - - if encodedJwt == "" { - return - } - - r.Header.Set("Authorization", "BEARER "+string(encodedJwt)) -} - -func (s3a *S3ApiServer) maybeGetFilerJwtAuthorizationToken(isWrite bool) string { - var encodedJwt security.EncodedJwt - if isWrite { - encodedJwt = security.GenJwtForFilerServer(s3a.filerGuard.SigningKey, s3a.filerGuard.ExpiresAfterSec) - } else { - encodedJwt = security.GenJwtForFilerServer(s3a.filerGuard.ReadSigningKey, s3a.filerGuard.ReadExpiresAfterSec) - } - return string(encodedJwt) -} - // setObjectOwnerFromRequest sets the object owner metadata based on the authenticated user func (s3a *S3ApiServer) setObjectOwnerFromRequest(r *http.Request, entry *filer_pb.Entry) { amzAccountId := r.Header.Get(s3_constants.AmzAccountId) @@ -446,19 +719,12 @@ func (s3a *S3ApiServer) setObjectOwnerFromRequest(r *http.Request, entry *filer_ // // For suspended versioning, objects are stored as regular files (version ID "null") in the bucket directory, // while existing versions from when versioning was enabled remain preserved in the .versions subdirectory. -func (s3a *S3ApiServer) putSuspendedVersioningObject(r *http.Request, bucket, object string, dataReader io.Reader, objectContentType string) (etag string, errCode s3err.ErrorCode) { +func (s3a *S3ApiServer) putSuspendedVersioningObject(r *http.Request, bucket, object string, dataReader io.Reader, objectContentType string) (etag string, errCode s3err.ErrorCode, sseMetadata SSEResponseMetadata) { // Normalize object path to ensure consistency with toFilerUrl behavior normalizedObject := removeDuplicateSlashes(object) - // Enable detailed logging for testobjbar - isTestObj := (normalizedObject == "testobjbar") - - glog.V(0).Infof("putSuspendedVersioningObject: START bucket=%s, object=%s, normalized=%s, isTestObj=%v", - bucket, object, normalizedObject, isTestObj) - - if isTestObj { - glog.V(0).Infof("=== TESTOBJBAR: putSuspendedVersioningObject START ===") - } + glog.V(3).Infof("putSuspendedVersioningObject: START bucket=%s, object=%s, normalized=%s", + bucket, object, normalizedObject) bucketDir := s3a.option.BucketsPath + "/" + bucket @@ -470,20 +736,20 @@ func (s3a *S3ApiServer) putSuspendedVersioningObject(r *http.Request, bucket, ob entries, _, err := s3a.list(versionsDir, "", "", false, 1000) if err == nil { // .versions directory exists - glog.V(0).Infof("putSuspendedVersioningObject: found %d entries in .versions for %s/%s", len(entries), bucket, object) + glog.V(3).Infof("putSuspendedVersioningObject: found %d entries in .versions for %s/%s", len(entries), bucket, object) for _, entry := range entries { if entry.Extended != nil { if versionIdBytes, ok := entry.Extended[s3_constants.ExtVersionIdKey]; ok { versionId := string(versionIdBytes) - glog.V(0).Infof("putSuspendedVersioningObject: found version '%s' in .versions", versionId) + glog.V(3).Infof("putSuspendedVersioningObject: found version '%s' in .versions", versionId) if versionId == "null" { // Only delete null version - preserve real versioned entries - glog.V(0).Infof("putSuspendedVersioningObject: deleting null version from .versions") + glog.V(3).Infof("putSuspendedVersioningObject: deleting null version from .versions") err := s3a.rm(versionsDir, entry.Name, true, false) if err != nil { glog.Warningf("putSuspendedVersioningObject: failed to delete null version: %v", err) } else { - glog.V(0).Infof("putSuspendedVersioningObject: successfully deleted null version") + glog.V(3).Infof("putSuspendedVersioningObject: successfully deleted null version") } break } @@ -491,13 +757,12 @@ func (s3a *S3ApiServer) putSuspendedVersioningObject(r *http.Request, bucket, ob } } } else { - glog.V(0).Infof("putSuspendedVersioningObject: no .versions directory for %s/%s", bucket, object) + glog.V(3).Infof("putSuspendedVersioningObject: no .versions directory for %s/%s", bucket, object) } uploadUrl := s3a.toFilerUrl(bucket, normalizedObject) - hash := md5.New() - var body = io.TeeReader(dataReader, hash) + body := dataReader if objectContentType == "" { body = mimeDetect(r, body) } @@ -508,10 +773,6 @@ func (s3a *S3ApiServer) putSuspendedVersioningObject(r *http.Request, bucket, ob // Set version ID to "null" for suspended versioning r.Header.Set(s3_constants.ExtVersionIdKey, "null") - if isTestObj { - glog.V(0).Infof("=== TESTOBJBAR: set version header before putToFiler, r.Header[%s]=%s ===", - s3_constants.ExtVersionIdKey, r.Header.Get(s3_constants.ExtVersionIdKey)) - } // Extract and set object lock metadata as headers // This handles retention mode, retention date, and legal hold @@ -528,7 +789,7 @@ func (s3a *S3ApiServer) putSuspendedVersioningObject(r *http.Request, bucket, ob parsedTime, err := time.Parse(time.RFC3339, explicitRetainUntilDate) if err != nil { glog.Errorf("putSuspendedVersioningObject: failed to parse retention until date: %v", err) - return "", s3err.ErrInvalidRequest + return "", s3err.ErrInvalidRequest, SSEResponseMetadata{} } r.Header.Set(s3_constants.ExtRetentionUntilDateKey, strconv.FormatInt(parsedTime.Unix(), 10)) glog.V(2).Infof("putSuspendedVersioningObject: setting retention until date header (timestamp: %d)", parsedTime.Unix()) @@ -540,7 +801,7 @@ func (s3a *S3ApiServer) putSuspendedVersioningObject(r *http.Request, bucket, ob glog.V(2).Infof("putSuspendedVersioningObject: setting legal hold header: %s", legalHold) } else { glog.Errorf("putSuspendedVersioningObject: invalid legal hold value: %s", legalHold) - return "", s3err.ErrInvalidRequest + return "", s3err.ErrInvalidRequest, SSEResponseMetadata{} } } @@ -562,43 +823,10 @@ func (s3a *S3ApiServer) putSuspendedVersioningObject(r *http.Request, bucket, ob } // Upload the file using putToFiler - this will create the file with version metadata - if isTestObj { - glog.V(0).Infof("=== TESTOBJBAR: calling putToFiler ===") - } - etag, errCode, _ = s3a.putToFiler(r, uploadUrl, body, "", bucket, 1) + etag, errCode, sseMetadata = s3a.putToFiler(r, uploadUrl, body, bucket, 1) if errCode != s3err.ErrNone { glog.Errorf("putSuspendedVersioningObject: failed to upload object: %v", errCode) - return "", errCode - } - if isTestObj { - glog.V(0).Infof("=== TESTOBJBAR: putToFiler completed, etag=%s ===", etag) - } - - // Verify the metadata was set correctly during file creation - if isTestObj { - // Read back the entry to verify - maxRetries := 3 - for attempt := 1; attempt <= maxRetries; attempt++ { - verifyEntry, verifyErr := s3a.getEntry(bucketDir, normalizedObject) - if verifyErr == nil { - glog.V(0).Infof("=== TESTOBJBAR: verify attempt %d, entry.Extended=%v ===", attempt, verifyEntry.Extended) - if verifyEntry.Extended != nil { - if versionIdBytes, ok := verifyEntry.Extended[s3_constants.ExtVersionIdKey]; ok { - glog.V(0).Infof("=== TESTOBJBAR: verification SUCCESSFUL, version=%s ===", string(versionIdBytes)) - } else { - glog.V(0).Infof("=== TESTOBJBAR: verification FAILED, ExtVersionIdKey not found ===") - } - } else { - glog.V(0).Infof("=== TESTOBJBAR: verification FAILED, Extended is nil ===") - } - break - } else { - glog.V(0).Infof("=== TESTOBJBAR: getEntry failed on attempt %d: %v ===", attempt, verifyErr) - } - if attempt < maxRetries { - time.Sleep(time.Millisecond * 10) - } - } + return "", errCode, SSEResponseMetadata{} } // Update all existing versions/delete markers to set IsLatest=false since "null" is now latest @@ -609,10 +837,8 @@ func (s3a *S3ApiServer) putSuspendedVersioningObject(r *http.Request, bucket, ob } glog.V(2).Infof("putSuspendedVersioningObject: successfully created null version for %s/%s", bucket, object) - if isTestObj { - glog.V(0).Infof("=== TESTOBJBAR: putSuspendedVersioningObject COMPLETED ===") - } - return etag, s3err.ErrNone + + return etag, s3err.ErrNone, sseMetadata } // updateIsLatestFlagsForSuspendedVersioning sets IsLatest=false on all existing versions/delete markers @@ -684,7 +910,7 @@ func (s3a *S3ApiServer) updateIsLatestFlagsForSuspendedVersioning(bucket, object return nil } -func (s3a *S3ApiServer) putVersionedObject(r *http.Request, bucket, object string, dataReader io.Reader, objectContentType string) (versionId string, etag string, errCode s3err.ErrorCode) { +func (s3a *S3ApiServer) putVersionedObject(r *http.Request, bucket, object string, dataReader io.Reader, objectContentType string) (versionId string, etag string, errCode s3err.ErrorCode, sseMetadata SSEResponseMetadata) { // Generate version ID versionId = generateVersionId() @@ -709,21 +935,20 @@ func (s3a *S3ApiServer) putVersionedObject(r *http.Request, bucket, object strin }) if err != nil { glog.Errorf("putVersionedObject: failed to create .versions directory: %v", err) - return "", "", s3err.ErrInternalError + return "", "", s3err.ErrInternalError, SSEResponseMetadata{} } - hash := md5.New() - var body = io.TeeReader(dataReader, hash) + body := dataReader if objectContentType == "" { body = mimeDetect(r, body) } glog.V(2).Infof("putVersionedObject: uploading %s/%s version %s to %s", bucket, object, versionId, versionUploadUrl) - etag, errCode, _ = s3a.putToFiler(r, versionUploadUrl, body, "", bucket, 1) + etag, errCode, sseMetadata = s3a.putToFiler(r, versionUploadUrl, body, bucket, 1) if errCode != s3err.ErrNone { glog.Errorf("putVersionedObject: failed to upload version: %v", errCode) - return "", "", errCode + return "", "", errCode, SSEResponseMetadata{} } // Get the uploaded entry to add versioning metadata @@ -745,7 +970,7 @@ func (s3a *S3ApiServer) putVersionedObject(r *http.Request, bucket, object strin if err != nil { glog.Errorf("putVersionedObject: failed to get version entry after %d attempts: %v", maxRetries, err) - return "", "", s3err.ErrInternalError + return "", "", s3err.ErrInternalError, SSEResponseMetadata{} } // Add versioning metadata to this version @@ -766,7 +991,7 @@ func (s3a *S3ApiServer) putVersionedObject(r *http.Request, bucket, object strin // Extract and store object lock metadata from request headers if err := s3a.extractObjectLockMetadataFromRequest(r, versionEntry); err != nil { glog.Errorf("putVersionedObject: failed to extract object lock metadata: %v", err) - return "", "", s3err.ErrInvalidRequest + return "", "", s3err.ErrInvalidRequest, SSEResponseMetadata{} } // Update the version entry with metadata @@ -777,17 +1002,17 @@ func (s3a *S3ApiServer) putVersionedObject(r *http.Request, bucket, object strin }) if err != nil { glog.Errorf("putVersionedObject: failed to update version metadata: %v", err) - return "", "", s3err.ErrInternalError + return "", "", s3err.ErrInternalError, SSEResponseMetadata{} } // Update the .versions directory metadata to indicate this is the latest version err = s3a.updateLatestVersionInDirectory(bucket, normalizedObject, versionId, versionFileName) if err != nil { glog.Errorf("putVersionedObject: failed to update latest version in directory: %v", err) - return "", "", s3err.ErrInternalError + return "", "", s3err.ErrInternalError, SSEResponseMetadata{} } glog.V(2).Infof("putVersionedObject: successfully created version %s for %s/%s (normalized: %s)", versionId, bucket, object, normalizedObject) - return versionId, etag, s3err.ErrNone + return versionId, etag, s3err.ErrNone, sseMetadata } // updateLatestVersionInDirectory updates the .versions directory metadata to indicate the latest version @@ -897,7 +1122,16 @@ func (s3a *S3ApiServer) extractObjectLockMetadataFromRequest(r *http.Request, en func (s3a *S3ApiServer) applyBucketDefaultEncryption(bucket string, r *http.Request, dataReader io.Reader) (*BucketDefaultEncryptionResult, error) { // Check if bucket has default encryption configured encryptionConfig, err := s3a.GetBucketEncryptionConfig(bucket) - if err != nil || encryptionConfig == nil { + if err != nil { + // Check if this is just "no encryption configured" vs a real error + if errors.Is(err, ErrNoEncryptionConfig) { + // No default encryption configured, return original reader + return &BucketDefaultEncryptionResult{DataReader: dataReader}, nil + } + // Real error - propagate to prevent silent encryption bypass + return nil, fmt.Errorf("failed to read bucket encryption config: %v", err) + } + if encryptionConfig == nil { // No default encryption configured, return original reader return &BucketDefaultEncryptionResult{DataReader: dataReader}, nil } @@ -963,7 +1197,8 @@ func (s3a *S3ApiServer) applySSEKMSDefaultEncryption(bucket string, r *http.Requ bucketKeyEnabled := encryptionConfig.BucketKeyEnabled // Build encryption context for KMS - bucket, object := s3_constants.GetBucketAndObject(r) + // Use bucket parameter passed to function (not from request parsing) + _, object := s3_constants.GetBucketAndObject(r) encryptionContext := BuildEncryptionContext(bucket, object, bucketKeyEnabled) // Create SSE-KMS encrypted reader @@ -1474,3 +1709,88 @@ func (s3a *S3ApiServer) checkConditionalHeadersForReadsWithGetter(getter EntryGe func (s3a *S3ApiServer) checkConditionalHeadersForReads(r *http.Request, bucket, object string) ConditionalHeaderResult { return s3a.checkConditionalHeadersForReadsWithGetter(s3a, r, bucket, object) } + +// deleteOrphanedChunks attempts to delete chunks that were uploaded but whose entry creation failed +// This prevents resource leaks and wasted storage. Errors are logged but don't prevent cleanup attempts. +func (s3a *S3ApiServer) deleteOrphanedChunks(chunks []*filer_pb.FileChunk) { + if len(chunks) == 0 { + return + } + + // Extract file IDs from chunks + var fileIds []string + for _, chunk := range chunks { + if chunk.GetFileIdString() != "" { + fileIds = append(fileIds, chunk.GetFileIdString()) + } + } + + if len(fileIds) == 0 { + glog.Warningf("deleteOrphanedChunks: no valid file IDs found in %d chunks", len(chunks)) + return + } + + glog.V(3).Infof("deleteOrphanedChunks: attempting to delete %d file IDs: %v", len(fileIds), fileIds) + + // Create a lookup function that queries the filer for volume locations + // This is similar to createLookupFileIdFunction but returns the format needed by DeleteFileIdsWithLookupVolumeId + lookupFunc := func(vids []string) (map[string]*operation.LookupResult, error) { + results := make(map[string]*operation.LookupResult) + + err := s3a.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error { + // Query filer for all volume IDs at once + resp, err := client.LookupVolume(context.Background(), &filer_pb.LookupVolumeRequest{ + VolumeIds: vids, + }) + if err != nil { + return err + } + + // Convert filer response to operation.LookupResult format + for vid, locs := range resp.LocationsMap { + result := &operation.LookupResult{ + VolumeOrFileId: vid, + } + + for _, loc := range locs.Locations { + result.Locations = append(result.Locations, operation.Location{ + Url: loc.Url, + PublicUrl: loc.PublicUrl, + DataCenter: loc.DataCenter, + GrpcPort: int(loc.GrpcPort), + }) + } + + results[vid] = result + } + return nil + }) + + return results, err + } + + // Attempt deletion using the operation package's batch delete with custom lookup + deleteResults := operation.DeleteFileIdsWithLookupVolumeId(s3a.option.GrpcDialOption, fileIds, lookupFunc) + + // Log results - track successes and failures + successCount := 0 + failureCount := 0 + for _, result := range deleteResults { + if result.Error != "" { + glog.Warningf("deleteOrphanedChunks: failed to delete chunk %s: %s (status: %d)", + result.FileId, result.Error, result.Status) + failureCount++ + } else { + glog.V(4).Infof("deleteOrphanedChunks: successfully deleted chunk %s (size: %d bytes)", + result.FileId, result.Size) + successCount++ + } + } + + if failureCount > 0 { + glog.Warningf("deleteOrphanedChunks: cleanup completed with %d successes and %d failures out of %d chunks", + successCount, failureCount, len(fileIds)) + } else { + glog.V(3).Infof("deleteOrphanedChunks: successfully deleted all %d orphaned chunks", successCount) + } +} diff --git a/weed/s3api/s3api_object_handlers_test.go b/weed/s3api/s3api_object_handlers_test.go index 950dd45f8..cf650a36e 100644 --- a/weed/s3api/s3api_object_handlers_test.go +++ b/weed/s3api/s3api_object_handlers_test.go @@ -147,3 +147,112 @@ func TestS3ApiServer_toFilerUrl(t *testing.T) { }) } } + +func TestPartNumberWithRangeHeader(t *testing.T) { + tests := []struct { + name string + partStartOffset int64 // Part's start offset in the object + partEndOffset int64 // Part's end offset in the object + clientRangeHeader string + expectedStart int64 // Expected absolute start offset + expectedEnd int64 // Expected absolute end offset + expectError bool + }{ + { + name: "No client range - full part", + partStartOffset: 1000, + partEndOffset: 1999, + clientRangeHeader: "", + expectedStart: 1000, + expectedEnd: 1999, + expectError: false, + }, + { + name: "Range within part - start and end", + partStartOffset: 1000, + partEndOffset: 1999, // Part size: 1000 bytes + clientRangeHeader: "bytes=0-99", + expectedStart: 1000, // 1000 + 0 + expectedEnd: 1099, // 1000 + 99 + expectError: false, + }, + { + name: "Range within part - start to end", + partStartOffset: 1000, + partEndOffset: 1999, + clientRangeHeader: "bytes=100-", + expectedStart: 1100, // 1000 + 100 + expectedEnd: 1999, // 1000 + 999 (end of part) + expectError: false, + }, + { + name: "Range suffix - last 100 bytes", + partStartOffset: 1000, + partEndOffset: 1999, // Part size: 1000 bytes + clientRangeHeader: "bytes=-100", + expectedStart: 1900, // 1000 + (1000 - 100) + expectedEnd: 1999, // 1000 + 999 + expectError: false, + }, + { + name: "Range suffix larger than part", + partStartOffset: 1000, + partEndOffset: 1999, // Part size: 1000 bytes + clientRangeHeader: "bytes=-2000", + expectedStart: 1000, // Start of part (clamped) + expectedEnd: 1999, // End of part + expectError: false, + }, + { + name: "Range start beyond part size", + partStartOffset: 1000, + partEndOffset: 1999, + clientRangeHeader: "bytes=1000-1100", + expectedStart: 0, + expectedEnd: 0, + expectError: true, + }, + { + name: "Range end clamped to part size", + partStartOffset: 1000, + partEndOffset: 1999, + clientRangeHeader: "bytes=0-2000", + expectedStart: 1000, // 1000 + 0 + expectedEnd: 1999, // Clamped to end of part + expectError: false, + }, + { + name: "Single byte range at start", + partStartOffset: 5000, + partEndOffset: 9999, // Part size: 5000 bytes + clientRangeHeader: "bytes=0-0", + expectedStart: 5000, + expectedEnd: 5000, + expectError: false, + }, + { + name: "Single byte range in middle", + partStartOffset: 5000, + partEndOffset: 9999, + clientRangeHeader: "bytes=100-100", + expectedStart: 5100, + expectedEnd: 5100, + expectError: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + // Test the actual range adjustment logic from GetObjectHandler + startOffset, endOffset, err := adjustRangeForPart(tt.partStartOffset, tt.partEndOffset, tt.clientRangeHeader) + + if tt.expectError { + assert.Error(t, err, "Expected error for range %s", tt.clientRangeHeader) + } else { + assert.NoError(t, err, "Unexpected error for range %s: %v", tt.clientRangeHeader, err) + assert.Equal(t, tt.expectedStart, startOffset, "Start offset mismatch") + assert.Equal(t, tt.expectedEnd, endOffset, "End offset mismatch") + } + }) + } +} diff --git a/weed/s3api/s3api_object_versioning.go b/weed/s3api/s3api_object_versioning.go index 17a00ee01..1c1dbee03 100644 --- a/weed/s3api/s3api_object_versioning.go +++ b/weed/s3api/s3api_object_versioning.go @@ -328,7 +328,7 @@ func (s3a *S3ApiServer) findVersionsRecursively(currentPath, relativePath string seenVersionIds[versionKey] = true if version.IsDeleteMarker { - glog.V(0).Infof("Adding delete marker from .versions: objectKey=%s, versionId=%s, isLatest=%v, versionKey=%s", + glog.V(4).Infof("Adding delete marker from .versions: objectKey=%s, versionId=%s, isLatest=%v, versionKey=%s", normalizedObjectKey, version.VersionId, version.IsLatest, versionKey) deleteMarker := &DeleteMarkerEntry{ Key: normalizedObjectKey, // Use normalized key for consistency @@ -339,7 +339,7 @@ func (s3a *S3ApiServer) findVersionsRecursively(currentPath, relativePath string } *allVersions = append(*allVersions, deleteMarker) } else { - glog.V(0).Infof("Adding version from .versions: objectKey=%s, versionId=%s, isLatest=%v, versionKey=%s", + glog.V(4).Infof("Adding version from .versions: objectKey=%s, versionId=%s, isLatest=%v, versionKey=%s", normalizedObjectKey, version.VersionId, version.IsLatest, versionKey) versionEntry := &VersionEntry{ Key: normalizedObjectKey, // Use normalized key for consistency @@ -401,12 +401,12 @@ func (s3a *S3ApiServer) findVersionsRecursively(currentPath, relativePath string // Skip if this object already has a .versions directory (already processed) // Check both normalized and original keys for backward compatibility if processedObjects[objectKey] || processedObjects[normalizedObjectKey] { - glog.V(0).Infof("Skipping already processed object: objectKey=%s, normalizedObjectKey=%s, processedObjects[objectKey]=%v, processedObjects[normalizedObjectKey]=%v", + glog.V(4).Infof("Skipping already processed object: objectKey=%s, normalizedObjectKey=%s, processedObjects[objectKey]=%v, processedObjects[normalizedObjectKey]=%v", objectKey, normalizedObjectKey, processedObjects[objectKey], processedObjects[normalizedObjectKey]) continue } - glog.V(0).Infof("Processing regular file: objectKey=%s, normalizedObjectKey=%s, NOT in processedObjects", objectKey, normalizedObjectKey) + glog.V(4).Infof("Processing regular file: objectKey=%s, normalizedObjectKey=%s, NOT in processedObjects", objectKey, normalizedObjectKey) // This is a pre-versioning or suspended-versioning object // Check if this file has version metadata (ExtVersionIdKey) @@ -414,7 +414,7 @@ func (s3a *S3ApiServer) findVersionsRecursively(currentPath, relativePath string if entry.Extended != nil { if versionIdBytes, ok := entry.Extended[s3_constants.ExtVersionIdKey]; ok { hasVersionMeta = true - glog.V(0).Infof("Regular file %s has version metadata: %s", normalizedObjectKey, string(versionIdBytes)) + glog.V(4).Infof("Regular file %s has version metadata: %s", normalizedObjectKey, string(versionIdBytes)) } } @@ -423,12 +423,12 @@ func (s3a *S3ApiServer) findVersionsRecursively(currentPath, relativePath string _, versionsErr := s3a.getEntry(currentPath, versionsObjectPath) if versionsErr == nil { // .versions directory exists - glog.V(0).Infof("Found .versions directory for regular file %s, hasVersionMeta=%v", normalizedObjectKey, hasVersionMeta) + glog.V(4).Infof("Found .versions directory for regular file %s, hasVersionMeta=%v", normalizedObjectKey, hasVersionMeta) // If this file has version metadata, it's a suspended versioning null version // Include it and it will be the latest if hasVersionMeta { - glog.V(0).Infof("Including suspended versioning file %s (has version metadata)", normalizedObjectKey) + glog.V(4).Infof("Including suspended versioning file %s (has version metadata)", normalizedObjectKey) // Continue to add it below } else { // No version metadata - this is a pre-versioning file @@ -443,16 +443,16 @@ func (s3a *S3ApiServer) findVersionsRecursively(currentPath, relativePath string } } if hasNullVersion { - glog.V(0).Infof("Skipping pre-versioning file %s, null version exists in .versions", normalizedObjectKey) + glog.V(4).Infof("Skipping pre-versioning file %s, null version exists in .versions", normalizedObjectKey) processedObjects[objectKey] = true processedObjects[normalizedObjectKey] = true continue } } - glog.V(0).Infof("Including pre-versioning file %s (no null version in .versions)", normalizedObjectKey) + glog.V(4).Infof("Including pre-versioning file %s (no null version in .versions)", normalizedObjectKey) } } else { - glog.V(0).Infof("No .versions directory for regular file %s, hasVersionMeta=%v", normalizedObjectKey, hasVersionMeta) + glog.V(4).Infof("No .versions directory for regular file %s, hasVersionMeta=%v", normalizedObjectKey, hasVersionMeta) } // Add this file as a null version with IsLatest=true @@ -469,7 +469,7 @@ func (s3a *S3ApiServer) findVersionsRecursively(currentPath, relativePath string etag := s3a.calculateETagFromChunks(entry.Chunks) - glog.V(0).Infof("Adding null version from regular file: objectKey=%s, normalizedObjectKey=%s, versionKey=%s, isLatest=%v, hasVersionMeta=%v", + glog.V(4).Infof("Adding null version from regular file: objectKey=%s, normalizedObjectKey=%s, versionKey=%s, isLatest=%v, hasVersionMeta=%v", objectKey, normalizedObjectKey, versionKey, isLatest, hasVersionMeta) versionEntry := &VersionEntry{ diff --git a/weed/s3api/s3api_put_handlers.go b/weed/s3api/s3api_put_handlers.go index fafd2f329..ea797a8bb 100644 --- a/weed/s3api/s3api_put_handlers.go +++ b/weed/s3api/s3api_put_handlers.go @@ -100,20 +100,28 @@ func (s3a *S3ApiServer) handleSSEKMSEncryption(r *http.Request, dataReader io.Re if baseIVHeader != "" { // Decode the base IV from the header baseIV, decodeErr := base64.StdEncoding.DecodeString(baseIVHeader) - if decodeErr != nil || len(baseIV) != 16 { + if decodeErr != nil { + glog.Errorf("handleSSEKMSEncryption: failed to decode base IV: %v", decodeErr) + return nil, nil, nil, s3err.ErrInternalError + } + if len(baseIV) != 16 { + glog.Errorf("handleSSEKMSEncryption: invalid base IV length: %d (expected 16)", len(baseIV)) return nil, nil, nil, s3err.ErrInternalError } // Use the provided base IV with unique part offset for multipart upload consistency + glog.V(4).Infof("handleSSEKMSEncryption: creating encrypted reader with baseIV=%x, partOffset=%d", baseIV[:8], partOffset) encryptedReader, sseKey, encErr = CreateSSEKMSEncryptedReaderWithBaseIVAndOffset(dataReader, keyID, encryptionContext, bucketKeyEnabled, baseIV, partOffset) - glog.V(4).Infof("Using provided base IV %x for SSE-KMS encryption", baseIV[:8]) } else { // Generate a new IV for single-part uploads + glog.V(4).Infof("handleSSEKMSEncryption: creating encrypted reader for single-part (no base IV)") encryptedReader, sseKey, encErr = CreateSSEKMSEncryptedReaderWithBucketKey(dataReader, keyID, encryptionContext, bucketKeyEnabled) } if encErr != nil { + glog.Errorf("handleSSEKMSEncryption: encryption failed: %v", encErr) return nil, nil, nil, s3err.ErrInternalError } + glog.V(3).Infof("handleSSEKMSEncryption: encryption successful, keyID=%s", keyID) // Prepare SSE-KMS metadata for later header setting sseKMSMetadata, metaErr := SerializeSSEKMSMetadata(sseKey) @@ -151,12 +159,20 @@ func (s3a *S3ApiServer) handleSSES3MultipartEncryption(r *http.Request, dataRead } // Use the provided base IV with unique part offset for multipart upload consistency - encryptedReader, _, encErr := CreateSSES3EncryptedReaderWithBaseIV(dataReader, key, baseIV, partOffset) + // CRITICAL: Capture the derived IV returned by CreateSSES3EncryptedReaderWithBaseIV + // This function calculates adjustedIV = calculateIVWithOffset(baseIV, partOffset) + // We MUST store this derived IV in metadata, not the base IV, for decryption to work + encryptedReader, derivedIV, encErr := CreateSSES3EncryptedReaderWithBaseIV(dataReader, key, baseIV, partOffset) if encErr != nil { return nil, nil, s3err.ErrInternalError } - glog.V(4).Infof("handleSSES3MultipartEncryption: using provided base IV %x", baseIV[:8]) + // Update the key with the derived IV so it gets serialized into chunk metadata + // This ensures decryption uses the correct offset-adjusted IV + key.IV = derivedIV + + glog.V(4).Infof("handleSSES3MultipartEncryption: using base IV %x, derived IV %x for offset %d", + baseIV[:8], derivedIV[:8], partOffset) return encryptedReader, key, s3err.ErrNone } diff --git a/weed/s3api/s3api_server.go b/weed/s3api/s3api_server.go index 053d4f56a..b9c4eb3fc 100644 --- a/weed/s3api/s3api_server.go +++ b/weed/s3api/s3api_server.go @@ -90,7 +90,7 @@ func NewS3ApiServerWithStore(router *mux.Router, option *S3ApiServerOption, expl // Initialize bucket policy engine first policyEngine := NewBucketPolicyEngine() - + s3ApiServer = &S3ApiServer{ option: option, iam: iam, @@ -108,7 +108,7 @@ func NewS3ApiServerWithStore(router *mux.Router, option *S3ApiServerOption, expl // Initialize advanced IAM system if config is provided if option.IamConfig != "" { - glog.V(0).Infof("Loading advanced IAM configuration from: %s", option.IamConfig) + glog.V(1).Infof("Loading advanced IAM configuration from: %s", option.IamConfig) iamManager, err := loadIAMManagerFromConfig(option.IamConfig, func() string { return string(option.Filer) @@ -125,7 +125,7 @@ func NewS3ApiServerWithStore(router *mux.Router, option *S3ApiServerOption, expl // Set the integration in the traditional IAM for compatibility iam.SetIAMIntegration(s3iam) - glog.V(0).Infof("Advanced IAM system initialized successfully") + glog.V(1).Infof("Advanced IAM system initialized successfully") } } @@ -134,7 +134,7 @@ func NewS3ApiServerWithStore(router *mux.Router, option *S3ApiServerOption, expl if err := s3ApiServer.iam.loadS3ApiConfigurationFromFile(option.Config); err != nil { glog.Errorf("fail to load config file %s: %v", option.Config, err) } else { - glog.V(0).Infof("Loaded %d identities from config file %s", len(s3ApiServer.iam.identities), option.Config) + glog.V(1).Infof("Loaded %d identities from config file %s", len(s3ApiServer.iam.identities), option.Config) } }) } @@ -168,6 +168,10 @@ func NewS3ApiServerWithStore(router *mux.Router, option *S3ApiServerOption, expl // This helper method centralizes the logic for loading bucket policies into the engine // to avoid duplication and ensure consistent error handling func (s3a *S3ApiServer) syncBucketPolicyToEngine(bucket string, policyDoc *policy.PolicyDocument) { + if s3a.policyEngine == nil { + return + } + if policyDoc != nil { if err := s3a.policyEngine.LoadBucketPolicyFromCache(bucket, policyDoc); err != nil { glog.Errorf("Failed to sync bucket policy for %s to policy engine: %v", bucket, err) @@ -498,7 +502,7 @@ func loadIAMManagerFromConfig(configPath string, filerAddressProvider func() str if configRoot.Policy == nil { // Provide a secure default if not specified in the config file // Default to Deny with in-memory store so that JSON-defined policies work without filer - glog.V(0).Infof("No policy engine config provided; using defaults (DefaultEffect=%s, StoreType=%s)", sts.EffectDeny, sts.StoreTypeMemory) + glog.V(1).Infof("No policy engine config provided; using defaults (DefaultEffect=%s, StoreType=%s)", sts.EffectDeny, sts.StoreTypeMemory) configRoot.Policy = &policy.PolicyEngineConfig{ DefaultEffect: sts.EffectDeny, StoreType: sts.StoreTypeMemory, @@ -556,7 +560,7 @@ func loadIAMManagerFromConfig(configPath string, filerAddressProvider func() str } } - glog.V(0).Infof("Loaded %d providers, %d policies and %d roles from config", len(configRoot.Providers), len(configRoot.Policies), len(configRoot.Roles)) + glog.V(1).Infof("Loaded %d providers, %d policies and %d roles from config", len(configRoot.Providers), len(configRoot.Policies), len(configRoot.Roles)) return iamManager, nil } diff --git a/weed/s3api/s3api_sse_chunk_metadata_test.go b/weed/s3api/s3api_sse_chunk_metadata_test.go new file mode 100644 index 000000000..ca38f44f4 --- /dev/null +++ b/weed/s3api/s3api_sse_chunk_metadata_test.go @@ -0,0 +1,361 @@ +package s3api + +import ( + "bytes" + "crypto/aes" + "crypto/cipher" + "crypto/rand" + "encoding/json" + "io" + "testing" + + "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" +) + +// TestSSEKMSChunkMetadataAssignment tests that SSE-KMS creates per-chunk metadata +// with correct ChunkOffset values for each chunk (matching the fix in putToFiler) +func TestSSEKMSChunkMetadataAssignment(t *testing.T) { + kmsKey := SetupTestKMS(t) + defer kmsKey.Cleanup() + + // Generate SSE-KMS key by encrypting test data (this gives us a real SSEKMSKey) + encryptionContext := BuildEncryptionContext("test-bucket", "test-object", false) + testData := "Test data for SSE-KMS chunk metadata validation" + encryptedReader, sseKMSKey, err := CreateSSEKMSEncryptedReader(bytes.NewReader([]byte(testData)), kmsKey.KeyID, encryptionContext) + if err != nil { + t.Fatalf("Failed to create encrypted reader: %v", err) + } + // Read to complete encryption setup + io.ReadAll(encryptedReader) + + // Serialize the base metadata (what putToFiler receives before chunking) + baseMetadata, err := SerializeSSEKMSMetadata(sseKMSKey) + if err != nil { + t.Fatalf("Failed to serialize base SSE-KMS metadata: %v", err) + } + + // Simulate multi-chunk upload scenario (what putToFiler does after UploadReaderInChunks) + simulatedChunks := []*filer_pb.FileChunk{ + {FileId: "chunk1", Offset: 0, Size: 8 * 1024 * 1024}, // 8MB chunk at offset 0 + {FileId: "chunk2", Offset: 8 * 1024 * 1024, Size: 8 * 1024 * 1024}, // 8MB chunk at offset 8MB + {FileId: "chunk3", Offset: 16 * 1024 * 1024, Size: 4 * 1024 * 1024}, // 4MB chunk at offset 16MB + } + + // THIS IS THE CRITICAL FIX: Create per-chunk metadata (lines 421-443 in putToFiler) + for _, chunk := range simulatedChunks { + chunk.SseType = filer_pb.SSEType_SSE_KMS + + // Create a copy of the SSE-KMS key with chunk-specific offset + chunkSSEKey := &SSEKMSKey{ + KeyID: sseKMSKey.KeyID, + EncryptedDataKey: sseKMSKey.EncryptedDataKey, + EncryptionContext: sseKMSKey.EncryptionContext, + BucketKeyEnabled: sseKMSKey.BucketKeyEnabled, + IV: sseKMSKey.IV, + ChunkOffset: chunk.Offset, // Set chunk-specific offset + } + + // Serialize per-chunk metadata + chunkMetadata, serErr := SerializeSSEKMSMetadata(chunkSSEKey) + if serErr != nil { + t.Fatalf("Failed to serialize SSE-KMS metadata for chunk at offset %d: %v", chunk.Offset, serErr) + } + chunk.SseMetadata = chunkMetadata + } + + // VERIFICATION 1: Each chunk should have different metadata (due to different ChunkOffset) + metadataSet := make(map[string]bool) + for i, chunk := range simulatedChunks { + metadataStr := string(chunk.SseMetadata) + if metadataSet[metadataStr] { + t.Errorf("Chunk %d has duplicate metadata (should be unique per chunk)", i) + } + metadataSet[metadataStr] = true + + // Deserialize and verify ChunkOffset + var metadata SSEKMSMetadata + if err := json.Unmarshal(chunk.SseMetadata, &metadata); err != nil { + t.Fatalf("Failed to deserialize chunk %d metadata: %v", i, err) + } + + expectedOffset := chunk.Offset + if metadata.PartOffset != expectedOffset { + t.Errorf("Chunk %d: expected PartOffset=%d, got %d", i, expectedOffset, metadata.PartOffset) + } + + t.Logf("✓ Chunk %d: PartOffset=%d (correct)", i, metadata.PartOffset) + } + + // VERIFICATION 2: Verify metadata can be deserialized and has correct ChunkOffset + for i, chunk := range simulatedChunks { + // Deserialize chunk metadata + deserializedKey, err := DeserializeSSEKMSMetadata(chunk.SseMetadata) + if err != nil { + t.Fatalf("Failed to deserialize chunk %d metadata: %v", i, err) + } + + // Verify the deserialized key has correct ChunkOffset + if deserializedKey.ChunkOffset != chunk.Offset { + t.Errorf("Chunk %d: deserialized ChunkOffset=%d, expected %d", + i, deserializedKey.ChunkOffset, chunk.Offset) + } + + // Verify IV is set (should be inherited from base) + if len(deserializedKey.IV) != aes.BlockSize { + t.Errorf("Chunk %d: invalid IV length: %d", i, len(deserializedKey.IV)) + } + + // Verify KeyID matches + if deserializedKey.KeyID != sseKMSKey.KeyID { + t.Errorf("Chunk %d: KeyID mismatch", i) + } + + t.Logf("✓ Chunk %d: metadata deserialized successfully (ChunkOffset=%d, KeyID=%s)", + i, deserializedKey.ChunkOffset, deserializedKey.KeyID) + } + + // VERIFICATION 3: Ensure base metadata is NOT reused (the bug we're preventing) + var baseMetadataStruct SSEKMSMetadata + if err := json.Unmarshal(baseMetadata, &baseMetadataStruct); err != nil { + t.Fatalf("Failed to deserialize base metadata: %v", err) + } + + // Base metadata should have ChunkOffset=0 + if baseMetadataStruct.PartOffset != 0 { + t.Errorf("Base metadata should have PartOffset=0, got %d", baseMetadataStruct.PartOffset) + } + + // Chunks 2 and 3 should NOT have the same metadata as base (proving we're not reusing) + for i := 1; i < len(simulatedChunks); i++ { + if bytes.Equal(simulatedChunks[i].SseMetadata, baseMetadata) { + t.Errorf("CRITICAL BUG: Chunk %d reuses base metadata (should have per-chunk metadata)", i) + } + } + + t.Log("✓ All chunks have unique per-chunk metadata (bug prevented)") +} + +// TestSSES3ChunkMetadataAssignment tests that SSE-S3 creates per-chunk metadata +// with offset-adjusted IVs for each chunk (matching the fix in putToFiler) +func TestSSES3ChunkMetadataAssignment(t *testing.T) { + // Initialize global SSE-S3 key manager + globalSSES3KeyManager = NewSSES3KeyManager() + defer func() { + globalSSES3KeyManager = NewSSES3KeyManager() + }() + + keyManager := GetSSES3KeyManager() + keyManager.superKey = make([]byte, 32) + rand.Read(keyManager.superKey) + + // Generate SSE-S3 key + sseS3Key, err := GenerateSSES3Key() + if err != nil { + t.Fatalf("Failed to generate SSE-S3 key: %v", err) + } + + // Generate base IV + baseIV := make([]byte, aes.BlockSize) + rand.Read(baseIV) + sseS3Key.IV = baseIV + + // Serialize base metadata (what putToFiler receives) + baseMetadata, err := SerializeSSES3Metadata(sseS3Key) + if err != nil { + t.Fatalf("Failed to serialize base SSE-S3 metadata: %v", err) + } + + // Simulate multi-chunk upload scenario (what putToFiler does after UploadReaderInChunks) + simulatedChunks := []*filer_pb.FileChunk{ + {FileId: "chunk1", Offset: 0, Size: 8 * 1024 * 1024}, // 8MB chunk at offset 0 + {FileId: "chunk2", Offset: 8 * 1024 * 1024, Size: 8 * 1024 * 1024}, // 8MB chunk at offset 8MB + {FileId: "chunk3", Offset: 16 * 1024 * 1024, Size: 4 * 1024 * 1024}, // 4MB chunk at offset 16MB + } + + // THIS IS THE CRITICAL FIX: Create per-chunk metadata (lines 444-468 in putToFiler) + for _, chunk := range simulatedChunks { + chunk.SseType = filer_pb.SSEType_SSE_S3 + + // Calculate chunk-specific IV using base IV and chunk offset + chunkIV, _ := calculateIVWithOffset(sseS3Key.IV, chunk.Offset) + + // Create a copy of the SSE-S3 key with chunk-specific IV + chunkSSEKey := &SSES3Key{ + Key: sseS3Key.Key, + KeyID: sseS3Key.KeyID, + Algorithm: sseS3Key.Algorithm, + IV: chunkIV, // Use chunk-specific IV + } + + // Serialize per-chunk metadata + chunkMetadata, serErr := SerializeSSES3Metadata(chunkSSEKey) + if serErr != nil { + t.Fatalf("Failed to serialize SSE-S3 metadata for chunk at offset %d: %v", chunk.Offset, serErr) + } + chunk.SseMetadata = chunkMetadata + } + + // VERIFICATION 1: Each chunk should have different metadata (due to different IVs) + metadataSet := make(map[string]bool) + for i, chunk := range simulatedChunks { + metadataStr := string(chunk.SseMetadata) + if metadataSet[metadataStr] { + t.Errorf("Chunk %d has duplicate metadata (should be unique per chunk)", i) + } + metadataSet[metadataStr] = true + + // Deserialize and verify IV + deserializedKey, err := DeserializeSSES3Metadata(chunk.SseMetadata, keyManager) + if err != nil { + t.Fatalf("Failed to deserialize chunk %d metadata: %v", i, err) + } + + // Calculate expected IV for this chunk + expectedIV, _ := calculateIVWithOffset(baseIV, chunk.Offset) + if !bytes.Equal(deserializedKey.IV, expectedIV) { + t.Errorf("Chunk %d: IV mismatch\nExpected: %x\nGot: %x", + i, expectedIV[:8], deserializedKey.IV[:8]) + } + + t.Logf("✓ Chunk %d: IV correctly adjusted for offset=%d", i, chunk.Offset) + } + + // VERIFICATION 2: Verify decryption works with per-chunk IVs + for i, chunk := range simulatedChunks { + // Deserialize chunk metadata + deserializedKey, err := DeserializeSSES3Metadata(chunk.SseMetadata, keyManager) + if err != nil { + t.Fatalf("Failed to deserialize chunk %d metadata: %v", i, err) + } + + // Simulate encryption/decryption with the chunk's IV + testData := []byte("Test data for SSE-S3 chunk decryption verification") + block, err := aes.NewCipher(deserializedKey.Key) + if err != nil { + t.Fatalf("Failed to create cipher: %v", err) + } + + // Encrypt with chunk's IV + ciphertext := make([]byte, len(testData)) + stream := cipher.NewCTR(block, deserializedKey.IV) + stream.XORKeyStream(ciphertext, testData) + + // Decrypt with chunk's IV + plaintext := make([]byte, len(ciphertext)) + block2, _ := aes.NewCipher(deserializedKey.Key) + stream2 := cipher.NewCTR(block2, deserializedKey.IV) + stream2.XORKeyStream(plaintext, ciphertext) + + if !bytes.Equal(plaintext, testData) { + t.Errorf("Chunk %d: decryption failed", i) + } + + t.Logf("✓ Chunk %d: encryption/decryption successful with chunk-specific IV", i) + } + + // VERIFICATION 3: Ensure base IV is NOT reused for non-zero offset chunks (the bug we're preventing) + for i := 1; i < len(simulatedChunks); i++ { + if bytes.Equal(simulatedChunks[i].SseMetadata, baseMetadata) { + t.Errorf("CRITICAL BUG: Chunk %d reuses base metadata (should have per-chunk metadata)", i) + } + + // Verify chunk metadata has different IV than base IV + deserializedKey, _ := DeserializeSSES3Metadata(simulatedChunks[i].SseMetadata, keyManager) + if bytes.Equal(deserializedKey.IV, baseIV) { + t.Errorf("CRITICAL BUG: Chunk %d uses base IV (should use offset-adjusted IV)", i) + } + } + + t.Log("✓ All chunks have unique per-chunk IVs (bug prevented)") +} + +// TestSSEChunkMetadataComparison tests that the bug (reusing same metadata for all chunks) +// would cause decryption failures, while the fix (per-chunk metadata) works correctly +func TestSSEChunkMetadataComparison(t *testing.T) { + // Generate test key and IV + key := make([]byte, 32) + rand.Read(key) + baseIV := make([]byte, aes.BlockSize) + rand.Read(baseIV) + + // Create test data for 3 chunks + chunk0Data := []byte("Chunk 0 data at offset 0") + chunk1Data := []byte("Chunk 1 data at offset 8MB") + chunk2Data := []byte("Chunk 2 data at offset 16MB") + + chunkOffsets := []int64{0, 8 * 1024 * 1024, 16 * 1024 * 1024} + chunkDataList := [][]byte{chunk0Data, chunk1Data, chunk2Data} + + // Scenario 1: BUG - Using same IV for all chunks (what the old code did) + t.Run("Bug: Reusing base IV causes decryption failures", func(t *testing.T) { + var encryptedChunks [][]byte + + // Encrypt each chunk with offset-adjusted IV (what encryption does) + for i, offset := range chunkOffsets { + adjustedIV, _ := calculateIVWithOffset(baseIV, offset) + block, _ := aes.NewCipher(key) + stream := cipher.NewCTR(block, adjustedIV) + + ciphertext := make([]byte, len(chunkDataList[i])) + stream.XORKeyStream(ciphertext, chunkDataList[i]) + encryptedChunks = append(encryptedChunks, ciphertext) + } + + // Try to decrypt with base IV (THE BUG) + for i := range encryptedChunks { + block, _ := aes.NewCipher(key) + stream := cipher.NewCTR(block, baseIV) // BUG: Always using base IV + + plaintext := make([]byte, len(encryptedChunks[i])) + stream.XORKeyStream(plaintext, encryptedChunks[i]) + + if i == 0 { + // Chunk 0 should work (offset 0 means base IV = adjusted IV) + if !bytes.Equal(plaintext, chunkDataList[i]) { + t.Errorf("Chunk 0 decryption failed (unexpected)") + } + } else { + // Chunks 1 and 2 should FAIL (wrong IV) + if bytes.Equal(plaintext, chunkDataList[i]) { + t.Errorf("BUG NOT REPRODUCED: Chunk %d decrypted correctly with base IV (should fail)", i) + } else { + t.Logf("✓ Chunk %d: Correctly failed to decrypt with base IV (bug reproduced)", i) + } + } + } + }) + + // Scenario 2: FIX - Using per-chunk offset-adjusted IVs (what the new code does) + t.Run("Fix: Per-chunk IVs enable correct decryption", func(t *testing.T) { + var encryptedChunks [][]byte + var chunkIVs [][]byte + + // Encrypt each chunk with offset-adjusted IV + for i, offset := range chunkOffsets { + adjustedIV, _ := calculateIVWithOffset(baseIV, offset) + chunkIVs = append(chunkIVs, adjustedIV) + + block, _ := aes.NewCipher(key) + stream := cipher.NewCTR(block, adjustedIV) + + ciphertext := make([]byte, len(chunkDataList[i])) + stream.XORKeyStream(ciphertext, chunkDataList[i]) + encryptedChunks = append(encryptedChunks, ciphertext) + } + + // Decrypt with per-chunk IVs (THE FIX) + for i := range encryptedChunks { + block, _ := aes.NewCipher(key) + stream := cipher.NewCTR(block, chunkIVs[i]) // FIX: Using per-chunk IV + + plaintext := make([]byte, len(encryptedChunks[i])) + stream.XORKeyStream(plaintext, encryptedChunks[i]) + + if !bytes.Equal(plaintext, chunkDataList[i]) { + t.Errorf("Chunk %d decryption failed with per-chunk IV (unexpected)", i) + } else { + t.Logf("✓ Chunk %d: Successfully decrypted with per-chunk IV", i) + } + } + }) +} diff --git a/weed/s3api/s3api_sse_decrypt_test.go b/weed/s3api/s3api_sse_decrypt_test.go new file mode 100644 index 000000000..f66a89ebd --- /dev/null +++ b/weed/s3api/s3api_sse_decrypt_test.go @@ -0,0 +1,189 @@ +package s3api + +import ( + "bytes" + "crypto/aes" + "crypto/cipher" + "crypto/rand" + "io" + "testing" +) + +// TestSSECDecryptChunkView_NoOffsetAdjustment verifies that SSE-C decryption +// does NOT apply calculateIVWithOffset, preventing the critical bug where +// offset adjustment would cause CTR stream misalignment and data corruption. +func TestSSECDecryptChunkView_NoOffsetAdjustment(t *testing.T) { + // Setup: Create test data + plaintext := []byte("This is a test message for SSE-C decryption without offset adjustment") + customerKey := &SSECustomerKey{ + Key: make([]byte, 32), // 256-bit key + KeyMD5: "test-key-md5", + } + // Generate random AES key + if _, err := rand.Read(customerKey.Key); err != nil { + t.Fatalf("Failed to generate random key: %v", err) + } + + // Generate random IV for this "part" + randomIV := make([]byte, aes.BlockSize) + if _, err := rand.Read(randomIV); err != nil { + t.Fatalf("Failed to generate random IV: %v", err) + } + + // Encrypt the plaintext using the random IV (simulating SSE-C multipart upload) + // This is what CreateSSECEncryptedReader does - uses the IV directly without offset + block, err := aes.NewCipher(customerKey.Key) + if err != nil { + t.Fatalf("Failed to create cipher: %v", err) + } + ciphertext := make([]byte, len(plaintext)) + stream := cipher.NewCTR(block, randomIV) + stream.XORKeyStream(ciphertext, plaintext) + + partOffset := int64(1024) // Non-zero offset that should NOT be applied during SSE-C decryption + + // TEST: Decrypt using stored IV directly (correct behavior) + decryptedReaderCorrect, err := CreateSSECDecryptedReader( + io.NopCloser(bytes.NewReader(ciphertext)), + customerKey, + randomIV, // Use stored IV directly - CORRECT + ) + if err != nil { + t.Fatalf("Failed to create decrypted reader (correct): %v", err) + } + decryptedCorrect, err := io.ReadAll(decryptedReaderCorrect) + if err != nil { + t.Fatalf("Failed to read decrypted data (correct): %v", err) + } + + // Verify correct decryption + if !bytes.Equal(decryptedCorrect, plaintext) { + t.Errorf("Correct decryption failed:\nExpected: %s\nGot: %s", plaintext, decryptedCorrect) + } else { + t.Logf("✓ Correct decryption (using stored IV directly) successful") + } + + // ANTI-TEST: Decrypt using offset-adjusted IV (incorrect behavior - the bug) + adjustedIV, ivSkip := calculateIVWithOffset(randomIV, partOffset) + decryptedReaderWrong, err := CreateSSECDecryptedReader( + io.NopCloser(bytes.NewReader(ciphertext)), + customerKey, + adjustedIV, // Use adjusted IV - WRONG + ) + if err != nil { + t.Fatalf("Failed to create decrypted reader (wrong): %v", err) + } + + // Skip ivSkip bytes (as the buggy code would do) + if ivSkip > 0 { + io.CopyN(io.Discard, decryptedReaderWrong, int64(ivSkip)) + } + + decryptedWrong, err := io.ReadAll(decryptedReaderWrong) + if err != nil { + t.Fatalf("Failed to read decrypted data (wrong): %v", err) + } + + // Verify that offset adjustment produces DIFFERENT (corrupted) output + if bytes.Equal(decryptedWrong, plaintext) { + t.Errorf("CRITICAL: Offset-adjusted IV produced correct plaintext! This shouldn't happen for SSE-C.") + } else { + t.Logf("✓ Verified: Offset-adjusted IV produces corrupted data (as expected for SSE-C)") + maxLen := 20 + if len(plaintext) < maxLen { + maxLen = len(plaintext) + } + t.Logf(" Plaintext: %q", plaintext[:maxLen]) + maxLen2 := 20 + if len(decryptedWrong) < maxLen2 { + maxLen2 = len(decryptedWrong) + } + t.Logf(" Corrupted: %q", decryptedWrong[:maxLen2]) + } +} + +// TestSSEKMSDecryptChunkView_RequiresOffsetAdjustment verifies that SSE-KMS +// decryption DOES require calculateIVWithOffset, unlike SSE-C. +func TestSSEKMSDecryptChunkView_RequiresOffsetAdjustment(t *testing.T) { + // Setup: Create test data + plaintext := []byte("This is a test message for SSE-KMS decryption with offset adjustment") + + // Generate base IV and key + baseIV := make([]byte, aes.BlockSize) + key := make([]byte, 32) + if _, err := rand.Read(baseIV); err != nil { + t.Fatalf("Failed to generate base IV: %v", err) + } + if _, err := rand.Read(key); err != nil { + t.Fatalf("Failed to generate key: %v", err) + } + + chunkOffset := int64(2048) // Simulate chunk at offset 2048 + + // Encrypt using base IV + offset (simulating SSE-KMS multipart upload) + adjustedIV, ivSkip := calculateIVWithOffset(baseIV, chunkOffset) + block, err := aes.NewCipher(key) + if err != nil { + t.Fatalf("Failed to create cipher: %v", err) + } + + ciphertext := make([]byte, len(plaintext)) + stream := cipher.NewCTR(block, adjustedIV) + + // Skip ivSkip bytes in the encryption stream if needed + if ivSkip > 0 { + dummy := make([]byte, ivSkip) + stream.XORKeyStream(dummy, dummy) + } + stream.XORKeyStream(ciphertext, plaintext) + + // TEST: Decrypt using base IV + offset adjustment (correct for SSE-KMS) + adjustedIVDecrypt, ivSkipDecrypt := calculateIVWithOffset(baseIV, chunkOffset) + blockDecrypt, err := aes.NewCipher(key) + if err != nil { + t.Fatalf("Failed to create cipher for decryption: %v", err) + } + + decrypted := make([]byte, len(ciphertext)) + streamDecrypt := cipher.NewCTR(blockDecrypt, adjustedIVDecrypt) + + // Skip ivSkip bytes in the decryption stream + if ivSkipDecrypt > 0 { + dummy := make([]byte, ivSkipDecrypt) + streamDecrypt.XORKeyStream(dummy, dummy) + } + streamDecrypt.XORKeyStream(decrypted, ciphertext) + + // Verify correct decryption with offset adjustment + if !bytes.Equal(decrypted, plaintext) { + t.Errorf("SSE-KMS decryption with offset adjustment failed:\nExpected: %s\nGot: %s", plaintext, decrypted) + } else { + t.Logf("✓ SSE-KMS decryption with offset adjustment successful") + } + + // ANTI-TEST: Decrypt using base IV directly (incorrect for SSE-KMS) + blockWrong, err := aes.NewCipher(key) + if err != nil { + t.Fatalf("Failed to create cipher for wrong decryption: %v", err) + } + + decryptedWrong := make([]byte, len(ciphertext)) + streamWrong := cipher.NewCTR(blockWrong, baseIV) // Use base IV directly - WRONG for SSE-KMS + streamWrong.XORKeyStream(decryptedWrong, ciphertext) + + // Verify that NOT using offset adjustment produces corrupted output + if bytes.Equal(decryptedWrong, plaintext) { + t.Errorf("CRITICAL: Base IV without offset produced correct plaintext! SSE-KMS requires offset adjustment.") + } else { + t.Logf("✓ Verified: Base IV without offset produces corrupted data (as expected for SSE-KMS)") + } +} + +// TestSSEDecryptionDifferences documents the key differences between SSE types +func TestSSEDecryptionDifferences(t *testing.T) { + t.Log("SSE-C: Random IV per part → Use stored IV DIRECTLY (no offset)") + t.Log("SSE-KMS: Base IV + offset → MUST call calculateIVWithOffset(baseIV, offset)") + t.Log("SSE-S3: Base IV + offset → Stores ADJUSTED IV, use directly") + + // This test documents the critical differences and serves as executable documentation +} diff --git a/weed/s3api/s3api_sse_s3_upload_test.go b/weed/s3api/s3api_sse_s3_upload_test.go new file mode 100644 index 000000000..e349b9333 --- /dev/null +++ b/weed/s3api/s3api_sse_s3_upload_test.go @@ -0,0 +1,257 @@ +package s3api + +import ( + "bytes" + "crypto/aes" + "crypto/cipher" + "crypto/rand" + "encoding/base64" + "io" + "testing" + + "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" +) + +// TestSSES3MultipartUploadStoresDerivedIV verifies the critical fix where +// handleSSES3MultipartEncryption must store the DERIVED IV (not base IV) +// in the returned key so it gets serialized into chunk metadata. +// +// This test prevents the bug where the derived IV was discarded, causing +// decryption to use the wrong IV and produce corrupted plaintext. +func TestSSES3MultipartUploadStoresDerivedIV(t *testing.T) { + // Setup: Create a test key and base IV + keyManager := GetSSES3KeyManager() + sseS3Key, err := keyManager.GetOrCreateKey("") + if err != nil { + t.Fatalf("Failed to create SSE-S3 key: %v", err) + } + + // Generate a random base IV + baseIV := make([]byte, aes.BlockSize) + if _, err := rand.Read(baseIV); err != nil { + t.Fatalf("Failed to generate base IV: %v", err) + } + + // Test data for multipart upload parts + testCases := []struct { + name string + partOffset int64 + data []byte + }{ + {"Part 1 at offset 0", 0, []byte("First part of multipart upload")}, + {"Part 2 at offset 1MB", 1024 * 1024, []byte("Second part of multipart upload")}, + {"Part 3 at offset 5MB", 5 * 1024 * 1024, []byte("Third part at 5MB offset")}, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + // Calculate the expected derived IV (what encryption will use) + expectedDerivedIV, ivSkip := calculateIVWithOffset(baseIV, tc.partOffset) + + // Call CreateSSES3EncryptedReaderWithBaseIV to encrypt the data + dataReader := bytes.NewReader(tc.data) + encryptedReader, returnedDerivedIV, encErr := CreateSSES3EncryptedReaderWithBaseIV( + dataReader, + sseS3Key, + baseIV, + tc.partOffset, + ) + if encErr != nil { + t.Fatalf("Failed to create encrypted reader: %v", encErr) + } + + // Read the encrypted data + encryptedData, err := io.ReadAll(encryptedReader) + if err != nil { + t.Fatalf("Failed to read encrypted data: %v", err) + } + + // CRITICAL VERIFICATION: The returned IV should be the DERIVED IV + if !bytes.Equal(returnedDerivedIV, expectedDerivedIV) { + t.Errorf("CreateSSES3EncryptedReaderWithBaseIV returned wrong IV:\nExpected: %x\nGot: %x", + expectedDerivedIV[:8], returnedDerivedIV[:8]) + } + + // CRITICAL TEST: Verify the key.IV field would be updated (simulating handleSSES3MultipartEncryption) + // This is what the fix does: key.IV = derivedIV + keyWithDerivedIV := &SSES3Key{ + Key: sseS3Key.Key, + KeyID: sseS3Key.KeyID, + Algorithm: sseS3Key.Algorithm, + IV: returnedDerivedIV, // This simulates: key.IV = derivedIV + } + + // TEST 1: Verify decryption with DERIVED IV produces correct plaintext (correct behavior) + decryptedWithDerivedIV := make([]byte, len(encryptedData)) + block, err := aes.NewCipher(keyWithDerivedIV.Key) + if err != nil { + t.Fatalf("Failed to create cipher: %v", err) + } + stream := cipher.NewCTR(block, keyWithDerivedIV.IV) + + // Handle ivSkip for non-block-aligned offsets + if ivSkip > 0 { + skipDummy := make([]byte, ivSkip) + stream.XORKeyStream(skipDummy, skipDummy) + } + stream.XORKeyStream(decryptedWithDerivedIV, encryptedData) + + if !bytes.Equal(decryptedWithDerivedIV, tc.data) { + t.Errorf("Decryption with derived IV failed:\nExpected: %q\nGot: %q", + tc.data, decryptedWithDerivedIV) + } else { + t.Logf("✓ Derived IV decryption successful for offset %d", tc.partOffset) + } + + // TEST 2: Verify decryption with BASE IV produces WRONG plaintext (bug behavior) + // This is what would happen if the bug wasn't fixed + if tc.partOffset > 0 { // Only test for non-zero offsets (where IVs differ) + keyWithBaseIV := &SSES3Key{ + Key: sseS3Key.Key, + KeyID: sseS3Key.KeyID, + Algorithm: sseS3Key.Algorithm, + IV: baseIV, // BUG: Using base IV instead of derived IV + } + + decryptedWithBaseIV := make([]byte, len(encryptedData)) + blockWrong, err := aes.NewCipher(keyWithBaseIV.Key) + if err != nil { + t.Fatalf("Failed to create cipher for wrong decryption: %v", err) + } + streamWrong := cipher.NewCTR(blockWrong, keyWithBaseIV.IV) + streamWrong.XORKeyStream(decryptedWithBaseIV, encryptedData) + + if bytes.Equal(decryptedWithBaseIV, tc.data) { + t.Errorf("CRITICAL BUG: Base IV produced correct plaintext at offset %d! Should produce corrupted data.", tc.partOffset) + } else { + t.Logf("✓ Verified: Base IV produces corrupted data at offset %d (bug would cause this)", tc.partOffset) + } + } + }) + } +} + +// TestHandleSSES3MultipartEncryptionFlow is an integration test that verifies +// the complete flow of handleSSES3MultipartEncryption, including that the +// returned key contains the derived IV (not base IV). +func TestHandleSSES3MultipartEncryptionFlow(t *testing.T) { + // This test simulates what happens in a real multipart upload request + + // Generate test key manually (simulating a complete SSE-S3 key) + keyBytes := make([]byte, 32) // 256-bit key + if _, err := rand.Read(keyBytes); err != nil { + t.Fatalf("Failed to generate key: %v", err) + } + + originalKey := &SSES3Key{ + Key: keyBytes, + KeyID: "test-key-id", + Algorithm: SSES3Algorithm, + IV: nil, // Will be set later + } + + baseIV := make([]byte, aes.BlockSize) + if _, err := rand.Read(baseIV); err != nil { + t.Fatalf("Failed to generate base IV: %v", err) + } + + // For this test, we'll work directly with the key structure + // since SerializeSSES3Metadata requires KMS setup + + // Test with a non-zero offset (where base IV != derived IV) + partOffset := int64(2 * 1024 * 1024) // 2MB offset + plaintext := []byte("Test data for part 2 of multipart upload") + + // Calculate what the derived IV should be + expectedDerivedIV, ivSkip := calculateIVWithOffset(baseIV, partOffset) + + // Simulate the upload by calling CreateSSES3EncryptedReaderWithBaseIV directly + // (This is what handleSSES3MultipartEncryption does internally) + dataReader := bytes.NewReader(plaintext) + + // Encrypt with base IV and offset + encryptedReader, derivedIV, encErr := CreateSSES3EncryptedReaderWithBaseIV( + dataReader, + originalKey, + baseIV, + partOffset, + ) + if encErr != nil { + t.Fatalf("Failed to create encrypted reader: %v", encErr) + } + + // THE FIX: Update key.IV with derivedIV (this is what the bug fix does) + originalKey.IV = derivedIV + + // Read encrypted data + encryptedData, err := io.ReadAll(encryptedReader) + if err != nil { + t.Fatalf("Failed to read encrypted data: %v", err) + } + + // VERIFICATION 1: Derived IV should match expected + if !bytes.Equal(derivedIV, expectedDerivedIV) { + t.Errorf("Derived IV mismatch:\nExpected: %x\nGot: %x", + expectedDerivedIV[:8], derivedIV[:8]) + } + + // VERIFICATION 2: Key should now contain derived IV (the fix) + if !bytes.Equal(originalKey.IV, derivedIV) { + t.Errorf("Key.IV was not updated with derived IV!\nKey.IV: %x\nDerived IV: %x", + originalKey.IV[:8], derivedIV[:8]) + } else { + t.Logf("✓ Key.IV correctly updated with derived IV") + } + + // VERIFICATION 3: The IV stored in the key can be used for decryption + decryptedData := make([]byte, len(encryptedData)) + block, err := aes.NewCipher(originalKey.Key) + if err != nil { + t.Fatalf("Failed to create cipher: %v", err) + } + + stream := cipher.NewCTR(block, originalKey.IV) + + // Handle ivSkip for non-block-aligned offsets + if ivSkip > 0 { + skipDummy := make([]byte, ivSkip) + stream.XORKeyStream(skipDummy, skipDummy) + } + stream.XORKeyStream(decryptedData, encryptedData) + + if !bytes.Equal(decryptedData, plaintext) { + t.Errorf("Final decryption failed:\nExpected: %q\nGot: %q", plaintext, decryptedData) + } else { + t.Logf("✓ Full encrypt-update_key-decrypt cycle successful") + } +} + +// TestSSES3HeaderEncoding tests that the header encoding/decoding works correctly +func TestSSES3HeaderEncoding(t *testing.T) { + // Generate test base IV + baseIV := make([]byte, aes.BlockSize) + if _, err := rand.Read(baseIV); err != nil { + t.Fatalf("Failed to generate base IV: %v", err) + } + + // Encode as it would be in HTTP header + baseIVHeader := base64.StdEncoding.EncodeToString(baseIV) + + // Decode (as handleSSES3MultipartEncryption does) + decodedBaseIV, err := base64.StdEncoding.DecodeString(baseIVHeader) + if err != nil { + t.Fatalf("Failed to decode base IV: %v", err) + } + + // Verify round-trip + if !bytes.Equal(decodedBaseIV, baseIV) { + t.Errorf("Base IV encoding round-trip failed:\nOriginal: %x\nDecoded: %x", + baseIV, decodedBaseIV) + } + + // Verify length + if len(decodedBaseIV) != s3_constants.AESBlockSize { + t.Errorf("Decoded base IV has wrong length: expected %d, got %d", + s3_constants.AESBlockSize, len(decodedBaseIV)) + } +} diff --git a/weed/s3api/s3err/error_handler.go b/weed/s3api/s3err/error_handler.go index 24dcfad7f..4f96b4ffb 100644 --- a/weed/s3api/s3err/error_handler.go +++ b/weed/s3api/s3err/error_handler.go @@ -121,7 +121,7 @@ func WriteResponse(w http.ResponseWriter, r *http.Request, statusCode int, respo glog.V(4).Infof("status %d %s: %s", statusCode, mType, string(response)) _, err := w.Write(response) if err != nil { - glog.V(0).Infof("write err: %v", err) + glog.V(1).Infof("write err: %v", err) } w.(http.Flusher).Flush() } @@ -129,6 +129,6 @@ func WriteResponse(w http.ResponseWriter, r *http.Request, statusCode int, respo // If none of the http routes match respond with MethodNotAllowed func NotFoundHandler(w http.ResponseWriter, r *http.Request) { - glog.V(0).Infof("unsupported %s %s", r.Method, r.RequestURI) + glog.V(2).Infof("unsupported %s %s", r.Method, r.RequestURI) WriteErrorResponse(w, r, ErrMethodNotAllowed) } diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go index 5f886afa9..1a66dd045 100644 --- a/weed/server/filer_server_handlers_read.go +++ b/weed/server/filer_server_handlers_read.go @@ -221,32 +221,6 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) w.Header().Set(s3_constants.AmzTagCount, strconv.Itoa(tagCount)) } - // Set SSE metadata headers for S3 API consumption - if sseIV, exists := entry.Extended[s3_constants.SeaweedFSSSEIV]; exists { - // Convert binary IV to base64 for HTTP header - ivBase64 := base64.StdEncoding.EncodeToString(sseIV) - w.Header().Set(s3_constants.SeaweedFSSSEIVHeader, ivBase64) - } - - // Set SSE-C algorithm and key MD5 headers for S3 API response - if sseAlgorithm, exists := entry.Extended[s3_constants.AmzServerSideEncryptionCustomerAlgorithm]; exists { - w.Header().Set(s3_constants.AmzServerSideEncryptionCustomerAlgorithm, string(sseAlgorithm)) - } - if sseKeyMD5, exists := entry.Extended[s3_constants.AmzServerSideEncryptionCustomerKeyMD5]; exists { - w.Header().Set(s3_constants.AmzServerSideEncryptionCustomerKeyMD5, string(sseKeyMD5)) - } - - if sseKMSKey, exists := entry.Extended[s3_constants.SeaweedFSSSEKMSKey]; exists { - // Convert binary KMS metadata to base64 for HTTP header - kmsBase64 := base64.StdEncoding.EncodeToString(sseKMSKey) - w.Header().Set(s3_constants.SeaweedFSSSEKMSKeyHeader, kmsBase64) - } - - if _, exists := entry.Extended[s3_constants.SeaweedFSSSES3Key]; exists { - // Set standard S3 SSE-S3 response header (not the internal SeaweedFS header) - w.Header().Set(s3_constants.AmzServerSideEncryption, s3_constants.SSEAlgorithmAES256) - } - SetEtag(w, etag) filename := entry.Name() diff --git a/weed/server/filer_server_handlers_write_autochunk.go b/weed/server/filer_server_handlers_write_autochunk.go index fba693f43..4a200cf43 100644 --- a/weed/server/filer_server_handlers_write_autochunk.go +++ b/weed/server/filer_server_handlers_write_autochunk.go @@ -3,7 +3,6 @@ package weed_server import ( "bytes" "context" - "encoding/base64" "errors" "fmt" "io" @@ -174,10 +173,6 @@ func skipCheckParentDirEntry(r *http.Request) bool { return r.URL.Query().Get("skipCheckParentDir") == "true" } -func isS3Request(r *http.Request) bool { - return r.Header.Get(s3_constants.AmzAuthType) != "" || r.Header.Get("X-Amz-Date") != "" -} - func (fs *FilerServer) checkPermissions(ctx context.Context, r *http.Request, fileName string) error { fullPath := fs.fixFilePath(ctx, r, fileName) enforced, err := fs.wormEnforcedForEntry(ctx, fullPath) @@ -357,52 +352,7 @@ func (fs *FilerServer) saveMetaData(ctx context.Context, r *http.Request, fileNa } } - // Process SSE metadata headers sent by S3 API and store in entry extended metadata - if sseIVHeader := r.Header.Get(s3_constants.SeaweedFSSSEIVHeader); sseIVHeader != "" { - // Decode base64-encoded IV and store in metadata - if ivData, err := base64.StdEncoding.DecodeString(sseIVHeader); err == nil { - entry.Extended[s3_constants.SeaweedFSSSEIV] = ivData - glog.V(4).Infof("Stored SSE-C IV metadata for %s", entry.FullPath) - } else { - glog.Errorf("Failed to decode SSE-C IV header for %s: %v", entry.FullPath, err) - } - } - - // Store SSE-C algorithm and key MD5 for proper S3 API response headers - if sseAlgorithm := r.Header.Get(s3_constants.AmzServerSideEncryptionCustomerAlgorithm); sseAlgorithm != "" { - entry.Extended[s3_constants.AmzServerSideEncryptionCustomerAlgorithm] = []byte(sseAlgorithm) - glog.V(4).Infof("Stored SSE-C algorithm metadata for %s", entry.FullPath) - } - if sseKeyMD5 := r.Header.Get(s3_constants.AmzServerSideEncryptionCustomerKeyMD5); sseKeyMD5 != "" { - entry.Extended[s3_constants.AmzServerSideEncryptionCustomerKeyMD5] = []byte(sseKeyMD5) - glog.V(4).Infof("Stored SSE-C key MD5 metadata for %s", entry.FullPath) - } - - if sseKMSHeader := r.Header.Get(s3_constants.SeaweedFSSSEKMSKeyHeader); sseKMSHeader != "" { - // Decode base64-encoded KMS metadata and store - if kmsData, err := base64.StdEncoding.DecodeString(sseKMSHeader); err == nil { - entry.Extended[s3_constants.SeaweedFSSSEKMSKey] = kmsData - glog.V(4).Infof("Stored SSE-KMS metadata for %s", entry.FullPath) - } else { - glog.Errorf("Failed to decode SSE-KMS metadata header for %s: %v", entry.FullPath, err) - } - } - - if sseS3Header := r.Header.Get(s3_constants.SeaweedFSSSES3Key); sseS3Header != "" { - // Decode base64-encoded S3 metadata and store - if s3Data, err := base64.StdEncoding.DecodeString(sseS3Header); err == nil { - entry.Extended[s3_constants.SeaweedFSSSES3Key] = s3Data - glog.V(4).Infof("Stored SSE-S3 metadata for %s", entry.FullPath) - } else { - glog.Errorf("Failed to decode SSE-S3 metadata header for %s: %v", entry.FullPath, err) - } - } - dbErr := fs.filer.CreateEntry(ctx, entry, false, false, nil, skipCheckParentDirEntry(r), so.MaxFileNameLength) - // In test_bucket_listv2_delimiter_basic, the valid object key is the parent folder - if dbErr != nil && strings.HasSuffix(dbErr.Error(), " is a file") && isS3Request(r) { - dbErr = fs.filer.CreateEntry(ctx, entry, false, false, nil, true, so.MaxFileNameLength) - } if dbErr != nil { replyerr = dbErr filerResult.Error = dbErr.Error() @@ -544,6 +494,8 @@ func SaveAmzMetaData(r *http.Request, existing map[string][]byte, isReplace bool for header, values := range r.Header { if strings.HasPrefix(header, s3_constants.AmzUserMetaPrefix) { + // Go's HTTP server canonicalizes headers (e.g., x-amz-meta-foo → X-Amz-Meta-Foo) + // We store them as they come in (after canonicalization) to preserve the user's intent for _, value := range values { metadata[header] = []byte(value) } @@ -567,7 +519,7 @@ func SaveAmzMetaData(r *http.Request, existing map[string][]byte, isReplace bool //acp-grants acpGrants := r.Header.Get(s3_constants.ExtAmzAclKey) - if len(acpOwner) > 0 { + if len(acpGrants) > 0 { metadata[s3_constants.ExtAmzAclKey] = []byte(acpGrants) } diff --git a/weed/server/filer_server_handlers_write_upload.go b/weed/server/filer_server_handlers_write_upload.go index 3f3102d14..4279575e8 100644 --- a/weed/server/filer_server_handlers_write_upload.go +++ b/weed/server/filer_server_handlers_write_upload.go @@ -4,7 +4,6 @@ import ( "bytes" "context" "crypto/md5" - "encoding/base64" "fmt" "hash" "io" @@ -15,12 +14,9 @@ import ( "slices" - "encoding/json" - "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/operation" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" - "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" "github.com/seaweedfs/seaweedfs/weed/security" "github.com/seaweedfs/seaweedfs/weed/stats" "github.com/seaweedfs/seaweedfs/weed/util" @@ -248,70 +244,6 @@ func (fs *FilerServer) dataToChunkWithSSE(ctx context.Context, r *http.Request, var sseType filer_pb.SSEType = filer_pb.SSEType_NONE var sseMetadata []byte - if r != nil { - - // Check for SSE-KMS - sseKMSHeaderValue := r.Header.Get(s3_constants.SeaweedFSSSEKMSKeyHeader) - if sseKMSHeaderValue != "" { - sseType = filer_pb.SSEType_SSE_KMS - if kmsData, err := base64.StdEncoding.DecodeString(sseKMSHeaderValue); err == nil { - sseMetadata = kmsData - glog.V(4).InfofCtx(ctx, "Storing SSE-KMS metadata for chunk %s at offset %d", fileId, chunkOffset) - } else { - glog.V(1).InfofCtx(ctx, "Failed to decode SSE-KMS metadata for chunk %s: %v", fileId, err) - } - } else if r.Header.Get(s3_constants.AmzServerSideEncryptionCustomerAlgorithm) != "" { - // SSE-C: Create per-chunk metadata for unified handling - sseType = filer_pb.SSEType_SSE_C - - // Get SSE-C metadata from headers to create unified per-chunk metadata - sseIVHeader := r.Header.Get(s3_constants.SeaweedFSSSEIVHeader) - keyMD5Header := r.Header.Get(s3_constants.AmzServerSideEncryptionCustomerKeyMD5) - - if sseIVHeader != "" && keyMD5Header != "" { - // Decode IV from header - if ivData, err := base64.StdEncoding.DecodeString(sseIVHeader); err == nil { - // Create SSE-C metadata with chunk offset = chunkOffset for proper IV calculation - ssecMetadataStruct := struct { - Algorithm string `json:"algorithm"` - IV string `json:"iv"` - KeyMD5 string `json:"keyMD5"` - PartOffset int64 `json:"partOffset"` - }{ - Algorithm: "AES256", - IV: base64.StdEncoding.EncodeToString(ivData), - KeyMD5: keyMD5Header, - PartOffset: chunkOffset, - } - if ssecMetadata, serErr := json.Marshal(ssecMetadataStruct); serErr == nil { - sseMetadata = ssecMetadata - } else { - glog.V(1).InfofCtx(ctx, "Failed to serialize SSE-C metadata for chunk %s: %v", fileId, serErr) - } - } else { - glog.V(1).InfofCtx(ctx, "Failed to decode SSE-C IV for chunk %s: %v", fileId, err) - } - } else { - glog.V(4).InfofCtx(ctx, "SSE-C chunk %s missing IV or KeyMD5 header", fileId) - } - } else if r.Header.Get(s3_constants.SeaweedFSSSES3Key) != "" { - // SSE-S3: Server-side encryption with server-managed keys - // Set the correct SSE type for SSE-S3 chunks to maintain proper tracking - sseType = filer_pb.SSEType_SSE_S3 - - // Get SSE-S3 metadata from headers - sseS3Header := r.Header.Get(s3_constants.SeaweedFSSSES3Key) - if sseS3Header != "" { - if s3Data, err := base64.StdEncoding.DecodeString(sseS3Header); err == nil { - // For SSE-S3, store metadata at chunk level for consistency with SSE-KMS/SSE-C - glog.V(4).InfofCtx(ctx, "Storing SSE-S3 metadata for chunk %s at offset %d", fileId, chunkOffset) - sseMetadata = s3Data - } else { - glog.V(1).InfofCtx(ctx, "Failed to decode SSE-S3 metadata for chunk %s: %v", fileId, err) - } - } - } - } // Create chunk with SSE metadata if available var chunk *filer_pb.FileChunk diff --git a/weed/util/log_buffer/log_buffer.go b/weed/util/log_buffer/log_buffer.go index 715dbdd30..22e69cc60 100644 --- a/weed/util/log_buffer/log_buffer.go +++ b/weed/util/log_buffer/log_buffer.go @@ -19,6 +19,12 @@ import ( const BufferSize = 8 * 1024 * 1024 const PreviousBufferCount = 32 +// Errors that can be returned by log buffer operations +var ( + // ErrBufferCorrupted indicates the log buffer contains corrupted data + ErrBufferCorrupted = fmt.Errorf("log buffer is corrupted") +) + type dataToFlush struct { startTime time.Time stopTime time.Time @@ -117,14 +123,12 @@ func (logBuffer *LogBuffer) RegisterSubscriber(subscriberID string) chan struct{ // Check if already registered if existingChan, exists := logBuffer.subscribers[subscriberID]; exists { - glog.V(2).Infof("Subscriber %s already registered for %s, reusing channel", subscriberID, logBuffer.name) return existingChan } // Create buffered channel (size 1) so notifications never block notifyChan := make(chan struct{}, 1) logBuffer.subscribers[subscriberID] = notifyChan - glog.V(1).Infof("Registered subscriber %s for %s (total: %d)", subscriberID, logBuffer.name, len(logBuffer.subscribers)) return notifyChan } @@ -136,7 +140,6 @@ func (logBuffer *LogBuffer) UnregisterSubscriber(subscriberID string) { if ch, exists := logBuffer.subscribers[subscriberID]; exists { close(ch) delete(logBuffer.subscribers, subscriberID) - glog.V(1).Infof("Unregistered subscriber %s from %s (remaining: %d)", subscriberID, logBuffer.name, len(logBuffer.subscribers)) } } @@ -158,7 +161,6 @@ func (logBuffer *LogBuffer) IsOffsetInMemory(offset int64) bool { // it MUST be in memory (not written to disk yet) lastFlushed := logBuffer.lastFlushedOffset.Load() if lastFlushed >= 0 && offset > lastFlushed { - glog.V(3).Infof("Offset %d is in memory (newer than lastFlushed=%d)", offset, lastFlushed) return true } @@ -168,11 +170,9 @@ func (logBuffer *LogBuffer) IsOffsetInMemory(offset int64) bool { // CRITICAL: Check if buffer actually has data (pos > 0) // After flush, pos=0 but range is still valid - data is on disk, not in memory if logBuffer.pos > 0 { - glog.V(3).Infof("Offset %d is in current buffer [%d-%d] with data", offset, logBuffer.bufferStartOffset, logBuffer.offset) return true } // Buffer is empty (just flushed) - data is on disk - glog.V(3).Infof("Offset %d in range [%d-%d] but buffer empty (pos=0), data on disk", offset, logBuffer.bufferStartOffset, logBuffer.offset) return false } @@ -181,17 +181,14 @@ func (logBuffer *LogBuffer) IsOffsetInMemory(offset int64) bool { if offset >= buf.startOffset && offset <= buf.offset { // Check if prevBuffer actually has data if buf.size > 0 { - glog.V(3).Infof("Offset %d is in previous buffer [%d-%d] with data", offset, buf.startOffset, buf.offset) return true } // Buffer is empty (flushed) - data is on disk - glog.V(3).Infof("Offset %d in prevBuffer [%d-%d] but empty (size=0), data on disk", offset, buf.startOffset, buf.offset) return false } } // Offset is older than memory buffers - only available on disk - glog.V(3).Infof("Offset %d is NOT in memory (bufferStart=%d, lastFlushed=%d)", offset, logBuffer.bufferStartOffset, lastFlushed) return false } @@ -205,15 +202,13 @@ func (logBuffer *LogBuffer) notifySubscribers() { return // No subscribers, skip notification } - for subscriberID, notifyChan := range logBuffer.subscribers { + for _, notifyChan := range logBuffer.subscribers { select { case notifyChan <- struct{}{}: // Notification sent successfully - glog.V(3).Infof("Notified subscriber %s for %s", subscriberID, logBuffer.name) default: // Channel full - subscriber hasn't consumed previous notification yet // This is OK because one notification is sufficient to wake the subscriber - glog.V(3).Infof("Subscriber %s notification channel full (OK - already notified)", subscriberID) } } } @@ -227,7 +222,6 @@ func (logBuffer *LogBuffer) InitializeOffsetFromExistingData(getHighestOffsetFn highestOffset, err := getHighestOffsetFn() if err != nil { - glog.V(0).Infof("Failed to get highest offset for %s: %v, starting from 0", logBuffer.name, err) return nil // Continue with offset 0 if we can't read existing data } @@ -243,37 +237,36 @@ func (logBuffer *LogBuffer) InitializeOffsetFromExistingData(getHighestOffsetFn logBuffer.lastFlushedOffset.Store(highestOffset) // Set lastFlushedTime to current time (we know data up to highestOffset is on disk) logBuffer.lastFlushTsNs.Store(time.Now().UnixNano()) - glog.V(0).Infof("Initialized LogBuffer %s offset to %d (highest existing: %d), buffer starts at %d, lastFlushedOffset=%d, lastFlushedTime=%v", - logBuffer.name, nextOffset, highestOffset, nextOffset, highestOffset, time.Now()) } else { logBuffer.bufferStartOffset = 0 // Start from offset 0 // No data on disk yet - glog.V(0).Infof("No existing data found for %s, starting from offset 0, lastFlushedOffset=-1, lastFlushedTime=0", logBuffer.name) } return nil } -func (logBuffer *LogBuffer) AddToBuffer(message *mq_pb.DataMessage) { - logBuffer.AddDataToBuffer(message.Key, message.Value, message.TsNs) +func (logBuffer *LogBuffer) AddToBuffer(message *mq_pb.DataMessage) error { + return logBuffer.AddDataToBuffer(message.Key, message.Value, message.TsNs) } // AddLogEntryToBuffer directly adds a LogEntry to the buffer, preserving offset information -func (logBuffer *LogBuffer) AddLogEntryToBuffer(logEntry *filer_pb.LogEntry) { - logEntryData, _ := proto.Marshal(logEntry) - +func (logBuffer *LogBuffer) AddLogEntryToBuffer(logEntry *filer_pb.LogEntry) error { var toFlush *dataToFlush + var marshalErr error logBuffer.Lock() defer func() { logBuffer.Unlock() if toFlush != nil { logBuffer.flushChan <- toFlush } - if logBuffer.notifyFn != nil { - logBuffer.notifyFn() + // Only notify if there was no error + if marshalErr == nil { + if logBuffer.notifyFn != nil { + logBuffer.notifyFn() + } + // Notify all registered subscribers instantly (<1ms latency) + logBuffer.notifySubscribers() } - // Notify all registered subscribers instantly (<1ms latency) - logBuffer.notifySubscribers() }() processingTsNs := logEntry.TsNs @@ -285,11 +278,16 @@ func (logBuffer *LogBuffer) AddLogEntryToBuffer(logEntry *filer_pb.LogEntry) { ts = time.Unix(0, processingTsNs) // Re-marshal with corrected timestamp logEntry.TsNs = processingTsNs - logEntryData, _ = proto.Marshal(logEntry) } else { logBuffer.LastTsNs.Store(processingTsNs) } + logEntryData, err := proto.Marshal(logEntry) + if err != nil { + marshalErr = fmt.Errorf("failed to marshal LogEntry: %w", err) + glog.Errorf("%v", marshalErr) + return marshalErr + } size := len(logEntryData) if logBuffer.pos == 0 { @@ -323,8 +321,9 @@ func (logBuffer *LogBuffer) AddLogEntryToBuffer(logEntry *filer_pb.LogEntry) { const maxBufferSize = 1 << 30 // 1 GiB practical limit // Ensure 2*size + 4 won't overflow int and stays within practical bounds if size < 0 || size > (math.MaxInt-4)/2 || size > (maxBufferSize-4)/2 { - glog.Errorf("Buffer size out of valid range: %d bytes, skipping", size) - return + marshalErr = fmt.Errorf("message size %d exceeds maximum allowed size", size) + glog.Errorf("%v", marshalErr) + return marshalErr } // Safe to compute now that we've validated size is in valid range newSize := 2*size + 4 @@ -340,9 +339,10 @@ func (logBuffer *LogBuffer) AddLogEntryToBuffer(logEntry *filer_pb.LogEntry) { logBuffer.pos += size + 4 logBuffer.offset++ + return nil } -func (logBuffer *LogBuffer) AddDataToBuffer(partitionKey, data []byte, processingTsNs int64) { +func (logBuffer *LogBuffer) AddDataToBuffer(partitionKey, data []byte, processingTsNs int64) error { // PERFORMANCE OPTIMIZATION: Pre-process expensive operations OUTSIDE the lock var ts time.Time @@ -360,20 +360,22 @@ func (logBuffer *LogBuffer) AddDataToBuffer(partitionKey, data []byte, processin Key: partitionKey, } - logEntryData, _ := proto.Marshal(logEntry) - var toFlush *dataToFlush + var marshalErr error logBuffer.Lock() defer func() { logBuffer.Unlock() if toFlush != nil { logBuffer.flushChan <- toFlush } - if logBuffer.notifyFn != nil { - logBuffer.notifyFn() + // Only notify if there was no error + if marshalErr == nil { + if logBuffer.notifyFn != nil { + logBuffer.notifyFn() + } + // Notify all registered subscribers instantly (<1ms latency) + logBuffer.notifySubscribers() } - // Notify all registered subscribers instantly (<1ms latency) - logBuffer.notifySubscribers() }() // Handle timestamp collision inside lock (rare case) @@ -390,20 +392,13 @@ func (logBuffer *LogBuffer) AddDataToBuffer(partitionKey, data []byte, processin // Note: This also enables AddToBuffer to work correctly with Kafka-style offset-based reads logEntry.Offset = logBuffer.offset - // DEBUG: Log data being added to buffer for GitHub Actions debugging - dataPreview := "" - if len(data) > 0 { - if len(data) <= 50 { - dataPreview = string(data) - } else { - dataPreview = fmt.Sprintf("%s...(total %d bytes)", string(data[:50]), len(data)) - } - } - glog.V(2).Infof("[LOG_BUFFER_ADD] buffer=%s offset=%d dataLen=%d dataPreview=%q", - logBuffer.name, logBuffer.offset, len(data), dataPreview) - // Marshal with correct timestamp and offset - logEntryData, _ = proto.Marshal(logEntry) + logEntryData, err := proto.Marshal(logEntry) + if err != nil { + marshalErr = fmt.Errorf("failed to marshal LogEntry: %w", err) + glog.Errorf("%v", marshalErr) + return marshalErr + } size := len(logEntryData) @@ -429,7 +424,6 @@ func (logBuffer *LogBuffer) AddDataToBuffer(partitionKey, data []byte, processin } if logBuffer.startTime.Add(logBuffer.flushInterval).Before(ts) || len(logBuffer.buf)-logBuffer.pos < size+4 { - // glog.V(0).Infof("%s copyToFlush1 offset:%d count:%d start time %v, ts %v, remaining %d bytes", logBuffer.name, logBuffer.offset, len(logBuffer.idx), logBuffer.startTime, ts, len(logBuffer.buf)-logBuffer.pos) toFlush = logBuffer.copyToFlush() logBuffer.startTime = ts if len(logBuffer.buf) < size+4 { @@ -437,8 +431,9 @@ func (logBuffer *LogBuffer) AddDataToBuffer(partitionKey, data []byte, processin const maxBufferSize = 1 << 30 // 1 GiB practical limit // Ensure 2*size + 4 won't overflow int and stays within practical bounds if size < 0 || size > (math.MaxInt-4)/2 || size > (maxBufferSize-4)/2 { - glog.Errorf("Buffer size out of valid range: %d bytes, skipping", size) - return + marshalErr = fmt.Errorf("message size %d exceeds maximum allowed size", size) + glog.Errorf("%v", marshalErr) + return marshalErr } // Safe to compute now that we've validated size is in valid range newSize := 2*size + 4 @@ -454,6 +449,7 @@ func (logBuffer *LogBuffer) AddDataToBuffer(partitionKey, data []byte, processin logBuffer.pos += size + 4 logBuffer.offset++ + return nil } func (logBuffer *LogBuffer) IsStopping() bool { @@ -480,14 +476,11 @@ func (logBuffer *LogBuffer) ForceFlush() { select { case <-toFlush.done: // Flush completed successfully - glog.V(1).Infof("ForceFlush completed for %s", logBuffer.name) case <-time.After(5 * time.Second): // Timeout waiting for flush - this shouldn't happen - glog.Warningf("ForceFlush timed out waiting for completion on %s", logBuffer.name) } case <-time.After(2 * time.Second): // If flush channel is still blocked after 2s, something is wrong - glog.Warningf("ForceFlush channel timeout for %s - flush channel busy for 2s", logBuffer.name) } } } @@ -511,7 +504,6 @@ func (logBuffer *LogBuffer) IsAllFlushed() bool { func (logBuffer *LogBuffer) loopFlush() { for d := range logBuffer.flushChan { if d != nil { - // glog.V(4).Infof("%s flush [%v, %v] size %d", m.name, d.startTime, d.stopTime, len(d.data.Bytes())) logBuffer.flushFn(logBuffer, d.startTime, d.stopTime, d.data.Bytes(), d.minOffset, d.maxOffset) d.releaseMemory() // local logbuffer is different from aggregate logbuffer here @@ -546,10 +538,7 @@ func (logBuffer *LogBuffer) loopInterval() { toFlush := logBuffer.copyToFlush() logBuffer.Unlock() if toFlush != nil { - glog.V(4).Infof("%s flush [%v, %v] size %d", logBuffer.name, toFlush.startTime, toFlush.stopTime, len(toFlush.data.Bytes())) logBuffer.flushChan <- toFlush - } else { - // glog.V(0).Infof("%s no flush", m.name) } } } @@ -578,9 +567,7 @@ func (logBuffer *LogBuffer) copyToFlushInternal(withCallback bool) *dataToFlush if withCallback { d.done = make(chan struct{}) } - // glog.V(4).Infof("%s flushing [0,%d) with %d entries [%v, %v]", m.name, m.pos, len(m.idx), m.startTime, m.stopTime) } else { - // glog.V(4).Infof("%s removed from memory [0,%d) with %d entries [%v, %v]", m.name, m.pos, len(m.idx), m.startTime, m.stopTime) logBuffer.lastFlushDataTime = logBuffer.stopTime } // CRITICAL: logBuffer.offset is the "next offset to assign", so last offset in buffer is offset-1 @@ -647,8 +634,6 @@ func (logBuffer *LogBuffer) ReadFromBuffer(lastReadPosition MessagePosition) (bu defer logBuffer.RUnlock() isOffsetBased := lastReadPosition.IsOffsetBased - glog.V(2).Infof("[ReadFromBuffer] %s: isOffsetBased=%v, position=%+v, bufferStartOffset=%d, offset=%d, pos=%d", - logBuffer.name, isOffsetBased, lastReadPosition, logBuffer.bufferStartOffset, logBuffer.offset, logBuffer.pos) // For offset-based subscriptions, use offset comparisons, not time comparisons! if isOffsetBased { @@ -729,11 +714,7 @@ func (logBuffer *LogBuffer) ReadFromBuffer(lastReadPosition MessagePosition) (bu if !logBuffer.startTime.IsZero() { tsMemory = logBuffer.startTime } - glog.V(2).Infof("[ReadFromBuffer] %s: checking prevBuffers, count=%d, currentStartTime=%v", - logBuffer.name, len(logBuffer.prevBuffers.buffers), logBuffer.startTime) - for i, prevBuf := range logBuffer.prevBuffers.buffers { - glog.V(2).Infof("[ReadFromBuffer] %s: prevBuf[%d]: startTime=%v stopTime=%v size=%d startOffset=%d endOffset=%d", - logBuffer.name, i, prevBuf.startTime, prevBuf.stopTime, prevBuf.size, prevBuf.startOffset, prevBuf.offset) + for _, prevBuf := range logBuffer.prevBuffers.buffers { if !prevBuf.startTime.IsZero() { // If tsMemory is zero, assign directly; otherwise compare if tsMemory.IsZero() || prevBuf.startTime.Before(tsMemory) { @@ -754,19 +735,12 @@ func (logBuffer *LogBuffer) ReadFromBuffer(lastReadPosition MessagePosition) (bu // Fall through to case 2.1 to read from earliest buffer } else if lastReadPosition.Offset <= 0 && lastReadPosition.Time.Before(tsMemory) { // Treat first read with sentinel/zero offset as inclusive of earliest in-memory data - glog.V(4).Infof("first read (offset=%d) at time %v before earliest memory %v, reading from memory", - lastReadPosition.Offset, lastReadPosition.Time, tsMemory) } else { // Data not in memory buffers - read from disk - glog.V(0).Infof("[ReadFromBuffer] %s resume from disk: requested time %v < earliest memory time %v", - logBuffer.name, lastReadPosition.Time, tsMemory) return nil, -2, ResumeFromDiskError } } - glog.V(2).Infof("[ReadFromBuffer] %s: time-based read continuing, tsMemory=%v, lastReadPos=%v", - logBuffer.name, tsMemory, lastReadPosition.Time) - // the following is case 2.1 if lastReadPosition.Time.Equal(logBuffer.stopTime) && !logBuffer.stopTime.IsZero() { @@ -776,14 +750,12 @@ func (logBuffer *LogBuffer) ReadFromBuffer(lastReadPosition MessagePosition) (bu } } if lastReadPosition.Time.After(logBuffer.stopTime) && !logBuffer.stopTime.IsZero() { - // glog.Fatalf("unexpected last read time %v, older than latest %v", lastReadPosition, m.stopTime) return nil, logBuffer.offset, nil } // Also check prevBuffers when current buffer is empty (startTime is zero) if lastReadPosition.Time.Before(logBuffer.startTime) || logBuffer.startTime.IsZero() { for _, buf := range logBuffer.prevBuffers.buffers { if buf.startTime.After(lastReadPosition.Time) { - // glog.V(4).Infof("%s return the %d sealed buffer %v", m.name, i, buf.startTime) return copiedBytes(buf.buf[:buf.size]), buf.offset, nil } if !buf.startTime.After(lastReadPosition.Time) && buf.stopTime.After(lastReadPosition.Time) { @@ -791,14 +763,17 @@ func (logBuffer *LogBuffer) ReadFromBuffer(lastReadPosition MessagePosition) (bu if lastReadPosition.Offset <= 0 { searchTime = searchTime.Add(-time.Nanosecond) } - pos := buf.locateByTs(searchTime) - glog.V(2).Infof("[ReadFromBuffer] %s: found data in prevBuffer at pos %d, bufSize=%d", logBuffer.name, pos, buf.size) + pos, err := buf.locateByTs(searchTime) + if err != nil { + // Buffer corruption detected - return error wrapped with ErrBufferCorrupted + glog.Errorf("ReadFromBuffer: buffer corruption in prevBuffer: %v", err) + return nil, -1, fmt.Errorf("%w: %v", ErrBufferCorrupted, err) + } return copiedBytes(buf.buf[pos:buf.size]), buf.offset, nil } } // If current buffer is not empty, return it if logBuffer.pos > 0 { - // glog.V(4).Infof("%s return the current buf %v", m.name, lastReadPosition) return copiedBytes(logBuffer.buf[:logBuffer.pos]), logBuffer.offset, nil } // Buffer is empty and no data in prevBuffers - wait for new data @@ -830,13 +805,23 @@ func (logBuffer *LogBuffer) ReadFromBuffer(lastReadPosition MessagePosition) (bu for l <= h { mid := (l + h) / 2 pos := logBuffer.idx[mid] - _, t := readTs(logBuffer.buf, pos) + _, t, err := readTs(logBuffer.buf, pos) + if err != nil { + // Buffer corruption detected in binary search + glog.Errorf("ReadFromBuffer: buffer corruption at idx[%d] pos %d: %v", mid, pos, err) + return nil, -1, fmt.Errorf("%w: %v", ErrBufferCorrupted, err) + } if t <= searchTs { l = mid + 1 } else if searchTs < t { var prevT int64 if mid > 0 { - _, prevT = readTs(logBuffer.buf, logBuffer.idx[mid-1]) + _, prevT, err = readTs(logBuffer.buf, logBuffer.idx[mid-1]) + if err != nil { + // Buffer corruption detected in binary search (previous entry) + glog.Errorf("ReadFromBuffer: buffer corruption at idx[%d] pos %d: %v", mid-1, logBuffer.idx[mid-1], err) + return nil, -1, fmt.Errorf("%w: %v", ErrBufferCorrupted, err) + } } if prevT <= searchTs { return copiedBytes(logBuffer.buf[pos:logBuffer.pos]), logBuffer.offset, nil @@ -881,16 +866,28 @@ func copiedBytes(buf []byte) (copied *bytes.Buffer) { return } -func readTs(buf []byte, pos int) (size int, ts int64) { +func readTs(buf []byte, pos int) (size int, ts int64, err error) { + // Bounds check for size field (overflow-safe) + if pos < 0 || pos > len(buf)-4 { + return 0, 0, fmt.Errorf("corrupted log buffer: cannot read size at pos %d, buffer length %d", pos, len(buf)) + } size = int(util.BytesToUint32(buf[pos : pos+4])) + + // Bounds check for entry data (overflow-safe, protects against negative size) + if size < 0 || size > len(buf)-pos-4 { + return 0, 0, fmt.Errorf("corrupted log buffer: entry size %d at pos %d exceeds buffer length %d", size, pos, len(buf)) + } + entryData := buf[pos+4 : pos+4+size] logEntry := &filer_pb.LogEntry{} - err := proto.Unmarshal(entryData, logEntry) + err = proto.Unmarshal(entryData, logEntry) if err != nil { - glog.Fatalf("unexpected unmarshal filer_pb.LogEntry: %v", err) + // Return error instead of failing fast + // This allows caller to handle corruption gracefully + return 0, 0, fmt.Errorf("corrupted log buffer: failed to unmarshal LogEntry at pos %d, size %d: %w", pos, size, err) } - return size, logEntry.TsNs + return size, logEntry.TsNs, nil } diff --git a/weed/util/log_buffer/log_buffer_corruption_test.go b/weed/util/log_buffer/log_buffer_corruption_test.go new file mode 100644 index 000000000..2f7a029e6 --- /dev/null +++ b/weed/util/log_buffer/log_buffer_corruption_test.go @@ -0,0 +1,224 @@ +package log_buffer + +import ( + "errors" + "testing" + "time" + + "google.golang.org/protobuf/proto" + + "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" + "github.com/seaweedfs/seaweedfs/weed/util" +) + +// TestReadTsCorruptedBuffer tests that readTs properly returns an error for corrupted data +func TestReadTsCorruptedBuffer(t *testing.T) { + // Create a corrupted buffer with invalid protobuf data + buf := make([]byte, 100) + + // Set size field to 10 bytes (using proper encoding) + util.Uint32toBytes(buf[0:4], 10) + + // Fill with garbage data that won't unmarshal as LogEntry + for i := 4; i < 14; i++ { + buf[i] = 0xFF + } + + // Attempt to read timestamp + size, ts, err := readTs(buf, 0) + + // Should return an error + if err == nil { + t.Error("Expected error for corrupted buffer, got nil") + } + + // Size and ts should be zero on error + if size != 0 { + t.Errorf("Expected size=0 on error, got %d", size) + } + + if ts != 0 { + t.Errorf("Expected ts=0 on error, got %d", ts) + } + + // Error should indicate corruption + if !errors.Is(err, ErrBufferCorrupted) { + t.Logf("Error message: %v", err) + // Check if error message contains expected text + if err.Error() == "" || len(err.Error()) == 0 { + t.Error("Expected non-empty error message") + } + } + + t.Logf("✓ readTs correctly returned error for corrupted buffer: %v", err) +} + +// TestReadTsValidBuffer tests that readTs works correctly for valid data +func TestReadTsValidBuffer(t *testing.T) { + // Create a valid LogEntry + logEntry := &filer_pb.LogEntry{ + TsNs: 123456789, + Key: []byte("test-key"), + } + + // Marshal it + data, err := proto.Marshal(logEntry) + if err != nil { + t.Fatalf("Failed to marshal LogEntry: %v", err) + } + + // Create buffer with size prefix using util function + buf := make([]byte, 4+len(data)) + util.Uint32toBytes(buf[0:4], uint32(len(data))) + copy(buf[4:], data) + + // Read timestamp + size, ts, err := readTs(buf, 0) + + // Should succeed + if err != nil { + t.Fatalf("Expected no error for valid buffer, got: %v", err) + } + + // Should return correct values + if size != len(data) { + t.Errorf("Expected size=%d, got %d", len(data), size) + } + + if ts != logEntry.TsNs { + t.Errorf("Expected ts=%d, got %d", logEntry.TsNs, ts) + } + + t.Logf("✓ readTs correctly parsed valid buffer: size=%d, ts=%d", size, ts) +} + +// TestReadFromBufferCorruption tests that ReadFromBuffer propagates corruption errors +func TestReadFromBufferCorruption(t *testing.T) { + lb := NewLogBuffer("test-corruption", time.Second, nil, nil, func() {}) + + // Add a valid entry first using AddDataToBuffer + validKey := []byte("valid") + validData, _ := proto.Marshal(&filer_pb.LogEntry{ + TsNs: 1000, + Key: validKey, + }) + if err := lb.AddDataToBuffer(validKey, validData, 1000); err != nil { + t.Fatalf("Failed to add data to buffer: %v", err) + } + + // Manually corrupt the buffer by writing garbage + // This simulates a corruption scenario + if len(lb.idx) > 0 { + pos := lb.idx[0] + // Overwrite the protobuf data with garbage + for i := pos + 4; i < pos+8 && i < len(lb.buf); i++ { + lb.buf[i] = 0xFF + } + } + + // Try to read - should detect corruption + startPos := MessagePosition{Time: lb.startTime} + buf, offset, err := lb.ReadFromBuffer(startPos) + + // Should return corruption error + if err == nil { + t.Error("Expected corruption error, got nil") + if buf != nil { + t.Logf("Unexpected success: got buffer with %d bytes", buf.Len()) + } + } else { + // Verify it's a corruption error + if !errors.Is(err, ErrBufferCorrupted) { + t.Logf("Got error (not ErrBufferCorrupted sentinel, but still an error): %v", err) + } + t.Logf("✓ ReadFromBuffer correctly detected corruption: %v", err) + } + + t.Logf("ReadFromBuffer result: buf=%v, offset=%d, err=%v", buf != nil, offset, err) +} + +// TestLocateByTsCorruption tests that locateByTs propagates corruption errors +func TestLocateByTsCorruption(t *testing.T) { + // Create a MemBuffer with corrupted data + mb := &MemBuffer{ + buf: make([]byte, 100), + size: 14, + } + + // Set size field (using proper encoding) + util.Uint32toBytes(mb.buf[0:4], 10) + + // Fill with garbage + for i := 4; i < 14; i++ { + mb.buf[i] = 0xFF + } + + // Try to locate by timestamp + pos, err := mb.locateByTs(mb.startTime) + + // Should return error + if err == nil { + t.Errorf("Expected corruption error, got nil (pos=%d)", pos) + } else { + t.Logf("✓ locateByTs correctly detected corruption: %v", err) + } +} + +// TestErrorPropagationChain tests the complete error propagation from readTs -> locateByTs -> ReadFromBuffer +func TestErrorPropagationChain(t *testing.T) { + t.Run("Corruption in readTs", func(t *testing.T) { + // Already covered by TestReadTsCorruptedBuffer + t.Log("✓ readTs error propagation tested") + }) + + t.Run("Corruption in locateByTs", func(t *testing.T) { + // Already covered by TestLocateByTsCorruption + t.Log("✓ locateByTs error propagation tested") + }) + + t.Run("Corruption in ReadFromBuffer binary search", func(t *testing.T) { + // Already covered by TestReadFromBufferCorruption + t.Log("✓ ReadFromBuffer error propagation tested") + }) + + t.Log("✓ Complete error propagation chain verified") +} + +// TestNoSilentCorruption verifies that corruption never returns (0, 0) silently +func TestNoSilentCorruption(t *testing.T) { + // Create various corrupted buffers + testCases := []struct { + name string + buf []byte + pos int + }{ + { + name: "Invalid protobuf", + buf: []byte{10, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, + pos: 0, + }, + { + name: "Truncated data", + buf: []byte{100, 0, 0, 0, 1, 2, 3}, // Size says 100 but only 3 bytes available + pos: 0, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + size, ts, err := readTs(tc.buf, tc.pos) + + // CRITICAL: Must return error, never silent (0, 0) + if err == nil { + t.Errorf("CRITICAL: readTs returned (%d, %d, nil) for corrupted buffer - this causes silent data corruption!", size, ts) + } else { + t.Logf("✓ Correctly returned error instead of silent (0, 0): %v", err) + } + + // On error, size and ts should be 0 + if size != 0 || ts != 0 { + t.Errorf("On error, expected (0, 0), got (%d, %d)", size, ts) + } + }) + } +} diff --git a/weed/util/log_buffer/log_buffer_flush_gap_test.go b/weed/util/log_buffer/log_buffer_flush_gap_test.go index bc40ea6df..dc010f1b8 100644 --- a/weed/util/log_buffer/log_buffer_flush_gap_test.go +++ b/weed/util/log_buffer/log_buffer_flush_gap_test.go @@ -69,11 +69,13 @@ func TestFlushOffsetGap_ReproduceDataLoss(t *testing.T) { t.Logf("Sending %d messages...", messageCount) for i := 0; i < messageCount; i++ { - logBuffer.AddToBuffer(&mq_pb.DataMessage{ + if err := logBuffer.AddToBuffer(&mq_pb.DataMessage{ Key: []byte(fmt.Sprintf("key-%d", i)), Value: []byte(fmt.Sprintf("message-%d", i)), TsNs: time.Now().UnixNano(), - }) + }); err != nil { + t.Fatalf("Failed to add buffer: %v", err) + } } // Force flush multiple times to simulate real workload @@ -82,11 +84,13 @@ func TestFlushOffsetGap_ReproduceDataLoss(t *testing.T) { // Add more messages after flush for i := messageCount; i < messageCount+50; i++ { - logBuffer.AddToBuffer(&mq_pb.DataMessage{ + if err := logBuffer.AddToBuffer(&mq_pb.DataMessage{ Key: []byte(fmt.Sprintf("key-%d", i)), Value: []byte(fmt.Sprintf("message-%d", i)), TsNs: time.Now().UnixNano(), - }) + }); err != nil { + t.Fatalf("Failed to add buffer: %v", err) + } } // Force another flush @@ -209,11 +213,13 @@ func TestFlushOffsetGap_CheckPrevBuffers(t *testing.T) { // Send 20 messages for i := 0; i < 20; i++ { offset := int64(batch*20 + i) - logBuffer.AddToBuffer(&mq_pb.DataMessage{ + if err := logBuffer.AddToBuffer(&mq_pb.DataMessage{ Key: []byte(fmt.Sprintf("key-%d", offset)), Value: []byte(fmt.Sprintf("message-%d", offset)), TsNs: time.Now().UnixNano(), - }) + }); err != nil { + t.Fatalf("Failed to add buffer: %v", err) + } } // Check state before flush @@ -285,11 +291,14 @@ func TestFlushOffsetGap_ConcurrentWriteAndFlush(t *testing.T) { go func() { defer wg.Done() for i := 0; i < 200; i++ { - logBuffer.AddToBuffer(&mq_pb.DataMessage{ + if err := logBuffer.AddToBuffer(&mq_pb.DataMessage{ Key: []byte(fmt.Sprintf("key-%d", i)), Value: []byte(fmt.Sprintf("message-%d", i)), TsNs: time.Now().UnixNano(), - }) + }); err != nil { + t.Errorf("Failed to add buffer: %v", err) + return + } if i%50 == 0 { time.Sleep(10 * time.Millisecond) } @@ -389,7 +398,9 @@ func TestFlushOffsetGap_ProductionScenario(t *testing.T) { TsNs: time.Now().UnixNano(), Offset: nextKafkaOffset, // Explicit Kafka offset } - logBuffer.AddLogEntryToBuffer(logEntry) + if err := logBuffer.AddLogEntryToBuffer(logEntry); err != nil { + t.Fatalf("Failed to add log entry: %v", err) + } nextKafkaOffset++ } @@ -422,7 +433,9 @@ func TestFlushOffsetGap_ProductionScenario(t *testing.T) { TsNs: time.Now().UnixNano(), Offset: nextKafkaOffset, } - logBuffer.AddLogEntryToBuffer(logEntry) + if err := logBuffer.AddLogEntryToBuffer(logEntry); err != nil { + t.Fatalf("Failed to add log entry: %v", err) + } nextKafkaOffset++ } @@ -546,7 +559,9 @@ func TestFlushOffsetGap_ConcurrentReadDuringFlush(t *testing.T) { TsNs: time.Now().UnixNano(), Offset: i, } - logBuffer.AddLogEntryToBuffer(logEntry) + if err := logBuffer.AddLogEntryToBuffer(logEntry); err != nil { + t.Fatalf("Failed to add log entry: %v", err) + } } // Flush (moves data to disk) @@ -616,11 +631,13 @@ func TestFlushOffsetGap_ForceFlushAdvancesBuffer(t *testing.T) { // Add 10 messages for i := 0; i < 10; i++ { - logBuffer.AddToBuffer(&mq_pb.DataMessage{ + if err := logBuffer.AddToBuffer(&mq_pb.DataMessage{ Key: []byte(fmt.Sprintf("round-%d-msg-%d", round, i)), Value: []byte(fmt.Sprintf("data-%d-%d", round, i)), TsNs: time.Now().UnixNano(), - }) + }); err != nil { + t.Fatalf("Failed to add buffer: %v", err) + } } // Check state after adding diff --git a/weed/util/log_buffer/log_buffer_queryability_test.go b/weed/util/log_buffer/log_buffer_queryability_test.go index 16dd0f9b0..4774f25d8 100644 --- a/weed/util/log_buffer/log_buffer_queryability_test.go +++ b/weed/util/log_buffer/log_buffer_queryability_test.go @@ -39,7 +39,9 @@ func TestBufferQueryability(t *testing.T) { } // Add the entry to the buffer - logBuffer.AddLogEntryToBuffer(logEntry) + if err := logBuffer.AddLogEntryToBuffer(logEntry); err != nil { + t.Fatalf("Failed to add log entry: %v", err) + } // Verify the buffer has data if logBuffer.pos == 0 { @@ -122,7 +124,9 @@ func TestMultipleEntriesQueryability(t *testing.T) { Key: []byte("test-key-" + string(rune('0'+i))), Offset: int64(i), } - logBuffer.AddLogEntryToBuffer(logEntry) + if err := logBuffer.AddLogEntryToBuffer(logEntry); err != nil { + t.Fatalf("Failed to add log entry: %v", err) + } } // Read all entries @@ -197,7 +201,9 @@ func TestSchemaRegistryScenario(t *testing.T) { } // Add to buffer - logBuffer.AddLogEntryToBuffer(logEntry) + if err := logBuffer.AddLogEntryToBuffer(logEntry); err != nil { + t.Fatalf("Failed to add log entry: %v", err) + } // Simulate the SQL query scenario - read from offset 0 startPosition := NewMessagePosition(0, 0) @@ -255,7 +261,9 @@ func TestTimeBasedFirstReadBeforeEarliest(t *testing.T) { // Seed one entry so earliestTime is set baseTs := time.Now().Add(-time.Second) entry := &filer_pb.LogEntry{TsNs: baseTs.UnixNano(), Data: []byte("x"), Key: []byte("k"), Offset: 0} - logBuffer.AddLogEntryToBuffer(entry) + if err := logBuffer.AddLogEntryToBuffer(entry); err != nil { + t.Fatalf("Failed to add log entry: %v", err) + } _ = flushed // Start read 1ns before earliest memory, with offset sentinel (-2) @@ -280,7 +288,9 @@ func TestEarliestTimeExactRead(t *testing.T) { ts := time.Now() entry := &filer_pb.LogEntry{TsNs: ts.UnixNano(), Data: []byte("a"), Key: []byte("k"), Offset: 0} - logBuffer.AddLogEntryToBuffer(entry) + if err := logBuffer.AddLogEntryToBuffer(entry); err != nil { + t.Fatalf("Failed to add log entry: %v", err) + } startPos := NewMessagePosition(ts.UnixNano(), -2) buf, _, err := logBuffer.ReadFromBuffer(startPos) diff --git a/weed/util/log_buffer/log_buffer_test.go b/weed/util/log_buffer/log_buffer_test.go index 7b851de06..d99a8f20c 100644 --- a/weed/util/log_buffer/log_buffer_test.go +++ b/weed/util/log_buffer/log_buffer_test.go @@ -52,11 +52,13 @@ func TestNewLogBufferFirstBuffer(t *testing.T) { var buf = make([]byte, messageSize) for i := 0; i < messageCount; i++ { rand.Read(buf) - lb.AddToBuffer(&mq_pb.DataMessage{ + if err := lb.AddToBuffer(&mq_pb.DataMessage{ Key: nil, Value: buf, TsNs: 0, - }) + }); err != nil { + t.Fatalf("Failed to add buffer: %v", err) + } } wg.Wait() @@ -141,12 +143,14 @@ func TestReadFromBuffer_OldOffsetReturnsResumeFromDiskError(t *testing.T) { if tt.hasData { testData := []byte("test message") // Use AddLogEntryToBuffer to preserve offset information - lb.AddLogEntryToBuffer(&filer_pb.LogEntry{ + if err := lb.AddLogEntryToBuffer(&filer_pb.LogEntry{ TsNs: time.Now().UnixNano(), Key: []byte("key"), Data: testData, Offset: tt.currentOffset, // Add data at current offset - }) + }); err != nil { + t.Fatalf("Failed to add log entry: %v", err) + } } // Create an offset-based position for the requested offset @@ -365,11 +369,13 @@ func TestReadFromBuffer_InitializedFromDisk(t *testing.T) { lb.offset, lb.bufferStartOffset) // Now write a new message at offset 4 - lb.AddToBuffer(&mq_pb.DataMessage{ + if err := lb.AddToBuffer(&mq_pb.DataMessage{ Key: []byte("new-key"), Value: []byte("new-message-at-offset-4"), TsNs: time.Now().UnixNano(), - }) + }); err != nil { + t.Fatalf("Failed to add buffer: %v", err) + } // After AddToBuffer: offset=5, pos>0 // Schema Registry tries to read offset 0 (should be on disk) @@ -503,11 +509,13 @@ func TestLoopProcessLogDataWithOffset_DiskReadRetry(t *testing.T) { // Now add data and flush it t.Logf("➕ Adding message to buffer...") - logBuffer.AddToBuffer(&mq_pb.DataMessage{ + if err := logBuffer.AddToBuffer(&mq_pb.DataMessage{ Key: []byte("key-0"), Value: []byte("message-0"), TsNs: time.Now().UnixNano(), - }) + }); err != nil { + t.Fatalf("Failed to add buffer: %v", err) + } // Force flush t.Logf("Force flushing...") diff --git a/weed/util/log_buffer/log_read.go b/weed/util/log_buffer/log_read.go index 950604022..0a2b8e89a 100644 --- a/weed/util/log_buffer/log_read.go +++ b/weed/util/log_buffer/log_read.go @@ -2,6 +2,7 @@ package log_buffer import ( "bytes" + "errors" "fmt" "time" @@ -77,6 +78,16 @@ func (logBuffer *LogBuffer) LoopProcessLogData(readerName string, startPosition time.Sleep(1127 * time.Millisecond) return lastReadPosition, isDone, ResumeFromDiskError } + if err != nil { + // Check for buffer corruption error + if errors.Is(err, ErrBufferCorrupted) { + glog.Errorf("%s: Buffer corruption detected: %v", readerName, err) + return lastReadPosition, true, fmt.Errorf("buffer corruption: %w", err) + } + // Other errors + glog.Errorf("%s: ReadFromBuffer error: %v", readerName, err) + return lastReadPosition, true, err + } readSize := 0 if bytesBuf != nil { readSize = bytesBuf.Len() @@ -212,6 +223,13 @@ func (logBuffer *LogBuffer) LoopProcessLogDataWithOffset(readerName string, star } bytesBuf, offset, err = logBuffer.ReadFromBuffer(lastReadPosition) glog.V(4).Infof("ReadFromBuffer for %s returned bytesBuf=%v, offset=%d, err=%v", readerName, bytesBuf != nil, offset, err) + + // Check for buffer corruption error before other error handling + if err != nil && errors.Is(err, ErrBufferCorrupted) { + glog.Errorf("%s: Buffer corruption detected: %v", readerName, err) + return lastReadPosition, true, fmt.Errorf("buffer corruption: %w", err) + } + if err == ResumeFromDiskError { // Try to read from disk if readFromDiskFn is available if logBuffer.ReadFromDiskFn != nil { diff --git a/weed/util/log_buffer/log_read_integration_test.go b/weed/util/log_buffer/log_read_integration_test.go index 38549b9f7..8970ca683 100644 --- a/weed/util/log_buffer/log_read_integration_test.go +++ b/weed/util/log_buffer/log_read_integration_test.go @@ -31,7 +31,10 @@ func TestConcurrentProducerConsumer(t *testing.T) { Data: []byte("value"), Offset: int64(i), } - lb.AddLogEntryToBuffer(entry) + if err := lb.AddLogEntryToBuffer(entry); err != nil { + t.Errorf("Failed to add log entry: %v", err) + return + } time.Sleep(1 * time.Millisecond) // Simulate production rate } producerDone <- true @@ -130,7 +133,10 @@ func TestBackwardSeeksWhileProducing(t *testing.T) { Data: []byte("value"), Offset: int64(i), } - lb.AddLogEntryToBuffer(entry) + if err := lb.AddLogEntryToBuffer(entry); err != nil { + t.Errorf("Failed to add log entry: %v", err) + return + } time.Sleep(1 * time.Millisecond) } producerDone <- true @@ -216,7 +222,9 @@ func TestHighConcurrencyReads(t *testing.T) { Data: []byte("value"), Offset: int64(i), } - lb.AddLogEntryToBuffer(entry) + if err := lb.AddLogEntryToBuffer(entry); err != nil { + t.Fatalf("Failed to add log entry: %v", err) + } } // Start many concurrent readers at different offsets @@ -286,7 +294,9 @@ func TestRepeatedReadsAtSameOffset(t *testing.T) { Data: []byte("value"), Offset: int64(i), } - lb.AddLogEntryToBuffer(entry) + if err := lb.AddLogEntryToBuffer(entry); err != nil { + t.Fatalf("Failed to add log entry: %v", err) + } } // Read the same offset multiple times concurrently diff --git a/weed/util/log_buffer/log_read_stateless_test.go b/weed/util/log_buffer/log_read_stateless_test.go index 948a929ba..6c9206eb4 100644 --- a/weed/util/log_buffer/log_read_stateless_test.go +++ b/weed/util/log_buffer/log_read_stateless_test.go @@ -45,7 +45,9 @@ func TestReadMessagesAtOffset_SingleMessage(t *testing.T) { Data: []byte("value1"), Offset: 0, } - lb.AddLogEntryToBuffer(entry) + if err := lb.AddLogEntryToBuffer(entry); err != nil { + t.Fatalf("Failed to add log entry to buffer: %v", err) + } // Read from offset 0 messages, nextOffset, _, endOfPartition, err := lb.ReadMessagesAtOffset(0, 10, 1024) @@ -82,7 +84,9 @@ func TestReadMessagesAtOffset_MultipleMessages(t *testing.T) { Data: []byte("value"), Offset: int64(i), } - lb.AddLogEntryToBuffer(entry) + if err := lb.AddLogEntryToBuffer(entry); err != nil { + t.Fatalf("Failed to add log entry to buffer: %v", err) + } } // Read from offset 0, max 3 messages @@ -118,7 +122,9 @@ func TestReadMessagesAtOffset_StartFromMiddle(t *testing.T) { Data: []byte("value"), Offset: int64(i), } - lb.AddLogEntryToBuffer(entry) + if err := lb.AddLogEntryToBuffer(entry); err != nil { + t.Fatalf("Failed to add log entry to buffer: %v", err) + } } // Read from offset 5 @@ -155,7 +161,9 @@ func TestReadMessagesAtOffset_MaxBytesLimit(t *testing.T) { Data: make([]byte, 100), // 100 bytes Offset: int64(i), } - lb.AddLogEntryToBuffer(entry) + if err := lb.AddLogEntryToBuffer(entry); err != nil { + t.Fatalf("Failed to add log entry to buffer: %v", err) + } } // Request with max 250 bytes (should get ~2 messages) @@ -186,7 +194,9 @@ func TestReadMessagesAtOffset_ConcurrentReads(t *testing.T) { Data: []byte("value"), Offset: int64(i), } - lb.AddLogEntryToBuffer(entry) + if err := lb.AddLogEntryToBuffer(entry); err != nil { + t.Fatalf("Failed to add log entry to buffer: %v", err) + } } // Start 10 concurrent readers at different offsets @@ -238,7 +248,9 @@ func TestReadMessagesAtOffset_FutureOffset(t *testing.T) { Data: []byte("value"), Offset: int64(i), } - lb.AddLogEntryToBuffer(entry) + if err := lb.AddLogEntryToBuffer(entry); err != nil { + t.Fatalf("Failed to add log entry to buffer: %v", err) + } } // Try to read from offset 10 (future) @@ -269,7 +281,9 @@ func TestWaitForDataWithTimeout_DataAvailable(t *testing.T) { Data: []byte("value"), Offset: 0, } - lb.AddLogEntryToBuffer(entry) + if err := lb.AddLogEntryToBuffer(entry); err != nil { + t.Fatalf("Failed to add log entry to buffer: %v", err) + } // Wait for data at offset 0 (should return immediately) dataAvailable := lb.WaitForDataWithTimeout(0, 100) @@ -321,7 +335,9 @@ func TestWaitForDataWithTimeout_DataArrives(t *testing.T) { Data: []byte("value"), Offset: 0, } - lb.AddLogEntryToBuffer(entry) + if err := lb.AddLogEntryToBuffer(entry); err != nil { + t.Fatalf("Failed to add log entry to buffer: %v", err) + } // Wait for result <-done @@ -349,7 +365,9 @@ func TestGetHighWaterMark(t *testing.T) { Data: []byte("value"), Offset: int64(i), } - lb.AddLogEntryToBuffer(entry) + if err := lb.AddLogEntryToBuffer(entry); err != nil { + t.Fatalf("Failed to add log entry to buffer: %v", err) + } } // HWM should be 5 (next offset to write, not last written offset) diff --git a/weed/util/log_buffer/log_read_test.go b/weed/util/log_buffer/log_read_test.go index f01e2912a..802dcdacf 100644 --- a/weed/util/log_buffer/log_read_test.go +++ b/weed/util/log_buffer/log_read_test.go @@ -171,7 +171,9 @@ func TestLoopProcessLogDataWithOffset_WithData(t *testing.T) { } for _, msg := range testMessages { - logBuffer.AddToBuffer(msg) + if err := logBuffer.AddToBuffer(msg); err != nil { + t.Fatalf("Failed to add message to buffer: %v", err) + } } receivedCount := 0 diff --git a/weed/util/log_buffer/sealed_buffer.go b/weed/util/log_buffer/sealed_buffer.go index 397dab1d4..109cb3862 100644 --- a/weed/util/log_buffer/sealed_buffer.go +++ b/weed/util/log_buffer/sealed_buffer.go @@ -51,16 +51,20 @@ func (sbs *SealedBuffers) SealBuffer(startTime, stopTime time.Time, buf []byte, return oldMemBuffer.buf } -func (mb *MemBuffer) locateByTs(lastReadTime time.Time) (pos int) { +func (mb *MemBuffer) locateByTs(lastReadTime time.Time) (pos int, err error) { lastReadTs := lastReadTime.UnixNano() for pos < len(mb.buf) { - size, t := readTs(mb.buf, pos) + size, t, readErr := readTs(mb.buf, pos) + if readErr != nil { + // Return error if buffer is corrupted + return 0, fmt.Errorf("locateByTs: buffer corruption at pos %d: %w", pos, readErr) + } if t > lastReadTs { - return + return pos, nil } pos += size + 4 } - return len(mb.buf) + return len(mb.buf), nil } func (mb *MemBuffer) String() string {