From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8E14E937A6 for ; Tue, 9 Apr 2024 13:00:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 74A281BCCF for ; Tue, 9 Apr 2024 13:00:33 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 9 Apr 2024 13:00:29 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E76774309A for ; Tue, 9 Apr 2024 13:00:23 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 9 Apr 2024 13:00:09 +0200 Message-Id: <20240409110012.166472-22-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240409110012.166472-1-h.laimer@proxmox.com> References: <20240409110012.166472-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.008 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: [pbs-devel] [PATCH proxmox-backup v3 21/24] ui: utils: make parseMaintenanceMode more robust X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2024 11:00:33 -0000 Signed-off-by: Hannes Laimer --- www/Utils.js | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/www/Utils.js b/www/Utils.js index 0ee6609c..1df46318 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -663,14 +663,29 @@ Ext.define('PBS.Utils', { return `${icon} ${value}`; }, - // FIXME: this "parser" is brittle and relies on the order the arguments will appear in + /** + * Parses maintenance mode property string. + * Examples: + * "offline,message=foo" -> ["offline", "foo"] + * "offline" -> ["offline", null] + * "message=foo,offline" -> ["offline", "foo"] + * null/undefined -> [null, null] + * + * @param {string|null} mode - Maintenance mode string to parse. + * @return {Array} - Parsed maintenance mode values. + */ parseMaintenanceMode: function(mode) { - let [type, message] = mode.split(/,(.+)/); - type = type.split("=").pop(); - message = message ? message.split("=")[1] - .replace(/^"(.*)"$/, '$1') - .replaceAll('\\"', '"') : null; - return [type, message]; + if (!mode) { + return [null, null]; + } + return mode.split(',').reduce(([m, msg], pair) => { + const [key, value] = pair.split('='); + if (key === 'message') { + return [m, value.replace(/^"(.*)"$/, '$1').replace(/\\"/g, '"')]; + } else { + return [value ?? key, msg]; + } + }, [null, null]); }, renderMaintenance: function(mode, activeTasks) { -- 2.39.2