From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 023901FF165 for ; Wed, 29 Jan 2025 12:27:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 69B4C28AE9; Wed, 29 Jan 2025 12:27:10 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Wed, 29 Jan 2025 12:26:12 +0100 Message-ID: <20250129112633.1082600-1-c.heiss@proxmox.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH widget-toolkit] window: ACMEDomains: show error dialog on domain limit X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Currently, this just fails silently for users and only logs an error to the console. Improve the error message & show an alert dialog on failure. This affects PMG & BS, as they use the exact same codepath/panel. Originally reported in the forum [0]. [0] https://forum.proxmox.com/threads/acme-max-certificate.161400/ Signed-off-by: Christoph Heiss --- src/window/ACMEDomains.js | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/window/ACMEDomains.js b/src/window/ACMEDomains.js index 1fcc784..067cbc9 100644 --- a/src/window/ACMEDomains.js +++ b/src/window/ACMEDomains.js @@ -49,13 +49,21 @@ Ext.define('Proxmox.window.ACMEDomainEdit', { return `acmedomain${i}`; } } - throw "too many domains configured"; + throw Ext.String.format( + gettext('Cannot create more than {0} ACME domains.'), + Proxmox.Utils.acmedomain_count, + ); }; // If we have a 'usage' property (pmg), we only use the `acmedomainX` config keys. if (win.separateDomainEntries || win.domainUsages) { if (!configkey || configkey === 'acme') { - configkey = find_free_slot(); + try { + configkey = find_free_slot(); + } catch (e) { + Ext.Msg.alert(gettext('Error'), e); + throw e; + } } delete values.type; params[configkey] = Proxmox.Utils.printPropertyString(values, 'domain'); @@ -68,7 +76,12 @@ Ext.define('Proxmox.window.ACMEDomainEdit', { // Then insert the domain depending on its type: if (values.type === 'dns') { if (!olddomain.configkey || olddomain.configkey === 'acme') { - configkey = find_free_slot(); + try { + configkey = find_free_slot(); + } catch (e) { + Ext.Msg.alert(gettext('Error'), e); + throw e; + } if (olddomain.domain) { // we have to remove the domain from the acme domainlist Proxmox.Utils.remove_domain_from_acme(acmeObj, olddomain.domain); -- 2.47.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel