* Migrate from deprecated azure-storage-blob-go to modern Azure SDK Migrates Azure Blob Storage integration from the deprecated github.com/Azure/azure-storage-blob-go to the modern github.com/Azure/azure-sdk-for-go/sdk/storage/azblob SDK. ## Changes ### Removed Files - weed/remote_storage/azure/azure_highlevel.go - Custom upload helper no longer needed with new SDK ### Updated Files - weed/remote_storage/azure/azure_storage_client.go - Migrated from ServiceURL/ContainerURL/BlobURL to Client-based API - Updated client creation using NewClientWithSharedKeyCredential - Replaced ListBlobsFlatSegment with NewListBlobsFlatPager - Updated Download to DownloadStream with proper HTTPRange - Replaced custom uploadReaderAtToBlockBlob with UploadStream - Updated GetProperties, SetMetadata, Delete to use new client methods - Fixed metadata conversion to return map[string]*string - weed/replication/sink/azuresink/azure_sink.go - Migrated from ContainerURL to Client-based API - Updated client initialization - Replaced AppendBlobURL with AppendBlobClient - Updated error handling to use azcore.ResponseError - Added streaming.NopCloser for AppendBlock ### New Test Files - weed/remote_storage/azure/azure_storage_client_test.go - Comprehensive unit tests for all client operations - Tests for Traverse, ReadFile, WriteFile, UpdateMetadata, Delete - Tests for metadata conversion function - Benchmark tests - Integration tests (skippable without credentials) - weed/replication/sink/azuresink/azure_sink_test.go - Unit tests for Azure sink operations - Tests for CreateEntry, UpdateEntry, DeleteEntry - Tests for cleanKey function - Tests for configuration-based initialization - Integration tests (skippable without credentials) - Benchmark tests ### Dependency Updates - go.mod: Removed github.com/Azure/azure-storage-blob-go v0.15.0 - go.mod: Made github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.2 direct dependency - All deprecated dependencies automatically cleaned up ## API Migration Summary Old SDK → New SDK mappings: - ServiceURL → Client (service-level operations) - ContainerURL → ContainerClient - BlobURL → BlobClient - BlockBlobURL → BlockBlobClient - AppendBlobURL → AppendBlobClient - ListBlobsFlatSegment() → NewListBlobsFlatPager() - Download() → DownloadStream() - Upload() → UploadStream() - Marker-based pagination → Pager-based pagination - azblob.ResponseError → azcore.ResponseError ## Testing All tests pass: - ✅ Unit tests for metadata conversion - ✅ Unit tests for helper functions (cleanKey) - ✅ Interface implementation tests - ✅ Build successful - ✅ No compilation errors - ✅ Integration tests available (require Azure credentials) ## Benefits - ✅ Uses actively maintained SDK - ✅ Better performance with modern API design - ✅ Improved error handling - ✅ Removes ~200 lines of custom upload code - ✅ Reduces dependency count - ✅ Better async/streaming support - ✅ Future-proof against SDK deprecation ## Backward Compatibility The changes are transparent to users: - Same configuration parameters (account name, account key) - Same functionality and behavior - No changes to SeaweedFS API or user-facing features - Existing Azure storage configurations continue to work ## Breaking Changes None - this is an internal implementation change only. * Address Gemini Code Assist review comments Fixed three issues identified by Gemini Code Assist: 1. HIGH: ReadFile now uses blob.CountToEnd when size is 0 - Old SDK: size=0 meant "read to end" - New SDK: size=0 means "read 0 bytes" - Fix: Use blob.CountToEnd (-1) to read entire blob from offset 2. MEDIUM: Use to.Ptr() instead of slice trick for DeleteSnapshots - Replaced &[]Type{value}[0] with to.Ptr(value) - Cleaner, more idiomatic Azure SDK pattern - Applied to both azure_storage_client.go and azure_sink.go 3. Added missing imports: - github.com/Azure/azure-sdk-for-go/sdk/azcore/to These changes improve code clarity and correctness while following Azure SDK best practices. * Address second round of Gemini Code Assist review comments Fixed all issues identified in the second review: 1. MEDIUM: Added constants for hardcoded values - Defined defaultBlockSize (4 MB) and defaultConcurrency (16) - Applied to WriteFile UploadStream options - Improves maintainability and readability 2. MEDIUM: Made DeleteFile idempotent - Now returns nil (no error) if blob doesn't exist - Uses bloberror.HasCode(err, bloberror.BlobNotFound) - Consistent with idempotent operation expectations 3. Fixed TestToMetadata test failures - Test was using lowercase 'x-amz-meta-' but constant is 'X-Amz-Meta-' - Updated test to use s3_constants.AmzUserMetaPrefix - All tests now pass Changes: - Added import: github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror - Added constants: defaultBlockSize, defaultConcurrency - Updated WriteFile to use constants - Updated DeleteFile to be idempotent - Fixed test to use correct S3 metadata prefix constant All tests pass. Build succeeds. Code follows Azure SDK best practices. * Address third round of Gemini Code Assist review comments Fixed all issues identified in the third review: 1. MEDIUM: Use bloberror.HasCode for ContainerAlreadyExists - Replaced fragile string check with bloberror.HasCode() - More robust and aligned with Azure SDK best practices - Applied to CreateBucket test 2. MEDIUM: Use bloberror.HasCode for BlobNotFound in test - Replaced generic error check with specific BlobNotFound check - Makes test more precise and verifies correct error returned - Applied to VerifyDeleted test 3. MEDIUM: Made DeleteEntry idempotent in azure_sink.go - Now returns nil (no error) if blob doesn't exist - Uses bloberror.HasCode(err, bloberror.BlobNotFound) - Consistent with DeleteFile implementation - Makes replication sink more robust to retries Changes: - Added import to azure_storage_client_test.go: bloberror - Added import to azure_sink.go: bloberror - Updated CreateBucket test to use bloberror.HasCode - Updated VerifyDeleted test to use bloberror.HasCode - Updated DeleteEntry to be idempotent All tests pass. Build succeeds. Code uses Azure SDK best practices. * Address fourth round of Gemini Code Assist review comments Fixed two critical issues identified in the fourth review: 1. HIGH: Handle BlobAlreadyExists in append blob creation - Problem: If append blob already exists, Create() fails causing replication failure - Fix: Added bloberror.HasCode(err, bloberror.BlobAlreadyExists) check - Behavior: Existing append blobs are now acceptable, appends can proceed - Impact: Makes replication sink more robust, prevents unnecessary failures - Location: azure_sink.go CreateEntry function 2. MEDIUM: Configure custom retry policy for download resiliency - Problem: Old SDK had MaxRetryRequests: 20, new SDK defaults to 3 retries - Fix: Configured policy.RetryOptions with MaxRetries: 10 - Settings: TryTimeout=1min, RetryDelay=2s, MaxRetryDelay=1min - Impact: Maintains similar resiliency in unreliable network conditions - Location: azure_storage_client.go client initialization Changes: - Added import: github.com/Azure/azure-sdk-for-go/sdk/azcore/policy - Updated NewClientWithSharedKeyCredential to include ClientOptions with retry policy - Updated CreateEntry error handling to allow BlobAlreadyExists Technical details: - Retry policy uses exponential backoff (default SDK behavior) - MaxRetries=10 provides good balance (was 20 in old SDK, default is 3) - TryTimeout prevents individual requests from hanging indefinitely - BlobAlreadyExists handling allows idempotent append operations All tests pass. Build succeeds. Code is more resilient and robust. * Update weed/replication/sink/azuresink/azure_sink.go Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * Revert "Update weed/replication/sink/azuresink/azure_sink.go" This reverts commit 605e41cadf4aaa3bb7b1796f71233ff73d90ed72. * Address fifth round of Gemini Code Assist review comment Added retry policy to azure_sink.go for consistency and resiliency: 1. MEDIUM: Configure retry policy in azure_sink.go client - Problem: azure_sink.go was using default retry policy (3 retries) while azure_storage_client.go had custom policy (10 retries) - Fix: Added same retry policy configuration for consistency - Settings: MaxRetries=10, TryTimeout=1min, RetryDelay=2s, MaxRetryDelay=1min - Impact: Replication sink now has same resiliency as storage client - Rationale: Replication sink needs to be robust against transient network errors Changes: - Added import: github.com/Azure/azure-sdk-for-go/sdk/azcore/policy - Updated NewClientWithSharedKeyCredential call in initialize() function - Both azure_storage_client.go and azure_sink.go now have identical retry policies Benefits: - Consistency: Both Azure clients now use same retry configuration - Resiliency: Replication operations more robust to network issues - Best practices: Follows Azure SDK recommended patterns for production use All tests pass. Build succeeds. Code is consistent and production-ready. * fmt * Address sixth round of Gemini Code Assist review comment Fixed HIGH priority metadata key validation for Azure compliance: 1. HIGH: Handle metadata keys starting with digits - Problem: Azure Blob Storage requires metadata keys to be valid C# identifiers - Constraint: C# identifiers cannot start with a digit (0-9) - Issue: S3 metadata like 'x-amz-meta-123key' would fail with InvalidInput error - Fix: Prefix keys starting with digits with underscore '_' - Example: '123key' becomes '_123key', '456-test' becomes '_456_test' 2. Code improvement: Use strings.ReplaceAll for better readability - Changed from: strings.Replace(str, "-", "_", -1) - Changed to: strings.ReplaceAll(str, "-", "_") - Both are functionally equivalent, ReplaceAll is more readable Changes: - Updated toMetadata() function in azure_storage_client.go - Added digit prefix check: if key[0] >= '0' && key[0] <= '9' - Added comprehensive test case 'keys starting with digits' - Tests cover: '123key' -> '_123key', '456-test' -> '_456_test', '789' -> '_789' Technical details: - Azure SDK validates metadata keys as C# identifiers - C# identifier rules: must start with letter or underscore - Digits allowed in identifiers but not as first character - This prevents SetMetadata() and UploadStream() failures All tests pass including new test case. Build succeeds. Code is now fully compliant with Azure metadata requirements. * Address seventh round of Gemini Code Assist review comment Normalize metadata keys to lowercase for S3 compatibility: 1. MEDIUM: Convert metadata keys to lowercase - Rationale: S3 specification stores user-defined metadata keys in lowercase - Consistency: Azure Blob Storage metadata is case-insensitive - Best practice: Normalizing to lowercase ensures consistent behavior - Example: 'x-amz-meta-My-Key' -> 'my_key' (not 'My_Key') Changes: - Updated toMetadata() to apply strings.ToLower() to keys - Added comment explaining S3 lowercase normalization - Order of operations: strip prefix -> lowercase -> replace dashes -> check digits Test coverage: - Added new test case 'uppercase and mixed case keys' - Tests: 'My-Key' -> 'my_key', 'UPPERCASE' -> 'uppercase', 'MiXeD-CaSe' -> 'mixed_case' - All 6 test cases pass Benefits: - S3 compatibility: Matches S3 metadata key behavior - Azure consistency: Case-insensitive keys work predictably - Cross-platform: Same metadata keys work identically on both S3 and Azure - Prevents issues: No surprises from case-sensitive key handling Implementation: ```go key := strings.ReplaceAll(strings.ToLower(k[len(s3_constants.AmzUserMetaPrefix):]), "-", "_") ``` All tests pass. Build succeeds. Metadata handling is now fully S3-compatible. * Address eighth round of Gemini Code Assist review comments Use %w instead of %v for error wrapping across both files: 1. MEDIUM: Error wrapping in azure_storage_client.go - Problem: Using %v in fmt.Errorf loses error type information - Modern Go practice: Use %w to preserve error chains - Benefit: Enables errors.Is() and errors.As() for callers - Example: Can check for bloberror.BlobNotFound after wrapping 2. MEDIUM: Error wrapping in azure_sink.go - Applied same improvement for consistency - All error wrapping now preserves underlying errors - Improved debugging and error handling capabilities Changes applied to all fmt.Errorf calls: - azure_storage_client.go: 10 instances changed from %v to %w - Invalid credential error - Client creation error - Traverse errors - Download errors (2) - Upload error - Delete error - Create/Delete bucket errors (2) - azure_sink.go: 3 instances changed from %v to %w - Credential creation error - Client creation error - Delete entry error - Create append blob error Benefits: - Error inspection: Callers can use errors.Is(err, target) - Error unwrapping: Callers can use errors.As(err, &target) - Type preservation: Original error types maintained through wraps - Better debugging: Full error chain available for inspection - Modern Go: Follows Go 1.13+ error wrapping best practices Example usage after this change: ```go err := client.ReadFile(...) if errors.Is(err, bloberror.BlobNotFound) { // Can detect specific Azure errors even after wrapping } ``` All tests pass. Build succeeds. Error handling is now modern and robust. * Address ninth round of Gemini Code Assist review comment Improve metadata key sanitization with comprehensive character validation: 1. MEDIUM: Complete Azure C# identifier validation - Problem: Previous implementation only handled dashes, not all invalid chars - Issue: Keys like 'my.key', 'key+plus', 'key@symbol' would cause InvalidMetadata - Azure requirement: Metadata keys must be valid C# identifiers - Valid characters: letters (a-z, A-Z), digits (0-9), underscore (_) only 2. Implemented robust regex-based sanitization - Added package-level regex: `[^a-zA-Z0-9_]` - Matches ANY character that's not alphanumeric or underscore - Replaces all invalid characters with underscore - Compiled once at package init for performance Implementation details: - Regex declared at package level: var invalidMetadataChars = regexp.MustCompile(`[^a-zA-Z0-9_]`) - Avoids recompiling regex on every toMetadata() call - Efficient single-pass replacement of all invalid characters - Processing order: lowercase -> regex replace -> digit check Examples of character transformations: - Dots: 'my.key' -> 'my_key' - Plus: 'key+plus' -> 'key_plus' - At symbol: 'key@symbol' -> 'key_symbol' - Mixed: 'key-with.' -> 'key_with_' - Slash: 'key/slash' -> 'key_slash' - Combined: '123-key.value+test' -> '_123_key_value_test' Test coverage: - Added comprehensive test case 'keys with invalid characters' - Tests: dot, plus, at-symbol, dash+dot, slash - All 7 test cases pass (was 6, now 7) Benefits: - Complete Azure compliance: Handles ALL invalid characters - Robust: Works with any S3 metadata key format - Performant: Regex compiled once, reused efficiently - Maintainable: Single source of truth for valid characters - Prevents errors: No more InvalidMetadata errors during upload All tests pass. Build succeeds. Metadata sanitization is now bulletproof. * Address tenth round review - HIGH: Fix metadata key collision issue Prevent metadata loss by using hex encoding for invalid characters: 1. HIGH PRIORITY: Metadata key collision prevention - Critical Issue: Different S3 keys mapping to same Azure key causes data loss - Example collisions (BEFORE): * 'my-key' -> 'my_key' * 'my.key' -> 'my_key' ❌ COLLISION! Second overwrites first * 'my_key' -> 'my_key' ❌ All three map to same key! - Fixed with hex encoding (AFTER): * 'my-key' -> 'my_2d_key' (dash = 0x2d) * 'my.key' -> 'my_2e_key' (dot = 0x2e) * 'my_key' -> 'my_key' (underscore is valid) ✅ All three are now unique! 2. Implemented collision-proof hex encoding - Pattern: Invalid chars -> _XX_ where XX is hex code - Dash (0x2d): 'content-type' -> 'content_2d_type' - Dot (0x2e): 'my.key' -> 'my_2e_key' - Plus (0x2b): 'key+plus' -> 'key_2b_plus' - At (0x40): 'key@symbol' -> 'key_40_symbol' - Slash (0x2f): 'key/slash' -> 'key_2f_slash' 3. Created sanitizeMetadataKey() function - Encapsulates hex encoding logic - Uses ReplaceAllStringFunc for efficient transformation - Maintains digit prefix check for Azure C# identifier rules - Clear documentation with examples Implementation details: ```go func sanitizeMetadataKey(key string) string { // Replace each invalid character with _XX_ where XX is the hex code result := invalidMetadataChars.ReplaceAllStringFunc(key, func(s string) string { return fmt.Sprintf("_%02x_", s[0]) }) // Azure metadata keys cannot start with a digit if len(result) > 0 && result[0] >= '0' && result[0] <= '9' { result = "_" + result } return result } ``` Why hex encoding solves the collision problem: - Each invalid character gets unique hex representation - Two-digit hex ensures no confusion (always _XX_ format) - Preserves all information from original key - Reversible (though not needed for this use case) - Azure-compliant (hex codes don't introduce new invalid chars) Test coverage: - Updated all test expectations to match hex encoding - Added 'collision prevention' test case demonstrating uniqueness: * Tests my-key, my.key, my_key all produce different results * Proves metadata from different S3 keys won't collide - Total test cases: 8 (was 7, added collision prevention) Examples from tests: - 'content-type' -> 'content_2d_type' (0x2d = dash) - '456-test' -> '_456_2d_test' (digit prefix + dash) - 'My-Key' -> 'my_2d_key' (lowercase + hex encode dash) - 'key-with.' -> 'key_2d_with_2e_' (multiple chars: dash, dot, trailing dot) Benefits: - ✅ Zero collision risk: Every unique S3 key -> unique Azure key - ✅ Data integrity: No metadata loss from overwrites - ✅ Complete info preservation: Original key distinguishable - ✅ Azure compliant: Hex-encoded keys are valid C# identifiers - ✅ Maintainable: Clean function with clear purpose - ✅ Testable: Collision prevention explicitly tested All tests pass. Build succeeds. Metadata integrity is now guaranteed. --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
552 lines
16 KiB
Go
552 lines
16 KiB
Go
package weed_server
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/base64"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"net/url"
|
|
"os"
|
|
"path"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"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/s3api/s3_constants"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/needle"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
"github.com/seaweedfs/seaweedfs/weed/util/constants"
|
|
)
|
|
|
|
func (fs *FilerServer) autoChunk(ctx context.Context, w http.ResponseWriter, r *http.Request, contentLength int64, so *operation.StorageOption) {
|
|
|
|
// autoChunking can be set at the command-line level or as a query param. Query param overrides command-line
|
|
query := r.URL.Query()
|
|
|
|
parsedMaxMB, _ := strconv.ParseInt(query.Get("maxMB"), 10, 32)
|
|
maxMB := int32(parsedMaxMB)
|
|
if maxMB <= 0 && fs.option.MaxMB > 0 {
|
|
maxMB = int32(fs.option.MaxMB)
|
|
}
|
|
|
|
chunkSize := 1024 * 1024 * maxMB
|
|
|
|
var reply *FilerPostResult
|
|
var err error
|
|
var md5bytes []byte
|
|
if r.Method == http.MethodPost {
|
|
if r.Header.Get("Content-Type") == "" && strings.HasSuffix(r.URL.Path, "/") {
|
|
reply, err = fs.mkdir(ctx, w, r, so)
|
|
} else {
|
|
reply, md5bytes, err = fs.doPostAutoChunk(ctx, w, r, chunkSize, contentLength, so)
|
|
}
|
|
} else {
|
|
reply, md5bytes, err = fs.doPutAutoChunk(ctx, w, r, chunkSize, contentLength, so)
|
|
}
|
|
if err != nil {
|
|
errStr := err.Error()
|
|
switch {
|
|
case errStr == constants.ErrMsgOperationNotPermitted:
|
|
writeJsonError(w, r, http.StatusForbidden, err)
|
|
case strings.HasPrefix(errStr, "read input:") || errStr == io.ErrUnexpectedEOF.Error():
|
|
writeJsonError(w, r, util.HttpStatusCancelled, err)
|
|
case strings.HasSuffix(errStr, "is a file") || strings.HasSuffix(errStr, "already exists"):
|
|
writeJsonError(w, r, http.StatusConflict, err)
|
|
case errStr == constants.ErrMsgBadDigest:
|
|
writeJsonError(w, r, http.StatusBadRequest, err)
|
|
default:
|
|
writeJsonError(w, r, http.StatusInternalServerError, err)
|
|
}
|
|
} else if reply != nil {
|
|
if len(md5bytes) > 0 {
|
|
md5InBase64 := util.Base64Encode(md5bytes)
|
|
w.Header().Set("Content-MD5", md5InBase64)
|
|
}
|
|
writeJsonQuiet(w, r, http.StatusCreated, reply)
|
|
}
|
|
}
|
|
|
|
func (fs *FilerServer) doPostAutoChunk(ctx context.Context, w http.ResponseWriter, r *http.Request, chunkSize int32, contentLength int64, so *operation.StorageOption) (filerResult *FilerPostResult, md5bytes []byte, replyerr error) {
|
|
multipartReader, multipartReaderErr := r.MultipartReader()
|
|
if multipartReaderErr != nil {
|
|
return nil, nil, multipartReaderErr
|
|
}
|
|
|
|
part1, part1Err := multipartReader.NextPart()
|
|
if part1Err != nil {
|
|
return nil, nil, part1Err
|
|
}
|
|
|
|
fileName := part1.FileName()
|
|
if fileName != "" {
|
|
fileName = path.Base(fileName)
|
|
}
|
|
contentType := part1.Header.Get("Content-Type")
|
|
if contentType == "application/octet-stream" {
|
|
contentType = ""
|
|
}
|
|
|
|
if err := fs.checkPermissions(ctx, r, fileName); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
if so.SaveInside {
|
|
buf := bufPool.Get().(*bytes.Buffer)
|
|
buf.Reset()
|
|
buf.ReadFrom(part1)
|
|
filerResult, replyerr = fs.saveMetaData(ctx, r, fileName, contentType, so, nil, nil, 0, buf.Bytes())
|
|
bufPool.Put(buf)
|
|
return
|
|
}
|
|
|
|
fileChunks, md5Hash, chunkOffset, err, smallContent := fs.uploadRequestToChunks(ctx, w, r, part1, chunkSize, fileName, contentType, contentLength, so)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
md5bytes = md5Hash.Sum(nil)
|
|
headerMd5 := r.Header.Get("Content-Md5")
|
|
if headerMd5 != "" && !(util.Base64Encode(md5bytes) == headerMd5 || fmt.Sprintf("%x", md5bytes) == headerMd5) {
|
|
fs.filer.DeleteUncommittedChunks(ctx, fileChunks)
|
|
return nil, nil, errors.New(constants.ErrMsgBadDigest)
|
|
}
|
|
filerResult, replyerr = fs.saveMetaData(ctx, r, fileName, contentType, so, md5bytes, fileChunks, chunkOffset, smallContent)
|
|
if replyerr != nil {
|
|
fs.filer.DeleteUncommittedChunks(ctx, fileChunks)
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func (fs *FilerServer) doPutAutoChunk(ctx context.Context, w http.ResponseWriter, r *http.Request, chunkSize int32, contentLength int64, so *operation.StorageOption) (filerResult *FilerPostResult, md5bytes []byte, replyerr error) {
|
|
|
|
fileName := path.Base(r.URL.Path)
|
|
contentType := r.Header.Get("Content-Type")
|
|
if contentType == "application/octet-stream" {
|
|
contentType = ""
|
|
}
|
|
|
|
if err := fs.checkPermissions(ctx, r, fileName); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
fileChunks, md5Hash, chunkOffset, err, smallContent := fs.uploadRequestToChunks(ctx, w, r, r.Body, chunkSize, fileName, contentType, contentLength, so)
|
|
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
md5bytes = md5Hash.Sum(nil)
|
|
headerMd5 := r.Header.Get("Content-Md5")
|
|
if headerMd5 != "" && !(util.Base64Encode(md5bytes) == headerMd5 || fmt.Sprintf("%x", md5bytes) == headerMd5) {
|
|
fs.filer.DeleteUncommittedChunks(ctx, fileChunks)
|
|
return nil, nil, errors.New(constants.ErrMsgBadDigest)
|
|
}
|
|
filerResult, replyerr = fs.saveMetaData(ctx, r, fileName, contentType, so, md5bytes, fileChunks, chunkOffset, smallContent)
|
|
if replyerr != nil {
|
|
fs.filer.DeleteUncommittedChunks(ctx, fileChunks)
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func isAppend(r *http.Request) bool {
|
|
return r.URL.Query().Get("op") == "append"
|
|
}
|
|
|
|
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)
|
|
if err != nil {
|
|
return err
|
|
} else if enforced {
|
|
// you cannot change a worm file
|
|
return errors.New(constants.ErrMsgOperationNotPermitted)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (fs *FilerServer) wormEnforcedForEntry(ctx context.Context, fullPath string) (bool, error) {
|
|
rule := fs.filer.FilerConf.MatchStorageRule(fullPath)
|
|
if !rule.Worm {
|
|
return false, nil
|
|
}
|
|
|
|
entry, err := fs.filer.FindEntry(ctx, util.FullPath(fullPath))
|
|
if err != nil {
|
|
if errors.Is(err, filer_pb.ErrNotFound) {
|
|
return false, nil
|
|
}
|
|
|
|
return false, err
|
|
}
|
|
|
|
// worm is not enforced
|
|
if entry.WORMEnforcedAtTsNs == 0 {
|
|
return false, nil
|
|
}
|
|
|
|
// worm will never expire
|
|
if rule.WormRetentionTimeSeconds == 0 {
|
|
return true, nil
|
|
}
|
|
|
|
enforcedAt := time.Unix(0, entry.WORMEnforcedAtTsNs)
|
|
|
|
// worm is expired
|
|
if time.Now().Sub(enforcedAt).Seconds() >= float64(rule.WormRetentionTimeSeconds) {
|
|
return false, nil
|
|
}
|
|
|
|
return true, nil
|
|
}
|
|
|
|
func (fs *FilerServer) fixFilePath(ctx context.Context, r *http.Request, fileName string) string {
|
|
// fix the path
|
|
fullPath := r.URL.Path
|
|
if strings.HasSuffix(fullPath, "/") {
|
|
if fileName != "" {
|
|
fullPath += fileName
|
|
}
|
|
} else {
|
|
if fileName != "" {
|
|
if possibleDirEntry, findDirErr := fs.filer.FindEntry(ctx, util.FullPath(fullPath)); findDirErr == nil {
|
|
if possibleDirEntry.IsDirectory() {
|
|
fullPath += "/" + fileName
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return fullPath
|
|
}
|
|
|
|
func (fs *FilerServer) saveMetaData(ctx context.Context, r *http.Request, fileName string, contentType string, so *operation.StorageOption, md5bytes []byte, fileChunks []*filer_pb.FileChunk, chunkOffset int64, content []byte) (filerResult *FilerPostResult, replyerr error) {
|
|
|
|
// detect file mode
|
|
modeStr := r.URL.Query().Get("mode")
|
|
if modeStr == "" {
|
|
modeStr = "0660"
|
|
}
|
|
mode, err := strconv.ParseUint(modeStr, 8, 32)
|
|
if err != nil {
|
|
glog.ErrorfCtx(ctx, "Invalid mode format: %s, use 0660 by default", modeStr)
|
|
mode = 0660
|
|
}
|
|
|
|
// fix the path
|
|
path := fs.fixFilePath(ctx, r, fileName)
|
|
|
|
var entry *filer.Entry
|
|
var newChunks []*filer_pb.FileChunk
|
|
var mergedChunks []*filer_pb.FileChunk
|
|
|
|
isAppend := isAppend(r)
|
|
isOffsetWrite := len(fileChunks) > 0 && fileChunks[0].Offset > 0
|
|
// when it is an append
|
|
if isAppend || isOffsetWrite {
|
|
existingEntry, findErr := fs.filer.FindEntry(ctx, util.FullPath(path))
|
|
if findErr != nil && findErr != filer_pb.ErrNotFound {
|
|
glog.V(0).InfofCtx(ctx, "failing to find %s: %v", path, findErr)
|
|
}
|
|
entry = existingEntry
|
|
}
|
|
if entry != nil {
|
|
entry.Mtime = time.Now()
|
|
entry.Md5 = nil
|
|
// adjust chunk offsets
|
|
if isAppend {
|
|
for _, chunk := range fileChunks {
|
|
chunk.Offset += int64(entry.FileSize)
|
|
}
|
|
entry.FileSize += uint64(chunkOffset)
|
|
}
|
|
newChunks = append(entry.GetChunks(), fileChunks...)
|
|
|
|
// TODO
|
|
if len(entry.Content) > 0 {
|
|
replyerr = fmt.Errorf("append to small file is not supported yet")
|
|
return
|
|
}
|
|
|
|
} else {
|
|
glog.V(4).InfolnCtx(ctx, "saving", path)
|
|
newChunks = fileChunks
|
|
entry = &filer.Entry{
|
|
FullPath: util.FullPath(path),
|
|
Attr: filer.Attr{
|
|
Mtime: time.Now(),
|
|
Crtime: time.Now(),
|
|
Mode: os.FileMode(mode),
|
|
Uid: OS_UID,
|
|
Gid: OS_GID,
|
|
TtlSec: so.TtlSeconds,
|
|
Mime: contentType,
|
|
Md5: md5bytes,
|
|
FileSize: uint64(chunkOffset),
|
|
},
|
|
Content: content,
|
|
}
|
|
}
|
|
|
|
// maybe concatenate small chunks into one whole chunk
|
|
mergedChunks, replyerr = fs.maybeMergeChunks(ctx, so, newChunks)
|
|
if replyerr != nil {
|
|
glog.V(0).InfofCtx(ctx, "merge chunks %s: %v", r.RequestURI, replyerr)
|
|
mergedChunks = newChunks
|
|
}
|
|
|
|
// maybe compact entry chunks
|
|
mergedChunks, replyerr = filer.MaybeManifestize(fs.saveAsChunk(ctx, so), mergedChunks)
|
|
if replyerr != nil {
|
|
glog.V(0).InfofCtx(ctx, "manifestize %s: %v", r.RequestURI, replyerr)
|
|
return
|
|
}
|
|
entry.Chunks = mergedChunks
|
|
if isOffsetWrite {
|
|
entry.Md5 = nil
|
|
entry.FileSize = entry.Size()
|
|
}
|
|
|
|
filerResult = &FilerPostResult{
|
|
Name: fileName,
|
|
Size: int64(entry.FileSize),
|
|
}
|
|
|
|
entry.Extended = SaveAmzMetaData(r, entry.Extended, false)
|
|
|
|
for k, v := range r.Header {
|
|
if len(v) > 0 && len(v[0]) > 0 {
|
|
if strings.HasPrefix(k, needle.PairNamePrefix) || 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])
|
|
}
|
|
}
|
|
}
|
|
|
|
// 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)
|
|
}
|
|
}
|
|
|
|
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()
|
|
glog.V(0).InfofCtx(ctx, "failing to write %s to filer server : %v", path, dbErr)
|
|
}
|
|
return filerResult, replyerr
|
|
}
|
|
|
|
func (fs *FilerServer) saveAsChunk(ctx context.Context, so *operation.StorageOption) filer.SaveDataAsChunkFunctionType {
|
|
|
|
return func(reader io.Reader, name string, offset int64, tsNs int64) (*filer_pb.FileChunk, error) {
|
|
var fileId string
|
|
var uploadResult *operation.UploadResult
|
|
|
|
err := util.Retry("saveAsChunk", func() error {
|
|
// assign one file id for one chunk
|
|
assignedFileId, urlLocation, auth, assignErr := fs.assignNewFileInfo(ctx, so)
|
|
if assignErr != nil {
|
|
return assignErr
|
|
}
|
|
|
|
fileId = assignedFileId
|
|
|
|
// upload the chunk to the volume server
|
|
uploadOption := &operation.UploadOption{
|
|
UploadUrl: urlLocation,
|
|
Filename: name,
|
|
Cipher: fs.option.Cipher,
|
|
IsInputCompressed: false,
|
|
MimeType: "",
|
|
PairMap: nil,
|
|
Jwt: auth,
|
|
}
|
|
|
|
uploader, uploaderErr := operation.NewUploader()
|
|
if uploaderErr != nil {
|
|
return uploaderErr
|
|
}
|
|
|
|
var uploadErr error
|
|
uploadResult, uploadErr, _ = uploader.Upload(ctx, reader, uploadOption)
|
|
if uploadErr != nil {
|
|
return uploadErr
|
|
}
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return uploadResult.ToPbFileChunk(fileId, offset, tsNs), nil
|
|
}
|
|
}
|
|
|
|
func (fs *FilerServer) mkdir(ctx context.Context, w http.ResponseWriter, r *http.Request, so *operation.StorageOption) (filerResult *FilerPostResult, replyerr error) {
|
|
|
|
// detect file mode
|
|
modeStr := r.URL.Query().Get("mode")
|
|
if modeStr == "" {
|
|
modeStr = "0660"
|
|
}
|
|
mode, err := strconv.ParseUint(modeStr, 8, 32)
|
|
if err != nil {
|
|
glog.ErrorfCtx(ctx, "Invalid mode format: %s, use 0660 by default", modeStr)
|
|
mode = 0660
|
|
}
|
|
|
|
// fix the path
|
|
path := r.URL.Path
|
|
if strings.HasSuffix(path, "/") {
|
|
path = path[:len(path)-1]
|
|
}
|
|
|
|
existingEntry, err := fs.filer.FindEntry(ctx, util.FullPath(path))
|
|
if err == nil && existingEntry != nil {
|
|
replyerr = fmt.Errorf("dir %s already exists", path)
|
|
return
|
|
}
|
|
|
|
glog.V(4).InfolnCtx(ctx, "mkdir", path)
|
|
entry := &filer.Entry{
|
|
FullPath: util.FullPath(path),
|
|
Attr: filer.Attr{
|
|
Mtime: time.Now(),
|
|
Crtime: time.Now(),
|
|
Mode: os.FileMode(mode) | os.ModeDir,
|
|
Uid: OS_UID,
|
|
Gid: OS_GID,
|
|
TtlSec: so.TtlSeconds,
|
|
},
|
|
}
|
|
|
|
filerResult = &FilerPostResult{
|
|
Name: util.FullPath(path).Name(),
|
|
}
|
|
|
|
if dbErr := fs.filer.CreateEntry(ctx, entry, false, false, nil, false, so.MaxFileNameLength); dbErr != nil {
|
|
replyerr = dbErr
|
|
filerResult.Error = dbErr.Error()
|
|
glog.V(0).InfofCtx(ctx, "failing to create dir %s on filer server : %v", path, dbErr)
|
|
}
|
|
return filerResult, replyerr
|
|
}
|
|
|
|
func SaveAmzMetaData(r *http.Request, existing map[string][]byte, isReplace bool) (metadata map[string][]byte) {
|
|
|
|
metadata = make(map[string][]byte)
|
|
if !isReplace {
|
|
for k, v := range existing {
|
|
metadata[k] = v
|
|
}
|
|
}
|
|
|
|
if sc := r.Header.Get(s3_constants.AmzStorageClass); sc != "" {
|
|
metadata[s3_constants.AmzStorageClass] = []byte(sc)
|
|
}
|
|
|
|
if ce := r.Header.Get("Content-Encoding"); ce != "" {
|
|
metadata["Content-Encoding"] = []byte(ce)
|
|
}
|
|
|
|
if tags := r.Header.Get(s3_constants.AmzObjectTagging); tags != "" {
|
|
// Use url.ParseQuery for robust parsing and automatic URL decoding
|
|
parsedTags, err := url.ParseQuery(tags)
|
|
if err != nil {
|
|
glog.Errorf("Failed to parse S3 tags '%s': %v", tags, err)
|
|
} else {
|
|
for key, values := range parsedTags {
|
|
// According to S3 spec, if a key is provided multiple times, the last value is used.
|
|
// A tag value can be an empty string but not nil.
|
|
value := ""
|
|
if len(values) > 0 {
|
|
value = values[len(values)-1]
|
|
}
|
|
metadata[s3_constants.AmzObjectTagging+"-"+key] = []byte(value)
|
|
}
|
|
}
|
|
}
|
|
|
|
for header, values := range r.Header {
|
|
if strings.HasPrefix(header, s3_constants.AmzUserMetaPrefix) {
|
|
for _, value := range values {
|
|
metadata[header] = []byte(value)
|
|
}
|
|
}
|
|
}
|
|
|
|
// Handle SSE-C headers
|
|
if algorithm := r.Header.Get(s3_constants.AmzServerSideEncryptionCustomerAlgorithm); algorithm != "" {
|
|
metadata[s3_constants.AmzServerSideEncryptionCustomerAlgorithm] = []byte(algorithm)
|
|
}
|
|
if keyMD5 := r.Header.Get(s3_constants.AmzServerSideEncryptionCustomerKeyMD5); keyMD5 != "" {
|
|
// Store as-is; SSE-C MD5 is base64 and case-sensitive
|
|
metadata[s3_constants.AmzServerSideEncryptionCustomerKeyMD5] = []byte(keyMD5)
|
|
}
|
|
|
|
//acp-owner
|
|
acpOwner := r.Header.Get(s3_constants.ExtAmzOwnerKey)
|
|
if len(acpOwner) > 0 {
|
|
metadata[s3_constants.ExtAmzOwnerKey] = []byte(acpOwner)
|
|
}
|
|
|
|
//acp-grants
|
|
acpGrants := r.Header.Get(s3_constants.ExtAmzAclKey)
|
|
if len(acpOwner) > 0 {
|
|
metadata[s3_constants.ExtAmzAclKey] = []byte(acpGrants)
|
|
}
|
|
|
|
return
|
|
|
|
}
|