* Add IAM gRPC service definition - Add GetConfiguration/PutConfiguration for config management - Add CreateUser/GetUser/UpdateUser/DeleteUser/ListUsers for user management - Add CreateAccessKey/DeleteAccessKey/GetUserByAccessKey for access key management - Methods mirror existing IAM HTTP API functionality * Add IAM gRPC handlers on filer server - Implement IamGrpcServer with CredentialManager integration - Handle configuration get/put operations - Handle user CRUD operations - Handle access key create/delete operations - All methods delegate to CredentialManager for actual storage * Wire IAM gRPC service to filer server - Add CredentialManager field to FilerOption and FilerServer - Import credential store implementations in filer command - Initialize CredentialManager from credential.toml if available - Register IAM gRPC service on filer gRPC server - Enable credential management via gRPC alongside existing filer services * Regenerate IAM protobuf with gRPC service methods * fix: compilation error in DeleteUser * fix: address code review comments for IAM migration * feat: migrate policies to multi-file layout and fix identity duplicated content * refactor: remove configuration.json and migrate Service Accounts to multi-file layout * refactor: standardize Service Accounts as distinct store entities and fix Admin Server persistence * config: set ServiceAccountsDirectory to /etc/iam/service_accounts * Fix Chrome dialog auto-dismiss with Bootstrap modals - Add modal-alerts.js library with Bootstrap modal replacements - Replace all 15 confirm() calls with showConfirm/showDeleteConfirm - Auto-override window.alert() for all alert() calls - Fixes Chrome 132+ aggressively blocking native dialogs * Upgrade Bootstrap from 5.3.2 to 5.3.8 * Fix syntax error in object_store_users.templ - remove duplicate closing braces * create policy * display errors * migrate to multi-file policies * address PR feedback: use showDeleteConfirm and showErrorMessage in policies.templ, refine migration check * Update policies_templ.go * add service account to iam grpc * iam: fix potential path traversal in policy names by validating name pattern * iam: add GetServiceAccountByAccessKey to CredentialStore interface * iam: implement service account support for PostgresStore Includes full CRUD operations and efficient lookup by access key. * iam: implement GetServiceAccountByAccessKey for filer_etc, grpc, and memory stores Provides efficient lookup of service accounts by access key where possible, with linear scan fallbacks for file-based stores. * iam: remove filer_multiple support Deleted its implementation and references in imports, scaffold config, and core interface constants. Redundant with filer_etc. * clear comment * dash: robustify service account construction - Guard against nil sa.Credential when constructing responses - Fix Expiration logic to only set if > 0, avoiding Unix epoch 1970 - Ensure consistency across Get, Create, and Update handlers * credential/filer_etc: improve error propagation in configuration handlers - Return error from loadServiceAccountsFromMultiFile to callers - Ensure listEntries errors in SaveConfiguration (cleanup logic) are propagated unless they are "not found" failures. - Fixes potential silent failures during IAM configuration sync. * credential/filer_etc: add existence check to CreateServiceAccount Ensures consistency with other stores by preventing accidental overwrite of existing service accounts during creation. * credential/memory: improve store robustness and Reset logic - Enforce ID immutability in UpdateServiceAccount to prevent orphans - Update Reset() to also clear the policies map, ensuring full state cleanup for tests. * dash: improve service account robustness and policy docs - Wrap parent user lookup errors to preserve context - Strictly validate Status field in UpdateServiceAccount - Add deprecation comments to legacy policy management methods * credential/filer_etc: protect against path traversal in service accounts Implemented ID validation (alphanumeric, underscores, hyphens) and applied it to Get, Save, and Delete operations to ensure no directory traversal via saId.json filenames. * credential/postgres: improve robustness and cleanup comments - Removed brainstorming comments in GetServiceAccountByAccessKey - Added missing rows.Err() check during iteration - Properly propagate Scan and Unmarshal errors instead of swallowing them * admin: unify UI alerts and confirmations using Bootstrap modals - Updated modal-alerts.js with improved automated alert type detection - Replaced native alert() and confirm() with showAlert(), showConfirm(), and showDeleteConfirm() across various Templ components - Improved UX for delete operations by providing better context and styling - Ensured consistent error reporting across IAM and Maintenance views * admin: additional UI consistency fixes for alerts and confirmations - Replaced native alert() and confirm() with Bootstrap modals in: - EC volumes (repair flow) - Collection details (repair flow) - File browser (properties and delete) - Maintenance config schema (save and reset) - Improved delete confirmation in file browser with item context - Ensured consistent success/error/info styling for all feedbacks * make * iam: add GetServiceAccountByAccessKey RPC and update GetConfiguration * iam: implement GetServiceAccountByAccessKey on server and client * iam: centralize policy and service account validation * iam: optimize MemoryStore service account lookups with indexing * iam: fix postgres service_accounts table and optimize lookups * admin: refactor modal alerts and clean up dashboard logic * admin: fix EC shards table layout mismatch * admin: URL-encode IAM path parameters for safety * admin: implement pauseWorker logic in maintenance view * iam: add rows.Err() check to postgres ListServiceAccounts * iam: standardize ErrServiceAccountNotFound across credential stores * iam: map ErrServiceAccountNotFound to codes.NotFound in DeleteServiceAccount * iam: refine service account store logic, errors and schema * iam: add validation to GetServiceAccountByAccessKey * admin: refine modal titles and ensure URL safety * admin: address bot review comments for alerts and async usage * iam: fix syntax error by restoring missing function declaration * [FilerEtcStore] improve error handling in CreateServiceAccount Refine error handling to provide clearer messages when checking for existing service accounts. * [PostgresStore] add nil guards and validation to service account methods Ensure input parameters are not nil and required IDs are present to prevent runtime panics and ensure data integrity. * [JS] add shared IAM utility script Consolidate common IAM operations like deleteUser and deleteAccessKey into a shared utility script for better maintainability. * [View] include shared IAM utilities in layout Include iam-utils.js in the main layout to make IAM functions available across all administrative pages. * [View] refactor IAM logic and restore async in EC Shards view Remove redundant local IAM functions and ensure that delete confirmation callbacks are properly marked as async. * [View] consolidate IAM logic in Object Store Users view Remove redundant local definitions of deleteUser and deleteAccessKey, relying on the shared utilities instead. * [View] update generated templ files for UI consistency * credential/postgres: remove redundant name column from service_accounts table The id is already used as the unique identifier and was being copied to the name column. This removes the name column from the schema and updates the INSERT/UPDATE queries. * credential/filer_etc: improve logging for policy migration failures Added Errorf log if AtomicRenameEntry fails during migration to ensure visibility of common failure points. * credential: allow uppercase characters in service account ID username Updated ServiceAccountIdPattern to allow [A-Za-z0-9_-]+ for the username component, matching the actual service account creation logic which uses the parent user name directly. * Update object_store_users_templ.go * admin: fix ec_shards pagination to handle numeric page arguments Updated goToPage in cluster_ec_shards.templ to accept either an Event or a numeric page argument. This prevents errors when goToPage(1) is called directly. Corrected both the .templ source and generated Go code. * credential/filer_etc: improve service account storage robustness Added nil guard to saveServiceAccount, updated GetServiceAccount to return ErrServiceAccountNotFound for empty data, and improved deleteServiceAccount to handle response-level Filer errors.
332 lines
13 KiB
JavaScript
332 lines
13 KiB
JavaScript
/**
|
|
* Modal Alerts - Bootstrap Modal replacement for native alert() and confirm()
|
|
* Fixes Chrome auto-dismiss issue with native dialogs
|
|
*
|
|
* Usage:
|
|
* showAlert('Message', 'success');
|
|
* showConfirm('Delete this?', function() { });
|
|
*/
|
|
|
|
(function () {
|
|
'use strict';
|
|
|
|
// Create and inject modal HTML into page if not already present
|
|
function ensureModalsExist() {
|
|
if (document.getElementById('globalAlertModal')) {
|
|
return; // Already exists
|
|
}
|
|
|
|
const modalsHTML = `
|
|
<!-- Global Alert Modal -->
|
|
<div class="modal fade" id="globalAlertModal" tabindex="-1" aria-labelledby="globalAlertModalLabel" aria-hidden="true">
|
|
<div class="modal-dialog">
|
|
<div class="modal-content">
|
|
<div class="modal-header" id="globalAlertModalHeader">
|
|
<h5 class="modal-title" id="globalAlertModalLabel">
|
|
<i class="fas fa-info-circle me-2" id="globalAlertModalIcon"></i>
|
|
<span id="globalAlertModalTitle">Notice</span>
|
|
</h5>
|
|
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
|
</div>
|
|
<div class="modal-body" id="globalAlertModalBody">
|
|
<!-- Message will be inserted here -->
|
|
</div>
|
|
<div class="modal-footer">
|
|
<button type="button" class="btn btn-primary" data-bs-dismiss="modal">OK</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Global Confirm Modal -->
|
|
<div class="modal fade" id="globalConfirmModal" tabindex="-1" aria-labelledby="globalConfirmModalLabel" aria-hidden="true">
|
|
<div class="modal-dialog">
|
|
<div class="modal-content">
|
|
<div class="modal-header bg-warning">
|
|
<h5 class="modal-title" id="globalConfirmModalLabel">
|
|
<i class="fas fa-question-circle me-2"></i><span id="globalConfirmModalTitleText">Confirm Action</span>
|
|
</h5>
|
|
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
|
</div>
|
|
<div class="modal-body" id="globalConfirmModalBody">
|
|
<!-- Message will be inserted here -->
|
|
</div>
|
|
<div class="modal-footer">
|
|
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="globalConfirmCancelBtn">Cancel</button>
|
|
<button type="button" class="btn btn-primary" id="globalConfirmOkBtn">OK</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Global Delete Confirm Modal -->
|
|
<div class="modal fade" id="globalDeleteModal" tabindex="-1" aria-labelledby="globalDeleteModalLabel" aria-hidden="true">
|
|
<div class="modal-dialog">
|
|
<div class="modal-content">
|
|
<div class="modal-header bg-danger text-white">
|
|
<h5 class="modal-title" id="globalDeleteModalLabel">
|
|
<i class="fas fa-exclamation-triangle me-2"></i>Confirm Delete
|
|
</h5>
|
|
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
|
|
</div>
|
|
<div class="modal-body">
|
|
<p class="mb-2" id="globalDeleteModalMessage">Are you sure you want to delete this item?</p>
|
|
<p class="mb-0"><strong id="globalDeleteModalItemName"></strong></p>
|
|
<p class="text-muted small mt-2 mb-0">This action cannot be undone.</p>
|
|
</div>
|
|
<div class="modal-footer">
|
|
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
|
|
<button type="button" class="btn btn-danger" id="globalDeleteConfirmBtn">
|
|
<i class="fas fa-trash me-1"></i>Delete
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
`;
|
|
|
|
// Inject modals at end of body
|
|
document.body.insertAdjacentHTML('beforeend', modalsHTML);
|
|
}
|
|
|
|
/**
|
|
* Show an alert message using Bootstrap modal
|
|
* @param {string} message - The message to display
|
|
* @param {string|object} typeOrOptions - Type ('success', 'error', 'warning', 'info') or options object
|
|
* @param {string} title - Optional custom title
|
|
*/
|
|
window.showAlert = function (message, typeOrOptions, title) {
|
|
ensureModalsExist();
|
|
|
|
let type = 'info';
|
|
let isHtml = false;
|
|
|
|
if (typeof typeOrOptions === 'object' && typeOrOptions !== null) {
|
|
type = typeOrOptions.type || 'info';
|
|
isHtml = typeOrOptions.isHtml || false;
|
|
title = typeOrOptions.title || title;
|
|
} else if (typeof typeOrOptions === 'string') {
|
|
type = typeOrOptions;
|
|
}
|
|
|
|
const modal = document.getElementById('globalAlertModal');
|
|
const header = document.getElementById('globalAlertModalHeader');
|
|
const titleEl = document.getElementById('globalAlertModalTitle');
|
|
const bodyEl = document.getElementById('globalAlertModalBody');
|
|
const iconEl = document.getElementById('globalAlertModalIcon');
|
|
|
|
// Configuration for different types
|
|
const types = {
|
|
'success': {
|
|
title: 'Success',
|
|
icon: 'fa-check-circle',
|
|
headerClass: 'bg-success text-white',
|
|
btnClose: 'btn-close-white'
|
|
},
|
|
'error': {
|
|
title: 'Error',
|
|
icon: 'fa-exclamation-triangle',
|
|
headerClass: 'bg-danger text-white',
|
|
btnClose: 'btn-close-white'
|
|
},
|
|
'warning': {
|
|
title: 'Warning',
|
|
icon: 'fa-exclamation-circle',
|
|
headerClass: 'bg-warning text-dark',
|
|
btnClose: ''
|
|
},
|
|
'info': {
|
|
title: 'Notice',
|
|
icon: 'fa-info-circle',
|
|
headerClass: 'bg-info text-white',
|
|
btnClose: 'btn-close-white'
|
|
}
|
|
};
|
|
|
|
const config = types[type] || types['info'];
|
|
|
|
// Update header styling
|
|
header.className = 'modal-header ' + config.headerClass;
|
|
const closeBtn = header.querySelector('.btn-close');
|
|
closeBtn.className = 'btn-close ' + config.btnClose;
|
|
|
|
// Update icon
|
|
iconEl.className = 'fas ' + config.icon + ' me-2';
|
|
|
|
// Update title
|
|
titleEl.textContent = title || config.title;
|
|
|
|
// Update body - support HTML or text
|
|
if (isHtml || message.includes('<p>') || message.includes('<ul>')) {
|
|
bodyEl.innerHTML = message;
|
|
} else {
|
|
bodyEl.innerHTML = '<p class="mb-0">' + escapeHtml(message) + '</p>';
|
|
}
|
|
|
|
// Show modal
|
|
const bsModal = new bootstrap.Modal(modal);
|
|
bsModal.show();
|
|
};
|
|
|
|
/**
|
|
* Show a confirmation dialog using Bootstrap modal
|
|
* @param {string} message - The confirmation message
|
|
* @param {function} onConfirm - Callback function if user confirms
|
|
* @param {function|object} onCancelOrOptions - Optional callback or options object
|
|
* @param {string} title - Optional custom title
|
|
*/
|
|
window.showConfirm = function (message, onConfirm, onCancelOrOptions, title) {
|
|
ensureModalsExist();
|
|
|
|
let onCancel = null;
|
|
let isHtml = false;
|
|
|
|
if (typeof onCancelOrOptions === 'object' && onCancelOrOptions !== null) {
|
|
onCancel = onCancelOrOptions.onCancel;
|
|
isHtml = onCancelOrOptions.isHtml || false;
|
|
title = onCancelOrOptions.title || null;
|
|
} else {
|
|
onCancel = onCancelOrOptions;
|
|
}
|
|
|
|
const modalEl = document.getElementById('globalConfirmModal');
|
|
const bodyEl = document.getElementById('globalConfirmModalBody');
|
|
const titleEl = document.getElementById('globalConfirmModalTitleText');
|
|
const okBtn = document.getElementById('globalConfirmOkBtn');
|
|
const cancelBtn = document.getElementById('globalConfirmCancelBtn');
|
|
|
|
// Set title
|
|
if (title) {
|
|
titleEl.textContent = title;
|
|
} else {
|
|
titleEl.textContent = 'Confirm Action';
|
|
}
|
|
|
|
// Set message
|
|
if (isHtml || message.includes('<p>') || message.includes('<ul>')) {
|
|
bodyEl.innerHTML = message;
|
|
} else {
|
|
bodyEl.innerHTML = '<p class="mb-0">' + escapeHtml(message) + '</p>';
|
|
}
|
|
|
|
// Remove old event listeners by cloning buttons
|
|
const newOkBtn = okBtn.cloneNode(true);
|
|
const newCancelBtn = cancelBtn.cloneNode(true);
|
|
okBtn.parentNode.replaceChild(newOkBtn, okBtn);
|
|
cancelBtn.parentNode.replaceChild(newCancelBtn, cancelBtn);
|
|
|
|
const modal = new bootstrap.Modal(modalEl);
|
|
|
|
// Add event listeners
|
|
newOkBtn.addEventListener('click', function () {
|
|
modal.hide();
|
|
if (typeof onConfirm === 'function') {
|
|
onConfirm();
|
|
}
|
|
});
|
|
|
|
newCancelBtn.addEventListener('click', function () {
|
|
modal.hide();
|
|
if (typeof onCancel === 'function') {
|
|
onCancel();
|
|
}
|
|
});
|
|
|
|
modal.show();
|
|
};
|
|
|
|
/**
|
|
* Show a delete confirmation dialog
|
|
* @param {string} itemName - Name of the item to delete
|
|
* @param {function} onConfirm - Callback function if user confirms deletion
|
|
* @param {string} message - Optional custom message (default: "Are you sure you want to delete this item?")
|
|
*/
|
|
window.showDeleteConfirm = function (itemName, onConfirm, message) {
|
|
ensureModalsExist();
|
|
|
|
const modalEl = document.getElementById('globalDeleteModal');
|
|
const messageEl = document.getElementById('globalDeleteModalMessage');
|
|
const itemNameEl = document.getElementById('globalDeleteModalItemName');
|
|
const confirmBtn = document.getElementById('globalDeleteConfirmBtn');
|
|
|
|
// Set custom message if provided
|
|
if (message) {
|
|
messageEl.textContent = message;
|
|
} else {
|
|
messageEl.textContent = 'Are you sure you want to delete this item?';
|
|
}
|
|
|
|
// Set item name
|
|
itemNameEl.textContent = itemName;
|
|
|
|
// Remove old event listener by cloning button
|
|
const newConfirmBtn = confirmBtn.cloneNode(true);
|
|
confirmBtn.parentNode.replaceChild(newConfirmBtn, confirmBtn);
|
|
|
|
const modal = new bootstrap.Modal(modalEl);
|
|
|
|
// Add new event listener
|
|
newConfirmBtn.addEventListener('click', function () {
|
|
modal.hide();
|
|
if (typeof onConfirm === 'function') {
|
|
onConfirm();
|
|
}
|
|
});
|
|
|
|
modal.show();
|
|
};
|
|
|
|
/**
|
|
* Escape HTML to prevent XSS
|
|
*/
|
|
function escapeHtml(text) {
|
|
const map = {
|
|
'&': '&',
|
|
'<': '<',
|
|
'>': '>',
|
|
'"': '"',
|
|
"'": '''
|
|
};
|
|
return text.replace(/[&<>"']/g, function (m) { return map[m]; });
|
|
}
|
|
|
|
// Auto-initialize on DOMContentLoaded
|
|
if (document.readyState === 'loading') {
|
|
document.addEventListener('DOMContentLoaded', ensureModalsExist);
|
|
} else {
|
|
ensureModalsExist();
|
|
}
|
|
|
|
/**
|
|
* AUTOMATIC OVERRIDE of native alert()
|
|
* This makes ALL existing alert() calls automatically use Bootstrap modals
|
|
*/
|
|
window.alert = function (message) {
|
|
// Auto-detect message type from content
|
|
let type = 'info';
|
|
const msg = String(message || '');
|
|
const msgLower = msg.toLowerCase();
|
|
|
|
// Refined type inference to avoid false positives
|
|
if (msgLower.includes('success') || msgLower.includes('successfully') || msgLower.includes('created') || msgLower.includes('updated') || msgLower.includes('saved')) {
|
|
// Avoid "not successful"
|
|
if (!msgLower.includes('not success')) {
|
|
type = 'success';
|
|
}
|
|
}
|
|
|
|
if (type === 'info') {
|
|
if (msgLower.includes('error') || msgLower.includes('failed') || msgLower.includes('invalid') || msgLower.includes('exception')) {
|
|
type = 'error';
|
|
} else if (msgLower.includes('warning') || msgLower.includes('required') || msgLower.includes('attention')) {
|
|
type = 'warning';
|
|
}
|
|
}
|
|
|
|
showAlert(msg, type);
|
|
};
|
|
|
|
console.log('Modal Alerts library loaded - native alert() overridden');
|
|
console.log('For confirm(), use showConfirm() or showDeleteConfirm() instead of native confirm()');
|
|
})();
|