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

s3tables: Consolidate getPrincipalFromRequest and getAccountID into single method

Browse Source 
Both methods had identical implementations - they return the account ID from
request header or fall back to handler's default. Remove the duplicate
getPrincipalFromRequest and use getAccountID throughout, with updated comment
explaining its dual role as both caller identity and principal for permission
checks.
This commit is contained in:
Chris Lu
2026-01-28 16:23:01 -08:00
parent ee3d779a5d
commit 41e799b4e0
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
weed/s3api/s3tables/handler.go
View File

@@ -157,19 +157,9 @@ func (h *S3TablesHandler) HandleRequest(w http.ResponseWriter, r *http.Request,
// Principal/authorization helpers
func (h *S3TablesHandler) getPrincipalFromRequest(r *http.Request) string {
// Prefer the authenticated account ID from the request header. This is the same
// identifier used as the "owner" in permission checks, so keeping them aligned
// avoids mismatches (e.g. username vs. account ID) when IAM is enabled.
if accountID := r.Header.Get(s3_constants.AmzAccountId); accountID != "" {
return accountID
}
// Default to handler's configured account ID
return h.accountID
}
// getAccountID returns the authenticated account ID from the request or the handler's default
// getAccountID returns the authenticated account ID from the request or the handler's default.
// This is also used as the principal for permission checks, ensuring alignment between
// the caller identity and ownership verification when IAM is enabled.
func (h *S3TablesHandler) getAccountID(r *http.Request) string {
if accountID := r.Header.Get(s3_constants.AmzAccountId); accountID != "" {
return accountID