SeaweedFS is a distributed storage system for object storage (S3), file systems, Iceberg table buckets, and Lance vector buckets, designed to handle billions of files with O(1) disk access and effortless horizontal scaling.
Go blob-storagecloud-drivedistributed-file-systemdistributed-storageerasure-codingfusehadoop-hdfshdfskuberneteslancelancedbobject-storageposixs3s3-storageseaweedfstiered-file-systemvector-search
Fixes from the review of the admin bucket policy UI (#10907)
Chris Lu69cc2869ad06
diff --git a/weed/admin/dash/bucket_management.go b/weed/admin/dash/bucket_management.goindex 07e649a509..a799964d01 100644--- a/weed/admin/dash/bucket_management.go+++ b/weed/admin/dash/bucket_management.go@@ -267,16 +267,22 @@ func (s *AdminServer) ShowBucketPolicy(w http.ResponseWriter, r *http.Request) {return}- policy, err := s.GetBucketPolicy(bucketName)+ policy, raw, err := s.GetBucketPolicy(bucketName)if err != nil {writeJSONError(w, bucketPolicyErrorStatus(err), "Failed to get bucket policy: "+err.Error())return}- writeJSON(w, http.StatusOK, map[string]interface{}{+ resp := map[string]interface{}{"bucket": bucketName,"policy": policy,- })+ }+ if policy == nil && len(raw) > 0 {+ // Stored bytes the decoder rejects: hand them to the JSON tab so+ // the operator can fix or delete the document.+ resp["policy_text"] = string(raw)+ }+ writeJSON(w, http.StatusOK, resp)}// UpdateBucketPolicy replaces the bucket policy for a bucket.diff --git a/weed/admin/dash/bucket_policy.go b/weed/admin/dash/bucket_policy.goindex 0a860f919b..31a14f6142 100644--- a/weed/admin/dash/bucket_policy.go+++ b/weed/admin/dash/bucket_policy.go@@ -12,28 +12,26 @@ import ("github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants")-// MaxBucketPolicySize mirrors AWS S3's 20 KB bucket-policy limit. This is an-// admin-side cap the S3 gateway does not itself enforce; it can only reject-// a policy the gateway would have accepted, never disagree about one-// already stored, so it cannot desync admin and S3 behavior.-const MaxBucketPolicySize = 20 * 1024-// ErrInvalidBucketPolicy wraps a validation failure from SetBucketPolicy so// callers (the HTTP handler) can map it to 400 instead of 500 without// resorting to matching on the error string.var ErrInvalidBucketPolicy = errors.New("invalid bucket policy")// GetBucketPolicy returns the policy document stored on a bucket's filer-// entry, or (nil, nil) if the bucket has no policy — that is not an error,-// it just means the caller (e.g. the admin UI) should show an empty editor-// instead of special-casing a 404.-func (s *AdminServer) GetBucketPolicy(bucketName string) (*policy_engine.PolicyDocument, error) {+// entry, or (nil, nil, nil) if the bucket has no policy — that is not an+// error, it just means the caller (e.g. the admin UI) should show an empty+// editor instead of special-casing a 404. Stored bytes the current decoder+// rejects come back as (nil, raw, nil): a 500 here would leave the UI+// unable to show, fix, or even delete the one policy an operator most+// needs to remove — and DeleteBucketPolicy never reads the document.+func (s *AdminServer) GetBucketPolicy(bucketName string) (*policy_engine.PolicyDocument, []byte, error) {filerConfig, err := s.getFilerConfig()if err != nil {- return nil, fmt.Errorf("get filer configuration: %w", err)+ return nil, nil, fmt.Errorf("get filer configuration: %w", err)}var doc *policy_engine.PolicyDocument+ var raw []byteerr = s.WithFilerClient(func(client filer_pb.SeaweedFilerClient) error {resp, err := filer_pb.LookupEntry(context.Background(), client, &filer_pb.LookupDirectoryEntryRequest{Directory: filerConfig.BucketsPath,@@ -50,19 +48,19 @@ func (s *AdminServer) GetBucketPolicy(bucketName string) (*policy_engine.PolicyDif len(policyJSON) == 0 {return nil}+ raw = policyJSONvar parsed policy_engine.PolicyDocument- if err := json.Unmarshal(policyJSON, &parsed); err != nil {- return fmt.Errorf("parse stored bucket policy: %w", err)+ if err := json.Unmarshal(policyJSON, &parsed); err == nil {+ doc = &parsed}- doc = &parsedreturn nil})if err != nil {- return nil, err+ return nil, nil, err}- return doc, nil+ return doc, raw, nil}// SetBucketPolicy validates and stores a bucket policy, applying the exact@@ -72,18 +70,11 @@ func (s *AdminServer) GetBucketPolicy(bucketName string) (*policy_engine.PolicyD//// Propagation to every S3 gateway is automatic: writing the// s3-bucket-policy extended attribute drives the filer metadata log, which-// each gateway's onBucketMetadataChange subscription already watches to-// rebuild its bucket policy cache. No separate notify step is needed here.-//-// Note: PutBucketPolicyHandler on the S3 gateway also mirrors the policy-// into the IAM policy store under "bucket-policy:<bucket>"-// (iam_manager.go's UpdateBucketPolicy), but its delete counterpart-// (removeBucketPolicyFromIAM) is an unimplemented TODO — so that mirror is-// already unreliable after any S3-side DeleteBucketPolicy. The admin write-// path deliberately does not replicate it: doing so would only deepen an-// existing inconsistency, and admin has no handle on the S3 gateway's-// iamManager anyway. See the TODO in-// weed/s3api/s3api_bucket_policy_handlers.go for the follow-up.+// each gateway's onBucketMetadataChange subscription watches to rebuild its+// bucket policy cache and to maintain the advanced-IAM+// "bucket-policy:<bucket>" mirror (mirrorBucketPolicyToIAM in+// weed/s3api/s3api_bucket_policy_handlers.go). No separate notify step is+// needed here.func (s *AdminServer) SetBucketPolicy(bucketName string, doc *policy_engine.PolicyDocument) error {if err := policy_engine.ValidatePolicy(doc); err != nil {return fmt.Errorf("%w: %w", ErrInvalidBucketPolicy, err)@@ -96,54 +87,32 @@ func (s *AdminServer) SetBucketPolicy(bucketName string, doc *policy_engine.Poliif err != nil {return fmt.Errorf("marshal policy document: %w", err)}- if len(policyJSON) > MaxBucketPolicySize {- return fmt.Errorf("%w: bucket policy is %d bytes, which exceeds the %d byte limit", ErrInvalidBucketPolicy, len(policyJSON), MaxBucketPolicySize)- }-- filerConfig, err := s.getFilerConfig()- if err != nil {- return fmt.Errorf("get filer configuration: %w", err)+ if len(policyJSON) > policy_engine.MaxBucketPolicySize {+ return fmt.Errorf("%w: bucket policy is %d bytes, which exceeds the %d byte limit", ErrInvalidBucketPolicy, len(policyJSON), policy_engine.MaxBucketPolicySize)}- return s.WithFilerClient(func(client filer_pb.SeaweedFilerClient) error {- // PATCH_EXTENDED is a no-op on a missing entry, so the existence- // check has to happen here rather than fall out of the write.- if _, err := filer_pb.LookupEntry(context.Background(), client, &filer_pb.LookupDirectoryEntryRequest{- Directory: filerConfig.BucketsPath,- Name: bucketName,- }); err != nil {- if errors.Is(err, filer_pb.ErrNotFound) {- return fmt.Errorf("%w: %s", ErrBucketNotFound, bucketName)- }- return fmt.Errorf("look up bucket %s: %w", bucketName, err)- }-- bucketPath := filerConfig.BucketsPath + "/" + bucketName- resp, err := client.ObjectTransaction(context.Background(), &filer_pb.ObjectTransactionRequest{- LockKey: bucketPath,- RouteKey: s3_constants.ObjectWriteRouteKeyPrefix + bucketPath,- Mutations: []*filer_pb.ObjectMutation{bucketPolicyMutation(filerConfig.BucketsPath, bucketName, policyJSON)},- })- if err != nil {- return fmt.Errorf("failed to update bucket policy: %w", err)- }- if resp.Error != "" {- return fmt.Errorf("failed to update bucket policy: %s", resp.Error)- }- return nil- })+ return s.writeBucketPolicy(bucketName, policyJSON)}// DeleteBucketPolicy clears the bucket policy stored on a bucket's filer// entry. Deleting a policy that doesn't exist is a success, matching-// DeleteBucketLifecycle's idempotent behavior.+// DeleteBucketLifecycle's idempotent behavior. This cannot go through+// SetBucketPolicy: validation there rejects a nil document.func (s *AdminServer) DeleteBucketPolicy(bucketName string) error {+ return s.writeBucketPolicy(bucketName, nil)+}++// writeBucketPolicy patches the policy key on the bucket's filer entry; a+// nil policyJSON clears it.+func (s *AdminServer) writeBucketPolicy(bucketName string, policyJSON []byte) error {filerConfig, err := s.getFilerConfig()if err != nil {return fmt.Errorf("get filer configuration: %w", err)}return s.WithFilerClient(func(client filer_pb.SeaweedFilerClient) error {+ // PATCH_EXTENDED is a no-op on a missing entry, so the existence+ // check has to happen here rather than fall out of the write.if _, err := filer_pb.LookupEntry(context.Background(), client, &filer_pb.LookupDirectoryEntryRequest{Directory: filerConfig.BucketsPath,Name: bucketName,@@ -158,13 +127,13 @@ func (s *AdminServer) DeleteBucketPolicy(bucketName string) error {resp, err := client.ObjectTransaction(context.Background(), &filer_pb.ObjectTransactionRequest{LockKey: bucketPath,RouteKey: s3_constants.ObjectWriteRouteKeyPrefix + bucketPath,- Mutations: []*filer_pb.ObjectMutation{bucketPolicyMutation(filerConfig.BucketsPath, bucketName, nil)},+ Mutations: []*filer_pb.ObjectMutation{bucketPolicyMutation(filerConfig.BucketsPath, bucketName, policyJSON)},})if err != nil {- return fmt.Errorf("failed to delete bucket policy: %w", err)+ return fmt.Errorf("write bucket policy: %w", err)}if resp.Error != "" {- return fmt.Errorf("failed to delete bucket policy: %s", resp.Error)+ return fmt.Errorf("write bucket policy: %s", resp.Error)}return nil})diff --git a/weed/admin/dash/bucket_policy_test.go b/weed/admin/dash/bucket_policy_test.goindex df8c19ce3f..422c352948 100644--- a/weed/admin/dash/bucket_policy_test.go+++ b/weed/admin/dash/bucket_policy_test.go@@ -128,7 +128,7 @@ func TestSetBucketPolicy_RejectsOversized(t *testing.T) {// A resource list long enough to blow the cap: this must fail before// any filer call, which is what makes it testable without one.doc := validBucketPolicyDoc("mybucket")- doc.Statement[0].Sid = strings.Repeat("x", MaxBucketPolicySize+1)+ doc.Statement[0].Sid = strings.Repeat("x", policy_engine.MaxBucketPolicySize+1)err := (&AdminServer{}).SetBucketPolicy("mybucket", doc)if err == nil {diff --git a/weed/admin/dash/s3tables_management.go b/weed/admin/dash/s3tables_management.goindex 78c35bb037..0db9e81d05 100644--- a/weed/admin/dash/s3tables_management.go+++ b/weed/admin/dash/s3tables_management.go@@ -1043,8 +1043,11 @@ func (s *AdminServer) GetS3TablesBucketPolicy(w http.ResponseWriter, r *http.ReqgetReq := &s3tables.GetTableBucketPolicyRequest{TableBucketARN: bucketArn}var resp s3tables.GetTableBucketPolicyResponseif err := s.executeS3TablesOperation(r.Context(), "GetTableBucketPolicy", getReq, &resp); err != nil {- writeS3TablesError(w, err)- return+ // No policy is a normal state for the UI (empty editor), not an error.+ if !isS3TablesNoSuchPolicy(err) {+ writeS3TablesError(w, err)+ return+ }}writeJSON(w, http.StatusOK, map[string]interface{}{"policy": resp.ResourcePolicy})}@@ -1111,8 +1114,10 @@ func (s *AdminServer) GetS3TablesTablePolicy(w http.ResponseWriter, r *http.RequgetReq := &s3tables.GetTablePolicyRequest{TableBucketARN: bucketArn, Namespace: namespaceParts, Name: name}var resp s3tables.GetTablePolicyResponseif err := s.executeS3TablesOperation(r.Context(), "GetTablePolicy", getReq, &resp); err != nil {- writeS3TablesError(w, err)- return+ if !isS3TablesNoSuchPolicy(err) {+ writeS3TablesError(w, err)+ return+ }}writeJSON(w, http.StatusOK, map[string]interface{}{"policy": resp.ResourcePolicy})}@@ -1225,6 +1230,11 @@ func writeS3TablesError(w http.ResponseWriter, err error) {writeJSONError(w, s3TablesErrorStatus(err), parseS3TablesErrorMessage(err))}+func isS3TablesNoSuchPolicy(err error) bool {+ var s3Err *s3tables.S3TablesError+ return errors.As(err, &s3Err) && s3Err.Type == s3tables.ErrCodeNoSuchPolicy+}+func s3TablesErrorStatus(err error) int {var s3Err *s3tables.S3TablesErrorif errors.As(err, &s3Err) {diff --git a/weed/admin/static/js/policy_editor.js b/weed/admin/static/js/policy_editor.jsindex 0f914ed776..015551e80e 100644--- a/weed/admin/static/js/policy_editor.js+++ b/weed/admin/static/js/policy_editor.js@@ -35,15 +35,24 @@ const POLICY_EDITOR_CONFIG = {};// resourceDatalistId - id of the shared resource-suggestions <datalist>. Default: 'policyResourceSuggestions'.// principalDatalistId - id of the shared principal-suggestions <datalist>. Default: 'policyPrincipalSuggestions'.// requirePrincipal - if true, a new statement seeds Principal with '*'-// instead of leaving it empty. Bucket policies-// require a Principal per statement; IAM policies-// don't. The server remains the source of truth for-// this rule either way - see-// policy_engine.ValidateBucketPolicy.+// instead of leaving it empty, and the NotPrincipal+// mode is not offered (the bucket policy backend+// rejects statements without a Principal). The+// server remains the source of truth for this rule+// either way - see policy_engine.ValidateBucketPolicy.+// allowNegation - if false, the NotResource/NotPrincipal mode+// dropdowns are not offered and a loaded document+// using them falls back to the JSON tab. For+// backends whose evaluator has no Not* fields+// (s3tables silently drops them, turning e.g.+// Allow+NotResource into allow-everything).// bucket - if set, the Resource autocomplete only offers// this bucket's ARN and ARN/*, instead of fetching// every bucket, and a new statement's Resource is// seeded with arn:aws:s3:::<bucket>/*.+// resourceSuggestions - if set, the Resource autocomplete offers exactly+// these values and never fetches bucket/folder+// names. For non-S3 ARN dialects (s3tables).function registerPolicyEditor(which, config) {POLICY_EDITOR_CONFIG[which] = Object.assign({textareaId: which + 'PolicyDocument',@@ -55,7 +64,9 @@ function registerPolicyEditor(which, config) {resourceDatalistId: 'policyResourceSuggestions',principalDatalistId: 'policyPrincipalSuggestions',requirePrincipal: false,- bucket: null+ allowNegation: true,+ bucket: null,+ resourceSuggestions: null}, config || {});}@@ -104,16 +115,43 @@ function policyEditorConfig(which) {return policyEditorConfig(which).textareaId;}+ function policyEditorOffersNotPrincipal(which) {+ const cfg = policyEditorConfig(which);+ return cfg.allowNegation && !cfg.requirePrincipal;+ }++ // True when the serialized policy carries at least one statement. Guards+ // Save in the consumers: an empty editor commits as {"Statement":[]},+ // which is never what a user wants stored - on backends with no+ // server-side validation (s3tables) it evaluates default-deny for every+ // non-owner while the UI still shows "Not configured".+ function policyTextHasStatements(text) {+ try {+ const stmts = (JSON.parse(text) || {}).Statement;+ return Array.isArray(stmts) ? stmts.length > 0 : !!stmts;+ } catch (e) {+ return true;+ }+ }+function policyEditorBodyId(which) {return policyEditorConfig(which).editorBodyId;}function normalizeToStringArray(value) {if (value === undefined || value === null) return [];- // Coerce: these feed escapeHtml, which calls text.replace, and a- // policy is free to carry a number or a boolean here.- if (Array.isArray(value)) return value.map(String);- return [String(value)];+ const values = Array.isArray(value) ? value : [value];+ return values.map(function(v) {+ if (v !== null && typeof v === 'object') {+ // String(v) would render '[object Object]' (or comma-join a+ // nested array) and a later save would persist that coercion;+ // send the document to the JSON tab instead.+ throw new Error('Policy list entries must be strings (got ' + JSON.stringify(v) + ')');+ }+ // Coerce scalars: these feed escapeHtml, which calls text.replace,+ // and a policy is free to carry a number or a boolean here.+ return String(v);+ });}const POLICY_DOCUMENT_KNOWN_KEYS = ['Version', 'Statement'];@@ -126,21 +164,21 @@ function policyEditorConfig(which) {// tab. The admin API's PolicyDocument only carries Version and Statement,// so such fields are still dropped by the server on save; see// confirmPolicyFieldDiscard, which warns the user before that happens.- function policyDocToEditorState(doc) {- if (doc === null || typeof doc !== 'object') {- // null or a bare scalar (string/number/boolean) can't represent a+ function policyDocToEditorState(which, doc) {+ const cfg = policyEditorConfig(which);+ if (doc === null || typeof doc !== 'object' || Array.isArray(doc)) {+ // null, a bare scalar, or an array (typeof [] is 'object', and a+ // pasted statement array is a common mistake) can't represent a// policy document; treating it as "zero statements" would hide// from the user that their input wasn't actually a document.throw new Error('Policy document must be a JSON object (got ' + JSON.stringify(doc) + ')');}const state = { version: doc.Version || '2012-10-17', statements: [], otherFields: {} };- if (!Array.isArray(doc)) {- Object.keys(doc).forEach(function(key) {- if (POLICY_DOCUMENT_KNOWN_KEYS.indexOf(key) === -1) {- state.otherFields[key] = doc[key];- }- });- }+ Object.keys(doc).forEach(function(key) {+ if (POLICY_DOCUMENT_KNOWN_KEYS.indexOf(key) === -1) {+ state.otherFields[key] = doc[key];+ }+ });const rawStatements = doc && doc.Statement? (Array.isArray(doc.Statement) ? doc.Statement : [doc.Statement]): [];@@ -161,6 +199,9 @@ function policyEditorConfig(which) {// it in the JSON tab rather than silently picking one.throw new Error('Statement ' + (idx + 1) + ': cannot specify both Resource and NotResource');}+ if (hasNotResource && !cfg.allowNegation) {+ throw new Error('Statement ' + (idx + 1) + ': NotResource is not supported for this policy type');+ }const resourceMode = hasNotResource ? 'NotResource' : 'Resource';const hasPrincipal = Object.prototype.hasOwnProperty.call(stmt, 'Principal');@@ -168,6 +209,9 @@ function policyEditorConfig(which) {if (hasPrincipal && hasNotPrincipal) {throw new Error('Statement ' + (idx + 1) + ': cannot specify both Principal and NotPrincipal');}+ if (hasNotPrincipal && (!cfg.allowNegation || cfg.requirePrincipal)) {+ throw new Error('Statement ' + (idx + 1) + ': NotPrincipal is not supported for this policy type');+ }let principalMode = 'Principal';let principalValues = [];let principalManaged = false;@@ -221,7 +265,12 @@ function policyEditorConfig(which) {if (!value || typeof value !== 'object' || Array.isArray(value)) return null;const keys = Object.keys(value);if (keys.length !== 1 || keys[0] !== 'AWS') return null;- return normalizeToStringArray(value.AWS);+ try {+ return normalizeToStringArray(value.AWS);+ } catch (e) {+ // Non-string entries: not the simple form; fall back to extras.+ return null;+ }}// Converts editor state back into a policy document. Structured fields@@ -365,24 +414,28 @@ function policyEditorConfig(which) {'<button type="button" class="btn btn-sm btn-outline-secondary policy-add-list-item-btn" data-which="' + which + '" data-index="' + idx + '" data-field="action"><i class="fas fa-plus me-1"></i>Add action</button>' +'</fieldset>' +'<fieldset class="policy-stmt-fieldset">' +- '<legend class="policy-stmt-legend">' +- '<select class="form-select form-select-sm d-inline-block w-auto policy-stmt-resource-mode" data-which="' + which + '" data-index="' + idx + '">' +- '<option value="Resource"' + (stmt.resourceMode !== 'NotResource' ? ' selected' : '') + '>Resource</option>' +- '<option value="NotResource"' + (stmt.resourceMode === 'NotResource' ? ' selected' : '') + '>NotResource</option>' +- '</select>' ++ '<legend class="policy-stmt-legend' + (policyEditorConfig(which).allowNegation ? '' : ' border rounded') + '">' ++ (policyEditorConfig(which).allowNegation+ ? '<select class="form-select form-select-sm d-inline-block w-auto policy-stmt-resource-mode" data-which="' + which + '" data-index="' + idx + '">' ++ '<option value="Resource"' + (stmt.resourceMode !== 'NotResource' ? ' selected' : '') + '>Resource</option>' ++ '<option value="NotResource"' + (stmt.resourceMode === 'NotResource' ? ' selected' : '') + '>NotResource</option>' ++ '</select>'+ : 'Resource') +'</legend>' +(stmt.resourceMode === 'NotResource' ? '<div class="form-text mt-0 mb-1">The statement applies to every resource except the ones listed.</div>' : '') +'<div class="policy-resource-rows" data-which="' + which + '" data-index="' + idx + '">' + resourceRows + '</div>' +'<button type="button" class="btn btn-sm btn-outline-secondary policy-add-list-item-btn" data-which="' + which + '" data-index="' + idx + '" data-field="resource"><i class="fas fa-plus me-1"></i>Add resource</button>' +'</fieldset>' +'<fieldset class="policy-stmt-fieldset">' +- '<legend class="policy-stmt-legend">' +- '<select class="form-select form-select-sm d-inline-block w-auto policy-stmt-principal-mode" data-which="' + which + '" data-index="' + idx + '">' +- '<option value="Principal"' + (stmt.principalMode !== 'NotPrincipal' ? ' selected' : '') + '>Principal</option>' +- '<option value="NotPrincipal"' + (stmt.principalMode === 'NotPrincipal' ? ' selected' : '') + '>NotPrincipal</option>' +- '</select>' ++ '<legend class="policy-stmt-legend' + (policyEditorOffersNotPrincipal(which) ? '' : ' border rounded') + '">' ++ (policyEditorOffersNotPrincipal(which)+ ? '<select class="form-select form-select-sm d-inline-block w-auto policy-stmt-principal-mode" data-which="' + which + '" data-index="' + idx + '">' ++ '<option value="Principal"' + (stmt.principalMode !== 'NotPrincipal' ? ' selected' : '') + '>Principal</option>' ++ '<option value="NotPrincipal"' + (stmt.principalMode === 'NotPrincipal' ? ' selected' : '') + '>NotPrincipal</option>' ++ '</select>'+ : 'Principal') +'</legend>' +- '<div class="form-text mt-0 mb-1">Principal / NotPrincipal (AWS account/user ARN, or "*" for everyone). Only the AWS type and "*" are supported here; other forms stay editable via Advanced fields.</div>' ++ '<div class="form-text mt-0 mb-1">' + (policyEditorOffersNotPrincipal(which) ? 'Principal / NotPrincipal' : 'Principal') + ' (AWS account/user ARN, or "*" for everyone). Only the AWS type and "*" are supported here; other forms stay editable via Advanced fields.</div>' +(stmt.hasComplexPrincipal ? '<div class="form-text text-warning mt-0 mb-1"><i class="fas fa-triangle-exclamation me-1"></i>This statement\'s Principal/NotPrincipal uses a form not supported by this field — see Advanced fields below.</div>' : '') +'<div class="policy-principal-rows" data-which="' + which + '" data-index="' + idx + '">' + principalRows + '</div>' +'<button type="button" class="btn btn-sm btn-outline-secondary policy-add-list-item-btn" data-which="' + which + '" data-index="' + idx + '" data-field="principal"><i class="fas fa-plus me-1"></i>Add principal</button>' +@@ -474,7 +527,7 @@ function policyEditorConfig(which) {}let newState;try {- newState = policyDocToEditorState(doc);+ newState = policyDocToEditorState(which, doc);} catch (e) {showAlert(e.message, 'error');return false;@@ -522,7 +575,7 @@ function policyEditorConfig(which) {}let state;try {- state = policyDocToEditorState(doc);+ state = policyDocToEditorState(which, doc);} catch (e) {policyEditors[which] = { version: '2012-10-17', statements: [], otherFields: {}, unparsed: true };renderPolicyEditor(which);@@ -543,9 +596,13 @@ function policyEditorConfig(which) {}const cfg = policyEditorConfig(which);commitPolicyEditorForm(which);+ // Seed Resource with the broadest pinned suggestion, mirroring the+ // arn:aws:s3::: seeding cfg.bucket gets.+ const seededResources = cfg.bucket ? ['arn:aws:s3:::' + cfg.bucket + '/*']+ : (cfg.resourceSuggestions ? [cfg.resourceSuggestions[cfg.resourceSuggestions.length - 1]] : []);policyEditorState(which).statements.push({sid: '', effect: 'Allow', actions: [],- resourceMode: 'Resource', resources: cfg.bucket ? ['arn:aws:s3:::' + cfg.bucket + '/*'] : [],+ resourceMode: 'Resource', resources: seededResources,principalMode: 'Principal', principalValues: cfg.requirePrincipal ? ['*'] : [], hasComplexPrincipal: false,extras: ''});@@ -569,21 +626,74 @@ function policyEditorConfig(which) {// The JSON tab is the source of truth right now; parse it back// into the structured editor to keep both in sync, but leave the// textarea's own text untouched.- return commitPolicyTextareaToEditor(which);+ const text = document.getElementById(policyTextareaId(which)).value;+ if (text && text.trim()) {+ let doc;+ try {+ doc = JSON.parse(text);+ } catch (e) {+ showAlert('Invalid JSON in policy document: ' + e.message, 'error');+ return false;+ }+ try {+ policyEditors[which] = policyDocToEditorState(which, doc);+ } catch (e) {+ // Valid JSON the structured editor can't model is still+ // saveable from here - exactly the documents the load path+ // shunts to this tab. It just stays JSON-tab-only.+ policyEditors[which] = { version: '2012-10-17', statements: [], otherFields: {}, unparsed: true };+ }+ renderPolicyEditor(which);+ } else if (!commitPolicyTextareaToEditor(which)) {+ return false;+ }+ } else {+ if (policyEditorState(which).unparsed) {+ // The editor never held this document, so serializing it would+ // write an empty policy over whatever is in the JSON tab.+ showAlert(POLICY_JSON_TAB_ONLY_MESSAGE, 'error');+ return false;+ }+ try {+ commitPolicyEditorToTextarea(which);+ } catch (e) {+ showAlert(e.message, 'error');+ return false;+ }}- if (policyEditorState(which).unparsed) {- // The editor never held this document, so serializing it would- // write an empty policy over whatever is in the JSON tab.- showAlert(POLICY_JSON_TAB_ONLY_MESSAGE, 'error');+ // Final gate over what would actually be saved. The mode dropdowns+ // being hidden is not enough: the JSON tab and a statement's+ // Advanced-fields box can both carry Not* keys, and where negation+ // is disallowed the backend's evaluator silently drops them -+ // Allow+NotResource would come back as allow-everything.+ const negationError = policyTextDisallowedNegationError(which);+ if (negationError) {+ showAlert(negationError, 'error');return false;}+ return true;+ }++ // Returns an error message if the JSON textarea for `which` holds a+ // statement using NotResource/NotPrincipal while the instance disallows+ // negation, or null. Unparseable/empty text is left to other checks.+ function policyTextDisallowedNegationError(which) {+ if (policyEditorConfig(which).allowNegation) return null;+ let doc;try {- commitPolicyEditorToTextarea(which);- return true;+ doc = JSON.parse(document.getElementById(policyTextareaId(which)).value);} catch (e) {- showAlert(e.message, 'error');- return false;+ return null;+ }+ const stmts = doc && doc.Statement ? (Array.isArray(doc.Statement) ? doc.Statement : [doc.Statement]) : [];+ for (let i = 0; i < stmts.length; i++) {+ const stmt = stmts[i] || {};+ if (Object.prototype.hasOwnProperty.call(stmt, 'NotResource') ||+ Object.prototype.hasOwnProperty.call(stmt, 'NotPrincipal')) {+ return 'Statement ' + (i + 1) + ': NotResource/NotPrincipal are not supported for this policy type and would be silently ignored. Remove them before saving.';+ }}+ return null;}// The admin API's policy document carries only Version and Statement, so@@ -609,8 +719,11 @@ function policyEditorConfig(which) {const statements = (doc && doc.Statement) || [];for (let i = 0; i < statements.length; i++) {const stmt = statements[i] || {};- if (stmt.Principal === undefined && stmt.NotPrincipal === undefined) {- return 'Statement ' + (i + 1) + ': a Principal (or NotPrincipal) is required.';+ // Principal specifically: the server rule this front-runs+ // (policy_engine.ValidateBucketPolicy) rejects NotPrincipal-only+ // statements too.+ if (stmt.Principal === undefined) {+ return 'Statement ' + (i + 1) + ': a Principal is required.';}}return null;@@ -805,6 +918,10 @@ function policyEditorConfig(which) {const cfg = policyEditorConfig(which);const datalist = document.getElementById(cfg.resourceDatalistId);if (!datalist) return;+ if (cfg.resourceSuggestions) {+ renderPolicyDatalistOptions(datalist, cfg.resourceSuggestions);+ return;+ }const state = policyResourcePathState(inputEl.value);if (state.stage === 'bucket') {@@ -880,7 +997,7 @@ function policyEditorConfig(which) {function insertSamplePolicy(which, sampleDoc) {const doc = sampleDoc || POLICY_SAMPLE_DOCUMENT;- policyEditors[which] = policyDocToEditorState(doc);+ policyEditors[which] = policyDocToEditorState(which, doc);renderPolicyEditor(which);document.getElementById(policyTextareaId(which)).value = JSON.stringify(doc, null, 2);}diff --git a/weed/admin/static/js/s3tables.js b/weed/admin/static/js/s3tables.jsindex f143a71da8..182f949fe8 100644--- a/weed/admin/static/js/s3tables.js+++ b/weed/admin/static/js/s3tables.js@@ -32,6 +32,41 @@ let s3tablesTablePolicyLoaded = false;let s3tablesBucketPolicyRequestSeq = 0;let s3tablesTablePolicyRequestSeq = 0;+// True while a policy PUT/DELETE is in flight, so a double-click - or Save+// and Delete fired in quick succession - can't send overlapping mutations.+// Same pattern as the classic bucket modal in s3_buckets.templ.+let s3tablesBucketPolicyMutationInFlight = false;+let s3tablesTablePolicyMutationInFlight = false;++function setS3TablesBucketPolicyMutationInFlight(inFlight) {+ s3tablesBucketPolicyMutationInFlight = inFlight;+ const save = document.getElementById('s3tablesBucketPolicySaveBtn');+ const del = document.getElementById('s3tablesBucketPolicyDeleteBtn');+ if (save) save.disabled = inFlight;+ if (del) del.disabled = inFlight;+}++function setS3TablesTablePolicyMutationInFlight(inFlight) {+ s3tablesTablePolicyMutationInFlight = inFlight;+ const save = document.getElementById('s3tablesTablePolicySaveBtn');+ const del = document.getElementById('s3tablesTablePolicyDeleteBtn');+ if (save) save.disabled = inFlight;+ if (del) del.disabled = inFlight;+}++// The dialog identity captured when a mutation started, so a completion+// that lands after the shared modal moved on to a different resource can't+// alert against, hide, or reload over that other resource's state.+function currentS3TablesBucketPolicyTarget() {+ return document.getElementById('s3tablesBucketPolicyArn').value;+}++function currentS3TablesTablePolicyTarget() {+ return document.getElementById('s3tablesTablePolicyBucketArn').value + '\n' ++ document.getElementById('s3tablesTablePolicyNamespace').value + '\n' ++ document.getElementById('s3tablesTablePolicyName').value;+}+function getCSRFToken() {const tokenMeta = document.querySelector('meta[name="csrf-token"]');if (!tokenMeta) {@@ -57,13 +92,7 @@ function initS3TablesBuckets() {s3tablesBucketPolicyModal = new bootstrap.Modal(document.getElementById('s3tablesBucketPolicyModal'));s3tablesTagsModal = new bootstrap.Modal(document.getElementById('s3tablesTagsModal'));- // Shared visual policy editor (weed/admin/static/js/policy_editor.js),- // reused here from the bucket policy admin page. Table bucket policies- // aren't validated against policy_engine.PolicyDocument server-side- // (see s3tables/permissions.go's separate PolicyDocument type), so no- // requirePrincipal/bucket config is set - the editor just gives a- // structured view over the same JSON the JSON tab holds.- registerPolicyEditor('s3tablesBucket', { textareaId: 's3tablesBucketPolicyText' });+ registerS3TablesBucketPolicyEditor('');setupPolicyEditor('s3tablesBucket');const ownerSelect = document.getElementById('s3tablesBucketOwner');@@ -107,6 +136,7 @@ function initS3TablesBuckets() {button.addEventListener('click', function () {const bucketArn = this.dataset.bucketArn || '';document.getElementById('s3tablesBucketPolicyArn').value = bucketArn;+ registerS3TablesBucketPolicyEditor(bucketArn);loadS3TablesBucketPolicy(bucketArn);s3tablesBucketPolicyModal.show();});@@ -203,36 +233,11 @@ function initS3TablesBuckets() {const policyForm = document.getElementById('s3tablesBucketPolicyForm');if (policyForm) {- policyForm.addEventListener('submit', async function (e) {- e.preventDefault();- if (!s3tablesBucketPolicyLoaded) {- alert('The current policy has not finished loading. Close and reopen this dialog before saving.');- return;- }- if (!commitPolicyActiveTab('s3tablesBucket')) return;- const bucketArn = document.getElementById('s3tablesBucketPolicyArn').value;- const policy = document.getElementById('s3tablesBucketPolicyText').value.trim();- if (!policy) {- alert('Policy JSON is required');- return;- }- try {- const response = await fetch(s3tBasePath('/api/s3tables/bucket-policy'), {- method: 'PUT',- headers: s3tWriteHeaders({ 'Content-Type': 'application/json' }),- body: JSON.stringify({ bucket_arn: bucketArn, policy: policy })- });- const data = await response.json();- if (!response.ok) {- alert(data.error || 'Failed to update policy');- return;- }- alert('Policy updated');- s3tablesBucketPolicyModal.hide();- } catch (error) {- alert('Failed to update policy: ' + error.message);- }- });+ // Saves go through the Save button only; implicit form submission+ // (Enter in a single-line editor input) must never PUT half-built+ // state, which the backend would store verbatim.+ policyForm.addEventListener('submit', function (e) { e.preventDefault(); });+ document.getElementById('s3tablesBucketPolicySaveBtn').addEventListener('click', saveS3TablesBucketPolicy);}const tagsForm = document.getElementById('s3tablesTagsForm');@@ -258,7 +263,7 @@ function initS3TablesTables() {s3tablesTablePolicyModal = new bootstrap.Modal(document.getElementById('s3tablesTablePolicyModal'));s3tablesTagsModal = new bootstrap.Modal(document.getElementById('s3tablesTagsModal'));- registerPolicyEditor('s3tablesTable', { textareaId: 's3tablesTablePolicyText' });+ registerS3TablesTablePolicyEditor('', '', '');setupPolicyEditor('s3tablesTable');const dataContainer = document.getElementById('s3tables-tables-content');@@ -278,6 +283,7 @@ function initS3TablesTables() {document.getElementById('s3tablesTablePolicyBucketArn').value = dataBucketArn;document.getElementById('s3tablesTablePolicyNamespace').value = dataNamespace;document.getElementById('s3tablesTablePolicyName').value = this.dataset.tableName || '';+ registerS3TablesTablePolicyEditor(dataBucketArn, dataNamespace, this.dataset.tableName || '');loadS3TablesTablePolicy(dataBucketArn, dataNamespace, this.dataset.tableName || '');s3tablesTablePolicyModal.show();});@@ -346,35 +352,9 @@ function initS3TablesTables() {const policyForm = document.getElementById('s3tablesTablePolicyForm');if (policyForm) {- policyForm.addEventListener('submit', async function (e) {- e.preventDefault();- if (!s3tablesTablePolicyLoaded) {- alert('The current policy has not finished loading. Close and reopen this dialog before saving.');- return;- }- if (!commitPolicyActiveTab('s3tablesTable')) return;- const policy = document.getElementById('s3tablesTablePolicyText').value.trim();- if (!policy) {- alert('Policy JSON is required');- return;- }- try {- const response = await fetch(s3tBasePath('/api/s3tables/table-policy'), {- method: 'PUT',- headers: s3tWriteHeaders({ 'Content-Type': 'application/json' }),- body: JSON.stringify({ bucket_arn: dataBucketArn, namespace: dataNamespace, name: document.getElementById('s3tablesTablePolicyName').value, policy: policy })- });- const data = await response.json();- if (!response.ok) {- alert(data.error || 'Failed to update policy');- return;- }- alert('Policy updated');- s3tablesTablePolicyModal.hide();- } catch (error) {- alert('Failed to update policy: ' + error.message);- }- });+ // Same Enter-must-not-submit rule as the bucket policy form.+ policyForm.addEventListener('submit', function (e) { e.preventDefault(); });+ document.getElementById('s3tablesTablePolicySaveBtn').addEventListener('click', saveS3TablesTablePolicy);}const tagsForm = document.getElementById('s3tablesTagsForm');@@ -619,6 +599,30 @@ async function deleteS3TablesBucket() {}}+// Shared visual policy editor (weed/admin/static/js/policy_editor.js),+// configured for the S3 Tables policy engine: only s3tables: action+// suggestions, resource suggestions pinned to the open resource's ARN, and+// no NotResource/NotPrincipal modes - the s3tables evaluator has no such+// fields and would silently drop them (see s3tables/permissions.go).+// Re-registered on every dialog open so the suggestions track the resource.+function registerS3TablesBucketPolicyEditor(bucketArn) {+ registerPolicyEditor('s3tablesBucket', {+ textareaId: 's3tablesBucketPolicyText',+ actionDatalistId: 's3tablesPolicyActionSuggestions',+ allowNegation: false,+ resourceSuggestions: bucketArn ? [bucketArn, bucketArn + '/table/*'] : null+ });+}++function registerS3TablesTablePolicyEditor(bucketArn, namespace, name) {+ registerPolicyEditor('s3tablesTable', {+ textareaId: 's3tablesTablePolicyText',+ actionDatalistId: 's3tablesPolicyActionSuggestions',+ allowNegation: false,+ resourceSuggestions: bucketArn && namespace && name ? [bucketArn + '/table/' + namespace + '/' + name] : null+ });+}+async function loadS3TablesBucketPolicy(bucketArn) {const requestSeq = ++s3tablesBucketPolicyRequestSeq;document.getElementById('s3tablesBucketPolicyText').value = '';@@ -658,25 +662,133 @@ async function loadS3TablesBucketPolicy(bucketArn) {loadPolicyTextareaIntoEditor('s3tablesBucket');}+async function saveS3TablesBucketPolicy() {+ if (s3tablesBucketPolicyMutationInFlight) return;+ if (!s3tablesBucketPolicyLoaded) {+ alert('The current policy has not finished loading. Close and reopen this dialog before saving.');+ return;+ }+ if (!commitPolicyActiveTab('s3tablesBucket')) return;+ const bucketArn = currentS3TablesBucketPolicyTarget();+ const policy = document.getElementById('s3tablesBucketPolicyText').value.trim();+ if (!policy || !policyTextHasStatements(policy)) {+ alert('Add at least one statement, or use Delete Policy to remove the policy.');+ return;+ }+ setS3TablesBucketPolicyMutationInFlight(true);+ try {+ const response = await fetch(s3tBasePath('/api/s3tables/bucket-policy'), {+ method: 'PUT',+ headers: s3tWriteHeaders({ 'Content-Type': 'application/json' }),+ body: JSON.stringify({ bucket_arn: bucketArn, policy: policy })+ });+ const data = await response.json();+ setS3TablesBucketPolicyMutationInFlight(false);+ const stillCurrent = bucketArn === currentS3TablesBucketPolicyTarget();+ if (!response.ok) {+ if (stillCurrent) {+ alert(data.error || 'Failed to update policy');+ } else {+ console.error('Error saving policy for ' + bucketArn + ' (no longer the open resource): ' + (data.error || 'unknown error'));+ }+ return;+ }+ if (!stillCurrent) return;+ s3tablesBucketPolicyModal.hide();+ // Reload so the Policy column reflects the change.+ setTimeout(() => location.reload(), 500);+ } catch (error) {+ setS3TablesBucketPolicyMutationInFlight(false);+ if (bucketArn === currentS3TablesBucketPolicyTarget()) {+ alert('Failed to update policy: ' + error.message);+ } else {+ console.error('Error saving policy for ' + bucketArn + ': ' + error.message);+ }+ }+}++async function saveS3TablesTablePolicy() {+ if (s3tablesTablePolicyMutationInFlight) return;+ if (!s3tablesTablePolicyLoaded) {+ alert('The current policy has not finished loading. Close and reopen this dialog before saving.');+ return;+ }+ if (!commitPolicyActiveTab('s3tablesTable')) return;+ const target = currentS3TablesTablePolicyTarget();+ const policy = document.getElementById('s3tablesTablePolicyText').value.trim();+ if (!policy || !policyTextHasStatements(policy)) {+ alert('Add at least one statement, or use Delete Policy to remove the policy.');+ return;+ }+ setS3TablesTablePolicyMutationInFlight(true);+ try {+ const response = await fetch(s3tBasePath('/api/s3tables/table-policy'), {+ method: 'PUT',+ headers: s3tWriteHeaders({ 'Content-Type': 'application/json' }),+ body: JSON.stringify({+ bucket_arn: document.getElementById('s3tablesTablePolicyBucketArn').value,+ namespace: document.getElementById('s3tablesTablePolicyNamespace').value,+ name: document.getElementById('s3tablesTablePolicyName').value,+ policy: policy+ })+ });+ const data = await response.json();+ setS3TablesTablePolicyMutationInFlight(false);+ const stillCurrent = target === currentS3TablesTablePolicyTarget();+ if (!response.ok) {+ if (stillCurrent) {+ alert(data.error || 'Failed to update policy');+ } else {+ console.error('Error saving table policy (no longer the open resource): ' + (data.error || 'unknown error'));+ }+ return;+ }+ if (!stillCurrent) return;+ s3tablesTablePolicyModal.hide();+ setTimeout(() => location.reload(), 500);+ } catch (error) {+ setS3TablesTablePolicyMutationInFlight(false);+ if (target === currentS3TablesTablePolicyTarget()) {+ alert('Failed to update policy: ' + error.message);+ } else {+ console.error('Error saving table policy: ' + error.message);+ }+ }+}+async function deleteS3TablesBucketPolicy() {- const bucketArn = document.getElementById('s3tablesBucketPolicyArn').value;+ const bucketArn = currentS3TablesBucketPolicyTarget();if (!bucketArn) return;+ if (s3tablesBucketPolicyMutationInFlight) return;if (!s3tablesBucketPolicyLoaded) {alert('The current policy has not finished loading. Close and reopen this dialog before deleting.');return;}+ if (!confirm('Delete this table bucket policy? This cannot be undone.')) return;+ setS3TablesBucketPolicyMutationInFlight(true);try {const response = await fetch(s3tBasePath(`/api/s3tables/bucket-policy?bucket=${encodeURIComponent(bucketArn)}`), { method: 'DELETE', headers: s3tWriteHeaders() });const data = await response.json();+ setS3TablesBucketPolicyMutationInFlight(false);+ const stillCurrent = bucketArn === currentS3TablesBucketPolicyTarget();if (!response.ok) {- alert(data.error || 'Failed to delete policy');+ if (stillCurrent) {+ alert(data.error || 'Failed to delete policy');+ } else {+ console.error('Error deleting policy for ' + bucketArn + ' (no longer the open resource): ' + (data.error || 'unknown error'));+ }return;}- alert('Policy deleted');- document.getElementById('s3tablesBucketPolicyText').value = '';- commitPolicyTextareaToEditor('s3tablesBucket');+ if (!stillCurrent) return;+ s3tablesBucketPolicyModal.hide();+ setTimeout(() => location.reload(), 500);} catch (error) {- alert('Failed to delete policy: ' + error.message);+ setS3TablesBucketPolicyMutationInFlight(false);+ if (bucketArn === currentS3TablesBucketPolicyTarget()) {+ alert('Failed to delete policy: ' + error.message);+ } else {+ console.error('Error deleting policy for ' + bucketArn + ': ' + error.message);+ }}}@@ -786,26 +898,42 @@ async function loadS3TablesTablePolicy(bucketArn, namespace, name) {}async function deleteS3TablesTablePolicy() {+ if (s3tablesTablePolicyMutationInFlight) return;if (!s3tablesTablePolicyLoaded) {alert('The current policy has not finished loading. Close and reopen this dialog before deleting.');return;}- const dataContainer = document.getElementById('s3tables-tables-content');- const dataBucketArn = dataContainer.dataset.bucketArn || '';- const dataNamespace = dataContainer.dataset.namespace || '';- const query = new URLSearchParams({ bucket: dataBucketArn, namespace: dataNamespace, name: document.getElementById('s3tablesTablePolicyName').value });+ const target = currentS3TablesTablePolicyTarget();+ const query = new URLSearchParams({+ bucket: document.getElementById('s3tablesTablePolicyBucketArn').value,+ namespace: document.getElementById('s3tablesTablePolicyNamespace').value,+ name: document.getElementById('s3tablesTablePolicyName').value+ });+ if (!confirm('Delete the policy for table ' + document.getElementById('s3tablesTablePolicyName').value + '? This cannot be undone.')) return;+ setS3TablesTablePolicyMutationInFlight(true);try {const response = await fetch(s3tBasePath(`/api/s3tables/table-policy?${query.toString()}`), { method: 'DELETE', headers: s3tWriteHeaders() });const data = await response.json();+ setS3TablesTablePolicyMutationInFlight(false);+ const stillCurrent = target === currentS3TablesTablePolicyTarget();if (!response.ok) {- alert(data.error || 'Failed to delete policy');+ if (stillCurrent) {+ alert(data.error || 'Failed to delete policy');+ } else {+ console.error('Error deleting table policy (no longer the open resource): ' + (data.error || 'unknown error'));+ }return;}- alert('Policy deleted');- document.getElementById('s3tablesTablePolicyText').value = '';- commitPolicyTextareaToEditor('s3tablesTable');+ if (!stillCurrent) return;+ s3tablesTablePolicyModal.hide();+ setTimeout(() => location.reload(), 500);} catch (error) {- alert('Failed to delete policy: ' + error.message);+ setS3TablesTablePolicyMutationInFlight(false);+ if (target === currentS3TablesTablePolicyTarget()) {+ alert('Failed to delete policy: ' + error.message);+ } else {+ console.error('Error deleting table policy: ' + error.message);+ }}}diff --git a/weed/admin/static_gz/js/policy_editor.js.gz b/weed/admin/static_gz/js/policy_editor.js.gzindex 5a7183cc23..79922b8d5a 100644Binary files a/weed/admin/static_gz/js/policy_editor.js.gz and b/weed/admin/static_gz/js/policy_editor.js.gz differdiff --git a/weed/admin/static_gz/js/s3tables.js.gz b/weed/admin/static_gz/js/s3tables.js.gzindex 2b5cd7e1fb..20a0c8cbce 100644Binary files a/weed/admin/static_gz/js/s3tables.js.gz and b/weed/admin/static_gz/js/s3tables.js.gz differdiff --git a/weed/admin/view/app/policies.templ b/weed/admin/view/app/policies.templindex dd85f75c28..60d34db5a2 100644--- a/weed/admin/view/app/policies.templ+++ b/weed/admin/view/app/policies.templ@@ -172,32 +172,6 @@ templ Policies(data dash.PoliciesData) {</div></div>- <style>- /* Groups a statement's Sid/Effect and its Action/Resource/Principal- sections in the structured policy editor. Plain <fieldset>/<legend>- render fine natively, but Bootstrap's form reset stretches <legend> to- the fieldset's full width (float: left; width: 100%), which loses the- usual "notch in the border" look and makes the label bar as wide as- the card. Undo just that here so the legend hugs its content instead.- */- .policy-stmt-fieldset {- border: 1px solid var(--bs-border-color, #dee2e6);- border-radius: 0.375rem;- padding: 0 0.75rem 0.75rem;- margin: 0.75rem 0 0;- }- .policy-stmt-legend {- float: none;- width: auto;- max-width: 100%;- padding: 0 0.5rem;- margin: 0 0 0.25rem;- font-size: 0.8125rem;- font-weight: 600;- color: var(--bs-secondary-color, #6c757d);- }- </style>-@PolicyDatalists()<!-- Create Policy Modal -->@@ -352,6 +326,11 @@ templ Policies(data dash.PoliciesData) {<script>// Current policy being viewed/editedlet currentPolicy = null;+ // Drop edit-modal GET responses superseded by a later editPolicy call,+ // so a stalled load for one policy can't populate the editor while the+ // name field already says another. Same pattern as the bucket and+ // S3 Tables policy dialogs.+ let editPolicyRequestSeq = 0;// Event listeners for policy actionsdocument.addEventListener('DOMContentLoaded', function() {@@ -600,7 +579,9 @@ templ Policies(data dash.PoliciesData) {policyEditors.edit = { version: '2012-10-17', statements: [], otherFields: {} };renderPolicyEditor('edit');- // Fetch policy data+ // Fetch policy data; drop the response if another editPolicy call+ // superseded this one meanwhile.+ const requestSeq = ++editPolicyRequestSeq;fetch(basePath('/api/object-store/policies/' + encodeURIComponent(policyName))).then(response => {if (!response.ok) {@@ -609,11 +590,12 @@ templ Policies(data dash.PoliciesData) {return response.json();}).then(policy => {+ if (requestSeq !== editPolicyRequestSeq) return;currentPolicy = policy;document.getElementById('editPolicyDocument').value = JSON.stringify(policy.document, null, 2);let state;try {- state = policyDocToEditorState(policy.document);+ state = policyDocToEditorState('edit', policy.document);} catch (e) {// Valid JSON the structured editor can't model. The JSON tab// exists for exactly this, so hand the document over to it@@ -630,6 +612,7 @@ templ Policies(data dash.PoliciesData) {editorTab.show();}).catch(error => {+ if (requestSeq !== editPolicyRequestSeq) return;console.error('Error:', error);showAlert('Error loading policy for editing: ' + error.message, 'error');const editModal = bootstrap.Modal.getInstance(document.getElementById('editPolicyModal'));diff --git a/weed/admin/view/app/policies_templ.go b/weed/admin/view/app/policies_templ.goindex 4fce2b4a1d..7279207d0a 100644--- a/weed/admin/view/app/policies_templ.go+++ b/weed/admin/view/app/policies_templ.go@@ -193,7 +193,7 @@ func Policies(data dash.PoliciesData) templ.Component {return templ_7745c5c3_Err}}- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</tbody></table></div></div></div></div></div></div><style>\n /* Groups a statement's Sid/Effect and its Action/Resource/Principal\n sections in the structured policy editor. Plain <fieldset>/<legend>\n render fine natively, but Bootstrap's form reset stretches <legend> to\n the fieldset's full width (float: left; width: 100%), which loses the\n usual \"notch in the border\" look and makes the label bar as wide as\n the card. Undo just that here so the legend hugs its content instead.\n */\n .policy-stmt-fieldset {\n border: 1px solid var(--bs-border-color, #dee2e6);\n border-radius: 0.375rem;\n padding: 0 0.75rem 0.75rem;\n margin: 0.75rem 0 0;\n }\n .policy-stmt-legend {\n float: none;\n width: auto;\n max-width: 100%;\n padding: 0 0.5rem;\n margin: 0 0 0.25rem;\n font-size: 0.8125rem;\n font-weight: 600;\n color: var(--bs-secondary-color, #6c757d);\n }\n </style>")+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</tbody></table></div></div></div></div></div></div>")if templ_7745c5c3_Err != nil {return templ_7745c5c3_Err}@@ -201,7 +201,7 @@ func Policies(data dash.PoliciesData) templ.Component {if templ_7745c5c3_Err != nil {return templ_7745c5c3_Err}- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<!-- Create Policy Modal --><div class=\"modal fade\" id=\"createPolicyModal\" tabindex=\"-1\" aria-labelledby=\"createPolicyModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-xl\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"createPolicyModalLabel\"><i class=\"fas fa-shield-alt me-2\"></i>Create IAM Policy</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><div class=\"modal-body\"><form id=\"createPolicyForm\"><div class=\"mb-3\"><label for=\"policyName\" class=\"form-label\">Policy Name</label> <input type=\"text\" class=\"form-control\" id=\"policyName\" name=\"name\" required placeholder=\"e.g., S3ReadOnlyPolicy\"><div class=\"form-text\">Enter a unique name for this policy (alphanumeric and underscores only)</div></div><ul class=\"nav nav-tabs\" role=\"tablist\"><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link active\" id=\"createPolicyEditorTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#createPolicyEditorTab\">Editor</button></li><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link\" id=\"createPolicyJsonTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#createPolicyJsonTab\">JSON</button></li></ul><div class=\"tab-content border border-top-0 rounded-bottom p-3 mb-3\"><div class=\"tab-pane fade show active\" id=\"createPolicyEditorTab\"><div id=\"createPolicyEditorBody\"></div><button type=\"button\" class=\"btn btn-sm btn-outline-secondary\" id=\"createPolicyAddStatementBtn\"><i class=\"fas fa-plus me-1\"></i>Add statement</button></div><div class=\"tab-pane fade\" id=\"createPolicyJsonTab\"><textarea class=\"form-control\" id=\"policyDocument\" name=\"document\" rows=\"15\" placeholder=\"Enter IAM policy JSON document...\"></textarea><div class=\"form-text\">Enter the policy document in AWS IAM JSON format</div></div></div><div class=\"mb-3 d-flex justify-content-between\"><button type=\"button\" class=\"btn btn-outline-info btn-sm\" onclick=\"insertSamplePolicy('create')\"><i class=\"fas fa-file-alt me-1\"></i>Use Sample Policy</button> <button type=\"button\" class=\"btn btn-outline-secondary btn-sm\" onclick=\"validatePolicyDocument('create')\"><i class=\"fas fa-check me-1\"></i>Validate</button></div></form></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Cancel</button> <button type=\"button\" class=\"btn btn-primary\" onclick=\"createPolicy()\"><i class=\"fas fa-plus me-1\"></i>Create Policy</button></div></div></div></div><!-- View Policy Modal --><div class=\"modal fade\" id=\"viewPolicyModal\" tabindex=\"-1\" aria-labelledby=\"viewPolicyModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-lg\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"viewPolicyModalLabel\"><i class=\"fas fa-eye me-2\"></i>View IAM Policy</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><div class=\"modal-body\"><div id=\"viewPolicyContent\"><div class=\"text-center\"><div class=\"spinner-border\" role=\"status\"><span class=\"visually-hidden\">Loading...</span></div><p class=\"mt-2\">Loading policy...</p></div></div></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Close</button> <button type=\"button\" class=\"btn btn-primary\" id=\"editFromViewBtn\"><i class=\"fas fa-edit me-1\"></i>Edit Policy</button></div></div></div></div><!-- Edit Policy Modal --><div class=\"modal fade\" id=\"editPolicyModal\" tabindex=\"-1\" aria-labelledby=\"editPolicyModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-xl\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"editPolicyModalLabel\"><i class=\"fas fa-edit me-2\"></i>Edit IAM Policy</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><div class=\"modal-body\"><form id=\"editPolicyForm\"><div class=\"mb-3\"><label for=\"editPolicyName\" class=\"form-label\">Policy Name</label> <input type=\"text\" class=\"form-control\" id=\"editPolicyName\" name=\"name\" readonly><div class=\"form-text\">Policy name cannot be changed</div></div><ul class=\"nav nav-tabs\" role=\"tablist\"><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link active\" id=\"editPolicyEditorTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#editPolicyEditorTab\">Editor</button></li><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link\" id=\"editPolicyJsonTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#editPolicyJsonTab\">JSON</button></li></ul><div class=\"tab-content border border-top-0 rounded-bottom p-3 mb-3\"><div class=\"tab-pane fade show active\" id=\"editPolicyEditorTab\"><div id=\"editPolicyEditorBody\"></div><button type=\"button\" class=\"btn btn-sm btn-outline-secondary\" id=\"editPolicyAddStatementBtn\"><i class=\"fas fa-plus me-1\"></i>Add statement</button></div><div class=\"tab-pane fade\" id=\"editPolicyJsonTab\"><textarea class=\"form-control\" id=\"editPolicyDocument\" name=\"document\" rows=\"15\"></textarea><div class=\"form-text\">Edit the policy document in AWS IAM JSON format</div></div></div><div class=\"mb-3 d-flex justify-content-between\"><button type=\"button\" class=\"btn btn-outline-info btn-sm\" onclick=\"insertSamplePolicy('edit')\"><i class=\"fas fa-file-alt me-1\"></i>Reset to Sample</button> <button type=\"button\" class=\"btn btn-outline-secondary btn-sm\" onclick=\"validatePolicyDocument('edit')\"><i class=\"fas fa-check me-1\"></i>Validate</button></div></form></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Cancel</button> <button type=\"button\" class=\"btn btn-primary\" onclick=\"updatePolicy()\"><i class=\"fas fa-save me-1\"></i>Save Changes</button></div></div></div></div><!-- JavaScript for Policy Management --><script>\n // Current policy being viewed/edited\n let currentPolicy = null;\n\n // Event listeners for policy actions\n document.addEventListener('DOMContentLoaded', function() {\n // Register the two editor instances used on this page. Config\n // overrides here preserve the pre-extraction ids exactly, so this\n // page's markup did not need to change. This has to run after\n // DOMContentLoaded (not at the top of this script) because\n // policy_editor.js - which defines registerPolicyEditor - is\n // loaded by layout.templ's script bundle at the end of <body>,\n // i.e. after this page's own content (including this inline\n // script) has already been parsed and run.\n registerPolicyEditor('create', { textareaId: 'policyDocument' });\n registerPolicyEditor('edit', { textareaId: 'editPolicyDocument' });\n setupPolicyEditor('create');\n setupPolicyEditor('edit');\n\n // View policy buttons\n document.querySelectorAll('.view-policy-btn').forEach(button => {\n button.addEventListener('click', function() {\n const policyName = this.getAttribute('data-policy-name');\n viewPolicy(policyName);\n });\n });\n\n // Edit policy buttons\n document.querySelectorAll('.edit-policy-btn').forEach(button => {\n button.addEventListener('click', function() {\n const policyName = this.getAttribute('data-policy-name');\n editPolicy(policyName);\n });\n });\n\n // Delete policy buttons\n document.querySelectorAll('.delete-policy-btn').forEach(button => {\n button.addEventListener('click', function() {\n const policyName = this.getAttribute('data-policy-name');\n deletePolicy(policyName);\n });\n });\n\n // Edit from view button\n document.getElementById('editFromViewBtn').addEventListener('click', function() {\n if (currentPolicy) {\n const viewModal = bootstrap.Modal.getInstance(document.getElementById('viewPolicyModal'));\n if (viewModal) viewModal.hide();\n editPolicy(currentPolicy.name);\n }\n });\n\n // Reset the create modal's editor each time it's opened, so leftover\n // state from a previous (possibly cancelled) create doesn't leak in.\n document.getElementById('createPolicyModal').addEventListener('show.bs.modal', function() {\n document.getElementById('createPolicyForm').reset();\n policyEditors.create = { version: '2012-10-17', statements: [], otherFields: {} };\n renderPolicyEditor('create');\n const editorTab = bootstrap.Tab.getOrCreateInstance(document.getElementById('createPolicyEditorTabBtn'));\n editorTab.show();\n });\n });\n\n function createPolicy() {\n if (!commitPolicyActiveTab('create')) return;\n if (!confirmPolicyFieldDiscard('create')) return;\n\n const policyName = document.getElementById('policyName').value;\n const policyDocumentText = document.getElementById('policyDocument').value;\n\n if (!policyName || !policyDocumentText) {\n showAlert('Please fill in all required fields', 'warning');\n return;\n }\n\n let policyDocument;\n try {\n policyDocument = JSON.parse(policyDocumentText);\n } catch (e) {\n showAlert('Invalid JSON in policy document: ' + e.message, 'error');\n return;\n }\n\n const requestData = {\n name: policyName,\n document: policyDocument\n };\n\n validatePolicyJSON(policyDocumentText, true).then(valid => {\n if (!valid) return;\n\n fetch(basePath('/api/object-store/policies'), {\n method: 'POST',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify(requestData)\n })\n .then(response => response.json())\n .then(data => {\n if (data.success) {\n showAlert('Policy created successfully!', 'success');\n const modal = bootstrap.Modal.getInstance(document.getElementById('createPolicyModal'));\n if (modal) modal.hide();\n location.reload(); // Refresh the page to show the new policy\n } else {\n showAlert('Error creating policy: ' + (data.error || 'Unknown error'), 'error');\n }\n })\n .catch(error => {\n console.error('Error:', error);\n showAlert('Error creating policy: ' + error.message, 'error');\n });\n });\n }\n\n function viewPolicy(policyName) {\n // Show the modal first\n const modal = new bootstrap.Modal(document.getElementById('viewPolicyModal'));\n modal.show();\n\n // Reset content to loading state\n document.getElementById('viewPolicyContent').innerHTML = `\n <div class=\"text-center\">\n <div class=\"spinner-border\" role=\"status\">\n <span class=\"visually-hidden\">Loading...</span>\n </div>\n <p class=\"mt-2\">Loading policy...</p>\n </div>\n `;\n\n // Fetch policy data\n fetch(basePath('/api/object-store/policies/' + encodeURIComponent(policyName)))\n .then(response => {\n if (!response.ok) {\n throw new Error('Policy not found');\n }\n return response.json();\n })\n .then(policy => {\n currentPolicy = policy;\n displayPolicyDetails(policy);\n })\n .catch(error => {\n console.error('Error:', error);\n document.getElementById('viewPolicyContent').innerHTML = `\n <div class=\"alert alert-danger\" role=\"alert\">\n <i class=\"fas fa-exclamation-triangle me-2\"></i>\n Error loading policy: ${error.message}\n </div>\n `;\n });\n }\n\n function displayPolicyDetails(policy) {\n const content = document.getElementById('viewPolicyContent');\n\n // Escapes a policy value for display, whether it's carried as a\n // single value or a list, and whatever type it turns out to be.\n function escapedJoin(list) {\n if (list === undefined || list === null) return '';\n return (Array.isArray(list) ? list : [list]).map(function(v) { return escapeHtml(String(v)); }).join(', ');\n }\n\n // Summarizes a Principal/NotPrincipal value for read-only display,\n // regardless of shape (bare string/array, or a {\"Type\": ...} object -\n // possibly with several type keys), since the View modal must stay\n // correct even for forms the structured editor doesn't model.\n function principalSummary(value) {\n if (value === undefined || value === null) return '';\n if (Array.isArray(value)) return escapedJoin(value);\n if (typeof value === 'object') {\n return Object.keys(value).map(function(key) {\n const v = value[key];\n return escapeHtml(key) + ': ' + escapedJoin(v);\n }).join('; ');\n }\n return escapeHtml(String(value));\n }\n\n let statementsHtml = '';\n if (policy.document && policy.document.Statement) {\n statementsHtml = policy.document.Statement.map((stmt, index) => `\n <div class=\"card mb-2\">\n <div class=\"card-header py-2\">\n <h6 class=\"mb-0\">Statement ${index + 1}${stmt.Sid ? ' — ' + escapeHtml(stmt.Sid) : ''}</h6>\n </div>\n <div class=\"card-body py-2\">\n <div class=\"row\">\n <div class=\"col-md-6\">\n <strong>Effect:</strong>\n <span class=\"badge ${stmt.Effect === 'Allow' ? 'bg-success' : 'bg-danger'}\">${escapedJoin(stmt.Effect)}</span>\n </div>\n <div class=\"col-md-6\">\n <strong>Actions:</strong> ${escapedJoin(stmt.Action)}\n </div>\n </div>\n <div class=\"row mt-2\">\n <div class=\"col-12\">\n ${stmt.NotResource\n ? '<strong>NotResource (excluded):</strong> ' + escapedJoin(stmt.NotResource)\n : '<strong>Resource:</strong> ' + escapedJoin(stmt.Resource)}\n </div>\n </div>\n ${(stmt.Principal || stmt.NotPrincipal)\n ? '<div class=\"row mt-2\"><div class=\"col-12\">' +\n (stmt.NotPrincipal\n ? '<strong>NotPrincipal (excluded):</strong> ' + principalSummary(stmt.NotPrincipal)\n : '<strong>Principal:</strong> ' + principalSummary(stmt.Principal)) +\n '</div></div>'\n : ''}\n </div>\n </div>\n `).join('');\n }\n\n content.innerHTML = `\n <div class=\"row mb-3\">\n <div class=\"col-md-6\">\n <strong>Policy Name:</strong> ${escapedJoin(policy.name || 'Unknown')}\n </div>\n <div class=\"col-md-6\">\n <strong>Version:</strong> <span class=\"badge bg-info\">${escapedJoin(policy.document?.Version || 'Unknown')}</span>\n </div>\n </div>\n\n <div class=\"mb-3\">\n <strong>Statements:</strong>\n <div class=\"mt-2\">\n ${statementsHtml || '<p class=\"text-muted\">No statements found</p>'}\n </div>\n </div>\n\n <div class=\"mb-3\">\n <strong>Raw Policy Document:</strong>\n <pre class=\"bg-light p-3 border rounded mt-2\"><code>${escapeHtml(JSON.stringify(policy.document, null, 2))}</code></pre>\n </div>\n `;\n }\n\n function editPolicy(policyName) {\n // Show the modal first\n const modal = new bootstrap.Modal(document.getElementById('editPolicyModal'));\n modal.show();\n\n // Set policy name\n document.getElementById('editPolicyName').value = policyName;\n document.getElementById('editPolicyDocument').value = 'Loading...';\n policyEditors.edit = { version: '2012-10-17', statements: [], otherFields: {} };\n renderPolicyEditor('edit');\n\n // Fetch policy data\n fetch(basePath('/api/object-store/policies/' + encodeURIComponent(policyName)))\n .then(response => {\n if (!response.ok) {\n throw new Error('Policy not found');\n }\n return response.json();\n })\n .then(policy => {\n currentPolicy = policy;\n document.getElementById('editPolicyDocument').value = JSON.stringify(policy.document, null, 2);\n let state;\n try {\n state = policyDocToEditorState(policy.document);\n } catch (e) {\n // Valid JSON the structured editor can't model. The JSON tab\n // exists for exactly this, so hand the document over to it\n // rather than closing the modal on the only view of it.\n policyEditors.edit = { version: '2012-10-17', statements: [], otherFields: {}, unparsed: true };\n renderPolicyEditor('edit');\n showAlert(e.message + '. ' + POLICY_JSON_TAB_ONLY_MESSAGE, 'error');\n bootstrap.Tab.getOrCreateInstance(document.getElementById('editPolicyJsonTabBtn')).show();\n return;\n }\n policyEditors.edit = state;\n renderPolicyEditor('edit');\n const editorTab = bootstrap.Tab.getOrCreateInstance(document.getElementById('editPolicyEditorTabBtn'));\n editorTab.show();\n })\n .catch(error => {\n console.error('Error:', error);\n showAlert('Error loading policy for editing: ' + error.message, 'error');\n const editModal = bootstrap.Modal.getInstance(document.getElementById('editPolicyModal'));\n if (editModal) editModal.hide();\n });\n }\n\n function updatePolicy() {\n if (!commitPolicyActiveTab('edit')) return;\n if (!confirmPolicyFieldDiscard('edit')) return;\n\n const policyName = document.getElementById('editPolicyName').value;\n const policyDocumentText = document.getElementById('editPolicyDocument').value;\n\n if (!policyName || !policyDocumentText) {\n showAlert('Please fill in all required fields', 'warning');\n return;\n }\n\n let policyDocument;\n try {\n policyDocument = JSON.parse(policyDocumentText);\n } catch (e) {\n showAlert('Invalid JSON in policy document: ' + e.message, 'error');\n return;\n }\n\n const requestData = {\n document: policyDocument\n };\n\n validatePolicyJSON(policyDocumentText, true).then(valid => {\n if (!valid) return;\n\n fetch(basePath('/api/object-store/policies/' + encodeURIComponent(policyName)), {\n method: 'PUT',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify(requestData)\n })\n .then(response => response.json())\n .then(data => {\n if (data.success) {\n showAlert('Policy updated successfully!', 'success');\n const modal = bootstrap.Modal.getInstance(document.getElementById('editPolicyModal'));\n if (modal) modal.hide();\n location.reload(); // Refresh the page to show the updated policy\n } else {\n showAlert('Error updating policy: ' + (data.error || 'Unknown error'), 'error');\n }\n })\n .catch(error => {\n console.error('Error:', error);\n showAlert('Error updating policy: ' + error.message, 'error');\n });\n });\n }\n\n function validatePolicyDocument(which) {\n if (!commitPolicyActiveTab(which)) return;\n const policyText = document.getElementById(policyTextareaId(which)).value;\n validatePolicyJSON(policyText);\n }\n\n // Runs a policy document past the server's validator. Resolves to true\n // when it passes, and to false after alerting the user when it doesn't.\n // `quiet` suppresses the success alert for callers that go on to report\n // an outcome of their own.\n function validatePolicyJSON(policyText, quiet) {\n if (!policyText) {\n showAlert('Please enter a policy document first', 'warning');\n return Promise.resolve(false);\n }\n\n let policyDocument;\n try {\n policyDocument = JSON.parse(policyText);\n } catch (e) {\n showAlert('Invalid JSON: ' + e.message, 'error');\n return Promise.resolve(false);\n }\n\n return fetch(basePath('/api/object-store/policies/validate'), {\n method: 'POST',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify({ document: policyDocument })\n })\n .then(response => response.json().then(data => ({ ok: response.ok, data })))\n .then(({ ok, data }) => {\n if (ok && data.valid) {\n if (!quiet) {\n showAlert(data.message || 'Policy document is valid!', 'success');\n }\n return true;\n }\n showAlert('Invalid policy: ' + (data.error || 'unknown error'), 'error');\n return false;\n })\n .catch(error => {\n console.error('Error:', error);\n showAlert('Error validating policy: ' + error.message, 'error');\n return false;\n });\n }\n\n function deletePolicy(policyName) {\n showDeleteConfirm(policyName, function() {\n fetch(basePath('/api/object-store/policies/' + encodeURIComponent(policyName)), {\n method: 'DELETE'\n })\n .then(response => response.json())\n .then(data => {\n if (data.success) {\n showAlert('Policy deleted successfully!', 'success');\n location.reload();\n } else {\n showAlert('Error deleting policy: ' + (data.error || 'Unknown error'), 'error');\n }\n })\n .catch(error => {\n console.error('Error:', error);\n showAlert('Error deleting policy: ' + error.message, 'error');\n });\n });\n }\n </script>")+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<!-- Create Policy Modal --><div class=\"modal fade\" id=\"createPolicyModal\" tabindex=\"-1\" aria-labelledby=\"createPolicyModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-xl\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"createPolicyModalLabel\"><i class=\"fas fa-shield-alt me-2\"></i>Create IAM Policy</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><div class=\"modal-body\"><form id=\"createPolicyForm\"><div class=\"mb-3\"><label for=\"policyName\" class=\"form-label\">Policy Name</label> <input type=\"text\" class=\"form-control\" id=\"policyName\" name=\"name\" required placeholder=\"e.g., S3ReadOnlyPolicy\"><div class=\"form-text\">Enter a unique name for this policy (alphanumeric and underscores only)</div></div><ul class=\"nav nav-tabs\" role=\"tablist\"><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link active\" id=\"createPolicyEditorTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#createPolicyEditorTab\">Editor</button></li><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link\" id=\"createPolicyJsonTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#createPolicyJsonTab\">JSON</button></li></ul><div class=\"tab-content border border-top-0 rounded-bottom p-3 mb-3\"><div class=\"tab-pane fade show active\" id=\"createPolicyEditorTab\"><div id=\"createPolicyEditorBody\"></div><button type=\"button\" class=\"btn btn-sm btn-outline-secondary\" id=\"createPolicyAddStatementBtn\"><i class=\"fas fa-plus me-1\"></i>Add statement</button></div><div class=\"tab-pane fade\" id=\"createPolicyJsonTab\"><textarea class=\"form-control\" id=\"policyDocument\" name=\"document\" rows=\"15\" placeholder=\"Enter IAM policy JSON document...\"></textarea><div class=\"form-text\">Enter the policy document in AWS IAM JSON format</div></div></div><div class=\"mb-3 d-flex justify-content-between\"><button type=\"button\" class=\"btn btn-outline-info btn-sm\" onclick=\"insertSamplePolicy('create')\"><i class=\"fas fa-file-alt me-1\"></i>Use Sample Policy</button> <button type=\"button\" class=\"btn btn-outline-secondary btn-sm\" onclick=\"validatePolicyDocument('create')\"><i class=\"fas fa-check me-1\"></i>Validate</button></div></form></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Cancel</button> <button type=\"button\" class=\"btn btn-primary\" onclick=\"createPolicy()\"><i class=\"fas fa-plus me-1\"></i>Create Policy</button></div></div></div></div><!-- View Policy Modal --><div class=\"modal fade\" id=\"viewPolicyModal\" tabindex=\"-1\" aria-labelledby=\"viewPolicyModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-lg\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"viewPolicyModalLabel\"><i class=\"fas fa-eye me-2\"></i>View IAM Policy</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><div class=\"modal-body\"><div id=\"viewPolicyContent\"><div class=\"text-center\"><div class=\"spinner-border\" role=\"status\"><span class=\"visually-hidden\">Loading...</span></div><p class=\"mt-2\">Loading policy...</p></div></div></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Close</button> <button type=\"button\" class=\"btn btn-primary\" id=\"editFromViewBtn\"><i class=\"fas fa-edit me-1\"></i>Edit Policy</button></div></div></div></div><!-- Edit Policy Modal --><div class=\"modal fade\" id=\"editPolicyModal\" tabindex=\"-1\" aria-labelledby=\"editPolicyModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-xl\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"editPolicyModalLabel\"><i class=\"fas fa-edit me-2\"></i>Edit IAM Policy</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><div class=\"modal-body\"><form id=\"editPolicyForm\"><div class=\"mb-3\"><label for=\"editPolicyName\" class=\"form-label\">Policy Name</label> <input type=\"text\" class=\"form-control\" id=\"editPolicyName\" name=\"name\" readonly><div class=\"form-text\">Policy name cannot be changed</div></div><ul class=\"nav nav-tabs\" role=\"tablist\"><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link active\" id=\"editPolicyEditorTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#editPolicyEditorTab\">Editor</button></li><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link\" id=\"editPolicyJsonTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#editPolicyJsonTab\">JSON</button></li></ul><div class=\"tab-content border border-top-0 rounded-bottom p-3 mb-3\"><div class=\"tab-pane fade show active\" id=\"editPolicyEditorTab\"><div id=\"editPolicyEditorBody\"></div><button type=\"button\" class=\"btn btn-sm btn-outline-secondary\" id=\"editPolicyAddStatementBtn\"><i class=\"fas fa-plus me-1\"></i>Add statement</button></div><div class=\"tab-pane fade\" id=\"editPolicyJsonTab\"><textarea class=\"form-control\" id=\"editPolicyDocument\" name=\"document\" rows=\"15\"></textarea><div class=\"form-text\">Edit the policy document in AWS IAM JSON format</div></div></div><div class=\"mb-3 d-flex justify-content-between\"><button type=\"button\" class=\"btn btn-outline-info btn-sm\" onclick=\"insertSamplePolicy('edit')\"><i class=\"fas fa-file-alt me-1\"></i>Reset to Sample</button> <button type=\"button\" class=\"btn btn-outline-secondary btn-sm\" onclick=\"validatePolicyDocument('edit')\"><i class=\"fas fa-check me-1\"></i>Validate</button></div></form></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Cancel</button> <button type=\"button\" class=\"btn btn-primary\" onclick=\"updatePolicy()\"><i class=\"fas fa-save me-1\"></i>Save Changes</button></div></div></div></div><!-- JavaScript for Policy Management --><script>\n // Current policy being viewed/edited\n let currentPolicy = null;\n // Drop edit-modal GET responses superseded by a later editPolicy call,\n // so a stalled load for one policy can't populate the editor while the\n // name field already says another. Same pattern as the bucket and\n // S3 Tables policy dialogs.\n let editPolicyRequestSeq = 0;\n\n // Event listeners for policy actions\n document.addEventListener('DOMContentLoaded', function() {\n // Register the two editor instances used on this page. Config\n // overrides here preserve the pre-extraction ids exactly, so this\n // page's markup did not need to change. This has to run after\n // DOMContentLoaded (not at the top of this script) because\n // policy_editor.js - which defines registerPolicyEditor - is\n // loaded by layout.templ's script bundle at the end of <body>,\n // i.e. after this page's own content (including this inline\n // script) has already been parsed and run.\n registerPolicyEditor('create', { textareaId: 'policyDocument' });\n registerPolicyEditor('edit', { textareaId: 'editPolicyDocument' });\n setupPolicyEditor('create');\n setupPolicyEditor('edit');\n\n // View policy buttons\n document.querySelectorAll('.view-policy-btn').forEach(button => {\n button.addEventListener('click', function() {\n const policyName = this.getAttribute('data-policy-name');\n viewPolicy(policyName);\n });\n });\n\n // Edit policy buttons\n document.querySelectorAll('.edit-policy-btn').forEach(button => {\n button.addEventListener('click', function() {\n const policyName = this.getAttribute('data-policy-name');\n editPolicy(policyName);\n });\n });\n\n // Delete policy buttons\n document.querySelectorAll('.delete-policy-btn').forEach(button => {\n button.addEventListener('click', function() {\n const policyName = this.getAttribute('data-policy-name');\n deletePolicy(policyName);\n });\n });\n\n // Edit from view button\n document.getElementById('editFromViewBtn').addEventListener('click', function() {\n if (currentPolicy) {\n const viewModal = bootstrap.Modal.getInstance(document.getElementById('viewPolicyModal'));\n if (viewModal) viewModal.hide();\n editPolicy(currentPolicy.name);\n }\n });\n\n // Reset the create modal's editor each time it's opened, so leftover\n // state from a previous (possibly cancelled) create doesn't leak in.\n document.getElementById('createPolicyModal').addEventListener('show.bs.modal', function() {\n document.getElementById('createPolicyForm').reset();\n policyEditors.create = { version: '2012-10-17', statements: [], otherFields: {} };\n renderPolicyEditor('create');\n const editorTab = bootstrap.Tab.getOrCreateInstance(document.getElementById('createPolicyEditorTabBtn'));\n editorTab.show();\n });\n });\n\n function createPolicy() {\n if (!commitPolicyActiveTab('create')) return;\n if (!confirmPolicyFieldDiscard('create')) return;\n\n const policyName = document.getElementById('policyName').value;\n const policyDocumentText = document.getElementById('policyDocument').value;\n\n if (!policyName || !policyDocumentText) {\n showAlert('Please fill in all required fields', 'warning');\n return;\n }\n\n let policyDocument;\n try {\n policyDocument = JSON.parse(policyDocumentText);\n } catch (e) {\n showAlert('Invalid JSON in policy document: ' + e.message, 'error');\n return;\n }\n\n const requestData = {\n name: policyName,\n document: policyDocument\n };\n\n validatePolicyJSON(policyDocumentText, true).then(valid => {\n if (!valid) return;\n\n fetch(basePath('/api/object-store/policies'), {\n method: 'POST',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify(requestData)\n })\n .then(response => response.json())\n .then(data => {\n if (data.success) {\n showAlert('Policy created successfully!', 'success');\n const modal = bootstrap.Modal.getInstance(document.getElementById('createPolicyModal'));\n if (modal) modal.hide();\n location.reload(); // Refresh the page to show the new policy\n } else {\n showAlert('Error creating policy: ' + (data.error || 'Unknown error'), 'error');\n }\n })\n .catch(error => {\n console.error('Error:', error);\n showAlert('Error creating policy: ' + error.message, 'error');\n });\n });\n }\n\n function viewPolicy(policyName) {\n // Show the modal first\n const modal = new bootstrap.Modal(document.getElementById('viewPolicyModal'));\n modal.show();\n\n // Reset content to loading state\n document.getElementById('viewPolicyContent').innerHTML = `\n <div class=\"text-center\">\n <div class=\"spinner-border\" role=\"status\">\n <span class=\"visually-hidden\">Loading...</span>\n </div>\n <p class=\"mt-2\">Loading policy...</p>\n </div>\n `;\n\n // Fetch policy data\n fetch(basePath('/api/object-store/policies/' + encodeURIComponent(policyName)))\n .then(response => {\n if (!response.ok) {\n throw new Error('Policy not found');\n }\n return response.json();\n })\n .then(policy => {\n currentPolicy = policy;\n displayPolicyDetails(policy);\n })\n .catch(error => {\n console.error('Error:', error);\n document.getElementById('viewPolicyContent').innerHTML = `\n <div class=\"alert alert-danger\" role=\"alert\">\n <i class=\"fas fa-exclamation-triangle me-2\"></i>\n Error loading policy: ${error.message}\n </div>\n `;\n });\n }\n\n function displayPolicyDetails(policy) {\n const content = document.getElementById('viewPolicyContent');\n\n // Escapes a policy value for display, whether it's carried as a\n // single value or a list, and whatever type it turns out to be.\n function escapedJoin(list) {\n if (list === undefined || list === null) return '';\n return (Array.isArray(list) ? list : [list]).map(function(v) { return escapeHtml(String(v)); }).join(', ');\n }\n\n // Summarizes a Principal/NotPrincipal value for read-only display,\n // regardless of shape (bare string/array, or a {\"Type\": ...} object -\n // possibly with several type keys), since the View modal must stay\n // correct even for forms the structured editor doesn't model.\n function principalSummary(value) {\n if (value === undefined || value === null) return '';\n if (Array.isArray(value)) return escapedJoin(value);\n if (typeof value === 'object') {\n return Object.keys(value).map(function(key) {\n const v = value[key];\n return escapeHtml(key) + ': ' + escapedJoin(v);\n }).join('; ');\n }\n return escapeHtml(String(value));\n }\n\n let statementsHtml = '';\n if (policy.document && policy.document.Statement) {\n statementsHtml = policy.document.Statement.map((stmt, index) => `\n <div class=\"card mb-2\">\n <div class=\"card-header py-2\">\n <h6 class=\"mb-0\">Statement ${index + 1}${stmt.Sid ? ' — ' + escapeHtml(stmt.Sid) : ''}</h6>\n </div>\n <div class=\"card-body py-2\">\n <div class=\"row\">\n <div class=\"col-md-6\">\n <strong>Effect:</strong>\n <span class=\"badge ${stmt.Effect === 'Allow' ? 'bg-success' : 'bg-danger'}\">${escapedJoin(stmt.Effect)}</span>\n </div>\n <div class=\"col-md-6\">\n <strong>Actions:</strong> ${escapedJoin(stmt.Action)}\n </div>\n </div>\n <div class=\"row mt-2\">\n <div class=\"col-12\">\n ${stmt.NotResource\n ? '<strong>NotResource (excluded):</strong> ' + escapedJoin(stmt.NotResource)\n : '<strong>Resource:</strong> ' + escapedJoin(stmt.Resource)}\n </div>\n </div>\n ${(stmt.Principal || stmt.NotPrincipal)\n ? '<div class=\"row mt-2\"><div class=\"col-12\">' +\n (stmt.NotPrincipal\n ? '<strong>NotPrincipal (excluded):</strong> ' + principalSummary(stmt.NotPrincipal)\n : '<strong>Principal:</strong> ' + principalSummary(stmt.Principal)) +\n '</div></div>'\n : ''}\n </div>\n </div>\n `).join('');\n }\n\n content.innerHTML = `\n <div class=\"row mb-3\">\n <div class=\"col-md-6\">\n <strong>Policy Name:</strong> ${escapedJoin(policy.name || 'Unknown')}\n </div>\n <div class=\"col-md-6\">\n <strong>Version:</strong> <span class=\"badge bg-info\">${escapedJoin(policy.document?.Version || 'Unknown')}</span>\n </div>\n </div>\n\n <div class=\"mb-3\">\n <strong>Statements:</strong>\n <div class=\"mt-2\">\n ${statementsHtml || '<p class=\"text-muted\">No statements found</p>'}\n </div>\n </div>\n\n <div class=\"mb-3\">\n <strong>Raw Policy Document:</strong>\n <pre class=\"bg-light p-3 border rounded mt-2\"><code>${escapeHtml(JSON.stringify(policy.document, null, 2))}</code></pre>\n </div>\n `;\n }\n\n function editPolicy(policyName) {\n // Show the modal first\n const modal = new bootstrap.Modal(document.getElementById('editPolicyModal'));\n modal.show();\n\n // Set policy name\n document.getElementById('editPolicyName').value = policyName;\n document.getElementById('editPolicyDocument').value = 'Loading...';\n policyEditors.edit = { version: '2012-10-17', statements: [], otherFields: {} };\n renderPolicyEditor('edit');\n\n // Fetch policy data; drop the response if another editPolicy call\n // superseded this one meanwhile.\n const requestSeq = ++editPolicyRequestSeq;\n fetch(basePath('/api/object-store/policies/' + encodeURIComponent(policyName)))\n .then(response => {\n if (!response.ok) {\n throw new Error('Policy not found');\n }\n return response.json();\n })\n .then(policy => {\n if (requestSeq !== editPolicyRequestSeq) return;\n currentPolicy = policy;\n document.getElementById('editPolicyDocument').value = JSON.stringify(policy.document, null, 2);\n let state;\n try {\n state = policyDocToEditorState('edit', policy.document);\n } catch (e) {\n // Valid JSON the structured editor can't model. The JSON tab\n // exists for exactly this, so hand the document over to it\n // rather than closing the modal on the only view of it.\n policyEditors.edit = { version: '2012-10-17', statements: [], otherFields: {}, unparsed: true };\n renderPolicyEditor('edit');\n showAlert(e.message + '. ' + POLICY_JSON_TAB_ONLY_MESSAGE, 'error');\n bootstrap.Tab.getOrCreateInstance(document.getElementById('editPolicyJsonTabBtn')).show();\n return;\n }\n policyEditors.edit = state;\n renderPolicyEditor('edit');\n const editorTab = bootstrap.Tab.getOrCreateInstance(document.getElementById('editPolicyEditorTabBtn'));\n editorTab.show();\n })\n .catch(error => {\n if (requestSeq !== editPolicyRequestSeq) return;\n console.error('Error:', error);\n showAlert('Error loading policy for editing: ' + error.message, 'error');\n const editModal = bootstrap.Modal.getInstance(document.getElementById('editPolicyModal'));\n if (editModal) editModal.hide();\n });\n }\n\n function updatePolicy() {\n if (!commitPolicyActiveTab('edit')) return;\n if (!confirmPolicyFieldDiscard('edit')) return;\n\n const policyName = document.getElementById('editPolicyName').value;\n const policyDocumentText = document.getElementById('editPolicyDocument').value;\n\n if (!policyName || !policyDocumentText) {\n showAlert('Please fill in all required fields', 'warning');\n return;\n }\n\n let policyDocument;\n try {\n policyDocument = JSON.parse(policyDocumentText);\n } catch (e) {\n showAlert('Invalid JSON in policy document: ' + e.message, 'error');\n return;\n }\n\n const requestData = {\n document: policyDocument\n };\n\n validatePolicyJSON(policyDocumentText, true).then(valid => {\n if (!valid) return;\n\n fetch(basePath('/api/object-store/policies/' + encodeURIComponent(policyName)), {\n method: 'PUT',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify(requestData)\n })\n .then(response => response.json())\n .then(data => {\n if (data.success) {\n showAlert('Policy updated successfully!', 'success');\n const modal = bootstrap.Modal.getInstance(document.getElementById('editPolicyModal'));\n if (modal) modal.hide();\n location.reload(); // Refresh the page to show the updated policy\n } else {\n showAlert('Error updating policy: ' + (data.error || 'Unknown error'), 'error');\n }\n })\n .catch(error => {\n console.error('Error:', error);\n showAlert('Error updating policy: ' + error.message, 'error');\n });\n });\n }\n\n function validatePolicyDocument(which) {\n if (!commitPolicyActiveTab(which)) return;\n const policyText = document.getElementById(policyTextareaId(which)).value;\n validatePolicyJSON(policyText);\n }\n\n // Runs a policy document past the server's validator. Resolves to true\n // when it passes, and to false after alerting the user when it doesn't.\n // `quiet` suppresses the success alert for callers that go on to report\n // an outcome of their own.\n function validatePolicyJSON(policyText, quiet) {\n if (!policyText) {\n showAlert('Please enter a policy document first', 'warning');\n return Promise.resolve(false);\n }\n\n let policyDocument;\n try {\n policyDocument = JSON.parse(policyText);\n } catch (e) {\n showAlert('Invalid JSON: ' + e.message, 'error');\n return Promise.resolve(false);\n }\n\n return fetch(basePath('/api/object-store/policies/validate'), {\n method: 'POST',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify({ document: policyDocument })\n })\n .then(response => response.json().then(data => ({ ok: response.ok, data })))\n .then(({ ok, data }) => {\n if (ok && data.valid) {\n if (!quiet) {\n showAlert(data.message || 'Policy document is valid!', 'success');\n }\n return true;\n }\n showAlert('Invalid policy: ' + (data.error || 'unknown error'), 'error');\n return false;\n })\n .catch(error => {\n console.error('Error:', error);\n showAlert('Error validating policy: ' + error.message, 'error');\n return false;\n });\n }\n\n function deletePolicy(policyName) {\n showDeleteConfirm(policyName, function() {\n fetch(basePath('/api/object-store/policies/' + encodeURIComponent(policyName)), {\n method: 'DELETE'\n })\n .then(response => response.json())\n .then(data => {\n if (data.success) {\n showAlert('Policy deleted successfully!', 'success');\n location.reload();\n } else {\n showAlert('Error deleting policy: ' + (data.error || 'Unknown error'), 'error');\n }\n })\n .catch(error => {\n console.error('Error:', error);\n showAlert('Error deleting policy: ' + error.message, 'error');\n });\n });\n }\n </script>")if templ_7745c5c3_Err != nil {return templ_7745c5c3_Err}diff --git a/weed/admin/view/app/policy_action_suggestions.go b/weed/admin/view/app/policy_action_suggestions.goindex 608bc8eaf5..2bb11ef170 100644--- a/weed/admin/view/app/policy_action_suggestions.go+++ b/weed/admin/view/app/policy_action_suggestions.go@@ -1,6 +1,10 @@package app-import "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"+import (+ "strings"++ "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"+)// PolicyActionSuggestions feeds the <datalist> used by the structured policy// editor's Action inputs. This is an input-assistance aid, NOT a validation@@ -9,6 +13,18 @@ import "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"// like "s3:Get*", etc.).var PolicyActionSuggestions = buildPolicyActionSuggestions()+// S3TablesPolicyActionSuggestions is the s3tables: subset, for the S3 Tables+// policy editors whose evaluator only matches s3tables actions.+var S3TablesPolicyActionSuggestions = func() []string {+ var out []string+ for _, a := range PolicyActionSuggestions {+ if strings.HasPrefix(a, "s3tables:") {+ out = append(out, a)+ }+ }+ return out+}()+func buildPolicyActionSuggestions() []string {return []string{// s3: actions, sourced from the constants used elsewhere for policydiff --git a/weed/admin/view/app/policy_datalists.templ b/weed/admin/view/app/policy_datalists.templindex 53a9165033..d29f0de06a 100644--- a/weed/admin/view/app/policy_datalists.templ+++ b/weed/admin/view/app/policy_datalists.templ@@ -1,14 +1,40 @@package app-// PolicyDatalists renders the three <datalist> elements the shared visual-// policy editor (weed/admin/static/js/policy_editor.js) attaches its-// action/resource/principal <input list="..."> suggestions to. Any page-// embedding that editor must render this once; its ids-// (policyActionSuggestions, policyResourceSuggestions,-// policyPrincipalSuggestions) are the registerPolicyEditor defaults, so a-// page only needs to override them if it renders more than one instance of-// this component.+// PolicyDatalists renders the <datalist> elements the shared visual policy+// editor (weed/admin/static/js/policy_editor.js) attaches its+// action/resource/principal <input list="..."> suggestions to, plus the+// styles the editor's generated markup depends on. Any page embedding that+// editor must render this once; the ids (policyActionSuggestions,+// policyResourceSuggestions, policyPrincipalSuggestions) are the+// registerPolicyEditor defaults, so a page only needs to override them if+// it renders more than one instance of this component.templ PolicyDatalists() {+ <style>+ /* Groups a statement's Sid/Effect and its Action/Resource/Principal+ sections in the structured policy editor. Plain <fieldset>/<legend>+ render fine natively, but Bootstrap's form reset stretches <legend> to+ the fieldset's full width (float: left; width: 100%), which loses the+ usual "notch in the border" look and makes the label bar as wide as+ the card. Undo just that here so the legend hugs its content instead.+ */+ .policy-stmt-fieldset {+ border: 1px solid var(--bs-border-color, #dee2e6);+ border-radius: 0.375rem;+ padding: 0 0.75rem 0.75rem;+ margin: 0.75rem 0 0;+ }+ .policy-stmt-legend {+ float: none;+ width: auto;+ max-width: 100%;+ padding: 0 0.5rem;+ margin: 0 0 0.25rem;+ font-size: 0.8125rem;+ font-weight: 600;+ color: var(--bs-secondary-color, #6c757d);+ }+ </style>+<!-- Datalist of suggested action names, shared by every policy editor on this page --><datalist id="policyActionSuggestions">for _, action := range PolicyActionSuggestions {@@ -16,6 +42,14 @@ templ PolicyDatalists() {}</datalist>+ <!-- The s3tables: subset, for editors over the S3 Tables policy engine+ (registered with actionDatalistId: 's3tablesPolicyActionSuggestions') -->+ <datalist id="s3tablesPolicyActionSuggestions">+ for _, action := range S3TablesPolicyActionSuggestions {+ <option value={ action }></option>+ }+ </datalist>+<!-- Populated dynamically as the user types in a Resource field: bucketnames first, then subfolders one path segment at a time. SeeupdatePolicyResourceSuggestions() in policy_editor.js. -->diff --git a/weed/admin/view/app/policy_datalists_templ.go b/weed/admin/view/app/policy_datalists_templ.goindex 0116f68459..b0e599dc59 100644--- a/weed/admin/view/app/policy_datalists_templ.go+++ b/weed/admin/view/app/policy_datalists_templ.go@@ -8,14 +8,14 @@ package appimport "github.com/a-h/templ"import templruntime "github.com/a-h/templ/runtime"-// PolicyDatalists renders the three <datalist> elements the shared visual-// policy editor (weed/admin/static/js/policy_editor.js) attaches its-// action/resource/principal <input list="..."> suggestions to. Any page-// embedding that editor must render this once; its ids-// (policyActionSuggestions, policyResourceSuggestions,-// policyPrincipalSuggestions) are the registerPolicyEditor defaults, so a-// page only needs to override them if it renders more than one instance of-// this component.+// PolicyDatalists renders the <datalist> elements the shared visual policy+// editor (weed/admin/static/js/policy_editor.js) attaches its+// action/resource/principal <input list="..."> suggestions to, plus the+// styles the editor's generated markup depends on. Any page embedding that+// editor must render this once; the ids (policyActionSuggestions,+// policyResourceSuggestions, policyPrincipalSuggestions) are the+// registerPolicyEditor defaults, so a page only needs to override them if+// it renders more than one instance of this component.func PolicyDatalists() templ.Component {return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context@@ -37,7 +37,7 @@ func PolicyDatalists() templ.Component {templ_7745c5c3_Var1 = templ.NopComponent}ctx = templ.ClearChildren(ctx)- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!-- Datalist of suggested action names, shared by every policy editor on this page --><datalist id=\"policyActionSuggestions\">")+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<style>\n\t/* Groups a statement's Sid/Effect and its Action/Resource/Principal\n\t sections in the structured policy editor. Plain <fieldset>/<legend>\n\t render fine natively, but Bootstrap's form reset stretches <legend> to\n\t the fieldset's full width (float: left; width: 100%), which loses the\n\t usual \"notch in the border\" look and makes the label bar as wide as\n\t the card. Undo just that here so the legend hugs its content instead.\n\t*/\n\t.policy-stmt-fieldset {\n\t\tborder: 1px solid var(--bs-border-color, #dee2e6);\n\t\tborder-radius: 0.375rem;\n\t\tpadding: 0 0.75rem 0.75rem;\n\t\tmargin: 0.75rem 0 0;\n\t}\n\t.policy-stmt-legend {\n\t\tfloat: none;\n\t\twidth: auto;\n\t\tmax-width: 100%;\n\t\tpadding: 0 0.5rem;\n\t\tmargin: 0 0 0.25rem;\n\t\tfont-size: 0.8125rem;\n\t\tfont-weight: 600;\n\t\tcolor: var(--bs-secondary-color, #6c757d);\n\t}\n\t</style><!-- Datalist of suggested action names, shared by every policy editor on this page --><datalist id=\"policyActionSuggestions\">")if templ_7745c5c3_Err != nil {return templ_7745c5c3_Err}@@ -49,7 +49,7 @@ func PolicyDatalists() templ.Component {var templ_7745c5c3_Var2 stringtempl_7745c5c3_Var2, templ_7745c5c3_Err = templ.ResolveAttributeValue(action)if templ_7745c5c3_Err != nil {- return templ.Error{Err: templ_7745c5c3_Err, FileName: `weed/admin/view/app/policy_datalists.templ`, Line: 15, Col: 25}+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `weed/admin/view/app/policy_datalists.templ`, Line: 41, Col: 25}}_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var2)if templ_7745c5c3_Err != nil {@@ -60,7 +60,30 @@ func PolicyDatalists() templ.Component {return templ_7745c5c3_Err}}- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</datalist><!-- Populated dynamically as the user types in a Resource field: bucket\n\t names first, then subfolders one path segment at a time. See\n\t updatePolicyResourceSuggestions() in policy_editor.js. --><datalist id=\"policyResourceSuggestions\"></datalist><!-- Populated dynamically as the user types/focuses a Principal field:\n\t existing users and IAM roles, fetched once from /api/principals. See\n\t updatePolicyPrincipalSuggestions() in policy_editor.js. --><datalist id=\"policyPrincipalSuggestions\"></datalist>")+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</datalist><!-- The s3tables: subset, for editors over the S3 Tables policy engine\n\t (registered with actionDatalistId: 's3tablesPolicyActionSuggestions') --><datalist id=\"s3tablesPolicyActionSuggestions\">")+ if templ_7745c5c3_Err != nil {+ return templ_7745c5c3_Err+ }+ for _, action := range S3TablesPolicyActionSuggestions {+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<option value=\"")+ if templ_7745c5c3_Err != nil {+ return templ_7745c5c3_Err+ }+ var templ_7745c5c3_Var3 string+ templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.ResolveAttributeValue(action)+ if templ_7745c5c3_Err != nil {+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `weed/admin/view/app/policy_datalists.templ`, Line: 49, Col: 25}+ }+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var3)+ if templ_7745c5c3_Err != nil {+ return templ_7745c5c3_Err+ }+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "\"></option>")+ if templ_7745c5c3_Err != nil {+ return templ_7745c5c3_Err+ }+ }+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "</datalist><!-- Populated dynamically as the user types in a Resource field: bucket\n\t names first, then subfolders one path segment at a time. See\n\t updatePolicyResourceSuggestions() in policy_editor.js. --><datalist id=\"policyResourceSuggestions\"></datalist><!-- Populated dynamically as the user types/focuses a Principal field:\n\t existing users and IAM roles, fetched once from /api/principals. See\n\t updatePolicyPrincipalSuggestions() in policy_editor.js. --><datalist id=\"policyPrincipalSuggestions\"></datalist>")if templ_7745c5c3_Err != nil {return templ_7745c5c3_Err}diff --git a/weed/admin/view/app/s3_buckets.templ b/weed/admin/view/app/s3_buckets.templindex fe124cd3a8..d76c071240 100644--- a/weed/admin/view/app/s3_buckets.templ+++ b/weed/admin/view/app/s3_buckets.templ@@ -1410,7 +1410,7 @@ templ S3Buckets(data dash.S3BucketsData) {// Drop responses that arrive after another bucket was openedconst requestSeq = ++policyRequestSeq;- fetch(basePath('/api/s3/buckets/' + bucketName + '/policy'))+ fetch(basePath('/api/s3/buckets/' + encodeURIComponent(bucketName) + '/policy')).then(parseLifecycleResponse).then(({ ok, data }) => {if (requestSeq !== policyRequestSeq) return;@@ -1422,8 +1422,11 @@ templ S3Buckets(data dash.S3BucketsData) {return;}document.getElementById('bucketPolicyEditorWrapper').style.display = '';+ // policy_text carries stored bytes the server-side+ // decoder rejects; the JSON tab shows them so they+ // can be fixed or deleted.document.getElementById('bucketPolicyDocument').value =- data.policy ? JSON.stringify(data.policy, null, 2) : '';+ data.policy ? JSON.stringify(data.policy, null, 2) : (data.policy_text || '');bucketPolicyLoaded = true;loadPolicyTextareaIntoEditor('bucket');})@@ -1454,8 +1457,8 @@ templ S3Buckets(data dash.S3BucketsData) {if (!commitPolicyActiveTab('bucket')) return;const raw = document.getElementById('bucketPolicyDocument').value.trim();- if (!raw) {- alert('Enter a policy document, or use Delete to remove the bucket policy.');+ if (!raw || !policyTextHasStatements(raw)) {+ alert('Add at least one statement, or use Delete to remove the bucket policy.');return;}@@ -1471,13 +1474,18 @@ templ S3Buckets(data dash.S3BucketsData) {alert(validationError);return;}+ // The admin API decodes only Version and Statement, so warn+ // before other top-level fields are silently dropped - the IAM+ // policies page already does. (The S3 Tables dialogs don't:+ // their backend stores the document verbatim.)+ if (!confirmPolicyFieldDiscard('bucket')) return;// Captured now: if the dialog moves on to a different bucket// before this PUT resolves, the completion below must not hide// or reload over whatever that other bucket is now showing.const targetBucket = policyEditorBucket;setBucketPolicyMutationInFlight(true);- fetch(basePath('/api/s3/buckets/' + targetBucket + '/policy'), {+ fetch(basePath('/api/s3/buckets/' + encodeURIComponent(targetBucket) + '/policy'), {method: 'PUT',headers: csrfHeaders(),body: JSON.stringify({ policy: policy })@@ -1524,7 +1532,7 @@ templ S3Buckets(data dash.S3BucketsData) {// hide or reload over whatever that other bucket is now showing.const targetBucket = policyEditorBucket;setBucketPolicyMutationInFlight(true);- fetch(basePath('/api/s3/buckets/' + targetBucket + '/policy'), {+ fetch(basePath('/api/s3/buckets/' + encodeURIComponent(targetBucket) + '/policy'), {method: 'DELETE',headers: csrfHeaders()})diff --git a/weed/admin/view/app/s3_buckets_templ.go b/weed/admin/view/app/s3_buckets_templ.goindex 64c1ee16a5..cfae7e1712 100644--- a/weed/admin/view/app/s3_buckets_templ.go+++ b/weed/admin/view/app/s3_buckets_templ.go@@ -865,7 +865,7 @@ func S3Buckets(data dash.S3BucketsData) templ.Component {if templ_7745c5c3_Err != nil {return templ_7745c5c3_Err}- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 99, "<!-- Bucket Policy Modal --><div class=\"modal fade\" id=\"bucketPolicyModal\" tabindex=\"-1\" aria-labelledby=\"bucketPolicyModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-xl\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"bucketPolicyModalLabel\"><i class=\"fas fa-file-shield me-2\"></i>Bucket Policy</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><div class=\"modal-body\"><div id=\"bucketPolicyLoading\" class=\"text-center py-4\"><div class=\"spinner-border text-primary\" role=\"status\"><span class=\"visually-hidden\">Loading...</span></div><div class=\"mt-2\">Loading bucket policy...</div></div><div id=\"bucketPolicyError\" class=\"alert alert-danger\" style=\"display: none;\"></div><div id=\"bucketPolicyEditorWrapper\" style=\"display: none;\"><p class=\"text-muted small\">Every statement must specify a Principal, and every Resource must refer to this bucket. Leave the document empty and click Delete to remove the policy.</p><ul class=\"nav nav-tabs\" role=\"tablist\"><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link active\" id=\"bucketPolicyEditorTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#bucketPolicyEditorTab\" role=\"tab\" aria-controls=\"bucketPolicyEditorTab\" aria-selected=\"true\">Editor</button></li><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link\" id=\"bucketPolicyJsonTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#bucketPolicyJsonTab\" role=\"tab\" aria-controls=\"bucketPolicyJsonTab\" aria-selected=\"false\">JSON</button></li></ul><div class=\"tab-content border border-top-0 rounded-bottom p-3 mb-3\"><div class=\"tab-pane fade show active\" id=\"bucketPolicyEditorTab\" role=\"tabpanel\" aria-labelledby=\"bucketPolicyEditorTabBtn\"><div id=\"bucketPolicyEditorBody\"></div><button type=\"button\" class=\"btn btn-sm btn-outline-secondary\" id=\"bucketPolicyAddStatementBtn\"><i class=\"fas fa-plus me-1\"></i>Add statement</button></div><div class=\"tab-pane fade\" id=\"bucketPolicyJsonTab\" role=\"tabpanel\" aria-labelledby=\"bucketPolicyJsonTabBtn\"><textarea class=\"form-control\" id=\"bucketPolicyDocument\" rows=\"15\" style=\"font-family: monospace;\" spellcheck=\"false\" placeholder='{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":\"*\",\"Action\":\"s3:GetObject\",\"Resource\":\"arn:aws:s3:::bucket-name/*\"}]}'></textarea><div class=\"form-text\">Enter the bucket policy document as JSON</div></div></div><div class=\"mb-3\"><button type=\"button\" class=\"btn btn-outline-info btn-sm\" id=\"bucketPolicyInsertSampleBtn\"><i class=\"fas fa-file-alt me-1\"></i>Use Sample Policy</button></div></div></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-outline-danger me-auto\" id=\"bucketPolicyDeleteBtn\"><i class=\"fas fa-trash me-1\"></i>Delete</button> <button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Cancel</button> <button type=\"button\" class=\"btn btn-primary\" id=\"bucketPolicySaveBtn\"><i class=\"fas fa-save me-1\"></i>Save</button></div></div></div></div><!-- Manage Owner Modal --><div class=\"modal fade\" id=\"manageOwnerModal\" tabindex=\"-1\" aria-labelledby=\"manageOwnerModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"manageOwnerModalLabel\"><i class=\"fas fa-user-edit me-2\"></i>Manage Bucket Owner</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><form id=\"ownerForm\"><div class=\"modal-body\"><div class=\"mb-3\"><label class=\"form-label\">Bucket Name</label> <input type=\"text\" class=\"form-control\" id=\"ownerBucketName\" readonly></div><div class=\"mb-3\"><label for=\"bucketOwnerSelect\" class=\"form-label\">Owner</label> <select class=\"form-select\" id=\"bucketOwnerSelect\" name=\"owner\"><option value=\"\">No owner (admin-only access)</option><!-- Options will be populated dynamically --></select><div class=\"form-text\">Select the S3 identity that owns this bucket. Non-admin users can only access buckets they own.</div></div><div id=\"ownerLoadingSpinner\" class=\"text-center py-2\" style=\"display: none;\"><div class=\"spinner-border spinner-border-sm text-primary\" role=\"status\"><span class=\"visually-hidden\">Loading users...</span></div><span class=\"ms-2\">Loading users...</span></div></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Cancel</button> <button type=\"submit\" class=\"btn btn-info\"><i class=\"fas fa-save me-1\"></i>Update Owner</button></div></form></div></div></div><!-- JavaScript for bucket management --><script>\n // Global state (shared between DOMContentLoaded handlers and global functions)\n let deleteModalInstance = null;\n let quotaModalInstance = null;\n let ownerModalInstance = null;\n let detailsModalInstance = null;\n let lifecycleModalInstance = null;\n let lifecycleRequestSeq = 0;\n let policyModalInstance = null;\n let policyRequestSeq = 0;\n let policyEditorBucket = null;\n // True only once the bucket-policy GET for the currently open bucket has\n // actually completed successfully. The Save button lives outside the\n // (initially hidden) editor wrapper, so it stays clickable while a load\n // is in flight or has failed; without this guard, Save could commit\n // whatever the editor happened to hold - a stale previous bucket's\n // statements, or a freshly-initialized empty state - onto\n // policyEditorBucket before its own policy ever loaded.\n let bucketPolicyLoaded = false;\n // True while a Save (PUT) or Delete (DELETE) request for the bucket\n // policy is in flight, so a double-click - or Save and Delete fired in\n // quick succession - can't send two overlapping mutations for the same\n // bucket. Cleared on failure so the user can retry; left set on success,\n // since the modal hides and the page reloads shortly after anyway.\n let bucketPolicyMutationInFlight = false;\n\n function setBucketPolicyMutationInFlight(inFlight) {\n bucketPolicyMutationInFlight = inFlight;\n document.getElementById('bucketPolicySaveBtn').disabled = inFlight;\n document.getElementById('bucketPolicyDeleteBtn').disabled = inFlight;\n }\n\n let cachedUsers = null;\n\n // Working copy of the lifecycle rules currently shown in the modal.\n // Edits (add/edit/delete rule) only mutate this local state; nothing is\n // sent to the server until \"Save\" or \"Delete all rules\" is clicked.\n let lifecycleEditor = { bucket: null, rules: [], editingIndex: null, editingRule: null, rawXml: '', hasTransition: false };\n\n function escapeHtml(v) {\n return String(v ?? '')\n .replace(/&/g, '&')\n .replace(/</g, '<')\n .replace(/>/g, '>')\n .replace(/\"/g, '"')\n .replace(/'/g, ''');\n }\n\n // Shadows admin.js's formatBytes for this page, so it keeps that\n // signature and unit list; the extra guard is for a size the API left\n // out, which the shared one renders as \"NaN undefined\".\n function formatBytes(bytes, decimals = 2) {\n if (!bytes) return '0 Bytes';\n const k = 1024;\n const dm = decimals < 0 ? 0 : decimals;\n const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB'];\n const i = Math.floor(Math.log(bytes) / Math.log(k));\n return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];\n }\n\n function formatDays(n) {\n return n + (n === 1 ? ' day' : ' days');\n }\n\n // csrfHeaders reads the token the layout stamps into every page\n // (<meta name=\"csrf-token\">) so mutating lifecycle requests pass it the\n // same way the newer admin pages (e.g. s3tables) do.\n function csrfHeaders() {\n const meta = document.querySelector('meta[name=\"csrf-token\"]');\n const token = meta ? (meta.getAttribute('content') || '') : '';\n const headers = { 'Content-Type': 'application/json' };\n if (token) {\n headers['X-CSRF-Token'] = token;\n }\n return headers;\n }\n\n // parseLifecycleResponse reads the body as text before parsing, so a\n // non-JSON response (a proxy's HTML error page, an empty body, plain\n // text from some middleware) surfaces the HTTP status instead of\n // throwing a raw JSON syntax error out of response.json().\n function parseLifecycleResponse(response) {\n return response.text().then(text => {\n let data = {};\n if (text) {\n try {\n data = JSON.parse(text);\n } catch (e) {\n data = { error: response.statusText || ('HTTP ' + response.status) };\n }\n } else if (!response.ok) {\n data = { error: response.statusText || ('HTTP ' + response.status) };\n }\n return { ok: response.ok, data: data };\n });\n }\n\n document.addEventListener('DOMContentLoaded', function() {\n // Add click handlers to pagination links\n document.querySelectorAll('.pagination-link').forEach(link => {\n link.addEventListener('click', function(e) {\n e.preventDefault();\n const page = this.getAttribute('data-page');\n goToPage(page);\n });\n });\n\n // Initialize modal instances once (reuse with show/hide)\n deleteModalInstance = new bootstrap.Modal(document.getElementById('deleteBucketModal'));\n quotaModalInstance = new bootstrap.Modal(document.getElementById('manageQuotaModal'));\n ownerModalInstance = new bootstrap.Modal(document.getElementById('manageOwnerModal'));\n detailsModalInstance = new bootstrap.Modal(document.getElementById('bucketDetailsModal'));\n lifecycleModalInstance = new bootstrap.Modal(document.getElementById('bucketLifecycleModal'));\n policyModalInstance = new bootstrap.Modal(document.getElementById('bucketPolicyModal'));\n\n const quotaCheckbox = document.getElementById('enableQuota');\n const quotaSettings = document.getElementById('quotaSettings');\n const versioningCheckbox = document.getElementById('enableVersioning');\n const objectLockCheckbox = document.getElementById('enableObjectLock');\n const objectLockSettings = document.getElementById('objectLockSettings');\n const setDefaultRetentionCheckbox = document.getElementById('setDefaultRetention');\n const defaultRetentionSettings = document.getElementById('defaultRetentionSettings');\n const createBucketForm = document.getElementById('createBucketForm');\n\n // Toggle quota settings\n quotaCheckbox.addEventListener('change', function() {\n quotaSettings.style.display = this.checked ? 'block' : 'none';\n });\n\n // Toggle object lock settings and automatically enable versioning\n objectLockCheckbox.addEventListener('change', function() {\n objectLockSettings.style.display = this.checked ? 'block' : 'none';\n if (this.checked) {\n versioningCheckbox.checked = true;\n versioningCheckbox.disabled = true;\n } else {\n versioningCheckbox.disabled = false;\n // Reset default retention settings when object lock is disabled\n setDefaultRetentionCheckbox.checked = false;\n defaultRetentionSettings.style.display = 'none';\n }\n });\n\n // Toggle default retention settings\n setDefaultRetentionCheckbox.addEventListener('change', function() {\n defaultRetentionSettings.style.display = this.checked ? 'block' : 'none';\n });\n\n // Populate owner dropdown when create bucket modal opens\n document.getElementById('createBucketModal').addEventListener('show.bs.modal', async function() {\n const ownerSelect = document.getElementById('bucketOwner');\n \n // Only fetch if not already populated\n if (ownerSelect.options.length <= 1) {\n try {\n const response = await fetch(basePath('/api/users'));\n const data = await response.json();\n const users = data.users || [];\n \n users.forEach(user => {\n const option = document.createElement('option');\n option.value = user.username;\n option.textContent = user.username;\n ownerSelect.appendChild(option);\n });\n } catch (error) {\n console.error('Error fetching users for owner dropdown:', error);\n // Reset to default state on error - user can still create bucket without owner\n ownerSelect.innerHTML = '<option value=\"\">No owner (admin-only access)</option>';\n ownerSelect.selectedIndex = 0;\n }\n }\n });\n\n // Handle form submission\n createBucketForm.addEventListener('submit', function(e) {\n e.preventDefault();\n \n const formData = new FormData(this);\n const data = {\n name: formData.get('name'),\n owner: formData.get('owner') || '',\n region: formData.get('region') || '',\n quota_size: quotaCheckbox.checked ? parseInt(formData.get('quota_size')) || 0 : 0,\n quota_unit: formData.get('quota_unit') || 'MB',\n quota_enabled: quotaCheckbox.checked,\n versioning_enabled: versioningCheckbox.checked,\n object_lock_enabled: objectLockCheckbox.checked,\n object_lock_mode: formData.get('object_lock_mode') || 'GOVERNANCE',\n set_default_retention: setDefaultRetentionCheckbox.checked,\n object_lock_duration: setDefaultRetentionCheckbox.checked ? parseInt(formData.get('object_lock_duration')) || 30 : 0\n };\n\n // Validate object lock settings\n if (data.object_lock_enabled && data.set_default_retention && data.object_lock_duration <= 0) {\n alert('Please enter a valid retention duration for object lock.');\n return;\n }\n\n fetch(basePath('/api/s3/buckets'), {\n method: 'POST',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify(data)\n })\n .then(response => response.json())\n .then(data => {\n if (data.error) {\n alert('Error creating bucket: ' + data.error);\n } else {\n alert('Bucket created successfully!');\n // Properly close the modal before reloading\n const createModal = bootstrap.Modal.getInstance(document.getElementById('createBucketModal'));\n if (createModal) {\n createModal.hide();\n }\n setTimeout(() => location.reload(), 500);\n }\n })\n .catch(error => {\n console.error('Error:', error);\n alert('Error creating bucket: ' + error.message);\n });\n });\n\n // Handle delete bucket\n const deleteForm = document.getElementById('deleteBucketModal');\n document.querySelectorAll('.delete-bucket-btn').forEach(button => {\n button.addEventListener('click', function() {\n const bucketName = this.dataset.bucketName;\n document.getElementById('deleteBucketName').textContent = bucketName;\n // Store bucket name on modal element instead of global window property\n deleteForm.dataset.bucketName = bucketName;\n deleteModalInstance.show();\n });\n });\n\n // Handle quota management\n const quotaForm = document.getElementById('quotaForm');\n document.querySelectorAll('.quota-btn').forEach(button => {\n button.addEventListener('click', function() {\n const bucketName = this.dataset.bucketName;\n const currentQuota = parseInt(this.dataset.currentQuota);\n const quotaEnabled = this.dataset.quotaEnabled === 'true';\n \n document.getElementById('quotaBucketName').value = bucketName;\n document.getElementById('quotaEnabled').checked = quotaEnabled;\n document.getElementById('quotaSizeMB').value = currentQuota;\n \n // Toggle quota size settings\n document.getElementById('quotaSizeSettings').style.display = quotaEnabled ? 'block' : 'none';\n \n // Store bucket name on form element instead of global window property\n quotaForm.dataset.bucketName = bucketName;\n quotaModalInstance.show();\n });\n });\n\n // Add event listener to properly dispose of quota modal when hidden\n document.getElementById('manageQuotaModal').addEventListener('hidden.bs.modal', function() {\n if (quotaModalInstance) {\n quotaModalInstance.dispose();\n quotaModalInstance = null;\n }\n // Force remove any remaining backdrops\n document.querySelectorAll('.modal-backdrop').forEach(backdrop => {\n backdrop.remove();\n });\n // Ensure body classes are removed\n document.body.classList.remove('modal-open');\n document.body.style.removeProperty('padding-right');\n });\n\n // Handle quota form submission\n document.getElementById('quotaForm').addEventListener('submit', function(e) {\n e.preventDefault();\n \n const bucketName = this.dataset.bucketName;\n if (!bucketName) return;\n\n const formData = new FormData(this);\n const enabled = document.getElementById('quotaEnabled').checked;\n const data = {\n quota_size: enabled ? parseInt(formData.get('quota_size')) || 0 : 0,\n quota_unit: formData.get('quota_unit') || 'MB',\n quota_enabled: enabled\n };\n\n fetch(basePath(`/api/s3/buckets/${bucketName}/quota`), {\n method: 'PUT',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify(data)\n })\n .then(response => response.json())\n .then(data => {\n if (data.error) {\n alert('Error updating quota: ' + data.error);\n } else {\n alert('Quota updated successfully!');\n // Properly close the modal before reloading\n if (quotaModalInstance) {\n quotaModalInstance.hide();\n }\n setTimeout(() => location.reload(), 500);\n }\n })\n .catch(error => {\n console.error('Error:', error);\n alert('Error updating quota: ' + error.message);\n });\n });\n\n // Handle quota enabled checkbox\n document.getElementById('quotaEnabled').addEventListener('change', function() {\n document.getElementById('quotaSizeSettings').style.display = this.checked ? 'block' : 'none';\n });\n\n // Handle owner management\n const ownerForm = document.getElementById('ownerForm');\n document.querySelectorAll('.owner-btn').forEach(button => {\n button.addEventListener('click', async function() {\n const bucketName = this.dataset.bucketName;\n const currentOwner = this.dataset.currentOwner || '';\n \n document.getElementById('ownerBucketName').value = bucketName;\n // Store bucket name on form element instead of global window property\n ownerForm.dataset.bucketName = bucketName;\n \n // Show loading spinner\n document.getElementById('ownerLoadingSpinner').style.display = 'block';\n document.getElementById('bucketOwnerSelect').disabled = true;\n \n ownerModalInstance.show();\n \n // Fetch users if not cached\n try {\n if (!cachedUsers) {\n const response = await fetch(basePath('/api/users'));\n const data = await response.json();\n cachedUsers = data.users || [];\n }\n \n // Populate the select dropdown\n const select = document.getElementById('bucketOwnerSelect');\n select.innerHTML = '<option value=\"\">No owner (admin-only access)</option>';\n \n cachedUsers.forEach(user => {\n const option = document.createElement('option');\n option.value = user.username;\n option.textContent = user.username;\n if (user.username === currentOwner) {\n option.selected = true;\n }\n select.appendChild(option);\n });\n \n select.disabled = false;\n } catch (error) {\n console.error('Error fetching users:', error);\n alert('Error loading users: ' + error.message);\n // Re-enable select and reset to default on error\n const select = document.getElementById('bucketOwnerSelect');\n select.innerHTML = '<option value=\"\">No owner (admin-only access)</option>';\n select.selectedIndex = 0;\n select.disabled = false;\n } finally {\n document.getElementById('ownerLoadingSpinner').style.display = 'none';\n }\n });\n });\n\n // Handle owner form submission\n document.getElementById('ownerForm').addEventListener('submit', function(e) {\n e.preventDefault();\n \n const bucketName = this.dataset.bucketName;\n if (!bucketName) return;\n\n const owner = document.getElementById('bucketOwnerSelect').value;\n const data = { owner: owner };\n\n fetch(basePath(`/api/s3/buckets/${bucketName}/owner`), {\n method: 'PUT',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify(data)\n })\n .then(response => response.json())\n .then(data => {\n if (data.error) {\n alert('Error updating owner: ' + data.error);\n } else {\n alert('Bucket owner updated successfully!');\n // Properly close the modal before reloading\n if (ownerModalInstance) {\n ownerModalInstance.hide();\n }\n setTimeout(() => location.reload(), 500);\n }\n })\n .catch(error => {\n console.error('Error:', error);\n alert('Error updating owner: ' + error.message);\n });\n });\n\n // Handle view details button\n document.querySelectorAll('.view-details-btn').forEach(button => {\n button.addEventListener('click', function() {\n const bucketName = this.dataset.bucketName;\n \n // Update modal title\n document.getElementById('bucketDetailsModalLabel').innerHTML = \n '<i class=\"fas fa-cube me-2\"></i>Bucket Details - ' + bucketName;\n \n // Show loading spinner\n document.getElementById('bucketDetailsContent').innerHTML = \n '<div class=\"text-center py-4\">' +\n '<div class=\"spinner-border text-primary\" role=\"status\">' +\n '<span class=\"visually-hidden\">Loading...</span>' +\n '<\\\\/div>' +\n '<div class=\"mt-2\">Loading bucket details...</div>' +\n '<\\\\/div>';\n \n detailsModalInstance.show();\n \n // Fetch bucket details\n fetch(basePath('/api/s3/buckets/' + bucketName))\n .then(response => response.json())\n .then(data => {\n if (data.error) {\n document.getElementById('bucketDetailsContent').innerHTML = \n '<div class=\"alert alert-danger\">' +\n '<i class=\"fas fa-exclamation-triangle me-2\"></i>' +\n 'Error loading bucket details: ' + data.error +\n '<\\\\/div>';\n } else {\n displayBucketDetails(data);\n }\n })\n .catch(error => {\n console.error('Error fetching bucket details:', error);\n document.getElementById('bucketDetailsContent').innerHTML = \n '<div class=\"alert alert-danger\">' +\n '<i class=\"fas fa-exclamation-triangle me-2\"></i>' +\n 'Error loading bucket details: ' + error.message +\n '<\\\\/div>';\n });\n });\n });\n\n // Lifecycle buttons: column badge and action button\n document.querySelectorAll('.lifecycle-btn').forEach(button => {\n button.addEventListener('click', function() {\n const bucketName = this.dataset.bucketName;\n\n // Reset the working copy until the GET below repopulates it,\n // so Save/Delete-all can't act on the previous bucket's rules.\n lifecycleEditor = { bucket: null, rules: [], editingIndex: null, editingRule: null, rawXml: '', hasTransition: false };\n\n document.getElementById('bucketLifecycleModalLabel').innerHTML =\n '<i class=\"fas fa-recycle me-2\"></i>Lifecycle - ' + bucketName;\n\n document.getElementById('bucketLifecycleContent').innerHTML =\n '<div class=\"text-center py-4\">' +\n '<div class=\"spinner-border text-primary\" role=\"status\">' +\n '<span class=\"visually-hidden\">Loading...</span>' +\n '<\\/div>' +\n '<div class=\"mt-2\">Loading lifecycle rules...</div>' +\n '<\\/div>';\n\n lifecycleModalInstance.show();\n\n // Drop responses that arrive after another bucket was opened\n const requestSeq = ++lifecycleRequestSeq;\n fetch(basePath('/api/s3/buckets/' + bucketName + '/lifecycle'))\n .then(parseLifecycleResponse)\n .then(({ ok, data }) => {\n if (requestSeq !== lifecycleRequestSeq) return;\n if (!ok || data.error) {\n document.getElementById('bucketLifecycleContent').innerHTML =\n '<div class=\"alert alert-danger\">' +\n '<i class=\"fas fa-exclamation-triangle me-2\"></i>' +\n 'Error loading lifecycle rules: ' + (data.error || 'unknown error') +\n '<\\/div>';\n } else {\n displayBucketLifecycle(data);\n }\n })\n .catch(error => {\n if (requestSeq !== lifecycleRequestSeq) return;\n console.error('Error fetching bucket lifecycle:', error);\n document.getElementById('bucketLifecycleContent').innerHTML =\n '<div class=\"alert alert-danger\">' +\n '<i class=\"fas fa-exclamation-triangle me-2\"></i>' +\n 'Error loading lifecycle rules: ' + error.message +\n '<\\/div>';\n });\n });\n });\n\n // Save the whole working rule set back to the bucket.\n document.getElementById('lifecycleSaveAllBtn').addEventListener('click', function() {\n if (!lifecycleEditor.bucket) return;\n // Fold in any rule the user is still editing so Save doesn't\n // silently discard it; abort if that form isn't valid yet.\n if (!commitOpenLifecycleRuleForm()) return;\n // An empty list clears the configuration, same as Delete all rules,\n // so it gets the same prompt.\n if (lifecycleEditor.rules.length === 0 &&\n !confirm('No rules left: saving removes the lifecycle configuration for ' + lifecycleEditor.bucket + '. This cannot be undone.')) {\n return;\n }\n\n fetch(basePath('/api/s3/buckets/' + lifecycleEditor.bucket + '/lifecycle'), {\n method: 'PUT',\n headers: csrfHeaders(),\n body: JSON.stringify({ rules: lifecycleEditor.rules })\n })\n .then(parseLifecycleResponse)\n .then(({ ok, data }) => {\n if (!ok || data.error) {\n alert('Error saving lifecycle rules: ' + (data.error || 'unknown error'));\n return;\n }\n if (lifecycleModalInstance) {\n lifecycleModalInstance.hide();\n }\n setTimeout(() => location.reload(), 500);\n })\n .catch(error => {\n console.error('Error:', error);\n alert('Error saving lifecycle rules: ' + error.message);\n });\n });\n\n // Clear the lifecycle configuration entirely.\n document.getElementById('lifecycleDeleteAllBtn').addEventListener('click', function() {\n if (!lifecycleEditor.bucket) return;\n if (!confirm('Delete all lifecycle rules for ' + lifecycleEditor.bucket + '? This cannot be undone.')) return;\n\n fetch(basePath('/api/s3/buckets/' + lifecycleEditor.bucket + '/lifecycle'), {\n method: 'DELETE',\n headers: csrfHeaders()\n })\n .then(parseLifecycleResponse)\n .then(({ ok, data }) => {\n if (!ok || data.error) {\n alert('Error deleting lifecycle rules: ' + (data.error || 'unknown error'));\n return;\n }\n if (lifecycleModalInstance) {\n lifecycleModalInstance.hide();\n }\n setTimeout(() => location.reload(), 500);\n })\n .catch(error => {\n console.error('Error:', error);\n alert('Error deleting lifecycle rules: ' + error.message);\n });\n });\n\n // Policy buttons: column badge and action button. The visual editor\n // (weed/admin/static/js/policy_editor.js) is set up once per page\n // load; registerPolicyEditor is re-called on every open so the\n // resource-ARN autocomplete and default Principal stay pinned to\n // whichever bucket is currently open.\n let bucketPolicyEditorSetUp = false;\n document.getElementById('bucketPolicyInsertSampleBtn').addEventListener('click', function() {\n if (!policyEditorBucket) return;\n insertSamplePolicy('bucket', {\n Version: '2012-10-17',\n Statement: [{\n Effect: 'Allow',\n Principal: '*',\n Action: ['s3:GetObject'],\n Resource: ['arn:aws:s3:::' + policyEditorBucket + '/*']\n }]\n });\n });\n\n document.querySelectorAll('.policy-btn').forEach(button => {\n button.addEventListener('click', function() {\n const bucketName = this.dataset.bucketName;\n policyEditorBucket = bucketName;\n bucketPolicyLoaded = false;\n // Deliberately not resetting bucketPolicyMutationInFlight\n // here: if a Save/Delete for a previously open bucket is\n // still in flight, Save/Delete for this bucket must stay\n // blocked until that request settles (its own completion\n // handler releases the flag once done, whether or not it's\n // still the active bucket by then) - otherwise this bucket's\n // mutation could race the abandoned one.\n registerPolicyEditor('bucket', { requirePrincipal: true, bucket: bucketName });\n if (!bucketPolicyEditorSetUp) {\n setupPolicyEditor('bucket');\n bucketPolicyEditorSetUp = true;\n }\n\n document.getElementById('bucketPolicyModalLabel').innerHTML =\n '<i class=\"fas fa-file-shield me-2\"></i>Bucket Policy - ' + escapeHtml(bucketName);\n document.getElementById('bucketPolicyLoading').style.display = '';\n document.getElementById('bucketPolicyError').style.display = 'none';\n document.getElementById('bucketPolicyEditorWrapper').style.display = 'none';\n\n policyModalInstance.show();\n\n // Drop responses that arrive after another bucket was opened\n const requestSeq = ++policyRequestSeq;\n fetch(basePath('/api/s3/buckets/' + bucketName + '/policy'))\n .then(parseLifecycleResponse)\n .then(({ ok, data }) => {\n if (requestSeq !== policyRequestSeq) return;\n document.getElementById('bucketPolicyLoading').style.display = 'none';\n if (!ok || data.error) {\n document.getElementById('bucketPolicyError').textContent =\n 'Error loading bucket policy: ' + (data.error || 'unknown error');\n document.getElementById('bucketPolicyError').style.display = '';\n return;\n }\n document.getElementById('bucketPolicyEditorWrapper').style.display = '';\n document.getElementById('bucketPolicyDocument').value =\n data.policy ? JSON.stringify(data.policy, null, 2) : '';\n bucketPolicyLoaded = true;\n loadPolicyTextareaIntoEditor('bucket');\n })\n .catch(error => {\n if (requestSeq !== policyRequestSeq) return;\n console.error('Error fetching bucket policy:', error);\n document.getElementById('bucketPolicyLoading').style.display = 'none';\n document.getElementById('bucketPolicyError').textContent =\n 'Error loading bucket policy: ' + error.message;\n document.getElementById('bucketPolicyError').style.display = '';\n });\n });\n });\n\n // Save the policy document currently shown (whichever tab is active).\n document.getElementById('bucketPolicySaveBtn').addEventListener('click', function() {\n if (!policyEditorBucket) return;\n if (bucketPolicyMutationInFlight) return;\n if (!bucketPolicyLoaded) {\n alert('The current policy has not finished loading. Close and reopen this dialog before saving.');\n return;\n }\n\n // Commit first: if the Editor tab is active, the textarea still\n // holds whatever was there at load time until this runs, so a\n // policy entered purely through the structured form (no tab\n // switch) would otherwise read back as empty here.\n if (!commitPolicyActiveTab('bucket')) return;\n\n const raw = document.getElementById('bucketPolicyDocument').value.trim();\n if (!raw) {\n alert('Enter a policy document, or use Delete to remove the bucket policy.');\n return;\n }\n\n let policy;\n try {\n policy = JSON.parse(document.getElementById('bucketPolicyDocument').value);\n } catch (e) {\n alert('Invalid JSON: ' + e.message);\n return;\n }\n const validationError = validatePolicyEditorDoc('bucket', policy);\n if (validationError) {\n alert(validationError);\n return;\n }\n\n // Captured now: if the dialog moves on to a different bucket\n // before this PUT resolves, the completion below must not hide\n // or reload over whatever that other bucket is now showing.\n const targetBucket = policyEditorBucket;\n setBucketPolicyMutationInFlight(true);\n fetch(basePath('/api/s3/buckets/' + targetBucket + '/policy'), {\n method: 'PUT',\n headers: csrfHeaders(),\n body: JSON.stringify({ policy: policy })\n })\n .then(parseLifecycleResponse)\n .then(({ ok, data }) => {\n setBucketPolicyMutationInFlight(false);\n const stillCurrent = targetBucket === policyEditorBucket;\n if (!ok || data.error) {\n if (stillCurrent) {\n alert('Error saving bucket policy: ' + (data.error || 'unknown error'));\n } else {\n console.error('Error saving policy for ' + targetBucket + ' (no longer the open bucket): ' + (data.error || 'unknown error'));\n }\n return;\n }\n if (!stillCurrent) return;\n if (policyModalInstance) {\n policyModalInstance.hide();\n }\n setTimeout(() => location.reload(), 500);\n })\n .catch(error => {\n setBucketPolicyMutationInFlight(false);\n console.error('Error:', error);\n if (targetBucket === policyEditorBucket) {\n alert('Error saving bucket policy: ' + error.message);\n }\n });\n });\n\n // Clear the bucket policy entirely.\n document.getElementById('bucketPolicyDeleteBtn').addEventListener('click', function() {\n if (!policyEditorBucket) return;\n if (bucketPolicyMutationInFlight) return;\n if (!bucketPolicyLoaded) {\n alert('The current policy has not finished loading. Close and reopen this dialog before deleting.');\n return;\n }\n if (!confirm('Delete the bucket policy for ' + policyEditorBucket + '? This cannot be undone.')) return;\n\n // Captured now: if the dialog moves on to a different bucket\n // before this DELETE resolves, the completion below must not\n // hide or reload over whatever that other bucket is now showing.\n const targetBucket = policyEditorBucket;\n setBucketPolicyMutationInFlight(true);\n fetch(basePath('/api/s3/buckets/' + targetBucket + '/policy'), {\n method: 'DELETE',\n headers: csrfHeaders()\n })\n .then(parseLifecycleResponse)\n .then(({ ok, data }) => {\n setBucketPolicyMutationInFlight(false);\n const stillCurrent = targetBucket === policyEditorBucket;\n if (!ok || data.error) {\n if (stillCurrent) {\n alert('Error deleting bucket policy: ' + (data.error || 'unknown error'));\n } else {\n console.error('Error deleting policy for ' + targetBucket + ' (no longer the open bucket): ' + (data.error || 'unknown error'));\n }\n return;\n }\n if (!stillCurrent) return;\n if (policyModalInstance) {\n policyModalInstance.hide();\n }\n setTimeout(() => location.reload(), 500);\n })\n .catch(error => {\n setBucketPolicyMutationInFlight(false);\n console.error('Error:', error);\n if (targetBucket === policyEditorBucket) {\n alert('Error deleting bucket policy: ' + error.message);\n }\n });\n });\n });\n\n function deleteBucket() {\n const bucketName = document.getElementById('deleteBucketModal').dataset.bucketName;\n if (!bucketName) return;\n\n fetch(basePath(`/api/s3/buckets/${bucketName}`), {\n method: 'DELETE'\n })\n .then(response => response.json())\n .then(data => {\n if (data.error) {\n alert('Error deleting bucket: ' + data.error);\n } else {\n alert('Bucket deleted successfully!');\n // Properly close the modal before reloading\n if (deleteModalInstance) {\n deleteModalInstance.hide();\n }\n setTimeout(() => location.reload(), 500);\n }\n })\n .catch(error => {\n console.error('Error:', error);\n alert('Error deleting bucket: ' + error.message);\n });\n }\n\nfunction displayBucketDetails(data) {\n const bucket = data.bucket;\n\n function formatDate(dateString) {\n const date = new Date(dateString);\n return date.toLocaleString();\n }\n\n let ownerHtml = '<span class=\"text-muted\">No owner (admin-only)</span>';\n if (bucket.owner) {\n ownerHtml = '<span class=\"badge bg-info\"><i class=\"fas fa-user me-1\"></i>' + escapeHtml(bucket.owner) + '</span>';\n }\n\n let usageHtml = '';\n if (bucket.physical_size > 0 && bucket.logical_size > 0 && bucket.physical_size > bucket.logical_size) {\n const overhead = (bucket.physical_size / bucket.logical_size).toFixed(1);\n usageHtml = '<br><small class=\"text-muted\">' + overhead + 'x overhead<\\/small>';\n }\n\n let quotaHtml = '<span class=\"badge bg-secondary\">Disabled</span>';\n if (bucket.quota_enabled) {\n quotaHtml = '<span class=\"badge bg-success\">' + formatBytes(bucket.quota) + '</span>';\n }\n\n let versioningHtml = '<span class=\"text-muted\">Not configured</span>';\n if (bucket.versioning_status === 'Enabled') {\n versioningHtml = '<span class=\"badge bg-success\"><i class=\"fas fa-check me-1\"></i>Enabled</span>';\n } else if (bucket.versioning_status === 'Suspended') {\n versioningHtml = '<span class=\"badge bg-warning\"><i class=\"fas fa-pause me-1\"></i>Suspended</span>';\n }\n\n let statusHtml = '<span class=\"badge bg-success\">Writable</span>';\n if (bucket.read_only) {\n statusHtml = '<span class=\"badge bg-danger\"><i class=\"fas fa-lock me-1\"></i>Read-only</span>';\n }\n\n let objectLockHtml = '<span class=\"text-muted\">Not configured</span>';\n if (bucket.object_lock_enabled) {\n let details = '';\n if (bucket.object_lock_mode && bucket.object_lock_duration > 0) {\n details = '<br><small class=\"text-muted\">' + escapeHtml(bucket.object_lock_mode) + ' • ' + bucket.object_lock_duration + ' days<\\/small>';\n }\n objectLockHtml = '<span class=\"badge bg-warning\"><i class=\"fas fa-lock me-1\"></i>Enabled</span>' + details;\n }\n\n let policyHtml = '<span class=\"text-muted\">Not configured</span>';\n if (bucket.policy_statement_count > 0) {\n const label = bucket.policy_statement_count === 1 ? '1 statement' : bucket.policy_statement_count + ' statements';\n policyHtml = '<span class=\"badge bg-primary\">' + label + '<\\/span>';\n }\n\n const rows = [\n '<div class=\"row\">',\n '<div class=\"col-md-6\">',\n '<h6><i class=\"fas fa-info-circle me-2\"></i>Bucket Information</h6>',\n '<table class=\"table table-sm\">',\n '<tr><td><strong>Name:</strong></td><td>' + escapeHtml(bucket.name) + '<\\/td><\\/tr>',\n '<tr><td><strong>Owner:</strong></td><td>' + ownerHtml + '<\\/td><\\/tr>',\n '<tr><td><strong>Created:</strong></td><td>' + formatDate(bucket.created_at) + '<\\/td><\\/tr>',\n '<tr><td><strong>Last Modified:</strong></td><td>' + formatDate(bucket.last_modified) + '<\\/td><\\/tr>',\n '<tr><td><strong>Logical Size:</strong></td><td>' + formatBytes(bucket.logical_size) + '<\\/td><\\/tr>',\n '<tr><td><strong>Physical Size:</strong></td><td>' + formatBytes(bucket.physical_size) + usageHtml + '<\\/td><\\/tr>',\n '<\\/table>',\n '<\\/div>',\n '<div class=\"col-md-6\">',\n '<h6><i class=\"fas fa-cogs me-2\"></i>Configuration</h6>',\n '<table class=\"table table-sm\">',\n '<tr><td><strong>Status:</strong></td><td>' + statusHtml + '<\\/td><\\/tr>',\n '<tr><td><strong>Quota:</strong></td><td>' + quotaHtml + '<\\/td><\\/tr>',\n '<tr><td><strong>Versioning:</strong></td><td>' + versioningHtml + '<\\/td><\\/tr>',\n '<tr><td><strong>Object Lock:</strong></td><td>' + objectLockHtml + '<\\/td><\\/tr>',\n '<tr><td><strong>Policy:</strong></td><td>' + policyHtml + '<\\/td><\\/tr>',\n '<\\/table>',\n '<\\/div>',\n '<\\/div>'\n ];\n\n document.getElementById('bucketDetailsContent').innerHTML = rows.join('');\n}\n\n// displayBucketLifecycle loads the GET response into the local working copy\n// and renders the editor. Nothing is sent back to the server until Save or\n// Delete all rules is clicked.\nfunction displayBucketLifecycle(data) {\n lifecycleEditor.bucket = data.bucket || lifecycleEditor.bucket;\n lifecycleEditor.rules = (data.rules || []).map(cloneLifecycleRule);\n lifecycleEditor.editingIndex = null;\n lifecycleEditor.editingRule = null;\n lifecycleEditor.rawXml = data.xml || '';\n // SeaweedFS doesn't support Transition rules (PutBucketLifecycleConfiguration\n // rejects them for Enabled rules), and the canonical rule shape the admin\n // edits has no field for one, so a Transition set by another client would\n // silently disappear on the next Save. Warn instead.\n // Matches <Transition> and <NoncurrentVersionTransition> however they are\n // spelled: with attributes, self-closed, or namespace-prefixed.\n lifecycleEditor.hasTransition = /<(\\w+:)?(NoncurrentVersion)?Transition[\\s>\\/]/.test(data.xml || '');\n renderLifecycleEditor();\n}\n\n// normalizeLifecycleStatus maps a stored status onto the two the editor can\n// show. The S3 API stores <Status> unvalidated, and the engine runs a rule\n// only on an exact \"Enabled\", so everything else is Disabled - collapsing it\n// here keeps an odd spelling from leaving both radios unchecked, which would\n// throw out of readLifecycleRuleFromForm and make the modal look dead.\nfunction normalizeLifecycleStatus(status) {\n return status === 'Enabled' ? 'Enabled' : 'Disabled';\n}\n\nfunction cloneLifecycleRule(r) {\n return {\n id: r.id || '',\n status: normalizeLifecycleStatus(r.status),\n prefix: r.prefix || '',\n tags: Object.assign({}, r.tags || {}),\n size_greater_than: r.size_greater_than || null,\n size_less_than: r.size_less_than || null,\n expiration_days: r.expiration_days || null,\n expiration_date: r.expiration_date || '',\n expired_object_delete_marker: !!r.expired_object_delete_marker,\n noncurrent_version_expiration_days: r.noncurrent_version_expiration_days || null,\n newer_noncurrent_versions: r.newer_noncurrent_versions || null,\n abort_multipart_days: r.abort_multipart_days || null,\n };\n}\n\nfunction blankLifecycleRule() {\n return {\n id: '', status: 'Enabled', prefix: '', tags: {},\n size_greater_than: null, size_less_than: null,\n expiration_days: null, expiration_date: '',\n expired_object_delete_marker: false,\n noncurrent_version_expiration_days: null, newer_noncurrent_versions: null,\n abort_multipart_days: null,\n };\n}\n\nfunction describeLifecycleScope(rule) {\n const parts = [];\n if (rule.prefix) {\n parts.push('<code>' + escapeHtml(rule.prefix) + '<\\/code>');\n }\n Object.entries(rule.tags || {}).forEach(([k, v]) => {\n parts.push('<span class=\"badge bg-light text-dark border\">' + escapeHtml(k) + '=' + escapeHtml(v) + '<\\/span>');\n });\n if (rule.size_greater_than) {\n parts.push('size > ' + formatBytes(rule.size_greater_than));\n }\n if (rule.size_less_than) {\n parts.push('size < ' + formatBytes(rule.size_less_than));\n }\n return parts.length ? parts.join(' ') : '<span class=\"text-muted\">Whole bucket<\\/span>';\n}\n\nfunction describeLifecycleActions(rule) {\n const actions = [];\n if (rule.expiration_days) {\n actions.push('Expire after ' + formatDays(rule.expiration_days));\n }\n if (rule.expiration_date) {\n actions.push('Expire on ' + escapeHtml(rule.expiration_date));\n }\n if (rule.expired_object_delete_marker) {\n actions.push('Remove expired object delete markers');\n }\n if (rule.noncurrent_version_expiration_days) {\n let action = 'Expire noncurrent versions after ' + formatDays(rule.noncurrent_version_expiration_days);\n if (rule.newer_noncurrent_versions) {\n action += ', keep ' + rule.newer_noncurrent_versions + ' newest';\n }\n actions.push(action);\n } else if (rule.newer_noncurrent_versions) {\n // Standalone (no expiration_days): the engine still recognizes this\n // as an action that expires noncurrent versions beyond the N newest.\n actions.push('Keep ' + rule.newer_noncurrent_versions + ' newest noncurrent versions');\n }\n if (rule.abort_multipart_days) {\n actions.push('Abort incomplete multipart uploads after ' + formatDays(rule.abort_multipart_days));\n }\n if (actions.length === 0) {\n return '<span class=\"text-muted\">None<\\/span>';\n }\n return actions.join('<br>');\n}\n\nfunction lifecycleRuleRowHtml(rule, idx) {\n const statusHtml = rule.status === 'Enabled'\n ? '<span class=\"badge bg-success\">Enabled<\\/span>'\n : '<span class=\"badge bg-secondary\">' + escapeHtml(rule.status) + '<\\/span>';\n return '<tr>' +\n '<td>' + (rule.id ? escapeHtml(rule.id) : '<span class=\"text-muted\">unnamed<\\/span>') + '<\\/td>' +\n '<td>' + statusHtml + '<\\/td>' +\n '<td>' + describeLifecycleScope(rule) + '<\\/td>' +\n '<td>' + describeLifecycleActions(rule) + '<\\/td>' +\n '<td class=\"text-end text-nowrap\">' +\n '<button type=\"button\" class=\"btn btn-sm btn-outline-secondary lifecycle-edit-rule-btn\" data-index=\"' + idx + '\" title=\"Edit rule\"><i class=\"fas fa-pen\"><\\/i><\\/button> ' +\n '<button type=\"button\" class=\"btn btn-sm btn-outline-danger lifecycle-delete-rule-btn\" data-index=\"' + idx + '\" title=\"Delete rule\"><i class=\"fas fa-trash\"><\\/i><\\/button>' +\n '<\\/td>' +\n '<\\/tr>';\n}\n\nfunction lifecycleRuleFormHtml() {\n const rule = lifecycleEditor.editingRule;\n const tagRowHtml = (k, v) =>\n '<div class=\"input-group input-group-sm mb-1 lifecycle-tag-row\">' +\n '<input type=\"text\" class=\"form-control lifecycle-tag-key\" placeholder=\"Key\" value=\"' + escapeHtml(k) + '\">' +\n '<input type=\"text\" class=\"form-control lifecycle-tag-value\" placeholder=\"Value\" value=\"' + escapeHtml(v) + '\">' +\n '<button type=\"button\" class=\"btn btn-outline-danger lifecycle-remove-tag-btn\"><i class=\"fas fa-times\"><\\/i><\\/button>' +\n '<\\/div>';\n const tagRows = Object.entries(rule.tags || {}).map(([k, v]) => tagRowHtml(k, v)).join('');\n\n return '' +\n '<div class=\"card mb-3\" id=\"lifecycleRuleForm\">' +\n '<div class=\"card-body\">' +\n '<h6 class=\"card-title\">' + (lifecycleEditor.editingIndex === 'new' ? 'Add rule' : 'Edit rule') + '<\\/h6>' +\n\n '<div class=\"row g-2 mb-2\">' +\n '<div class=\"col-md-6\">' +\n '<label class=\"form-label small\">ID (optional)<\\/label>' +\n '<input type=\"text\" class=\"form-control form-control-sm\" id=\"lifecycleRuleId\" value=\"' + escapeHtml(rule.id) + '\">' +\n '<\\/div>' +\n '<div class=\"col-md-6\">' +\n '<label class=\"form-label small d-block\">Status<\\/label>' +\n '<div class=\"form-check form-check-inline\">' +\n '<input class=\"form-check-input\" type=\"radio\" name=\"lifecycleRuleStatus\" id=\"lifecycleStatusEnabled\" value=\"Enabled\"' + (rule.status === 'Enabled' ? ' checked' : '') + '>' +\n '<label class=\"form-check-label\" for=\"lifecycleStatusEnabled\">Enabled<\\/label>' +\n '<\\/div>' +\n '<div class=\"form-check form-check-inline\">' +\n '<input class=\"form-check-input\" type=\"radio\" name=\"lifecycleRuleStatus\" id=\"lifecycleStatusDisabled\" value=\"Disabled\"' + (rule.status === 'Disabled' ? ' checked' : '') + '>' +\n '<label class=\"form-check-label\" for=\"lifecycleStatusDisabled\">Disabled<\\/label>' +\n '<\\/div>' +\n '<\\/div>' +\n '<\\/div>' +\n\n '<div class=\"mb-2\">' +\n '<label class=\"form-label small\">Prefix<\\/label>' +\n '<input type=\"text\" class=\"form-control form-control-sm\" id=\"lifecycleRulePrefix\" placeholder=\"logs/\" value=\"' + escapeHtml(rule.prefix) + '\">' +\n '<\\/div>' +\n\n '<div class=\"mb-2\">' +\n '<label class=\"form-label small d-block\">Tags<\\/label>' +\n '<div id=\"lifecycleTagRows\">' + tagRows + '<\\/div>' +\n '<button type=\"button\" class=\"btn btn-sm btn-outline-secondary\" id=\"lifecycleAddTagBtn\"><i class=\"fas fa-plus me-1\"><\\/i>Add tag<\\/button>' +\n '<\\/div>' +\n\n '<div class=\"row g-2 mb-3\">' +\n '<div class=\"col-md-6\">' +\n '<label class=\"form-label small\">Size greater than (bytes)<\\/label>' +\n '<input type=\"number\" class=\"form-control form-control-sm\" id=\"lifecycleRuleSizeGT\" min=\"0\" step=\"1\" value=\"' + (rule.size_greater_than || '') + '\">' +\n '<\\/div>' +\n '<div class=\"col-md-6\">' +\n '<label class=\"form-label small\">Size less than (bytes)<\\/label>' +\n '<input type=\"number\" class=\"form-control form-control-sm\" id=\"lifecycleRuleSizeLT\" min=\"0\" step=\"1\" value=\"' + (rule.size_less_than || '') + '\">' +\n '<\\/div>' +\n '<\\/div>' +\n\n '<hr>' +\n '<h6 class=\"small text-muted text-uppercase\">Actions<\\/h6>' +\n\n '<div class=\"row g-2 align-items-center mb-2\">' +\n '<div class=\"col-auto\">' +\n '<div class=\"form-check\">' +\n '<input class=\"form-check-input\" type=\"checkbox\" id=\"lifecycleExpireDaysEnabled\"' + (rule.expiration_days ? ' checked' : '') + '>' +\n '<label class=\"form-check-label\" for=\"lifecycleExpireDaysEnabled\">Expire after<\\/label>' +\n '<\\/div>' +\n '<\\/div>' +\n '<div class=\"col-auto\">' +\n '<input type=\"number\" class=\"form-control form-control-sm\" id=\"lifecycleExpireDays\" min=\"1\" step=\"1\" style=\"width: 6rem;\" value=\"' + (rule.expiration_days || '') + '\"' + (rule.expiration_days ? '' : ' disabled') + '>' +\n '<\\/div><div class=\"col-auto\">days<\\/div>' +\n '<\\/div>' +\n\n '<div class=\"row g-2 align-items-center mb-2\">' +\n '<div class=\"col-auto\">' +\n '<div class=\"form-check\">' +\n '<input class=\"form-check-input\" type=\"checkbox\" id=\"lifecycleExpireDateEnabled\"' + (rule.expiration_date ? ' checked' : '') + '>' +\n '<label class=\"form-check-label\" for=\"lifecycleExpireDateEnabled\">Expire on date<\\/label>' +\n '<\\/div>' +\n '<\\/div>' +\n '<div class=\"col-auto\">' +\n '<input type=\"date\" class=\"form-control form-control-sm\" id=\"lifecycleExpireDate\" value=\"' + escapeHtml(rule.expiration_date) + '\"' + (rule.expiration_date ? '' : ' disabled') + '>' +\n '<\\/div>' +\n '<\\/div>' +\n\n '<div class=\"form-check mb-2\">' +\n '<input class=\"form-check-input\" type=\"checkbox\" id=\"lifecycleDeleteMarker\"' + (rule.expired_object_delete_marker ? ' checked' : '') + '>' +\n '<label class=\"form-check-label\" for=\"lifecycleDeleteMarker\">Remove expired object delete markers<\\/label>' +\n '<\\/div>' +\n\n (() => {\n const noncurrentActive = !!(rule.noncurrent_version_expiration_days || rule.newer_noncurrent_versions);\n return '<div class=\"row g-2 align-items-center mb-2\">' +\n '<div class=\"col-auto\">' +\n '<div class=\"form-check\">' +\n '<input class=\"form-check-input\" type=\"checkbox\" id=\"lifecycleNoncurrentEnabled\"' + (noncurrentActive ? ' checked' : '') + '>' +\n '<label class=\"form-check-label\" for=\"lifecycleNoncurrentEnabled\">Limit noncurrent versions<\\/label>' +\n '<\\/div>' +\n '<\\/div>' +\n '<div class=\"col-auto\">after<\\/div>' +\n '<div class=\"col-auto\">' +\n '<input type=\"number\" class=\"form-control form-control-sm\" id=\"lifecycleNoncurrentDays\" min=\"1\" step=\"1\" style=\"width: 6rem;\" value=\"' + (rule.noncurrent_version_expiration_days || '') + '\"' + (noncurrentActive ? '' : ' disabled') + '>' +\n '<\\/div><div class=\"col-auto\">days (optional), keep<\\/div>' +\n '<div class=\"col-auto\">' +\n '<input type=\"number\" class=\"form-control form-control-sm\" id=\"lifecycleNoncurrentKeep\" min=\"0\" step=\"1\" style=\"width: 6rem;\" value=\"' + (rule.newer_noncurrent_versions || '') + '\"' + (noncurrentActive ? '' : ' disabled') + '>' +\n '<\\/div><div class=\"col-auto\">newest (optional)<\\/div>' +\n '<\\/div>';\n })() +\n\n '<div class=\"row g-2 align-items-center mb-3\">' +\n '<div class=\"col-auto\">' +\n '<div class=\"form-check\">' +\n '<input class=\"form-check-input\" type=\"checkbox\" id=\"lifecycleAbortMPUEnabled\"' + (rule.abort_multipart_days ? ' checked' : '') + '>' +\n '<label class=\"form-check-label\" for=\"lifecycleAbortMPUEnabled\">Abort incomplete multipart uploads after<\\/label>' +\n '<\\/div>' +\n '<\\/div>' +\n '<div class=\"col-auto\">' +\n '<input type=\"number\" class=\"form-control form-control-sm\" id=\"lifecycleAbortMPUDays\" min=\"1\" step=\"1\" style=\"width: 6rem;\" value=\"' + (rule.abort_multipart_days || '') + '\"' + (rule.abort_multipart_days ? '' : ' disabled') + '>' +\n '<\\/div><div class=\"col-auto\">days<\\/div>' +\n '<\\/div>' +\n\n '<div class=\"text-end\">' +\n '<button type=\"button\" class=\"btn btn-sm btn-secondary\" id=\"lifecycleCancelRuleBtn\">Cancel<\\/button> ' +\n '<button type=\"button\" class=\"btn btn-sm btn-primary\" id=\"lifecycleSaveRuleBtn\">Save rule<\\/button>' +\n '<\\/div>' +\n '<\\/div>' +\n '<\\/div>';\n}\n\nfunction renderLifecycleEditor() {\n const container = document.getElementById('bucketLifecycleContent');\n const rowsHtml = lifecycleEditor.rules.map(lifecycleRuleRowHtml).join('') ||\n '<tr><td colspan=\"5\" class=\"text-center text-muted py-3\">No lifecycle rules<\\/td><\\/tr>';\n\n let html = '';\n if (lifecycleEditor.hasTransition) {\n html += '<div class=\"alert alert-warning small\">' +\n '<i class=\"fas fa-triangle-exclamation me-1\"><\\/i>' +\n 'This bucket has a Transition rule set outside the admin (SeaweedFS does not support storage class transitions). Saving from here will drop it.' +\n '<\\/div>';\n }\n\n html += '<div class=\"table-responsive mb-3\">' +\n '<table class=\"table table-sm align-middle\">' +\n '<thead><tr><th>Rule<\\/th><th>Status<\\/th><th>Scope<\\/th><th>Actions<\\/th><th><\\/th><\\/tr><\\/thead>' +\n '<tbody>' + rowsHtml + '<\\/tbody>' +\n '<\\/table>' +\n '<\\/div>' +\n '<button type=\"button\" class=\"btn btn-sm btn-outline-primary mb-3\" id=\"lifecycleAddRuleBtn\">' +\n '<i class=\"fas fa-plus me-1\"><\\/i>Add rule' +\n '<\\/button>';\n\n if (lifecycleEditor.editingIndex !== null) {\n html += lifecycleRuleFormHtml();\n }\n\n if (lifecycleEditor.rawXml) {\n html += '<details class=\"mt-2\">' +\n '<summary class=\"text-muted small\">Raw XML (as currently stored)<\\/summary>' +\n '<pre class=\"bg-light border rounded p-2 mt-2 small mb-0\">' + escapeHtml(lifecycleEditor.rawXml) + '<\\/pre>' +\n '<\\/details>';\n }\n\n container.innerHTML = html;\n bindLifecycleEditorEvents();\n}\n\nfunction bindLifecycleToggle(checkboxId, fieldId, mutuallyExclusiveId) {\n const checkbox = document.getElementById(checkboxId);\n const field = document.getElementById(fieldId);\n if (!checkbox || !field) return;\n checkbox.addEventListener('change', function() {\n field.disabled = !this.checked;\n if (this.checked && mutuallyExclusiveId) {\n const other = document.getElementById(mutuallyExclusiveId);\n if (other && other.checked) {\n other.checked = false;\n other.dispatchEvent(new Event('change'));\n }\n }\n });\n}\n\nfunction bindLifecycleEditorEvents() {\n const addBtn = document.getElementById('lifecycleAddRuleBtn');\n if (addBtn) {\n addBtn.addEventListener('click', function() {\n // Fold in any rule already being edited before switching forms,\n // so an invalid in-progress draft isn't silently discarded.\n if (!commitOpenLifecycleRuleForm()) return;\n lifecycleEditor.editingIndex = 'new';\n lifecycleEditor.editingRule = blankLifecycleRule();\n renderLifecycleEditor();\n });\n }\n\n document.querySelectorAll('.lifecycle-edit-rule-btn').forEach(btn => {\n btn.addEventListener('click', function() {\n const idx = parseInt(this.dataset.index, 10);\n // Same as above: committing never shifts indices (it either\n // pushes a new rule at the end or replaces one in place), so\n // idx captured above is still valid after this call.\n if (!commitOpenLifecycleRuleForm()) return;\n lifecycleEditor.editingIndex = idx;\n lifecycleEditor.editingRule = cloneLifecycleRule(lifecycleEditor.rules[idx]);\n renderLifecycleEditor();\n });\n });\n\n document.querySelectorAll('.lifecycle-delete-rule-btn').forEach(btn => {\n btn.addEventListener('click', function() {\n const idx = parseInt(this.dataset.index, 10);\n // Fold in an open form first, like every other transition does:\n // re-rendering after the splice would otherwise redraw it from the\n // snapshot taken when editing began and lose what was typed.\n if (lifecycleEditor.editingIndex !== null && lifecycleEditor.editingIndex !== idx) {\n if (!commitOpenLifecycleRuleForm()) return;\n }\n lifecycleEditor.rules.splice(idx, 1);\n // Deleting a rule shifts every later index down by one, so an\n // open edit form must follow its rule rather than silently\n // start targeting whatever now sits at its old index.\n if (lifecycleEditor.editingIndex === idx) {\n lifecycleEditor.editingIndex = null;\n lifecycleEditor.editingRule = null;\n } else if (typeof lifecycleEditor.editingIndex === 'number' && lifecycleEditor.editingIndex > idx) {\n lifecycleEditor.editingIndex -= 1;\n }\n renderLifecycleEditor();\n });\n });\n\n const cancelBtn = document.getElementById('lifecycleCancelRuleBtn');\n if (cancelBtn) {\n cancelBtn.addEventListener('click', function() {\n lifecycleEditor.editingIndex = null;\n lifecycleEditor.editingRule = null;\n renderLifecycleEditor();\n });\n }\n\n const addTagBtn = document.getElementById('lifecycleAddTagBtn');\n if (addTagBtn) {\n addTagBtn.addEventListener('click', function() {\n const rows = document.getElementById('lifecycleTagRows');\n const row = document.createElement('div');\n row.className = 'input-group input-group-sm mb-1 lifecycle-tag-row';\n row.innerHTML =\n '<input type=\"text\" class=\"form-control lifecycle-tag-key\" placeholder=\"Key\">' +\n '<input type=\"text\" class=\"form-control lifecycle-tag-value\" placeholder=\"Value\">' +\n '<button type=\"button\" class=\"btn btn-outline-danger lifecycle-remove-tag-btn\"><i class=\"fas fa-times\"><\\/i><\\/button>';\n rows.appendChild(row);\n row.querySelector('.lifecycle-remove-tag-btn').addEventListener('click', function() {\n row.remove();\n });\n });\n }\n\n document.querySelectorAll('.lifecycle-remove-tag-btn').forEach(btn => {\n btn.addEventListener('click', function() {\n this.closest('.lifecycle-tag-row').remove();\n });\n });\n\n bindLifecycleToggle('lifecycleExpireDaysEnabled', 'lifecycleExpireDays', 'lifecycleExpireDateEnabled');\n bindLifecycleToggle('lifecycleExpireDateEnabled', 'lifecycleExpireDate', 'lifecycleExpireDaysEnabled');\n bindLifecycleToggle('lifecycleNoncurrentEnabled', 'lifecycleNoncurrentDays');\n bindLifecycleToggle('lifecycleNoncurrentEnabled', 'lifecycleNoncurrentKeep');\n bindLifecycleToggle('lifecycleAbortMPUEnabled', 'lifecycleAbortMPUDays');\n\n const saveRuleBtn = document.getElementById('lifecycleSaveRuleBtn');\n if (saveRuleBtn) {\n saveRuleBtn.addEventListener('click', saveLifecycleRuleFromForm);\n }\n}\n\n// readLifecycleRuleFromForm builds and validates a rule from the currently\n// open edit form's DOM inputs. Returns { rule: null, error: '...' } when the\n// form doesn't hold a valid rule, without mutating any state.\nfunction readLifecycleRuleFromForm() {\n const id = document.getElementById('lifecycleRuleId').value.trim();\n const status = document.querySelector('input[name=\"lifecycleRuleStatus\"]:checked').value;\n const prefix = document.getElementById('lifecycleRulePrefix').value.trim();\n\n const tags = {};\n document.querySelectorAll('#lifecycleTagRows .lifecycle-tag-row').forEach(row => {\n const key = row.querySelector('.lifecycle-tag-key').value.trim();\n const value = row.querySelector('.lifecycle-tag-value').value.trim();\n if (key) {\n tags[key] = value;\n }\n });\n\n const sizeGT = parseInt(document.getElementById('lifecycleRuleSizeGT').value, 10) || 0;\n const sizeLT = parseInt(document.getElementById('lifecycleRuleSizeLT').value, 10) || 0;\n\n const expireDaysEnabled = document.getElementById('lifecycleExpireDaysEnabled').checked;\n const expireDateEnabled = document.getElementById('lifecycleExpireDateEnabled').checked;\n const expirationDays = expireDaysEnabled ? (parseInt(document.getElementById('lifecycleExpireDays').value, 10) || 0) : 0;\n const expirationDate = expireDateEnabled ? document.getElementById('lifecycleExpireDate').value : '';\n\n const deleteMarker = document.getElementById('lifecycleDeleteMarker').checked;\n\n const noncurrentEnabled = document.getElementById('lifecycleNoncurrentEnabled').checked;\n const noncurrentDays = noncurrentEnabled ? (parseInt(document.getElementById('lifecycleNoncurrentDays').value, 10) || 0) : 0;\n const noncurrentKeep = noncurrentEnabled ? (parseInt(document.getElementById('lifecycleNoncurrentKeep').value, 10) || 0) : 0;\n\n const abortEnabled = document.getElementById('lifecycleAbortMPUEnabled').checked;\n const abortDays = abortEnabled ? (parseInt(document.getElementById('lifecycleAbortMPUDays').value, 10) || 0) : 0;\n\n if (expireDaysEnabled && expirationDays <= 0) {\n return { rule: null, error: 'Enter a valid number of days for expiration.' };\n }\n if (expireDateEnabled && !expirationDate) {\n return { rule: null, error: 'Enter a valid expiration date.' };\n }\n if (noncurrentEnabled && noncurrentDays <= 0 && noncurrentKeep <= 0) {\n return { rule: null, error: 'Enter a number of days and/or a newest-versions-to-keep count for noncurrent version handling.' };\n }\n if (abortEnabled && abortDays <= 0) {\n return { rule: null, error: 'Enter a valid number of days for aborting incomplete multipart uploads.' };\n }\n if (!expireDaysEnabled && !expireDateEnabled && !deleteMarker && !noncurrentEnabled && !abortEnabled) {\n return { rule: null, error: 'Select at least one action for this rule.' };\n }\n // The server rejects this combination too; catching it here names the two\n // fields instead of surfacing a 400 after the whole set is submitted.\n if (deleteMarker && (expireDaysEnabled || expireDateEnabled)) {\n return { rule: null, error: 'Removing expired object delete markers cannot be combined with an expiration.' };\n }\n if (sizeGT > 0 && sizeLT > 0 && sizeGT >= sizeLT) {\n return { rule: null, error: '\"Size greater than\" must be less than \"size less than\".' };\n }\n\n return {\n rule: {\n id: id,\n status: status,\n prefix: prefix,\n tags: tags,\n size_greater_than: sizeGT > 0 ? sizeGT : null,\n size_less_than: sizeLT > 0 ? sizeLT : null,\n expiration_days: expirationDays > 0 ? expirationDays : null,\n expiration_date: expirationDate || '',\n expired_object_delete_marker: deleteMarker,\n noncurrent_version_expiration_days: noncurrentDays > 0 ? noncurrentDays : null,\n newer_noncurrent_versions: noncurrentKeep > 0 ? noncurrentKeep : null,\n abort_multipart_days: abortDays > 0 ? abortDays : null,\n },\n error: null,\n };\n}\n\nfunction saveLifecycleRuleFromForm() {\n const { rule, error } = readLifecycleRuleFromForm();\n if (error) {\n alert(error);\n return;\n }\n\n if (lifecycleEditor.editingIndex === 'new') {\n lifecycleEditor.rules.push(rule);\n } else {\n lifecycleEditor.rules[lifecycleEditor.editingIndex] = rule;\n }\n lifecycleEditor.editingIndex = null;\n lifecycleEditor.editingRule = null;\n renderLifecycleEditor();\n}\n\n// commitOpenLifecycleRuleForm folds an in-progress add/edit form into\n// lifecycleEditor.rules before the whole rule set is sent to the server, so\n// clicking the modal's \"Save\" without first clicking \"Save rule\" doesn't\n// silently drop the open edit. Returns false (and leaves the form open) when\n// the open form doesn't hold a valid rule, so the caller can abort the save.\nfunction commitOpenLifecycleRuleForm() {\n if (lifecycleEditor.editingIndex === null) {\n return true;\n }\n\n const { rule, error } = readLifecycleRuleFromForm();\n if (error) {\n alert(error);\n return false;\n }\n\n if (lifecycleEditor.editingIndex === 'new') {\n lifecycleEditor.rules.push(rule);\n } else {\n lifecycleEditor.rules[lifecycleEditor.editingIndex] = rule;\n }\n lifecycleEditor.editingIndex = null;\n lifecycleEditor.editingRule = null;\n renderLifecycleEditor();\n return true;\n}\n\n function goToPage(page) {\n const url = new URL(window.location);\n url.searchParams.set('page', page);\n window.location.href = url.toString();\n }\n\n function changePageSize() {\n const pageSize = document.getElementById('pageSizeSelect').value;\n const url = new URL(window.location);\n url.searchParams.set('pageSize', pageSize);\n url.searchParams.set('page', '1');\n window.location.href = url.toString();\n }\n\n function sortTable(column) {\n const url = new URL(window.location);\n const currentSort = url.searchParams.get('sortBy');\n const currentOrder = url.searchParams.get('sortOrder') || 'asc';\n\n let newOrder = 'asc';\n if (currentSort === column && currentOrder === 'asc') {\n newOrder = 'desc';\n }\n\n url.searchParams.set('sortBy', column);\n url.searchParams.set('sortOrder', newOrder);\n url.searchParams.set('page', '1');\n window.location.href = url.toString();\n }\n\n function exportBucketList() {\n // RFC 4180 compliant CSV escaping: escape double quotes by doubling them\n function escapeCsvField(value) {\n const str = String(value ?? '');\n if (str.includes(',') || str.includes('\"') || str.includes('\\n') || str.includes('\\r')) {\n return '\"' + str.replace(/\"/g, '\"\"') + '\"';\n }\n return '\"' + str + '\"';\n }\n\n // Fetch all buckets from the API (not just the current page)\n fetch(basePath('/api/s3/buckets'))\n .then(response => response.json())\n .then(data => {\n if (data.error) {\n alert('Error exporting buckets: ' + data.error);\n return;\n }\n\n const buckets = data.buckets || [];\n const csvContent = \"data:text/csv;charset=utf-8,\" +\n \"Name,Owner,Logical Size,Physical Size,Created,Quota,Versioning,Object Lock\\n\" +\n buckets.map(b => [\n escapeCsvField(b.name),\n escapeCsvField(b.owner),\n escapeCsvField(formatBytes(b.logical_size)),\n escapeCsvField(formatBytes(b.physical_size)),\n escapeCsvField(b.created_at),\n escapeCsvField(b.quota_enabled ? formatBytes(b.quota) : 'No quota'),\n escapeCsvField(b.versioning_status || 'Not configured'),\n escapeCsvField(b.object_lock_enabled ? 'Enabled' : 'Not configured')\n ].join(',')).join(\"\\n\");\n\n const encodedUri = encodeURI(csvContent);\n const link = document.createElement(\"a\");\n link.setAttribute(\"href\", encodedUri);\n link.setAttribute(\"download\", \"buckets.csv\");\n document.body.appendChild(link);\n link.click();\n document.body.removeChild(link);\n })\n .catch(error => {\n console.error('Error:', error);\n alert('Error exporting buckets: ' + error.message);\n });\n }\n </script>")+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 99, "<!-- Bucket Policy Modal --><div class=\"modal fade\" id=\"bucketPolicyModal\" tabindex=\"-1\" aria-labelledby=\"bucketPolicyModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-xl\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"bucketPolicyModalLabel\"><i class=\"fas fa-file-shield me-2\"></i>Bucket Policy</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><div class=\"modal-body\"><div id=\"bucketPolicyLoading\" class=\"text-center py-4\"><div class=\"spinner-border text-primary\" role=\"status\"><span class=\"visually-hidden\">Loading...</span></div><div class=\"mt-2\">Loading bucket policy...</div></div><div id=\"bucketPolicyError\" class=\"alert alert-danger\" style=\"display: none;\"></div><div id=\"bucketPolicyEditorWrapper\" style=\"display: none;\"><p class=\"text-muted small\">Every statement must specify a Principal, and every Resource must refer to this bucket. Leave the document empty and click Delete to remove the policy.</p><ul class=\"nav nav-tabs\" role=\"tablist\"><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link active\" id=\"bucketPolicyEditorTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#bucketPolicyEditorTab\" role=\"tab\" aria-controls=\"bucketPolicyEditorTab\" aria-selected=\"true\">Editor</button></li><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link\" id=\"bucketPolicyJsonTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#bucketPolicyJsonTab\" role=\"tab\" aria-controls=\"bucketPolicyJsonTab\" aria-selected=\"false\">JSON</button></li></ul><div class=\"tab-content border border-top-0 rounded-bottom p-3 mb-3\"><div class=\"tab-pane fade show active\" id=\"bucketPolicyEditorTab\" role=\"tabpanel\" aria-labelledby=\"bucketPolicyEditorTabBtn\"><div id=\"bucketPolicyEditorBody\"></div><button type=\"button\" class=\"btn btn-sm btn-outline-secondary\" id=\"bucketPolicyAddStatementBtn\"><i class=\"fas fa-plus me-1\"></i>Add statement</button></div><div class=\"tab-pane fade\" id=\"bucketPolicyJsonTab\" role=\"tabpanel\" aria-labelledby=\"bucketPolicyJsonTabBtn\"><textarea class=\"form-control\" id=\"bucketPolicyDocument\" rows=\"15\" style=\"font-family: monospace;\" spellcheck=\"false\" placeholder='{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":\"*\",\"Action\":\"s3:GetObject\",\"Resource\":\"arn:aws:s3:::bucket-name/*\"}]}'></textarea><div class=\"form-text\">Enter the bucket policy document as JSON</div></div></div><div class=\"mb-3\"><button type=\"button\" class=\"btn btn-outline-info btn-sm\" id=\"bucketPolicyInsertSampleBtn\"><i class=\"fas fa-file-alt me-1\"></i>Use Sample Policy</button></div></div></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-outline-danger me-auto\" id=\"bucketPolicyDeleteBtn\"><i class=\"fas fa-trash me-1\"></i>Delete</button> <button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Cancel</button> <button type=\"button\" class=\"btn btn-primary\" id=\"bucketPolicySaveBtn\"><i class=\"fas fa-save me-1\"></i>Save</button></div></div></div></div><!-- Manage Owner Modal --><div class=\"modal fade\" id=\"manageOwnerModal\" tabindex=\"-1\" aria-labelledby=\"manageOwnerModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"manageOwnerModalLabel\"><i class=\"fas fa-user-edit me-2\"></i>Manage Bucket Owner</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><form id=\"ownerForm\"><div class=\"modal-body\"><div class=\"mb-3\"><label class=\"form-label\">Bucket Name</label> <input type=\"text\" class=\"form-control\" id=\"ownerBucketName\" readonly></div><div class=\"mb-3\"><label for=\"bucketOwnerSelect\" class=\"form-label\">Owner</label> <select class=\"form-select\" id=\"bucketOwnerSelect\" name=\"owner\"><option value=\"\">No owner (admin-only access)</option><!-- Options will be populated dynamically --></select><div class=\"form-text\">Select the S3 identity that owns this bucket. Non-admin users can only access buckets they own.</div></div><div id=\"ownerLoadingSpinner\" class=\"text-center py-2\" style=\"display: none;\"><div class=\"spinner-border spinner-border-sm text-primary\" role=\"status\"><span class=\"visually-hidden\">Loading users...</span></div><span class=\"ms-2\">Loading users...</span></div></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Cancel</button> <button type=\"submit\" class=\"btn btn-info\"><i class=\"fas fa-save me-1\"></i>Update Owner</button></div></form></div></div></div><!-- JavaScript for bucket management --><script>\n // Global state (shared between DOMContentLoaded handlers and global functions)\n let deleteModalInstance = null;\n let quotaModalInstance = null;\n let ownerModalInstance = null;\n let detailsModalInstance = null;\n let lifecycleModalInstance = null;\n let lifecycleRequestSeq = 0;\n let policyModalInstance = null;\n let policyRequestSeq = 0;\n let policyEditorBucket = null;\n // True only once the bucket-policy GET for the currently open bucket has\n // actually completed successfully. The Save button lives outside the\n // (initially hidden) editor wrapper, so it stays clickable while a load\n // is in flight or has failed; without this guard, Save could commit\n // whatever the editor happened to hold - a stale previous bucket's\n // statements, or a freshly-initialized empty state - onto\n // policyEditorBucket before its own policy ever loaded.\n let bucketPolicyLoaded = false;\n // True while a Save (PUT) or Delete (DELETE) request for the bucket\n // policy is in flight, so a double-click - or Save and Delete fired in\n // quick succession - can't send two overlapping mutations for the same\n // bucket. Cleared on failure so the user can retry; left set on success,\n // since the modal hides and the page reloads shortly after anyway.\n let bucketPolicyMutationInFlight = false;\n\n function setBucketPolicyMutationInFlight(inFlight) {\n bucketPolicyMutationInFlight = inFlight;\n document.getElementById('bucketPolicySaveBtn').disabled = inFlight;\n document.getElementById('bucketPolicyDeleteBtn').disabled = inFlight;\n }\n\n let cachedUsers = null;\n\n // Working copy of the lifecycle rules currently shown in the modal.\n // Edits (add/edit/delete rule) only mutate this local state; nothing is\n // sent to the server until \"Save\" or \"Delete all rules\" is clicked.\n let lifecycleEditor = { bucket: null, rules: [], editingIndex: null, editingRule: null, rawXml: '', hasTransition: false };\n\n function escapeHtml(v) {\n return String(v ?? '')\n .replace(/&/g, '&')\n .replace(/</g, '<')\n .replace(/>/g, '>')\n .replace(/\"/g, '"')\n .replace(/'/g, ''');\n }\n\n // Shadows admin.js's formatBytes for this page, so it keeps that\n // signature and unit list; the extra guard is for a size the API left\n // out, which the shared one renders as \"NaN undefined\".\n function formatBytes(bytes, decimals = 2) {\n if (!bytes) return '0 Bytes';\n const k = 1024;\n const dm = decimals < 0 ? 0 : decimals;\n const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB'];\n const i = Math.floor(Math.log(bytes) / Math.log(k));\n return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];\n }\n\n function formatDays(n) {\n return n + (n === 1 ? ' day' : ' days');\n }\n\n // csrfHeaders reads the token the layout stamps into every page\n // (<meta name=\"csrf-token\">) so mutating lifecycle requests pass it the\n // same way the newer admin pages (e.g. s3tables) do.\n function csrfHeaders() {\n const meta = document.querySelector('meta[name=\"csrf-token\"]');\n const token = meta ? (meta.getAttribute('content') || '') : '';\n const headers = { 'Content-Type': 'application/json' };\n if (token) {\n headers['X-CSRF-Token'] = token;\n }\n return headers;\n }\n\n // parseLifecycleResponse reads the body as text before parsing, so a\n // non-JSON response (a proxy's HTML error page, an empty body, plain\n // text from some middleware) surfaces the HTTP status instead of\n // throwing a raw JSON syntax error out of response.json().\n function parseLifecycleResponse(response) {\n return response.text().then(text => {\n let data = {};\n if (text) {\n try {\n data = JSON.parse(text);\n } catch (e) {\n data = { error: response.statusText || ('HTTP ' + response.status) };\n }\n } else if (!response.ok) {\n data = { error: response.statusText || ('HTTP ' + response.status) };\n }\n return { ok: response.ok, data: data };\n });\n }\n\n document.addEventListener('DOMContentLoaded', function() {\n // Add click handlers to pagination links\n document.querySelectorAll('.pagination-link').forEach(link => {\n link.addEventListener('click', function(e) {\n e.preventDefault();\n const page = this.getAttribute('data-page');\n goToPage(page);\n });\n });\n\n // Initialize modal instances once (reuse with show/hide)\n deleteModalInstance = new bootstrap.Modal(document.getElementById('deleteBucketModal'));\n quotaModalInstance = new bootstrap.Modal(document.getElementById('manageQuotaModal'));\n ownerModalInstance = new bootstrap.Modal(document.getElementById('manageOwnerModal'));\n detailsModalInstance = new bootstrap.Modal(document.getElementById('bucketDetailsModal'));\n lifecycleModalInstance = new bootstrap.Modal(document.getElementById('bucketLifecycleModal'));\n policyModalInstance = new bootstrap.Modal(document.getElementById('bucketPolicyModal'));\n\n const quotaCheckbox = document.getElementById('enableQuota');\n const quotaSettings = document.getElementById('quotaSettings');\n const versioningCheckbox = document.getElementById('enableVersioning');\n const objectLockCheckbox = document.getElementById('enableObjectLock');\n const objectLockSettings = document.getElementById('objectLockSettings');\n const setDefaultRetentionCheckbox = document.getElementById('setDefaultRetention');\n const defaultRetentionSettings = document.getElementById('defaultRetentionSettings');\n const createBucketForm = document.getElementById('createBucketForm');\n\n // Toggle quota settings\n quotaCheckbox.addEventListener('change', function() {\n quotaSettings.style.display = this.checked ? 'block' : 'none';\n });\n\n // Toggle object lock settings and automatically enable versioning\n objectLockCheckbox.addEventListener('change', function() {\n objectLockSettings.style.display = this.checked ? 'block' : 'none';\n if (this.checked) {\n versioningCheckbox.checked = true;\n versioningCheckbox.disabled = true;\n } else {\n versioningCheckbox.disabled = false;\n // Reset default retention settings when object lock is disabled\n setDefaultRetentionCheckbox.checked = false;\n defaultRetentionSettings.style.display = 'none';\n }\n });\n\n // Toggle default retention settings\n setDefaultRetentionCheckbox.addEventListener('change', function() {\n defaultRetentionSettings.style.display = this.checked ? 'block' : 'none';\n });\n\n // Populate owner dropdown when create bucket modal opens\n document.getElementById('createBucketModal').addEventListener('show.bs.modal', async function() {\n const ownerSelect = document.getElementById('bucketOwner');\n \n // Only fetch if not already populated\n if (ownerSelect.options.length <= 1) {\n try {\n const response = await fetch(basePath('/api/users'));\n const data = await response.json();\n const users = data.users || [];\n \n users.forEach(user => {\n const option = document.createElement('option');\n option.value = user.username;\n option.textContent = user.username;\n ownerSelect.appendChild(option);\n });\n } catch (error) {\n console.error('Error fetching users for owner dropdown:', error);\n // Reset to default state on error - user can still create bucket without owner\n ownerSelect.innerHTML = '<option value=\"\">No owner (admin-only access)</option>';\n ownerSelect.selectedIndex = 0;\n }\n }\n });\n\n // Handle form submission\n createBucketForm.addEventListener('submit', function(e) {\n e.preventDefault();\n \n const formData = new FormData(this);\n const data = {\n name: formData.get('name'),\n owner: formData.get('owner') || '',\n region: formData.get('region') || '',\n quota_size: quotaCheckbox.checked ? parseInt(formData.get('quota_size')) || 0 : 0,\n quota_unit: formData.get('quota_unit') || 'MB',\n quota_enabled: quotaCheckbox.checked,\n versioning_enabled: versioningCheckbox.checked,\n object_lock_enabled: objectLockCheckbox.checked,\n object_lock_mode: formData.get('object_lock_mode') || 'GOVERNANCE',\n set_default_retention: setDefaultRetentionCheckbox.checked,\n object_lock_duration: setDefaultRetentionCheckbox.checked ? parseInt(formData.get('object_lock_duration')) || 30 : 0\n };\n\n // Validate object lock settings\n if (data.object_lock_enabled && data.set_default_retention && data.object_lock_duration <= 0) {\n alert('Please enter a valid retention duration for object lock.');\n return;\n }\n\n fetch(basePath('/api/s3/buckets'), {\n method: 'POST',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify(data)\n })\n .then(response => response.json())\n .then(data => {\n if (data.error) {\n alert('Error creating bucket: ' + data.error);\n } else {\n alert('Bucket created successfully!');\n // Properly close the modal before reloading\n const createModal = bootstrap.Modal.getInstance(document.getElementById('createBucketModal'));\n if (createModal) {\n createModal.hide();\n }\n setTimeout(() => location.reload(), 500);\n }\n })\n .catch(error => {\n console.error('Error:', error);\n alert('Error creating bucket: ' + error.message);\n });\n });\n\n // Handle delete bucket\n const deleteForm = document.getElementById('deleteBucketModal');\n document.querySelectorAll('.delete-bucket-btn').forEach(button => {\n button.addEventListener('click', function() {\n const bucketName = this.dataset.bucketName;\n document.getElementById('deleteBucketName').textContent = bucketName;\n // Store bucket name on modal element instead of global window property\n deleteForm.dataset.bucketName = bucketName;\n deleteModalInstance.show();\n });\n });\n\n // Handle quota management\n const quotaForm = document.getElementById('quotaForm');\n document.querySelectorAll('.quota-btn').forEach(button => {\n button.addEventListener('click', function() {\n const bucketName = this.dataset.bucketName;\n const currentQuota = parseInt(this.dataset.currentQuota);\n const quotaEnabled = this.dataset.quotaEnabled === 'true';\n \n document.getElementById('quotaBucketName').value = bucketName;\n document.getElementById('quotaEnabled').checked = quotaEnabled;\n document.getElementById('quotaSizeMB').value = currentQuota;\n \n // Toggle quota size settings\n document.getElementById('quotaSizeSettings').style.display = quotaEnabled ? 'block' : 'none';\n \n // Store bucket name on form element instead of global window property\n quotaForm.dataset.bucketName = bucketName;\n quotaModalInstance.show();\n });\n });\n\n // Add event listener to properly dispose of quota modal when hidden\n document.getElementById('manageQuotaModal').addEventListener('hidden.bs.modal', function() {\n if (quotaModalInstance) {\n quotaModalInstance.dispose();\n quotaModalInstance = null;\n }\n // Force remove any remaining backdrops\n document.querySelectorAll('.modal-backdrop').forEach(backdrop => {\n backdrop.remove();\n });\n // Ensure body classes are removed\n document.body.classList.remove('modal-open');\n document.body.style.removeProperty('padding-right');\n });\n\n // Handle quota form submission\n document.getElementById('quotaForm').addEventListener('submit', function(e) {\n e.preventDefault();\n \n const bucketName = this.dataset.bucketName;\n if (!bucketName) return;\n\n const formData = new FormData(this);\n const enabled = document.getElementById('quotaEnabled').checked;\n const data = {\n quota_size: enabled ? parseInt(formData.get('quota_size')) || 0 : 0,\n quota_unit: formData.get('quota_unit') || 'MB',\n quota_enabled: enabled\n };\n\n fetch(basePath(`/api/s3/buckets/${bucketName}/quota`), {\n method: 'PUT',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify(data)\n })\n .then(response => response.json())\n .then(data => {\n if (data.error) {\n alert('Error updating quota: ' + data.error);\n } else {\n alert('Quota updated successfully!');\n // Properly close the modal before reloading\n if (quotaModalInstance) {\n quotaModalInstance.hide();\n }\n setTimeout(() => location.reload(), 500);\n }\n })\n .catch(error => {\n console.error('Error:', error);\n alert('Error updating quota: ' + error.message);\n });\n });\n\n // Handle quota enabled checkbox\n document.getElementById('quotaEnabled').addEventListener('change', function() {\n document.getElementById('quotaSizeSettings').style.display = this.checked ? 'block' : 'none';\n });\n\n // Handle owner management\n const ownerForm = document.getElementById('ownerForm');\n document.querySelectorAll('.owner-btn').forEach(button => {\n button.addEventListener('click', async function() {\n const bucketName = this.dataset.bucketName;\n const currentOwner = this.dataset.currentOwner || '';\n \n document.getElementById('ownerBucketName').value = bucketName;\n // Store bucket name on form element instead of global window property\n ownerForm.dataset.bucketName = bucketName;\n \n // Show loading spinner\n document.getElementById('ownerLoadingSpinner').style.display = 'block';\n document.getElementById('bucketOwnerSelect').disabled = true;\n \n ownerModalInstance.show();\n \n // Fetch users if not cached\n try {\n if (!cachedUsers) {\n const response = await fetch(basePath('/api/users'));\n const data = await response.json();\n cachedUsers = data.users || [];\n }\n \n // Populate the select dropdown\n const select = document.getElementById('bucketOwnerSelect');\n select.innerHTML = '<option value=\"\">No owner (admin-only access)</option>';\n \n cachedUsers.forEach(user => {\n const option = document.createElement('option');\n option.value = user.username;\n option.textContent = user.username;\n if (user.username === currentOwner) {\n option.selected = true;\n }\n select.appendChild(option);\n });\n \n select.disabled = false;\n } catch (error) {\n console.error('Error fetching users:', error);\n alert('Error loading users: ' + error.message);\n // Re-enable select and reset to default on error\n const select = document.getElementById('bucketOwnerSelect');\n select.innerHTML = '<option value=\"\">No owner (admin-only access)</option>';\n select.selectedIndex = 0;\n select.disabled = false;\n } finally {\n document.getElementById('ownerLoadingSpinner').style.display = 'none';\n }\n });\n });\n\n // Handle owner form submission\n document.getElementById('ownerForm').addEventListener('submit', function(e) {\n e.preventDefault();\n \n const bucketName = this.dataset.bucketName;\n if (!bucketName) return;\n\n const owner = document.getElementById('bucketOwnerSelect').value;\n const data = { owner: owner };\n\n fetch(basePath(`/api/s3/buckets/${bucketName}/owner`), {\n method: 'PUT',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify(data)\n })\n .then(response => response.json())\n .then(data => {\n if (data.error) {\n alert('Error updating owner: ' + data.error);\n } else {\n alert('Bucket owner updated successfully!');\n // Properly close the modal before reloading\n if (ownerModalInstance) {\n ownerModalInstance.hide();\n }\n setTimeout(() => location.reload(), 500);\n }\n })\n .catch(error => {\n console.error('Error:', error);\n alert('Error updating owner: ' + error.message);\n });\n });\n\n // Handle view details button\n document.querySelectorAll('.view-details-btn').forEach(button => {\n button.addEventListener('click', function() {\n const bucketName = this.dataset.bucketName;\n \n // Update modal title\n document.getElementById('bucketDetailsModalLabel').innerHTML = \n '<i class=\"fas fa-cube me-2\"></i>Bucket Details - ' + bucketName;\n \n // Show loading spinner\n document.getElementById('bucketDetailsContent').innerHTML = \n '<div class=\"text-center py-4\">' +\n '<div class=\"spinner-border text-primary\" role=\"status\">' +\n '<span class=\"visually-hidden\">Loading...</span>' +\n '<\\\\/div>' +\n '<div class=\"mt-2\">Loading bucket details...</div>' +\n '<\\\\/div>';\n \n detailsModalInstance.show();\n \n // Fetch bucket details\n fetch(basePath('/api/s3/buckets/' + bucketName))\n .then(response => response.json())\n .then(data => {\n if (data.error) {\n document.getElementById('bucketDetailsContent').innerHTML = \n '<div class=\"alert alert-danger\">' +\n '<i class=\"fas fa-exclamation-triangle me-2\"></i>' +\n 'Error loading bucket details: ' + data.error +\n '<\\\\/div>';\n } else {\n displayBucketDetails(data);\n }\n })\n .catch(error => {\n console.error('Error fetching bucket details:', error);\n document.getElementById('bucketDetailsContent').innerHTML = \n '<div class=\"alert alert-danger\">' +\n '<i class=\"fas fa-exclamation-triangle me-2\"></i>' +\n 'Error loading bucket details: ' + error.message +\n '<\\\\/div>';\n });\n });\n });\n\n // Lifecycle buttons: column badge and action button\n document.querySelectorAll('.lifecycle-btn').forEach(button => {\n button.addEventListener('click', function() {\n const bucketName = this.dataset.bucketName;\n\n // Reset the working copy until the GET below repopulates it,\n // so Save/Delete-all can't act on the previous bucket's rules.\n lifecycleEditor = { bucket: null, rules: [], editingIndex: null, editingRule: null, rawXml: '', hasTransition: false };\n\n document.getElementById('bucketLifecycleModalLabel').innerHTML =\n '<i class=\"fas fa-recycle me-2\"></i>Lifecycle - ' + bucketName;\n\n document.getElementById('bucketLifecycleContent').innerHTML =\n '<div class=\"text-center py-4\">' +\n '<div class=\"spinner-border text-primary\" role=\"status\">' +\n '<span class=\"visually-hidden\">Loading...</span>' +\n '<\\/div>' +\n '<div class=\"mt-2\">Loading lifecycle rules...</div>' +\n '<\\/div>';\n\n lifecycleModalInstance.show();\n\n // Drop responses that arrive after another bucket was opened\n const requestSeq = ++lifecycleRequestSeq;\n fetch(basePath('/api/s3/buckets/' + bucketName + '/lifecycle'))\n .then(parseLifecycleResponse)\n .then(({ ok, data }) => {\n if (requestSeq !== lifecycleRequestSeq) return;\n if (!ok || data.error) {\n document.getElementById('bucketLifecycleContent').innerHTML =\n '<div class=\"alert alert-danger\">' +\n '<i class=\"fas fa-exclamation-triangle me-2\"></i>' +\n 'Error loading lifecycle rules: ' + (data.error || 'unknown error') +\n '<\\/div>';\n } else {\n displayBucketLifecycle(data);\n }\n })\n .catch(error => {\n if (requestSeq !== lifecycleRequestSeq) return;\n console.error('Error fetching bucket lifecycle:', error);\n document.getElementById('bucketLifecycleContent').innerHTML =\n '<div class=\"alert alert-danger\">' +\n '<i class=\"fas fa-exclamation-triangle me-2\"></i>' +\n 'Error loading lifecycle rules: ' + error.message +\n '<\\/div>';\n });\n });\n });\n\n // Save the whole working rule set back to the bucket.\n document.getElementById('lifecycleSaveAllBtn').addEventListener('click', function() {\n if (!lifecycleEditor.bucket) return;\n // Fold in any rule the user is still editing so Save doesn't\n // silently discard it; abort if that form isn't valid yet.\n if (!commitOpenLifecycleRuleForm()) return;\n // An empty list clears the configuration, same as Delete all rules,\n // so it gets the same prompt.\n if (lifecycleEditor.rules.length === 0 &&\n !confirm('No rules left: saving removes the lifecycle configuration for ' + lifecycleEditor.bucket + '. This cannot be undone.')) {\n return;\n }\n\n fetch(basePath('/api/s3/buckets/' + lifecycleEditor.bucket + '/lifecycle'), {\n method: 'PUT',\n headers: csrfHeaders(),\n body: JSON.stringify({ rules: lifecycleEditor.rules })\n })\n .then(parseLifecycleResponse)\n .then(({ ok, data }) => {\n if (!ok || data.error) {\n alert('Error saving lifecycle rules: ' + (data.error || 'unknown error'));\n return;\n }\n if (lifecycleModalInstance) {\n lifecycleModalInstance.hide();\n }\n setTimeout(() => location.reload(), 500);\n })\n .catch(error => {\n console.error('Error:', error);\n alert('Error saving lifecycle rules: ' + error.message);\n });\n });\n\n // Clear the lifecycle configuration entirely.\n document.getElementById('lifecycleDeleteAllBtn').addEventListener('click', function() {\n if (!lifecycleEditor.bucket) return;\n if (!confirm('Delete all lifecycle rules for ' + lifecycleEditor.bucket + '? This cannot be undone.')) return;\n\n fetch(basePath('/api/s3/buckets/' + lifecycleEditor.bucket + '/lifecycle'), {\n method: 'DELETE',\n headers: csrfHeaders()\n })\n .then(parseLifecycleResponse)\n .then(({ ok, data }) => {\n if (!ok || data.error) {\n alert('Error deleting lifecycle rules: ' + (data.error || 'unknown error'));\n return;\n }\n if (lifecycleModalInstance) {\n lifecycleModalInstance.hide();\n }\n setTimeout(() => location.reload(), 500);\n })\n .catch(error => {\n console.error('Error:', error);\n alert('Error deleting lifecycle rules: ' + error.message);\n });\n });\n\n // Policy buttons: column badge and action button. The visual editor\n // (weed/admin/static/js/policy_editor.js) is set up once per page\n // load; registerPolicyEditor is re-called on every open so the\n // resource-ARN autocomplete and default Principal stay pinned to\n // whichever bucket is currently open.\n let bucketPolicyEditorSetUp = false;\n document.getElementById('bucketPolicyInsertSampleBtn').addEventListener('click', function() {\n if (!policyEditorBucket) return;\n insertSamplePolicy('bucket', {\n Version: '2012-10-17',\n Statement: [{\n Effect: 'Allow',\n Principal: '*',\n Action: ['s3:GetObject'],\n Resource: ['arn:aws:s3:::' + policyEditorBucket + '/*']\n }]\n });\n });\n\n document.querySelectorAll('.policy-btn').forEach(button => {\n button.addEventListener('click', function() {\n const bucketName = this.dataset.bucketName;\n policyEditorBucket = bucketName;\n bucketPolicyLoaded = false;\n // Deliberately not resetting bucketPolicyMutationInFlight\n // here: if a Save/Delete for a previously open bucket is\n // still in flight, Save/Delete for this bucket must stay\n // blocked until that request settles (its own completion\n // handler releases the flag once done, whether or not it's\n // still the active bucket by then) - otherwise this bucket's\n // mutation could race the abandoned one.\n registerPolicyEditor('bucket', { requirePrincipal: true, bucket: bucketName });\n if (!bucketPolicyEditorSetUp) {\n setupPolicyEditor('bucket');\n bucketPolicyEditorSetUp = true;\n }\n\n document.getElementById('bucketPolicyModalLabel').innerHTML =\n '<i class=\"fas fa-file-shield me-2\"></i>Bucket Policy - ' + escapeHtml(bucketName);\n document.getElementById('bucketPolicyLoading').style.display = '';\n document.getElementById('bucketPolicyError').style.display = 'none';\n document.getElementById('bucketPolicyEditorWrapper').style.display = 'none';\n\n policyModalInstance.show();\n\n // Drop responses that arrive after another bucket was opened\n const requestSeq = ++policyRequestSeq;\n fetch(basePath('/api/s3/buckets/' + encodeURIComponent(bucketName) + '/policy'))\n .then(parseLifecycleResponse)\n .then(({ ok, data }) => {\n if (requestSeq !== policyRequestSeq) return;\n document.getElementById('bucketPolicyLoading').style.display = 'none';\n if (!ok || data.error) {\n document.getElementById('bucketPolicyError').textContent =\n 'Error loading bucket policy: ' + (data.error || 'unknown error');\n document.getElementById('bucketPolicyError').style.display = '';\n return;\n }\n document.getElementById('bucketPolicyEditorWrapper').style.display = '';\n // policy_text carries stored bytes the server-side\n // decoder rejects; the JSON tab shows them so they\n // can be fixed or deleted.\n document.getElementById('bucketPolicyDocument').value =\n data.policy ? JSON.stringify(data.policy, null, 2) : (data.policy_text || '');\n bucketPolicyLoaded = true;\n loadPolicyTextareaIntoEditor('bucket');\n })\n .catch(error => {\n if (requestSeq !== policyRequestSeq) return;\n console.error('Error fetching bucket policy:', error);\n document.getElementById('bucketPolicyLoading').style.display = 'none';\n document.getElementById('bucketPolicyError').textContent =\n 'Error loading bucket policy: ' + error.message;\n document.getElementById('bucketPolicyError').style.display = '';\n });\n });\n });\n\n // Save the policy document currently shown (whichever tab is active).\n document.getElementById('bucketPolicySaveBtn').addEventListener('click', function() {\n if (!policyEditorBucket) return;\n if (bucketPolicyMutationInFlight) return;\n if (!bucketPolicyLoaded) {\n alert('The current policy has not finished loading. Close and reopen this dialog before saving.');\n return;\n }\n\n // Commit first: if the Editor tab is active, the textarea still\n // holds whatever was there at load time until this runs, so a\n // policy entered purely through the structured form (no tab\n // switch) would otherwise read back as empty here.\n if (!commitPolicyActiveTab('bucket')) return;\n\n const raw = document.getElementById('bucketPolicyDocument').value.trim();\n if (!raw || !policyTextHasStatements(raw)) {\n alert('Add at least one statement, or use Delete to remove the bucket policy.');\n return;\n }\n\n let policy;\n try {\n policy = JSON.parse(document.getElementById('bucketPolicyDocument').value);\n } catch (e) {\n alert('Invalid JSON: ' + e.message);\n return;\n }\n const validationError = validatePolicyEditorDoc('bucket', policy);\n if (validationError) {\n alert(validationError);\n return;\n }\n // The admin API decodes only Version and Statement, so warn\n // before other top-level fields are silently dropped - the IAM\n // policies page already does. (The S3 Tables dialogs don't:\n // their backend stores the document verbatim.)\n if (!confirmPolicyFieldDiscard('bucket')) return;\n\n // Captured now: if the dialog moves on to a different bucket\n // before this PUT resolves, the completion below must not hide\n // or reload over whatever that other bucket is now showing.\n const targetBucket = policyEditorBucket;\n setBucketPolicyMutationInFlight(true);\n fetch(basePath('/api/s3/buckets/' + encodeURIComponent(targetBucket) + '/policy'), {\n method: 'PUT',\n headers: csrfHeaders(),\n body: JSON.stringify({ policy: policy })\n })\n .then(parseLifecycleResponse)\n .then(({ ok, data }) => {\n setBucketPolicyMutationInFlight(false);\n const stillCurrent = targetBucket === policyEditorBucket;\n if (!ok || data.error) {\n if (stillCurrent) {\n alert('Error saving bucket policy: ' + (data.error || 'unknown error'));\n } else {\n console.error('Error saving policy for ' + targetBucket + ' (no longer the open bucket): ' + (data.error || 'unknown error'));\n }\n return;\n }\n if (!stillCurrent) return;\n if (policyModalInstance) {\n policyModalInstance.hide();\n }\n setTimeout(() => location.reload(), 500);\n })\n .catch(error => {\n setBucketPolicyMutationInFlight(false);\n console.error('Error:', error);\n if (targetBucket === policyEditorBucket) {\n alert('Error saving bucket policy: ' + error.message);\n }\n });\n });\n\n // Clear the bucket policy entirely.\n document.getElementById('bucketPolicyDeleteBtn').addEventListener('click', function() {\n if (!policyEditorBucket) return;\n if (bucketPolicyMutationInFlight) return;\n if (!bucketPolicyLoaded) {\n alert('The current policy has not finished loading. Close and reopen this dialog before deleting.');\n return;\n }\n if (!confirm('Delete the bucket policy for ' + policyEditorBucket + '? This cannot be undone.')) return;\n\n // Captured now: if the dialog moves on to a different bucket\n // before this DELETE resolves, the completion below must not\n // hide or reload over whatever that other bucket is now showing.\n const targetBucket = policyEditorBucket;\n setBucketPolicyMutationInFlight(true);\n fetch(basePath('/api/s3/buckets/' + encodeURIComponent(targetBucket) + '/policy'), {\n method: 'DELETE',\n headers: csrfHeaders()\n })\n .then(parseLifecycleResponse)\n .then(({ ok, data }) => {\n setBucketPolicyMutationInFlight(false);\n const stillCurrent = targetBucket === policyEditorBucket;\n if (!ok || data.error) {\n if (stillCurrent) {\n alert('Error deleting bucket policy: ' + (data.error || 'unknown error'));\n } else {\n console.error('Error deleting policy for ' + targetBucket + ' (no longer the open bucket): ' + (data.error || 'unknown error'));\n }\n return;\n }\n if (!stillCurrent) return;\n if (policyModalInstance) {\n policyModalInstance.hide();\n }\n setTimeout(() => location.reload(), 500);\n })\n .catch(error => {\n setBucketPolicyMutationInFlight(false);\n console.error('Error:', error);\n if (targetBucket === policyEditorBucket) {\n alert('Error deleting bucket policy: ' + error.message);\n }\n });\n });\n });\n\n function deleteBucket() {\n const bucketName = document.getElementById('deleteBucketModal').dataset.bucketName;\n if (!bucketName) return;\n\n fetch(basePath(`/api/s3/buckets/${bucketName}`), {\n method: 'DELETE'\n })\n .then(response => response.json())\n .then(data => {\n if (data.error) {\n alert('Error deleting bucket: ' + data.error);\n } else {\n alert('Bucket deleted successfully!');\n // Properly close the modal before reloading\n if (deleteModalInstance) {\n deleteModalInstance.hide();\n }\n setTimeout(() => location.reload(), 500);\n }\n })\n .catch(error => {\n console.error('Error:', error);\n alert('Error deleting bucket: ' + error.message);\n });\n }\n\nfunction displayBucketDetails(data) {\n const bucket = data.bucket;\n\n function formatDate(dateString) {\n const date = new Date(dateString);\n return date.toLocaleString();\n }\n\n let ownerHtml = '<span class=\"text-muted\">No owner (admin-only)</span>';\n if (bucket.owner) {\n ownerHtml = '<span class=\"badge bg-info\"><i class=\"fas fa-user me-1\"></i>' + escapeHtml(bucket.owner) + '</span>';\n }\n\n let usageHtml = '';\n if (bucket.physical_size > 0 && bucket.logical_size > 0 && bucket.physical_size > bucket.logical_size) {\n const overhead = (bucket.physical_size / bucket.logical_size).toFixed(1);\n usageHtml = '<br><small class=\"text-muted\">' + overhead + 'x overhead<\\/small>';\n }\n\n let quotaHtml = '<span class=\"badge bg-secondary\">Disabled</span>';\n if (bucket.quota_enabled) {\n quotaHtml = '<span class=\"badge bg-success\">' + formatBytes(bucket.quota) + '</span>';\n }\n\n let versioningHtml = '<span class=\"text-muted\">Not configured</span>';\n if (bucket.versioning_status === 'Enabled') {\n versioningHtml = '<span class=\"badge bg-success\"><i class=\"fas fa-check me-1\"></i>Enabled</span>';\n } else if (bucket.versioning_status === 'Suspended') {\n versioningHtml = '<span class=\"badge bg-warning\"><i class=\"fas fa-pause me-1\"></i>Suspended</span>';\n }\n\n let statusHtml = '<span class=\"badge bg-success\">Writable</span>';\n if (bucket.read_only) {\n statusHtml = '<span class=\"badge bg-danger\"><i class=\"fas fa-lock me-1\"></i>Read-only</span>';\n }\n\n let objectLockHtml = '<span class=\"text-muted\">Not configured</span>';\n if (bucket.object_lock_enabled) {\n let details = '';\n if (bucket.object_lock_mode && bucket.object_lock_duration > 0) {\n details = '<br><small class=\"text-muted\">' + escapeHtml(bucket.object_lock_mode) + ' • ' + bucket.object_lock_duration + ' days<\\/small>';\n }\n objectLockHtml = '<span class=\"badge bg-warning\"><i class=\"fas fa-lock me-1\"></i>Enabled</span>' + details;\n }\n\n let policyHtml = '<span class=\"text-muted\">Not configured</span>';\n if (bucket.policy_statement_count > 0) {\n const label = bucket.policy_statement_count === 1 ? '1 statement' : bucket.policy_statement_count + ' statements';\n policyHtml = '<span class=\"badge bg-primary\">' + label + '<\\/span>';\n }\n\n const rows = [\n '<div class=\"row\">',\n '<div class=\"col-md-6\">',\n '<h6><i class=\"fas fa-info-circle me-2\"></i>Bucket Information</h6>',\n '<table class=\"table table-sm\">',\n '<tr><td><strong>Name:</strong></td><td>' + escapeHtml(bucket.name) + '<\\/td><\\/tr>',\n '<tr><td><strong>Owner:</strong></td><td>' + ownerHtml + '<\\/td><\\/tr>',\n '<tr><td><strong>Created:</strong></td><td>' + formatDate(bucket.created_at) + '<\\/td><\\/tr>',\n '<tr><td><strong>Last Modified:</strong></td><td>' + formatDate(bucket.last_modified) + '<\\/td><\\/tr>',\n '<tr><td><strong>Logical Size:</strong></td><td>' + formatBytes(bucket.logical_size) + '<\\/td><\\/tr>',\n '<tr><td><strong>Physical Size:</strong></td><td>' + formatBytes(bucket.physical_size) + usageHtml + '<\\/td><\\/tr>',\n '<\\/table>',\n '<\\/div>',\n '<div class=\"col-md-6\">',\n '<h6><i class=\"fas fa-cogs me-2\"></i>Configuration</h6>',\n '<table class=\"table table-sm\">',\n '<tr><td><strong>Status:</strong></td><td>' + statusHtml + '<\\/td><\\/tr>',\n '<tr><td><strong>Quota:</strong></td><td>' + quotaHtml + '<\\/td><\\/tr>',\n '<tr><td><strong>Versioning:</strong></td><td>' + versioningHtml + '<\\/td><\\/tr>',\n '<tr><td><strong>Object Lock:</strong></td><td>' + objectLockHtml + '<\\/td><\\/tr>',\n '<tr><td><strong>Policy:</strong></td><td>' + policyHtml + '<\\/td><\\/tr>',\n '<\\/table>',\n '<\\/div>',\n '<\\/div>'\n ];\n\n document.getElementById('bucketDetailsContent').innerHTML = rows.join('');\n}\n\n// displayBucketLifecycle loads the GET response into the local working copy\n// and renders the editor. Nothing is sent back to the server until Save or\n// Delete all rules is clicked.\nfunction displayBucketLifecycle(data) {\n lifecycleEditor.bucket = data.bucket || lifecycleEditor.bucket;\n lifecycleEditor.rules = (data.rules || []).map(cloneLifecycleRule);\n lifecycleEditor.editingIndex = null;\n lifecycleEditor.editingRule = null;\n lifecycleEditor.rawXml = data.xml || '';\n // SeaweedFS doesn't support Transition rules (PutBucketLifecycleConfiguration\n // rejects them for Enabled rules), and the canonical rule shape the admin\n // edits has no field for one, so a Transition set by another client would\n // silently disappear on the next Save. Warn instead.\n // Matches <Transition> and <NoncurrentVersionTransition> however they are\n // spelled: with attributes, self-closed, or namespace-prefixed.\n lifecycleEditor.hasTransition = /<(\\w+:)?(NoncurrentVersion)?Transition[\\s>\\/]/.test(data.xml || '');\n renderLifecycleEditor();\n}\n\n// normalizeLifecycleStatus maps a stored status onto the two the editor can\n// show. The S3 API stores <Status> unvalidated, and the engine runs a rule\n// only on an exact \"Enabled\", so everything else is Disabled - collapsing it\n// here keeps an odd spelling from leaving both radios unchecked, which would\n// throw out of readLifecycleRuleFromForm and make the modal look dead.\nfunction normalizeLifecycleStatus(status) {\n return status === 'Enabled' ? 'Enabled' : 'Disabled';\n}\n\nfunction cloneLifecycleRule(r) {\n return {\n id: r.id || '',\n status: normalizeLifecycleStatus(r.status),\n prefix: r.prefix || '',\n tags: Object.assign({}, r.tags || {}),\n size_greater_than: r.size_greater_than || null,\n size_less_than: r.size_less_than || null,\n expiration_days: r.expiration_days || null,\n expiration_date: r.expiration_date || '',\n expired_object_delete_marker: !!r.expired_object_delete_marker,\n noncurrent_version_expiration_days: r.noncurrent_version_expiration_days || null,\n newer_noncurrent_versions: r.newer_noncurrent_versions || null,\n abort_multipart_days: r.abort_multipart_days || null,\n };\n}\n\nfunction blankLifecycleRule() {\n return {\n id: '', status: 'Enabled', prefix: '', tags: {},\n size_greater_than: null, size_less_than: null,\n expiration_days: null, expiration_date: '',\n expired_object_delete_marker: false,\n noncurrent_version_expiration_days: null, newer_noncurrent_versions: null,\n abort_multipart_days: null,\n };\n}\n\nfunction describeLifecycleScope(rule) {\n const parts = [];\n if (rule.prefix) {\n parts.push('<code>' + escapeHtml(rule.prefix) + '<\\/code>');\n }\n Object.entries(rule.tags || {}).forEach(([k, v]) => {\n parts.push('<span class=\"badge bg-light text-dark border\">' + escapeHtml(k) + '=' + escapeHtml(v) + '<\\/span>');\n });\n if (rule.size_greater_than) {\n parts.push('size > ' + formatBytes(rule.size_greater_than));\n }\n if (rule.size_less_than) {\n parts.push('size < ' + formatBytes(rule.size_less_than));\n }\n return parts.length ? parts.join(' ') : '<span class=\"text-muted\">Whole bucket<\\/span>';\n}\n\nfunction describeLifecycleActions(rule) {\n const actions = [];\n if (rule.expiration_days) {\n actions.push('Expire after ' + formatDays(rule.expiration_days));\n }\n if (rule.expiration_date) {\n actions.push('Expire on ' + escapeHtml(rule.expiration_date));\n }\n if (rule.expired_object_delete_marker) {\n actions.push('Remove expired object delete markers');\n }\n if (rule.noncurrent_version_expiration_days) {\n let action = 'Expire noncurrent versions after ' + formatDays(rule.noncurrent_version_expiration_days);\n if (rule.newer_noncurrent_versions) {\n action += ', keep ' + rule.newer_noncurrent_versions + ' newest';\n }\n actions.push(action);\n } else if (rule.newer_noncurrent_versions) {\n // Standalone (no expiration_days): the engine still recognizes this\n // as an action that expires noncurrent versions beyond the N newest.\n actions.push('Keep ' + rule.newer_noncurrent_versions + ' newest noncurrent versions');\n }\n if (rule.abort_multipart_days) {\n actions.push('Abort incomplete multipart uploads after ' + formatDays(rule.abort_multipart_days));\n }\n if (actions.length === 0) {\n return '<span class=\"text-muted\">None<\\/span>';\n }\n return actions.join('<br>');\n}\n\nfunction lifecycleRuleRowHtml(rule, idx) {\n const statusHtml = rule.status === 'Enabled'\n ? '<span class=\"badge bg-success\">Enabled<\\/span>'\n : '<span class=\"badge bg-secondary\">' + escapeHtml(rule.status) + '<\\/span>';\n return '<tr>' +\n '<td>' + (rule.id ? escapeHtml(rule.id) : '<span class=\"text-muted\">unnamed<\\/span>') + '<\\/td>' +\n '<td>' + statusHtml + '<\\/td>' +\n '<td>' + describeLifecycleScope(rule) + '<\\/td>' +\n '<td>' + describeLifecycleActions(rule) + '<\\/td>' +\n '<td class=\"text-end text-nowrap\">' +\n '<button type=\"button\" class=\"btn btn-sm btn-outline-secondary lifecycle-edit-rule-btn\" data-index=\"' + idx + '\" title=\"Edit rule\"><i class=\"fas fa-pen\"><\\/i><\\/button> ' +\n '<button type=\"button\" class=\"btn btn-sm btn-outline-danger lifecycle-delete-rule-btn\" data-index=\"' + idx + '\" title=\"Delete rule\"><i class=\"fas fa-trash\"><\\/i><\\/button>' +\n '<\\/td>' +\n '<\\/tr>';\n}\n\nfunction lifecycleRuleFormHtml() {\n const rule = lifecycleEditor.editingRule;\n const tagRowHtml = (k, v) =>\n '<div class=\"input-group input-group-sm mb-1 lifecycle-tag-row\">' +\n '<input type=\"text\" class=\"form-control lifecycle-tag-key\" placeholder=\"Key\" value=\"' + escapeHtml(k) + '\">' +\n '<input type=\"text\" class=\"form-control lifecycle-tag-value\" placeholder=\"Value\" value=\"' + escapeHtml(v) + '\">' +\n '<button type=\"button\" class=\"btn btn-outline-danger lifecycle-remove-tag-btn\"><i class=\"fas fa-times\"><\\/i><\\/button>' +\n '<\\/div>';\n const tagRows = Object.entries(rule.tags || {}).map(([k, v]) => tagRowHtml(k, v)).join('');\n\n return '' +\n '<div class=\"card mb-3\" id=\"lifecycleRuleForm\">' +\n '<div class=\"card-body\">' +\n '<h6 class=\"card-title\">' + (lifecycleEditor.editingIndex === 'new' ? 'Add rule' : 'Edit rule') + '<\\/h6>' +\n\n '<div class=\"row g-2 mb-2\">' +\n '<div class=\"col-md-6\">' +\n '<label class=\"form-label small\">ID (optional)<\\/label>' +\n '<input type=\"text\" class=\"form-control form-control-sm\" id=\"lifecycleRuleId\" value=\"' + escapeHtml(rule.id) + '\">' +\n '<\\/div>' +\n '<div class=\"col-md-6\">' +\n '<label class=\"form-label small d-block\">Status<\\/label>' +\n '<div class=\"form-check form-check-inline\">' +\n '<input class=\"form-check-input\" type=\"radio\" name=\"lifecycleRuleStatus\" id=\"lifecycleStatusEnabled\" value=\"Enabled\"' + (rule.status === 'Enabled' ? ' checked' : '') + '>' +\n '<label class=\"form-check-label\" for=\"lifecycleStatusEnabled\">Enabled<\\/label>' +\n '<\\/div>' +\n '<div class=\"form-check form-check-inline\">' +\n '<input class=\"form-check-input\" type=\"radio\" name=\"lifecycleRuleStatus\" id=\"lifecycleStatusDisabled\" value=\"Disabled\"' + (rule.status === 'Disabled' ? ' checked' : '') + '>' +\n '<label class=\"form-check-label\" for=\"lifecycleStatusDisabled\">Disabled<\\/label>' +\n '<\\/div>' +\n '<\\/div>' +\n '<\\/div>' +\n\n '<div class=\"mb-2\">' +\n '<label class=\"form-label small\">Prefix<\\/label>' +\n '<input type=\"text\" class=\"form-control form-control-sm\" id=\"lifecycleRulePrefix\" placeholder=\"logs/\" value=\"' + escapeHtml(rule.prefix) + '\">' +\n '<\\/div>' +\n\n '<div class=\"mb-2\">' +\n '<label class=\"form-label small d-block\">Tags<\\/label>' +\n '<div id=\"lifecycleTagRows\">' + tagRows + '<\\/div>' +\n '<button type=\"button\" class=\"btn btn-sm btn-outline-secondary\" id=\"lifecycleAddTagBtn\"><i class=\"fas fa-plus me-1\"><\\/i>Add tag<\\/button>' +\n '<\\/div>' +\n\n '<div class=\"row g-2 mb-3\">' +\n '<div class=\"col-md-6\">' +\n '<label class=\"form-label small\">Size greater than (bytes)<\\/label>' +\n '<input type=\"number\" class=\"form-control form-control-sm\" id=\"lifecycleRuleSizeGT\" min=\"0\" step=\"1\" value=\"' + (rule.size_greater_than || '') + '\">' +\n '<\\/div>' +\n '<div class=\"col-md-6\">' +\n '<label class=\"form-label small\">Size less than (bytes)<\\/label>' +\n '<input type=\"number\" class=\"form-control form-control-sm\" id=\"lifecycleRuleSizeLT\" min=\"0\" step=\"1\" value=\"' + (rule.size_less_than || '') + '\">' +\n '<\\/div>' +\n '<\\/div>' +\n\n '<hr>' +\n '<h6 class=\"small text-muted text-uppercase\">Actions<\\/h6>' +\n\n '<div class=\"row g-2 align-items-center mb-2\">' +\n '<div class=\"col-auto\">' +\n '<div class=\"form-check\">' +\n '<input class=\"form-check-input\" type=\"checkbox\" id=\"lifecycleExpireDaysEnabled\"' + (rule.expiration_days ? ' checked' : '') + '>' +\n '<label class=\"form-check-label\" for=\"lifecycleExpireDaysEnabled\">Expire after<\\/label>' +\n '<\\/div>' +\n '<\\/div>' +\n '<div class=\"col-auto\">' +\n '<input type=\"number\" class=\"form-control form-control-sm\" id=\"lifecycleExpireDays\" min=\"1\" step=\"1\" style=\"width: 6rem;\" value=\"' + (rule.expiration_days || '') + '\"' + (rule.expiration_days ? '' : ' disabled') + '>' +\n '<\\/div><div class=\"col-auto\">days<\\/div>' +\n '<\\/div>' +\n\n '<div class=\"row g-2 align-items-center mb-2\">' +\n '<div class=\"col-auto\">' +\n '<div class=\"form-check\">' +\n '<input class=\"form-check-input\" type=\"checkbox\" id=\"lifecycleExpireDateEnabled\"' + (rule.expiration_date ? ' checked' : '') + '>' +\n '<label class=\"form-check-label\" for=\"lifecycleExpireDateEnabled\">Expire on date<\\/label>' +\n '<\\/div>' +\n '<\\/div>' +\n '<div class=\"col-auto\">' +\n '<input type=\"date\" class=\"form-control form-control-sm\" id=\"lifecycleExpireDate\" value=\"' + escapeHtml(rule.expiration_date) + '\"' + (rule.expiration_date ? '' : ' disabled') + '>' +\n '<\\/div>' +\n '<\\/div>' +\n\n '<div class=\"form-check mb-2\">' +\n '<input class=\"form-check-input\" type=\"checkbox\" id=\"lifecycleDeleteMarker\"' + (rule.expired_object_delete_marker ? ' checked' : '') + '>' +\n '<label class=\"form-check-label\" for=\"lifecycleDeleteMarker\">Remove expired object delete markers<\\/label>' +\n '<\\/div>' +\n\n (() => {\n const noncurrentActive = !!(rule.noncurrent_version_expiration_days || rule.newer_noncurrent_versions);\n return '<div class=\"row g-2 align-items-center mb-2\">' +\n '<div class=\"col-auto\">' +\n '<div class=\"form-check\">' +\n '<input class=\"form-check-input\" type=\"checkbox\" id=\"lifecycleNoncurrentEnabled\"' + (noncurrentActive ? ' checked' : '') + '>' +\n '<label class=\"form-check-label\" for=\"lifecycleNoncurrentEnabled\">Limit noncurrent versions<\\/label>' +\n '<\\/div>' +\n '<\\/div>' +\n '<div class=\"col-auto\">after<\\/div>' +\n '<div class=\"col-auto\">' +\n '<input type=\"number\" class=\"form-control form-control-sm\" id=\"lifecycleNoncurrentDays\" min=\"1\" step=\"1\" style=\"width: 6rem;\" value=\"' + (rule.noncurrent_version_expiration_days || '') + '\"' + (noncurrentActive ? '' : ' disabled') + '>' +\n '<\\/div><div class=\"col-auto\">days (optional), keep<\\/div>' +\n '<div class=\"col-auto\">' +\n '<input type=\"number\" class=\"form-control form-control-sm\" id=\"lifecycleNoncurrentKeep\" min=\"0\" step=\"1\" style=\"width: 6rem;\" value=\"' + (rule.newer_noncurrent_versions || '') + '\"' + (noncurrentActive ? '' : ' disabled') + '>' +\n '<\\/div><div class=\"col-auto\">newest (optional)<\\/div>' +\n '<\\/div>';\n })() +\n\n '<div class=\"row g-2 align-items-center mb-3\">' +\n '<div class=\"col-auto\">' +\n '<div class=\"form-check\">' +\n '<input class=\"form-check-input\" type=\"checkbox\" id=\"lifecycleAbortMPUEnabled\"' + (rule.abort_multipart_days ? ' checked' : '') + '>' +\n '<label class=\"form-check-label\" for=\"lifecycleAbortMPUEnabled\">Abort incomplete multipart uploads after<\\/label>' +\n '<\\/div>' +\n '<\\/div>' +\n '<div class=\"col-auto\">' +\n '<input type=\"number\" class=\"form-control form-control-sm\" id=\"lifecycleAbortMPUDays\" min=\"1\" step=\"1\" style=\"width: 6rem;\" value=\"' + (rule.abort_multipart_days || '') + '\"' + (rule.abort_multipart_days ? '' : ' disabled') + '>' +\n '<\\/div><div class=\"col-auto\">days<\\/div>' +\n '<\\/div>' +\n\n '<div class=\"text-end\">' +\n '<button type=\"button\" class=\"btn btn-sm btn-secondary\" id=\"lifecycleCancelRuleBtn\">Cancel<\\/button> ' +\n '<button type=\"button\" class=\"btn btn-sm btn-primary\" id=\"lifecycleSaveRuleBtn\">Save rule<\\/button>' +\n '<\\/div>' +\n '<\\/div>' +\n '<\\/div>';\n}\n\nfunction renderLifecycleEditor() {\n const container = document.getElementById('bucketLifecycleContent');\n const rowsHtml = lifecycleEditor.rules.map(lifecycleRuleRowHtml).join('') ||\n '<tr><td colspan=\"5\" class=\"text-center text-muted py-3\">No lifecycle rules<\\/td><\\/tr>';\n\n let html = '';\n if (lifecycleEditor.hasTransition) {\n html += '<div class=\"alert alert-warning small\">' +\n '<i class=\"fas fa-triangle-exclamation me-1\"><\\/i>' +\n 'This bucket has a Transition rule set outside the admin (SeaweedFS does not support storage class transitions). Saving from here will drop it.' +\n '<\\/div>';\n }\n\n html += '<div class=\"table-responsive mb-3\">' +\n '<table class=\"table table-sm align-middle\">' +\n '<thead><tr><th>Rule<\\/th><th>Status<\\/th><th>Scope<\\/th><th>Actions<\\/th><th><\\/th><\\/tr><\\/thead>' +\n '<tbody>' + rowsHtml + '<\\/tbody>' +\n '<\\/table>' +\n '<\\/div>' +\n '<button type=\"button\" class=\"btn btn-sm btn-outline-primary mb-3\" id=\"lifecycleAddRuleBtn\">' +\n '<i class=\"fas fa-plus me-1\"><\\/i>Add rule' +\n '<\\/button>';\n\n if (lifecycleEditor.editingIndex !== null) {\n html += lifecycleRuleFormHtml();\n }\n\n if (lifecycleEditor.rawXml) {\n html += '<details class=\"mt-2\">' +\n '<summary class=\"text-muted small\">Raw XML (as currently stored)<\\/summary>' +\n '<pre class=\"bg-light border rounded p-2 mt-2 small mb-0\">' + escapeHtml(lifecycleEditor.rawXml) + '<\\/pre>' +\n '<\\/details>';\n }\n\n container.innerHTML = html;\n bindLifecycleEditorEvents();\n}\n\nfunction bindLifecycleToggle(checkboxId, fieldId, mutuallyExclusiveId) {\n const checkbox = document.getElementById(checkboxId);\n const field = document.getElementById(fieldId);\n if (!checkbox || !field) return;\n checkbox.addEventListener('change', function() {\n field.disabled = !this.checked;\n if (this.checked && mutuallyExclusiveId) {\n const other = document.getElementById(mutuallyExclusiveId);\n if (other && other.checked) {\n other.checked = false;\n other.dispatchEvent(new Event('change'));\n }\n }\n });\n}\n\nfunction bindLifecycleEditorEvents() {\n const addBtn = document.getElementById('lifecycleAddRuleBtn');\n if (addBtn) {\n addBtn.addEventListener('click', function() {\n // Fold in any rule already being edited before switching forms,\n // so an invalid in-progress draft isn't silently discarded.\n if (!commitOpenLifecycleRuleForm()) return;\n lifecycleEditor.editingIndex = 'new';\n lifecycleEditor.editingRule = blankLifecycleRule();\n renderLifecycleEditor();\n });\n }\n\n document.querySelectorAll('.lifecycle-edit-rule-btn').forEach(btn => {\n btn.addEventListener('click', function() {\n const idx = parseInt(this.dataset.index, 10);\n // Same as above: committing never shifts indices (it either\n // pushes a new rule at the end or replaces one in place), so\n // idx captured above is still valid after this call.\n if (!commitOpenLifecycleRuleForm()) return;\n lifecycleEditor.editingIndex = idx;\n lifecycleEditor.editingRule = cloneLifecycleRule(lifecycleEditor.rules[idx]);\n renderLifecycleEditor();\n });\n });\n\n document.querySelectorAll('.lifecycle-delete-rule-btn').forEach(btn => {\n btn.addEventListener('click', function() {\n const idx = parseInt(this.dataset.index, 10);\n // Fold in an open form first, like every other transition does:\n // re-rendering after the splice would otherwise redraw it from the\n // snapshot taken when editing began and lose what was typed.\n if (lifecycleEditor.editingIndex !== null && lifecycleEditor.editingIndex !== idx) {\n if (!commitOpenLifecycleRuleForm()) return;\n }\n lifecycleEditor.rules.splice(idx, 1);\n // Deleting a rule shifts every later index down by one, so an\n // open edit form must follow its rule rather than silently\n // start targeting whatever now sits at its old index.\n if (lifecycleEditor.editingIndex === idx) {\n lifecycleEditor.editingIndex = null;\n lifecycleEditor.editingRule = null;\n } else if (typeof lifecycleEditor.editingIndex === 'number' && lifecycleEditor.editingIndex > idx) {\n lifecycleEditor.editingIndex -= 1;\n }\n renderLifecycleEditor();\n });\n });\n\n const cancelBtn = document.getElementById('lifecycleCancelRuleBtn');\n if (cancelBtn) {\n cancelBtn.addEventListener('click', function() {\n lifecycleEditor.editingIndex = null;\n lifecycleEditor.editingRule = null;\n renderLifecycleEditor();\n });\n }\n\n const addTagBtn = document.getElementById('lifecycleAddTagBtn');\n if (addTagBtn) {\n addTagBtn.addEventListener('click', function() {\n const rows = document.getElementById('lifecycleTagRows');\n const row = document.createElement('div');\n row.className = 'input-group input-group-sm mb-1 lifecycle-tag-row';\n row.innerHTML =\n '<input type=\"text\" class=\"form-control lifecycle-tag-key\" placeholder=\"Key\">' +\n '<input type=\"text\" class=\"form-control lifecycle-tag-value\" placeholder=\"Value\">' +\n '<button type=\"button\" class=\"btn btn-outline-danger lifecycle-remove-tag-btn\"><i class=\"fas fa-times\"><\\/i><\\/button>';\n rows.appendChild(row);\n row.querySelector('.lifecycle-remove-tag-btn').addEventListener('click', function() {\n row.remove();\n });\n });\n }\n\n document.querySelectorAll('.lifecycle-remove-tag-btn').forEach(btn => {\n btn.addEventListener('click', function() {\n this.closest('.lifecycle-tag-row').remove();\n });\n });\n\n bindLifecycleToggle('lifecycleExpireDaysEnabled', 'lifecycleExpireDays', 'lifecycleExpireDateEnabled');\n bindLifecycleToggle('lifecycleExpireDateEnabled', 'lifecycleExpireDate', 'lifecycleExpireDaysEnabled');\n bindLifecycleToggle('lifecycleNoncurrentEnabled', 'lifecycleNoncurrentDays');\n bindLifecycleToggle('lifecycleNoncurrentEnabled', 'lifecycleNoncurrentKeep');\n bindLifecycleToggle('lifecycleAbortMPUEnabled', 'lifecycleAbortMPUDays');\n\n const saveRuleBtn = document.getElementById('lifecycleSaveRuleBtn');\n if (saveRuleBtn) {\n saveRuleBtn.addEventListener('click', saveLifecycleRuleFromForm);\n }\n}\n\n// readLifecycleRuleFromForm builds and validates a rule from the currently\n// open edit form's DOM inputs. Returns { rule: null, error: '...' } when the\n// form doesn't hold a valid rule, without mutating any state.\nfunction readLifecycleRuleFromForm() {\n const id = document.getElementById('lifecycleRuleId').value.trim();\n const status = document.querySelector('input[name=\"lifecycleRuleStatus\"]:checked').value;\n const prefix = document.getElementById('lifecycleRulePrefix').value.trim();\n\n const tags = {};\n document.querySelectorAll('#lifecycleTagRows .lifecycle-tag-row').forEach(row => {\n const key = row.querySelector('.lifecycle-tag-key').value.trim();\n const value = row.querySelector('.lifecycle-tag-value').value.trim();\n if (key) {\n tags[key] = value;\n }\n });\n\n const sizeGT = parseInt(document.getElementById('lifecycleRuleSizeGT').value, 10) || 0;\n const sizeLT = parseInt(document.getElementById('lifecycleRuleSizeLT').value, 10) || 0;\n\n const expireDaysEnabled = document.getElementById('lifecycleExpireDaysEnabled').checked;\n const expireDateEnabled = document.getElementById('lifecycleExpireDateEnabled').checked;\n const expirationDays = expireDaysEnabled ? (parseInt(document.getElementById('lifecycleExpireDays').value, 10) || 0) : 0;\n const expirationDate = expireDateEnabled ? document.getElementById('lifecycleExpireDate').value : '';\n\n const deleteMarker = document.getElementById('lifecycleDeleteMarker').checked;\n\n const noncurrentEnabled = document.getElementById('lifecycleNoncurrentEnabled').checked;\n const noncurrentDays = noncurrentEnabled ? (parseInt(document.getElementById('lifecycleNoncurrentDays').value, 10) || 0) : 0;\n const noncurrentKeep = noncurrentEnabled ? (parseInt(document.getElementById('lifecycleNoncurrentKeep').value, 10) || 0) : 0;\n\n const abortEnabled = document.getElementById('lifecycleAbortMPUEnabled').checked;\n const abortDays = abortEnabled ? (parseInt(document.getElementById('lifecycleAbortMPUDays').value, 10) || 0) : 0;\n\n if (expireDaysEnabled && expirationDays <= 0) {\n return { rule: null, error: 'Enter a valid number of days for expiration.' };\n }\n if (expireDateEnabled && !expirationDate) {\n return { rule: null, error: 'Enter a valid expiration date.' };\n }\n if (noncurrentEnabled && noncurrentDays <= 0 && noncurrentKeep <= 0) {\n return { rule: null, error: 'Enter a number of days and/or a newest-versions-to-keep count for noncurrent version handling.' };\n }\n if (abortEnabled && abortDays <= 0) {\n return { rule: null, error: 'Enter a valid number of days for aborting incomplete multipart uploads.' };\n }\n if (!expireDaysEnabled && !expireDateEnabled && !deleteMarker && !noncurrentEnabled && !abortEnabled) {\n return { rule: null, error: 'Select at least one action for this rule.' };\n }\n // The server rejects this combination too; catching it here names the two\n // fields instead of surfacing a 400 after the whole set is submitted.\n if (deleteMarker && (expireDaysEnabled || expireDateEnabled)) {\n return { rule: null, error: 'Removing expired object delete markers cannot be combined with an expiration.' };\n }\n if (sizeGT > 0 && sizeLT > 0 && sizeGT >= sizeLT) {\n return { rule: null, error: '\"Size greater than\" must be less than \"size less than\".' };\n }\n\n return {\n rule: {\n id: id,\n status: status,\n prefix: prefix,\n tags: tags,\n size_greater_than: sizeGT > 0 ? sizeGT : null,\n size_less_than: sizeLT > 0 ? sizeLT : null,\n expiration_days: expirationDays > 0 ? expirationDays : null,\n expiration_date: expirationDate || '',\n expired_object_delete_marker: deleteMarker,\n noncurrent_version_expiration_days: noncurrentDays > 0 ? noncurrentDays : null,\n newer_noncurrent_versions: noncurrentKeep > 0 ? noncurrentKeep : null,\n abort_multipart_days: abortDays > 0 ? abortDays : null,\n },\n error: null,\n };\n}\n\nfunction saveLifecycleRuleFromForm() {\n const { rule, error } = readLifecycleRuleFromForm();\n if (error) {\n alert(error);\n return;\n }\n\n if (lifecycleEditor.editingIndex === 'new') {\n lifecycleEditor.rules.push(rule);\n } else {\n lifecycleEditor.rules[lifecycleEditor.editingIndex] = rule;\n }\n lifecycleEditor.editingIndex = null;\n lifecycleEditor.editingRule = null;\n renderLifecycleEditor();\n}\n\n// commitOpenLifecycleRuleForm folds an in-progress add/edit form into\n// lifecycleEditor.rules before the whole rule set is sent to the server, so\n// clicking the modal's \"Save\" without first clicking \"Save rule\" doesn't\n// silently drop the open edit. Returns false (and leaves the form open) when\n// the open form doesn't hold a valid rule, so the caller can abort the save.\nfunction commitOpenLifecycleRuleForm() {\n if (lifecycleEditor.editingIndex === null) {\n return true;\n }\n\n const { rule, error } = readLifecycleRuleFromForm();\n if (error) {\n alert(error);\n return false;\n }\n\n if (lifecycleEditor.editingIndex === 'new') {\n lifecycleEditor.rules.push(rule);\n } else {\n lifecycleEditor.rules[lifecycleEditor.editingIndex] = rule;\n }\n lifecycleEditor.editingIndex = null;\n lifecycleEditor.editingRule = null;\n renderLifecycleEditor();\n return true;\n}\n\n function goToPage(page) {\n const url = new URL(window.location);\n url.searchParams.set('page', page);\n window.location.href = url.toString();\n }\n\n function changePageSize() {\n const pageSize = document.getElementById('pageSizeSelect').value;\n const url = new URL(window.location);\n url.searchParams.set('pageSize', pageSize);\n url.searchParams.set('page', '1');\n window.location.href = url.toString();\n }\n\n function sortTable(column) {\n const url = new URL(window.location);\n const currentSort = url.searchParams.get('sortBy');\n const currentOrder = url.searchParams.get('sortOrder') || 'asc';\n\n let newOrder = 'asc';\n if (currentSort === column && currentOrder === 'asc') {\n newOrder = 'desc';\n }\n\n url.searchParams.set('sortBy', column);\n url.searchParams.set('sortOrder', newOrder);\n url.searchParams.set('page', '1');\n window.location.href = url.toString();\n }\n\n function exportBucketList() {\n // RFC 4180 compliant CSV escaping: escape double quotes by doubling them\n function escapeCsvField(value) {\n const str = String(value ?? '');\n if (str.includes(',') || str.includes('\"') || str.includes('\\n') || str.includes('\\r')) {\n return '\"' + str.replace(/\"/g, '\"\"') + '\"';\n }\n return '\"' + str + '\"';\n }\n\n // Fetch all buckets from the API (not just the current page)\n fetch(basePath('/api/s3/buckets'))\n .then(response => response.json())\n .then(data => {\n if (data.error) {\n alert('Error exporting buckets: ' + data.error);\n return;\n }\n\n const buckets = data.buckets || [];\n const csvContent = \"data:text/csv;charset=utf-8,\" +\n \"Name,Owner,Logical Size,Physical Size,Created,Quota,Versioning,Object Lock\\n\" +\n buckets.map(b => [\n escapeCsvField(b.name),\n escapeCsvField(b.owner),\n escapeCsvField(formatBytes(b.logical_size)),\n escapeCsvField(formatBytes(b.physical_size)),\n escapeCsvField(b.created_at),\n escapeCsvField(b.quota_enabled ? formatBytes(b.quota) : 'No quota'),\n escapeCsvField(b.versioning_status || 'Not configured'),\n escapeCsvField(b.object_lock_enabled ? 'Enabled' : 'Not configured')\n ].join(',')).join(\"\\n\");\n\n const encodedUri = encodeURI(csvContent);\n const link = document.createElement(\"a\");\n link.setAttribute(\"href\", encodedUri);\n link.setAttribute(\"download\", \"buckets.csv\");\n document.body.appendChild(link);\n link.click();\n document.body.removeChild(link);\n })\n .catch(error => {\n console.error('Error:', error);\n alert('Error exporting buckets: ' + error.message);\n });\n }\n </script>")if templ_7745c5c3_Err != nil {return templ_7745c5c3_Err}diff --git a/weed/admin/view/app/s3tables_buckets.templ b/weed/admin/view/app/s3tables_buckets.templindex 9530175d06..9ee9196469 100644--- a/weed/admin/view/app/s3tables_buckets.templ+++ b/weed/admin/view/app/s3tables_buckets.templ@@ -449,10 +449,13 @@ dataset = lance.dataset(table.location, storage_options=table.storage_options)`</div><div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>- <button type="button" class="btn btn-outline-danger" onclick="deleteS3TablesBucketPolicy()">+ <button type="button" class="btn btn-outline-danger" id="s3tablesBucketPolicyDeleteBtn" onclick="deleteS3TablesBucketPolicy()"><i class="fas fa-trash me-1"></i>Delete Policy</button>- <button type="submit" class="btn btn-primary">+ <!-- type="button": a submit button would make Enter in any+ single-line editor input implicitly submit a half-built+ policy, which the backend stores verbatim. -->+ <button type="button" class="btn btn-primary" id="s3tablesBucketPolicySaveBtn"><i class="fas fa-save me-1"></i>Save Policy</button></div>diff --git a/weed/admin/view/app/s3tables_buckets_templ.go b/weed/admin/view/app/s3tables_buckets_templ.goindex 5936465aea..e321473f81 100644--- a/weed/admin/view/app/s3tables_buckets_templ.go+++ b/weed/admin/view/app/s3tables_buckets_templ.go@@ -690,7 +690,7 @@ dataset = lance.dataset(table.location, storage_options=table.storage_options)`)if templ_7745c5c3_Err != nil {return templ_7745c5c3_Err}- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 68, "<div class=\"modal fade\" id=\"s3tablesBucketPolicyModal\" tabindex=\"-1\" aria-labelledby=\"s3tablesBucketPolicyModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-xl\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"s3tablesBucketPolicyModalLabel\"><i class=\"fas fa-shield-alt me-2\"></i>Table Bucket Policy</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><form id=\"s3tablesBucketPolicyForm\"><div class=\"modal-body\"><input type=\"hidden\" id=\"s3tablesBucketPolicyArn\" name=\"bucket_arn\"><ul class=\"nav nav-tabs\" role=\"tablist\"><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link active\" id=\"s3tablesBucketPolicyEditorTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#s3tablesBucketPolicyEditorTab\" role=\"tab\" aria-controls=\"s3tablesBucketPolicyEditorTab\" aria-selected=\"true\">Editor</button></li><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link\" id=\"s3tablesBucketPolicyJsonTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#s3tablesBucketPolicyJsonTab\" role=\"tab\" aria-controls=\"s3tablesBucketPolicyJsonTab\" aria-selected=\"false\">JSON</button></li></ul><div class=\"tab-content border border-top-0 rounded-bottom p-3 mb-3\"><div class=\"tab-pane fade show active\" id=\"s3tablesBucketPolicyEditorTab\" role=\"tabpanel\" aria-labelledby=\"s3tablesBucketPolicyEditorTabBtn\"><div id=\"s3tablesBucketPolicyEditorBody\"></div><button type=\"button\" class=\"btn btn-sm btn-outline-secondary\" id=\"s3tablesBucketPolicyAddStatementBtn\"><i class=\"fas fa-plus me-1\"></i>Add statement</button></div><div class=\"tab-pane fade\" id=\"s3tablesBucketPolicyJsonTab\" role=\"tabpanel\" aria-labelledby=\"s3tablesBucketPolicyJsonTabBtn\"><textarea class=\"form-control\" id=\"s3tablesBucketPolicyText\" name=\"policy\" rows=\"12\" placeholder=\"{ }\"></textarea></div></div><div class=\"form-text\">Provide a policy JSON; use Delete Policy to remove the policy.</div></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Close</button> <button type=\"button\" class=\"btn btn-outline-danger\" onclick=\"deleteS3TablesBucketPolicy()\"><i class=\"fas fa-trash me-1\"></i>Delete Policy</button> <button type=\"submit\" class=\"btn btn-primary\"><i class=\"fas fa-save me-1\"></i>Save Policy</button></div></form></div></div></div><div class=\"modal fade\" id=\"s3tablesTagsModal\" tabindex=\"-1\" aria-labelledby=\"s3tablesTagsModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-lg\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"s3tablesTagsModalLabel\"><i class=\"fas fa-tags me-2\"></i>Resource Tags</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><form id=\"s3tablesTagsForm\"><div class=\"modal-body\"><input type=\"hidden\" id=\"s3tablesTagsResourceArn\" name=\"resource_arn\"><div class=\"mb-3\"><label class=\"form-label\">Existing Tags</label><pre class=\"bg-light p-3 border rounded\" id=\"s3tablesTagsList\">Loading...</pre></div><div class=\"mb-3\"><label for=\"s3tablesTagsInput\" class=\"form-label\">Add or Update Tags</label> <input type=\"text\" class=\"form-control\" id=\"s3tablesTagsInput\" placeholder=\"key1=value1,key2=value2\"></div><div class=\"mb-3\"><label for=\"s3tablesTagsDeleteInput\" class=\"form-label\">Remove Tag Keys</label> <input type=\"text\" class=\"form-control\" id=\"s3tablesTagsDeleteInput\" placeholder=\"key1,key2\"></div></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Close</button> <button type=\"button\" class=\"btn btn-outline-danger\" onclick=\"deleteS3TablesTags()\"><i class=\"fas fa-trash me-1\"></i>Remove Tags</button> <button type=\"submit\" class=\"btn btn-primary\"><i class=\"fas fa-save me-1\"></i>Update Tags</button></div></form></div></div></div><script>\n\t\tdocument.addEventListener('DOMContentLoaded', function() {\n\t\t\tinitS3TablesBuckets();\n\t\t});\n\t</script>")+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 68, "<div class=\"modal fade\" id=\"s3tablesBucketPolicyModal\" tabindex=\"-1\" aria-labelledby=\"s3tablesBucketPolicyModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-xl\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"s3tablesBucketPolicyModalLabel\"><i class=\"fas fa-shield-alt me-2\"></i>Table Bucket Policy</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><form id=\"s3tablesBucketPolicyForm\"><div class=\"modal-body\"><input type=\"hidden\" id=\"s3tablesBucketPolicyArn\" name=\"bucket_arn\"><ul class=\"nav nav-tabs\" role=\"tablist\"><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link active\" id=\"s3tablesBucketPolicyEditorTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#s3tablesBucketPolicyEditorTab\" role=\"tab\" aria-controls=\"s3tablesBucketPolicyEditorTab\" aria-selected=\"true\">Editor</button></li><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link\" id=\"s3tablesBucketPolicyJsonTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#s3tablesBucketPolicyJsonTab\" role=\"tab\" aria-controls=\"s3tablesBucketPolicyJsonTab\" aria-selected=\"false\">JSON</button></li></ul><div class=\"tab-content border border-top-0 rounded-bottom p-3 mb-3\"><div class=\"tab-pane fade show active\" id=\"s3tablesBucketPolicyEditorTab\" role=\"tabpanel\" aria-labelledby=\"s3tablesBucketPolicyEditorTabBtn\"><div id=\"s3tablesBucketPolicyEditorBody\"></div><button type=\"button\" class=\"btn btn-sm btn-outline-secondary\" id=\"s3tablesBucketPolicyAddStatementBtn\"><i class=\"fas fa-plus me-1\"></i>Add statement</button></div><div class=\"tab-pane fade\" id=\"s3tablesBucketPolicyJsonTab\" role=\"tabpanel\" aria-labelledby=\"s3tablesBucketPolicyJsonTabBtn\"><textarea class=\"form-control\" id=\"s3tablesBucketPolicyText\" name=\"policy\" rows=\"12\" placeholder=\"{ }\"></textarea></div></div><div class=\"form-text\">Provide a policy JSON; use Delete Policy to remove the policy.</div></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Close</button> <button type=\"button\" class=\"btn btn-outline-danger\" id=\"s3tablesBucketPolicyDeleteBtn\" onclick=\"deleteS3TablesBucketPolicy()\"><i class=\"fas fa-trash me-1\"></i>Delete Policy</button><!-- type=\"button\": a submit button would make Enter in any\n\t\t\t\t\t\t single-line editor input implicitly submit a half-built\n\t\t\t\t\t\t policy, which the backend stores verbatim. --><button type=\"button\" class=\"btn btn-primary\" id=\"s3tablesBucketPolicySaveBtn\"><i class=\"fas fa-save me-1\"></i>Save Policy</button></div></form></div></div></div><div class=\"modal fade\" id=\"s3tablesTagsModal\" tabindex=\"-1\" aria-labelledby=\"s3tablesTagsModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-lg\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"s3tablesTagsModalLabel\"><i class=\"fas fa-tags me-2\"></i>Resource Tags</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><form id=\"s3tablesTagsForm\"><div class=\"modal-body\"><input type=\"hidden\" id=\"s3tablesTagsResourceArn\" name=\"resource_arn\"><div class=\"mb-3\"><label class=\"form-label\">Existing Tags</label><pre class=\"bg-light p-3 border rounded\" id=\"s3tablesTagsList\">Loading...</pre></div><div class=\"mb-3\"><label for=\"s3tablesTagsInput\" class=\"form-label\">Add or Update Tags</label> <input type=\"text\" class=\"form-control\" id=\"s3tablesTagsInput\" placeholder=\"key1=value1,key2=value2\"></div><div class=\"mb-3\"><label for=\"s3tablesTagsDeleteInput\" class=\"form-label\">Remove Tag Keys</label> <input type=\"text\" class=\"form-control\" id=\"s3tablesTagsDeleteInput\" placeholder=\"key1,key2\"></div></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Close</button> <button type=\"button\" class=\"btn btn-outline-danger\" onclick=\"deleteS3TablesTags()\"><i class=\"fas fa-trash me-1\"></i>Remove Tags</button> <button type=\"submit\" class=\"btn btn-primary\"><i class=\"fas fa-save me-1\"></i>Update Tags</button></div></form></div></div></div><script>\n\t\tdocument.addEventListener('DOMContentLoaded', function() {\n\t\t\tinitS3TablesBuckets();\n\t\t});\n\t</script>")if templ_7745c5c3_Err != nil {return templ_7745c5c3_Err}diff --git a/weed/admin/view/app/s3tables_tables.templ b/weed/admin/view/app/s3tables_tables.templindex 8df58785db..8cc100e11b 100644--- a/weed/admin/view/app/s3tables_tables.templ+++ b/weed/admin/view/app/s3tables_tables.templ@@ -292,10 +292,13 @@ templ S3TablesTables(data dash.S3TablesTablesData) {</div><div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>- <button type="button" class="btn btn-outline-danger" onclick="deleteS3TablesTablePolicy()">+ <button type="button" class="btn btn-outline-danger" id="s3tablesTablePolicyDeleteBtn" onclick="deleteS3TablesTablePolicy()"><i class="fas fa-trash me-1"></i>Delete Policy</button>- <button type="submit" class="btn btn-primary">+ <!-- type="button": a submit button would make Enter in any+ single-line editor input implicitly submit a half-built+ policy, which the backend stores verbatim. -->+ <button type="button" class="btn btn-primary" id="s3tablesTablePolicySaveBtn"><i class="fas fa-save me-1"></i>Save Policy</button></div>diff --git a/weed/admin/view/app/s3tables_tables_templ.go b/weed/admin/view/app/s3tables_tables_templ.goindex e8efb6074d..f5ad06cecc 100644--- a/weed/admin/view/app/s3tables_tables_templ.go+++ b/weed/admin/view/app/s3tables_tables_templ.go@@ -549,7 +549,7 @@ func S3TablesTables(data dash.S3TablesTablesData) templ.Component {if templ_7745c5c3_Err != nil {return templ_7745c5c3_Err}- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 56, "<div class=\"modal fade\" id=\"s3tablesTablePolicyModal\" tabindex=\"-1\" aria-labelledby=\"s3tablesTablePolicyModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-xl\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"s3tablesTablePolicyModalLabel\"><i class=\"fas fa-shield-alt me-2\"></i>Table Policy</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><form id=\"s3tablesTablePolicyForm\"><div class=\"modal-body\"><input type=\"hidden\" id=\"s3tablesTablePolicyBucketArn\" name=\"bucket_arn\"> <input type=\"hidden\" id=\"s3tablesTablePolicyNamespace\" name=\"namespace\"> <input type=\"hidden\" id=\"s3tablesTablePolicyName\" name=\"name\"><ul class=\"nav nav-tabs\" role=\"tablist\"><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link active\" id=\"s3tablesTablePolicyEditorTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#s3tablesTablePolicyEditorTab\" role=\"tab\" aria-controls=\"s3tablesTablePolicyEditorTab\" aria-selected=\"true\">Editor</button></li><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link\" id=\"s3tablesTablePolicyJsonTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#s3tablesTablePolicyJsonTab\" role=\"tab\" aria-controls=\"s3tablesTablePolicyJsonTab\" aria-selected=\"false\">JSON</button></li></ul><div class=\"tab-content border border-top-0 rounded-bottom p-3 mb-3\"><div class=\"tab-pane fade show active\" id=\"s3tablesTablePolicyEditorTab\" role=\"tabpanel\" aria-labelledby=\"s3tablesTablePolicyEditorTabBtn\"><div id=\"s3tablesTablePolicyEditorBody\"></div><button type=\"button\" class=\"btn btn-sm btn-outline-secondary\" id=\"s3tablesTablePolicyAddStatementBtn\"><i class=\"fas fa-plus me-1\"></i>Add statement</button></div><div class=\"tab-pane fade\" id=\"s3tablesTablePolicyJsonTab\" role=\"tabpanel\" aria-labelledby=\"s3tablesTablePolicyJsonTabBtn\"><textarea class=\"form-control\" id=\"s3tablesTablePolicyText\" name=\"policy\" rows=\"12\" placeholder=\"{ }\"></textarea></div></div></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Close</button> <button type=\"button\" class=\"btn btn-outline-danger\" onclick=\"deleteS3TablesTablePolicy()\"><i class=\"fas fa-trash me-1\"></i>Delete Policy</button> <button type=\"submit\" class=\"btn btn-primary\"><i class=\"fas fa-save me-1\"></i>Save Policy</button></div></form></div></div></div><div class=\"modal fade\" id=\"s3tablesTagsModal\" tabindex=\"-1\" aria-labelledby=\"s3tablesTagsModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-lg\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"s3tablesTagsModalLabel\"><i class=\"fas fa-tags me-2\"></i>Resource Tags</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><form id=\"s3tablesTagsForm\"><div class=\"modal-body\"><input type=\"hidden\" id=\"s3tablesTagsResourceArn\" name=\"resource_arn\"><div class=\"mb-3\"><label class=\"form-label\">Existing Tags</label><pre class=\"bg-light p-3 border rounded\" id=\"s3tablesTagsList\">Loading...</pre></div><div class=\"mb-3\"><label for=\"s3tablesTagsInput\" class=\"form-label\">Add or Update Tags</label> <input type=\"text\" class=\"form-control\" id=\"s3tablesTagsInput\" placeholder=\"key1=value1,key2=value2\"></div><div class=\"mb-3\"><label for=\"s3tablesTagsDeleteInput\" class=\"form-label\">Remove Tag Keys</label> <input type=\"text\" class=\"form-control\" id=\"s3tablesTagsDeleteInput\" placeholder=\"key1,key2\"></div></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Close</button> <button type=\"button\" class=\"btn btn-outline-danger\" onclick=\"deleteS3TablesTags()\"><i class=\"fas fa-trash me-1\"></i>Remove Tags</button> <button type=\"submit\" class=\"btn btn-primary\"><i class=\"fas fa-save me-1\"></i>Update Tags</button></div></form></div></div></div><script>\n\t\tdocument.addEventListener('DOMContentLoaded', function() {\n\t\t\tinitS3TablesTables();\n\t\t});\n\t</script>")+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 56, "<div class=\"modal fade\" id=\"s3tablesTablePolicyModal\" tabindex=\"-1\" aria-labelledby=\"s3tablesTablePolicyModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-xl\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"s3tablesTablePolicyModalLabel\"><i class=\"fas fa-shield-alt me-2\"></i>Table Policy</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><form id=\"s3tablesTablePolicyForm\"><div class=\"modal-body\"><input type=\"hidden\" id=\"s3tablesTablePolicyBucketArn\" name=\"bucket_arn\"> <input type=\"hidden\" id=\"s3tablesTablePolicyNamespace\" name=\"namespace\"> <input type=\"hidden\" id=\"s3tablesTablePolicyName\" name=\"name\"><ul class=\"nav nav-tabs\" role=\"tablist\"><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link active\" id=\"s3tablesTablePolicyEditorTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#s3tablesTablePolicyEditorTab\" role=\"tab\" aria-controls=\"s3tablesTablePolicyEditorTab\" aria-selected=\"true\">Editor</button></li><li class=\"nav-item\" role=\"presentation\"><button class=\"nav-link\" id=\"s3tablesTablePolicyJsonTabBtn\" type=\"button\" data-bs-toggle=\"tab\" data-bs-target=\"#s3tablesTablePolicyJsonTab\" role=\"tab\" aria-controls=\"s3tablesTablePolicyJsonTab\" aria-selected=\"false\">JSON</button></li></ul><div class=\"tab-content border border-top-0 rounded-bottom p-3 mb-3\"><div class=\"tab-pane fade show active\" id=\"s3tablesTablePolicyEditorTab\" role=\"tabpanel\" aria-labelledby=\"s3tablesTablePolicyEditorTabBtn\"><div id=\"s3tablesTablePolicyEditorBody\"></div><button type=\"button\" class=\"btn btn-sm btn-outline-secondary\" id=\"s3tablesTablePolicyAddStatementBtn\"><i class=\"fas fa-plus me-1\"></i>Add statement</button></div><div class=\"tab-pane fade\" id=\"s3tablesTablePolicyJsonTab\" role=\"tabpanel\" aria-labelledby=\"s3tablesTablePolicyJsonTabBtn\"><textarea class=\"form-control\" id=\"s3tablesTablePolicyText\" name=\"policy\" rows=\"12\" placeholder=\"{ }\"></textarea></div></div></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Close</button> <button type=\"button\" class=\"btn btn-outline-danger\" id=\"s3tablesTablePolicyDeleteBtn\" onclick=\"deleteS3TablesTablePolicy()\"><i class=\"fas fa-trash me-1\"></i>Delete Policy</button><!-- type=\"button\": a submit button would make Enter in any\n\t\t\t\t\t\t single-line editor input implicitly submit a half-built\n\t\t\t\t\t\t policy, which the backend stores verbatim. --><button type=\"button\" class=\"btn btn-primary\" id=\"s3tablesTablePolicySaveBtn\"><i class=\"fas fa-save me-1\"></i>Save Policy</button></div></form></div></div></div><div class=\"modal fade\" id=\"s3tablesTagsModal\" tabindex=\"-1\" aria-labelledby=\"s3tablesTagsModalLabel\" aria-hidden=\"true\"><div class=\"modal-dialog modal-lg\"><div class=\"modal-content\"><div class=\"modal-header\"><h5 class=\"modal-title\" id=\"s3tablesTagsModalLabel\"><i class=\"fas fa-tags me-2\"></i>Resource Tags</h5><button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button></div><form id=\"s3tablesTagsForm\"><div class=\"modal-body\"><input type=\"hidden\" id=\"s3tablesTagsResourceArn\" name=\"resource_arn\"><div class=\"mb-3\"><label class=\"form-label\">Existing Tags</label><pre class=\"bg-light p-3 border rounded\" id=\"s3tablesTagsList\">Loading...</pre></div><div class=\"mb-3\"><label for=\"s3tablesTagsInput\" class=\"form-label\">Add or Update Tags</label> <input type=\"text\" class=\"form-control\" id=\"s3tablesTagsInput\" placeholder=\"key1=value1,key2=value2\"></div><div class=\"mb-3\"><label for=\"s3tablesTagsDeleteInput\" class=\"form-label\">Remove Tag Keys</label> <input type=\"text\" class=\"form-control\" id=\"s3tablesTagsDeleteInput\" placeholder=\"key1,key2\"></div></div><div class=\"modal-footer\"><button type=\"button\" class=\"btn btn-secondary\" data-bs-dismiss=\"modal\">Close</button> <button type=\"button\" class=\"btn btn-outline-danger\" onclick=\"deleteS3TablesTags()\"><i class=\"fas fa-trash me-1\"></i>Remove Tags</button> <button type=\"submit\" class=\"btn btn-primary\"><i class=\"fas fa-save me-1\"></i>Update Tags</button></div></form></div></div></div><script>\n\t\tdocument.addEventListener('DOMContentLoaded', function() {\n\t\t\tinitS3TablesTables();\n\t\t});\n\t</script>")if templ_7745c5c3_Err != nil {return templ_7745c5c3_Err}diff --git a/weed/iam/integration/iam_manager.go b/weed/iam/integration/iam_manager.goindex 6a04e09f99..ef4aae5168 100644--- a/weed/iam/integration/iam_manager.go+++ b/weed/iam/integration/iam_manager.go@@ -865,6 +865,44 @@ func (m *IAMManager) UpdateBucketPolicy(ctx context.Context, bucketName string,return m.policyEngine.AddPolicy(m.getFilerAddress(), policyName, &policyDoc)}+// EnsureBucketPolicy stores the policy for a bucket only when no mirror is+// stored yet, backfilling policies that predate the IAM integration (the+// metadata subscription only sees changes). A present mirror is left alone,+// so repeat calls cost one cached read. Returns whether a write happened,+// so the caller can reconcile a write that raced a concurrent change.+func (m *IAMManager) EnsureBucketPolicy(ctx context.Context, bucketName string, policyJSON []byte) (bool, error) {+ if !m.initialized {+ return false, fmt.Errorf("IAM manager not initialized")+ }++ if bucketName == "" {+ return false, fmt.Errorf("bucket name cannot be empty")+ }++ if existing, err := m.policyEngine.GetPolicy(ctx, m.getFilerAddress(), "bucket-policy:"+bucketName); err == nil && existing != nil {+ return false, nil+ }++ if err := m.UpdateBucketPolicy(ctx, bucketName, policyJSON); err != nil {+ return false, err+ }+ return true, nil+}++// RemoveBucketPolicy deletes the stored policy for a bucket. Removing a+// policy that was never stored is a success.+func (m *IAMManager) RemoveBucketPolicy(ctx context.Context, bucketName string) error {+ if !m.initialized {+ return fmt.Errorf("IAM manager not initialized")+ }++ if bucketName == "" {+ return fmt.Errorf("bucket name cannot be empty")+ }++ return m.policyEngine.DeletePolicy(ctx, m.getFilerAddress(), "bucket-policy:"+bucketName)+}+// AssumeRoleWithWebIdentity assumes a role using web identity (OIDC)func (m *IAMManager) AssumeRoleWithWebIdentity(ctx context.Context, request *sts.AssumeRoleWithWebIdentityRequest) (*sts.AssumeRoleResponse, error) {if !m.initialized {diff --git a/weed/iam/policy/policy_engine.go b/weed/iam/policy/policy_engine.goindex acd7c0a2fc..f53768bb4c 100644--- a/weed/iam/policy/policy_engine.go+++ b/weed/iam/policy/policy_engine.go@@ -357,6 +357,20 @@ func (e *PolicyEngine) AddPolicy(filerAddress string, name string, policy *Policreturn e.store.StorePolicy(context.Background(), filerAddress, name, policy)}+// GetPolicy returns a stored policy document, or an error when it does not+// exist in the configured store.+func (e *PolicyEngine) GetPolicy(ctx context.Context, filerAddress string, name string) (*PolicyDocument, error) {+ if !e.initialized {+ return nil, fmt.Errorf("policy engine not initialized")+ }++ if name == "" {+ return nil, fmt.Errorf("policy name cannot be empty")+ }++ return e.store.GetPolicy(ctx, filerAddress, name)+}+// DeletePolicy removes a policy from the configured store.func (e *PolicyEngine) DeletePolicy(ctx context.Context, filerAddress string, name string) error {if !e.initialized {diff --git a/weed/s3api/auth_credentials.go b/weed/s3api/auth_credentials.goindex 599fa1923a..add4e69f53 100644--- a/weed/s3api/auth_credentials.go+++ b/weed/s3api/auth_credentials.go@@ -76,6 +76,11 @@ type IdentityAccessManagement struct {// Bucket policy engine for evaluating bucket policiespolicyEngine *BucketPolicyEngine+ // primeBucketForIAM loads a bucket's config (and with it the advanced-IAM+ // bucket-policy mirror backfill) before an IAM authorization that will+ // evaluate that mirror. Set by NewS3ApiServer; nil in tests.+ primeBucketForIAM func(bucket string)+// Cached policy engine for IAM policy fallback evaluation.// Keyed by policy name, kept in sync by PutPolicy/DeletePolicy.iamPolicyEngine *policy_engine.PolicyEngine@@ -2865,6 +2870,13 @@ func (iam *IdentityAccessManagement) AuthorizeObjectDelete(r *http.Request, idenfunc (iam *IdentityAccessManagement) authorizeWithIAM(r *http.Request, identity *Identity, action Action, bucket string, object string) s3err.ErrorCode {ctx := r.Context()+ // The evaluation below consults the bucket-policy:<bucket> mirror, so the+ // bucket's lazy load (which backfills that mirror) must happen first -+ // nothing earlier on a denied request's path would ever trigger it.+ if iam.primeBucketForIAM != nil && bucket != "" {+ iam.primeBucketForIAM(bucket)+ }+// Get session info from request headers// First check for JWT-based authentication headers (SeaweedFSSessionTokenHeader)sessionToken := r.Header.Get(s3_constants.SeaweedFSSessionTokenHeader)diff --git a/weed/s3api/auth_credentials_subscribe.go b/weed/s3api/auth_credentials_subscribe.goindex 2f67148399..50be9104e1 100644--- a/weed/s3api/auth_credentials_subscribe.go+++ b/weed/s3api/auth_credentials_subscribe.go@@ -184,6 +184,7 @@ func (s3a *S3ApiServer) onCircuitBreakerConfigChange(dir string, oldEntry *filerfunc (s3a *S3ApiServer) onBucketMetadataChange(dir string, oldEntry *filer_pb.Entry, newEntry *filer_pb.Entry) error {if dir == s3a.option.BucketsPath {s3a.maintainBucketOwnerIndex(oldEntry, newEntry)+ s3a.mirrorBucketPolicyToIAM(oldEntry, newEntry)if newEntry != nil {// Update bucket registry (existing functionality)s3a.bucketRegistry.LoadBucketMetadata(newEntry)diff --git a/weed/s3api/policy_engine/bucket_policy.go b/weed/s3api/policy_engine/bucket_policy.goindex b7cf969c92..d909489fd4 100644--- a/weed/s3api/policy_engine/bucket_policy.go+++ b/weed/s3api/policy_engine/bucket_policy.go@@ -5,24 +5,22 @@ import ("strings")+// MaxBucketPolicySize mirrors AWS S3's 20 KB bucket-policy limit, enforced+// by both writers (the S3 gateway's PutBucketPolicy and the admin UI) so+// neither surface can store a document the other refuses to manage.+const MaxBucketPolicySize = 20 * 1024+// ValidateBucketPolicy performs bucket-specific policy validation, on top of-// the generic structural checks in ValidatePolicy. It enforces the rules-// that make a policy document valid as an S3 *bucket* policy specifically:-// every statement must name a Principal, and every Resource/NotResource/Action-// must scope to the given bucket.+// the generic structural checks in ValidatePolicy - callers run that first,+// so the version and non-empty-statement rules are not re-checked here. It+// enforces the rules that make a policy document valid as an S3 *bucket*+// policy specifically: every statement must name a Principal, and every+// Resource/NotResource/Action must scope to the given bucket.//// This is shared between the S3 gateway's PutBucketPolicy handler// (weed/s3api/s3api_bucket_policy_handlers.go) and the admin UI// (weed/admin/dash) so both enforce identical rules.func ValidateBucketPolicy(policyDoc *PolicyDocument, bucket string) error {- if policyDoc.Version != PolicyVersion2012_10_17 {- return fmt.Errorf("unsupported policy version: %s (must be %s)", policyDoc.Version, PolicyVersion2012_10_17)- }-- if len(policyDoc.Statement) == 0 {- return fmt.Errorf("policy document must contain at least one statement")- }-for i, statement := range policyDoc.Statement {// Bucket policies must have Principalif statement.Principal == nil {diff --git a/weed/s3api/policy_engine/bucket_policy_test.go b/weed/s3api/policy_engine/bucket_policy_test.goindex 217e1c8fab..0126850e95 100644--- a/weed/s3api/policy_engine/bucket_policy_test.go+++ b/weed/s3api/policy_engine/bucket_policy_test.go@@ -54,15 +54,17 @@ func TestValidateBucketPolicy(t *testing.T) {})t.Run("bad version", func(t *testing.T) {+ // Version and non-empty-statement rules live in ValidatePolicy,+ // which callers run first.doc := &PolicyDocument{Version: "2008-10-17", Statement: []PolicyStatement{validStatement()}}- if err := ValidateBucketPolicy(doc, bucket); err == nil {+ if err := ValidatePolicy(doc); err == nil {t.Error("expected error for bad version")}})t.Run("zero statements", func(t *testing.T) {doc := &PolicyDocument{Version: PolicyVersion2012_10_17, Statement: []PolicyStatement{}}- if err := ValidateBucketPolicy(doc, bucket); err == nil {+ if err := ValidatePolicy(doc); err == nil {t.Error("expected error for zero statements")}})diff --git a/weed/s3api/s3api_bucket_config.go b/weed/s3api/s3api_bucket_config.goindex fdecb24db8..9a3a3b02d1 100644--- a/weed/s3api/s3api_bucket_config.go+++ b/weed/s3api/s3api_bucket_config.go@@ -381,6 +381,19 @@ func (s3a *S3ApiServer) getBucketConfig(bucket string) (*BucketConfig, s3err.Errconfig := s3a.newBucketConfigFromEntry(bucket, entry)+ // A cold load is the first time this gateway learns the bucket's policy+ // exists, and the metadata subscription only mirrors changes - a policy+ // that predates the IAM integration would otherwise never reach the+ // advanced-IAM mirror and its grants would not bind on the IAM path.+ // Synchronous: the IAM auth path primes the bucket through here before+ // evaluating the mirror, so the backfill has to land first - a one-time+ // cost on the load that discovers the policy. Raw entry bytes, not the+ // parsed document, so the backfill can byte-compare against a later+ // entry read when it reconciles.+ if policyJSON := entry.Extended[BUCKET_POLICY_METADATA_KEY]; len(policyJSON) > 0 && config.BucketPolicy != nil && s3a.bucketPolicyIAMManager() != nil {+ s3a.ensureBucketPolicyInIAM(bucket, policyJSON)+ }+// Cache the results3a.bucketConfigCache.Set(bucket, config)diff --git a/weed/s3api/s3api_bucket_policy_handlers.go b/weed/s3api/s3api_bucket_policy_handlers.goindex 9e38fe09f5..4842403a38 100644--- a/weed/s3api/s3api_bucket_policy_handlers.go+++ b/weed/s3api/s3api_bucket_policy_handlers.go@@ -1,6 +1,7 @@package s3apiimport (+ "bytes""context""encoding/json""errors"@@ -9,6 +10,7 @@ import ("net/http""github.com/seaweedfs/seaweedfs/weed/glog"+ "github.com/seaweedfs/seaweedfs/weed/iam/integration""github.com/seaweedfs/seaweedfs/weed/pb/filer_pb""github.com/seaweedfs/seaweedfs/weed/s3api/policy_engine""github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"@@ -75,7 +77,7 @@ func (s3a *S3ApiServer) PutBucketPolicyHandler(w http.ResponseWriter, r *http.Reglog.V(3).Infof("PutBucketPolicyHandler: bucket=%s", bucket)// Read policy document from request body- body, err := io.ReadAll(r.Body)+ body, err := io.ReadAll(io.LimitReader(r.Body, policy_engine.MaxBucketPolicySize+1))if err != nil {glog.Errorf("Failed to read bucket policy request body: %v", err)s3err.WriteErrorResponse(w, r, s3err.ErrInvalidPolicyDocument)@@ -83,6 +85,11 @@ func (s3a *S3ApiServer) PutBucketPolicyHandler(w http.ResponseWriter, r *http.Re}defer r.Body.Close()+ if len(body) > policy_engine.MaxBucketPolicySize {+ s3err.WriteErrorResponse(w, r, s3err.ErrPolicyTooLarge)+ return+ }+// Parse and validate policy documentvar policyDoc policy_engine.PolicyDocumentif err := json.Unmarshal(body, &policyDoc); err != nil {@@ -299,37 +306,157 @@ func (s3a *S3ApiServer) deleteBucketPolicy(bucket string) error {// updateBucketPolicyInIAM updates the IAM system with the new bucket policyfunc (s3a *S3ApiServer) updateBucketPolicyInIAM(bucket string, policyDoc *policy_engine.PolicyDocument) error {- // Update IAM integration with new bucket policy- if s3a.iam.iamIntegration != nil {- // Type assert to access the concrete implementation which has access to iamManager- if s3Integration, ok := s3a.iam.iamIntegration.(*S3IAMIntegration); ok {- if s3Integration.iamManager != nil {- glog.V(2).Infof("Updated bucket policy for %s in IAM system", bucket)+ iamManager := s3a.bucketPolicyIAMManager()+ if iamManager == nil {+ return nil+ }- policyJSON, err := json.Marshal(policyDoc)- if err != nil {- return fmt.Errorf("failed to marshal policy: %w", err)- }+ policyJSON, err := json.Marshal(policyDoc)+ if err != nil {+ return fmt.Errorf("failed to marshal policy: %w", err)+ }++ glog.V(2).Infof("Updated bucket policy for %s in IAM system", bucket)+ return iamManager.UpdateBucketPolicy(context.Background(), bucket, policyJSON)+}++// ensureBucketPolicyInIAM backfills the IAM mirror for a policy the+// subscription never saw change (one that predates the IAM integration).+// Called from the lazy bucket-config load; a present mirror is left alone.+func (s3a *S3ApiServer) ensureBucketPolicyInIAM(bucket string, policyJSON []byte) {+ iamManager := s3a.bucketPolicyIAMManager()+ if iamManager == nil {+ return+ }- return s3Integration.iamManager.UpdateBucketPolicy(context.Background(), bucket, policyJSON)+ wrote, err := iamManager.EnsureBucketPolicy(context.Background(), bucket, policyJSON)+ if err != nil {+ glog.Warningf("backfill bucket policy for %s into IAM: %v", bucket, err)+ return+ }+ if !wrote {+ return+ }++ // The check-then-write above can race a concurrent policy change or+ // delete: the event-driven mirror may have landed in between, and this+ // write would then have re-stored bytes that are already stale - with+ // no later event to heal it. Reconcile against a fresh entry read,+ // which is authoritative; anything changing after this read fires its+ // own event, and the mirror for it finds this write already present.+ entry, err := s3a.getBucketEntry(bucket)+ if err != nil {+ if errors.Is(err, filer_pb.ErrNotFound) {+ if err := s3a.removeBucketPolicyFromIAM(bucket); err != nil {+ glog.Warningf("remove bucket policy for %s from IAM: %v", bucket, err)}}+ return+ }+ current := entry.Extended[BUCKET_POLICY_METADATA_KEY]+ if bytes.Equal(current, policyJSON) {+ return+ }+ if len(current) == 0 {+ if err := s3a.removeBucketPolicyFromIAM(bucket); err != nil {+ glog.Warningf("remove bucket policy for %s from IAM: %v", bucket, err)+ }+ return+ }+ var policyDoc policy_engine.PolicyDocument+ if err := json.Unmarshal(current, &policyDoc); err != nil {+ glog.Warningf("backfill bucket policy for %s into IAM: parse: %v", bucket, err)+ return+ }+ if err := s3a.updateBucketPolicyInIAM(bucket, &policyDoc); err != nil {+ glog.Warningf("backfill bucket policy for %s into IAM: %v", bucket, err)}-- return nil}// removeBucketPolicyFromIAM removes the bucket policy from the IAM systemfunc (s3a *S3ApiServer) removeBucketPolicyFromIAM(bucket string) error {- // This would remove the bucket policy from our advanced IAM system- glog.V(2).Infof("Removed bucket policy for %s from IAM system", bucket)+ iamManager := s3a.bucketPolicyIAMManager()+ if iamManager == nil {+ return nil+ }- // TODO: Integrate with IAM manager to remove resource-based policies- // s3a.iam.iamIntegration.iamManager.RemoveBucketPolicy(bucket)+ glog.V(2).Infof("Removed bucket policy for %s from IAM system", bucket)+ return iamManager.RemoveBucketPolicy(context.Background(), bucket)+}+// bucketPolicyIAMManager returns the advanced-IAM manager the+// "bucket-policy:<bucket>" mirror lives in, or nil when the integration is+// not enabled.+func (s3a *S3ApiServer) bucketPolicyIAMManager() *integration.IAMManager {+ if s3a.iam == nil || s3a.iam.iamIntegration == nil {+ return nil+ }+ if s3Integration, ok := s3a.iam.iamIntegration.(*S3IAMIntegration); ok {+ return s3Integration.iamManager+ }return nil}+// mirrorBucketPolicyToIAM keeps the "bucket-policy:<bucket>" IAM mirror in+// sync with the policy stored on a bucket's filer entry. Driven from the+// metadata subscription so it covers every writer - this gateway's own+// PutBucketPolicy, another gateway's, the admin UI, bucket deletion, and+// rename - where the handlers' direct calls only ever covered the first.+func (s3a *S3ApiServer) mirrorBucketPolicyToIAM(oldEntry, newEntry *filer_pb.Entry) {+ if s3a.bucketPolicyIAMManager() == nil {+ return+ }+ removeName, updateName, updatePolicy := bucketPolicyMirrorOps(oldEntry, newEntry)+ if removeName != "" {+ if err := s3a.removeBucketPolicyFromIAM(removeName); err != nil {+ glog.Warningf("remove bucket policy for %s from IAM: %v", removeName, err)+ }+ }+ if updateName == "" {+ return+ }+ var policyDoc policy_engine.PolicyDocument+ if err := json.Unmarshal(updatePolicy, &policyDoc); err != nil {+ glog.Warningf("mirror bucket policy for %s to IAM: parse: %v", updateName, err)+ return+ }+ if err := s3a.updateBucketPolicyInIAM(updateName, &policyDoc); err != nil {+ glog.Warningf("mirror bucket policy for %s to IAM: %v", updateName, err)+ }+}++// bucketPolicyMirrorOps computes what a bucket entry change means for the+// IAM mirror: a name whose mirror must be removed, and a (name, policy) to+// write. A rename delivers both entries under different names in one event,+// and the old name's mirror has to move even when the policy bytes are+// unchanged - equality only short-circuits same-name updates.+func bucketPolicyMirrorOps(oldEntry, newEntry *filer_pb.Entry) (removeName, updateName string, updatePolicy []byte) {+ var oldName, newName string+ var oldPolicy, newPolicy []byte+ if oldEntry != nil {+ oldName = oldEntry.Name+ oldPolicy = oldEntry.Extended[BUCKET_POLICY_METADATA_KEY]+ }+ if newEntry != nil {+ newName = newEntry.Name+ newPolicy = newEntry.Extended[BUCKET_POLICY_METADATA_KEY]+ }+ if oldName != "" && oldName != newName && len(oldPolicy) > 0 {+ removeName = oldName+ oldPolicy = nil+ }+ if newName == "" || bytes.Equal(oldPolicy, newPolicy) {+ return+ }+ if len(newPolicy) == 0 {+ removeName = newName+ return+ }+ updateName = newName+ updatePolicy = newPolicy+ return+}+// GetPublicAccessBlockHandler Retrieves the PublicAccessBlock configuration for an S3 bucket// https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetPublicAccessBlock.htmlfunc (s3a *S3ApiServer) GetPublicAccessBlockHandler(w http.ResponseWriter, r *http.Request) {diff --git a/weed/s3api/s3api_bucket_policy_mirror_test.go b/weed/s3api/s3api_bucket_policy_mirror_test.gonew file mode 100644index 0000000000..b000e32779--- /dev/null+++ b/weed/s3api/s3api_bucket_policy_mirror_test.go@@ -0,0 +1,114 @@+package s3api++import (+ "testing"++ "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"+)++func bucketEntryWithPolicy(name, policy string) *filer_pb.Entry {+ entry := &filer_pb.Entry{Name: name}+ if policy != "" {+ entry.Extended = map[string][]byte{BUCKET_POLICY_METADATA_KEY: []byte(policy)}+ }+ return entry+}++func TestBucketPolicyMirrorOps(t *testing.T) {+ policyA := `{"Version":"2012-10-17","Statement":[{"Effect":"Allow"}]}`+ policyB := `{"Version":"2012-10-17","Statement":[{"Effect":"Deny"}]}`++ tests := []struct {+ name string+ oldEntry *filer_pb.Entry+ newEntry *filer_pb.Entry+ removeName string+ updateName string+ updatePolicy string+ }{+ {+ name: "create without policy",+ newEntry: bucketEntryWithPolicy("a", ""),+ },+ {+ name: "policy set",+ oldEntry: bucketEntryWithPolicy("a", ""),+ newEntry: bucketEntryWithPolicy("a", policyA),+ updateName: "a",+ updatePolicy: policyA,+ },+ {+ name: "policy replaced",+ oldEntry: bucketEntryWithPolicy("a", policyA),+ newEntry: bucketEntryWithPolicy("a", policyB),+ updateName: "a",+ updatePolicy: policyB,+ },+ {+ name: "policy unchanged",+ oldEntry: bucketEntryWithPolicy("a", policyA),+ newEntry: bucketEntryWithPolicy("a", policyA),+ },+ {+ name: "policy removed",+ oldEntry: bucketEntryWithPolicy("a", policyA),+ newEntry: bucketEntryWithPolicy("a", ""),+ removeName: "a",+ },+ {+ name: "bucket deleted",+ oldEntry: bucketEntryWithPolicy("a", policyA),+ removeName: "a",+ },+ {+ name: "bucket deleted without policy",+ oldEntry: bucketEntryWithPolicy("a", ""),+ },+ {+ // The rename case: same policy bytes on both sides must still+ // move the mirror to the new name.+ name: "renamed with unchanged policy",+ oldEntry: bucketEntryWithPolicy("a", policyA),+ newEntry: bucketEntryWithPolicy("b", policyA),+ removeName: "a",+ updateName: "b",+ updatePolicy: policyA,+ },+ {+ name: "renamed with changed policy",+ oldEntry: bucketEntryWithPolicy("a", policyA),+ newEntry: bucketEntryWithPolicy("b", policyB),+ removeName: "a",+ updateName: "b",+ updatePolicy: policyB,+ },+ {+ name: "renamed and policy dropped",+ oldEntry: bucketEntryWithPolicy("a", policyA),+ newEntry: bucketEntryWithPolicy("b", ""),+ removeName: "a",+ },+ {+ name: "renamed without prior policy",+ oldEntry: bucketEntryWithPolicy("a", ""),+ newEntry: bucketEntryWithPolicy("b", policyA),+ updateName: "b",+ updatePolicy: policyA,+ },+ }++ for _, tc := range tests {+ t.Run(tc.name, func(t *testing.T) {+ removeName, updateName, updatePolicy := bucketPolicyMirrorOps(tc.oldEntry, tc.newEntry)+ if removeName != tc.removeName {+ t.Errorf("removeName = %q, want %q", removeName, tc.removeName)+ }+ if updateName != tc.updateName {+ t.Errorf("updateName = %q, want %q", updateName, tc.updateName)+ }+ if string(updatePolicy) != tc.updatePolicy {+ t.Errorf("updatePolicy = %q, want %q", updatePolicy, tc.updatePolicy)+ }+ })+ }+}diff --git a/weed/s3api/s3api_server.go b/weed/s3api/s3api_server.goindex dd60b8d59c..704200f347 100644--- a/weed/s3api/s3api_server.go+++ b/weed/s3api/s3api_server.go@@ -358,6 +358,15 @@ func NewS3ApiServerWithStore(router *mux.Router, option *S3ApiServerOption, expl// policy conditions on s3:x-amz-server-side-encryption evaluate correctly.policyEngine.MultipartSSELookup = s3ApiServer.getMultipartSSEAlgorithm+ // Advanced-IAM authorization evaluates the bucket-policy:<bucket> mirror+ // before any handler runs, so the auth path has to be what triggers the+ // lazy bucket load (and with it the mirror backfill): a grant carried+ // only by a not-yet-mirrored policy would otherwise deny forever, and+ // the denied request never reaches the handlers that load the bucket.+ iam.primeBucketForIAM = func(bucket string) {+ s3ApiServer.getBucketConfig(bucket)+ }+// Initialize advanced IAM system if config is provided or explicitly enabledif option.IamConfig != "" || option.EnableIam {configSource := "defaults"diff --git a/weed/s3api/s3err/s3api_errors.go b/weed/s3api/s3err/s3api_errors.goindex 87ffaeb6fb..0d5afa13f2 100644--- a/weed/s3api/s3err/s3api_errors.go+++ b/weed/s3api/s3err/s3api_errors.go@@ -95,6 +95,7 @@ const (ErrMalformedCredentialDateErrMalformedPolicyErrInvalidPolicyDocument+ ErrPolicyTooLargeErrMissingSignHeadersTagErrMissingSignTagErrUnsignedHeaders@@ -389,6 +390,11 @@ var errorCodeResponse = map[ErrorCode]APIError{Description: "Policy has invalid resource.",HTTPStatusCode: http.StatusBadRequest,},+ ErrPolicyTooLarge: {+ Code: "PolicyTooLarge",+ Description: "Policy exceeds the maximum allowed document size.",+ HTTPStatusCode: http.StatusBadRequest,+ },ErrInvalidPolicyDocument: {Code: "InvalidPolicyDocument",Description: "The content of the policy document is invalid.",