aboutsummaryrefslogtreecommitdiff
path: root/weed/s3api/s3api_object_handlers.go
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2025-12-09 07:53:31 -0800
committerchrislu <chris.lu@gmail.com>2025-12-09 07:53:31 -0800
commitdbb1e4b182c0e77af02729f3a52dfb3a52116089 (patch)
tree183a1cc1193b8a88864b41c054468a6985248c24 /weed/s3api/s3api_object_handlers.go
parent6079a0ae210ea0648d4a9ca44eafe7df8f40db99 (diff)
downloadseaweedfs-dbb1e4b182c0e77af02729f3a52dfb3a52116089.tar.xz
seaweedfs-dbb1e4b182c0e77af02729f3a52dfb3a52116089.zip
Fix GetObjectHandler to match HeadObjectHandler pattern
Add safety check for nil objectEntryForSSE before tag-based policy evaluation, ensuring tag-based conditions are always evaluated rather than silently skipped if entry is unexpectedly nil. Addresses review comment from Copilot.
Diffstat (limited to 'weed/s3api/s3api_object_handlers.go')
-rw-r--r--weed/s3api/s3api_object_handlers.go35
1 files changed, 20 insertions, 15 deletions
diff --git a/weed/s3api/s3api_object_handlers.go b/weed/s3api/s3api_object_handlers.go
index e9145aca0..f42e2f3b5 100644
--- a/weed/s3api/s3api_object_handlers.go
+++ b/weed/s3api/s3api_object_handlers.go
@@ -634,25 +634,30 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request)
}
entryFetchTime = time.Since(tEntryFetch)
+ // Safety check: entry must be valid before tag-based policy evaluation
+ if objectEntryForSSE == nil {
+ glog.Errorf("GetObjectHandler: objectEntryForSSE is nil for %s/%s (should not happen)", bucket, object)
+ s3err.WriteErrorResponse(w, r, s3err.ErrInternalError)
+ return
+ }
+
// Re-check bucket policy with object entry for tag-based conditions (e.g., s3:ExistingObjectTag)
- if objectEntryForSSE != nil {
- identityRaw := s3_constants.GetIdentityFromContext(r)
- var identity *Identity
- if identityRaw != nil {
- var ok bool
- identity, ok = identityRaw.(*Identity)
- if !ok {
- glog.Errorf("GetObjectHandler: unexpected identity type in context for %s/%s", bucket, object)
- s3err.WriteErrorResponse(w, r, s3err.ErrInternalError)
- return
- }
- }
- principal := buildPrincipalARN(identity)
- if errCode, _ := s3a.checkPolicyWithEntry(r, bucket, object, string(s3_constants.ACTION_READ), principal, objectEntryForSSE.Extended); errCode != s3err.ErrNone {
- s3err.WriteErrorResponse(w, r, errCode)
+ identityRaw := s3_constants.GetIdentityFromContext(r)
+ var identity *Identity
+ if identityRaw != nil {
+ var ok bool
+ identity, ok = identityRaw.(*Identity)
+ if !ok {
+ glog.Errorf("GetObjectHandler: unexpected identity type in context for %s/%s", bucket, object)
+ s3err.WriteErrorResponse(w, r, s3err.ErrInternalError)
return
}
}
+ principal := buildPrincipalARN(identity)
+ if errCode, _ := s3a.checkPolicyWithEntry(r, bucket, object, string(s3_constants.ACTION_READ), principal, objectEntryForSSE.Extended); errCode != s3err.ErrNone {
+ s3err.WriteErrorResponse(w, r, errCode)
+ return
+ }
// Check if PartNumber query parameter is present (for multipart GET requests)
partNumberStr := r.URL.Query().Get("partNumber")