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 82E1292803 for ; Tue, 14 Mar 2023 16:09:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 65C1323353 for ; Tue, 14 Mar 2023 16:08:46 +0100 (CET) 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, 14 Mar 2023 16:08:45 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D2C3D44FE0 for ; Tue, 14 Mar 2023 16:08:44 +0100 (CET) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Tue, 14 Mar 2023 16:08:36 +0100 Message-Id: <20230314150839.248059-1-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.039 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [certhelpers.pm, proxmox.com] Subject: [pve-devel] [PATCH v3 manager 0/3] Fix SSL Certificate and Key Upload Issues 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: , X-List-Received-Date: Tue, 14 Mar 2023 15:09:16 -0000 The respective previous versions can be found here: - v1: https://lists.proxmox.com/pipermail/pve-devel/2023-February/055955.html - v2: https://lists.proxmox.com/pipermail/pve-devel/2023-March/056011.html Note: The changes to pve-common are not included in this series anymore, as they've already been applied. Testing ------- The same tests as in v1 were performed. Changes from v2: - properly handle cleanup and warnings as well as temp file removal if setting a new key/cert pair fails[0] - if given, remove PID from beginning of error message after warning, making the error message in the UI a little prettier - use inputpanel widget for certificate upload form before providing fix for private key upload[1] Changes from v1: - properly handle OpenSSL errors[2] - provide actually correct format changes[3] - include trailing comma[4] - make JavaScript code a little more concise[5] [0] https://lists.proxmox.com/pipermail/pve-devel/2023-March/056047.html [1] https://lists.proxmox.com/pipermail/pve-devel/2023-March/056063.html [2] https://lists.proxmox.com/pipermail/pve-devel/2023-March/055962.html [3] https://lists.proxmox.com/pipermail/pve-devel/2023-March/055963.html [4] Not on mailing list unfortunately, boo! [5] https://lists.proxmox.com/pipermail/pve-devel/2023-March/055961.html pve-manager: Max Carrara (3): fix #4552: certhelpers: check if custom cert and key match on change ui: cert upload: use inputpanel for certificate upload ui: cert upload: fix private key field sending empty string PVE/CertHelpers.pm | 70 ++++++++++++++++++---- www/manager6/node/Certificates.js | 99 +++++++++++++++---------------- 2 files changed, 105 insertions(+), 64 deletions(-) -- 2.39.2