gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s3tables: refactor handleDeleteTableBucket to use strongly typed AuthError

Browse Source
This commit is contained in:
Chris Lu
2026-01-28 14:28:12 -08:00
parent 0d65daad4c
commit f5d71008d7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weed/s3api/s3tables/handler_bucket_get_list_delete.go
View File

@@ -239,8 +239,8 @@ func (h *S3TablesHandler) handleDeleteTableBucket(w http.ResponseWriter, r *http
// 2. Check ownership // 2. Check ownership
principal := h.getPrincipalFromRequest(r) principal := h.getPrincipalFromRequest(r)
if principal != metadata.OwnerAccountID { if !CanDeleteTableBucket(principal, metadata.OwnerAccountID) {
return fmt.Errorf("access denied: principal %s does not own bucket %s", principal, bucketName) return NewAuthError("DeleteTableBucket", principal, fmt.Sprintf("not authorized to delete bucket %s", bucketName))
} }
// 3. Check if bucket is empty // 3. Check if bucket is empty
@@ -272,7 +272,7 @@ func (h *S3TablesHandler) handleDeleteTableBucket(w http.ResponseWriter, r *http
if err != nil { if err != nil {
if errors.Is(err, filer_pb.ErrNotFound) { if errors.Is(err, filer_pb.ErrNotFound) {
h.writeError(w, http.StatusNotFound, ErrCodeNoSuchBucket, fmt.Sprintf("table bucket %s not found", bucketName)) h.writeError(w, http.StatusNotFound, ErrCodeNoSuchBucket, fmt.Sprintf("table bucket %s not found", bucketName))
} else if strings.Contains(err.Error(), "access denied") { } else if isAuthError(err) {
h.writeError(w, http.StatusForbidden, ErrCodeAccessDenied, err.Error()) h.writeError(w, http.StatusForbidden, ErrCodeAccessDenied, err.Error())
} else { } else {
h.writeError(w, http.StatusInternalServerError, ErrCodeInternalError, fmt.Sprintf("failed to delete table bucket: %v", err)) h.writeError(w, http.StatusInternalServerError, ErrCodeInternalError, fmt.Sprintf("failed to delete table bucket: %v", err))