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 4DBD06B6A2 for ; Wed, 17 Mar 2021 11:12:22 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 445772BFB8 for ; Wed, 17 Mar 2021 11:12:22 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id D67C62BFB0 for ; Wed, 17 Mar 2021 11:12:21 +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 A1914426F8 for ; Wed, 17 Mar 2021 11:12:21 +0100 (CET) From: Wolfgang Bumiller To: pmg-devel@lists.proxmox.com Date: Wed, 17 Mar 2021 11:12:18 +0100 Message-Id: <20210317101218.17524-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [certificates.pm] Subject: [pmg-devel] [PATCH api] fix revocation of old certificate on renewal X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 10:12:22 -0000 in PMG key and certificate are in the same file so we need to extract the certificate (like in the revoke api call) Signed-off-by: Wolfgang Bumiller --- src/PMG/API2/Certificates.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/PMG/API2/Certificates.pm b/src/PMG/API2/Certificates.pm index b50addd..1a6c434 100644 --- a/src/PMG/API2/Certificates.pm +++ b/src/PMG/API2/Certificates.pm @@ -610,7 +610,11 @@ __PACKAGE__->register_method ({ if (defined($old_cert)) { print "Revoking old certificate\n"; - eval { $acme->revoke_certificate($old_cert, undef) }; + eval { + $old_cert = pem_certificate($old_cert) + or die "no certificate section found in '$cert_path'\n"; + $acme->revoke_certificate($old_cert, undef); + }; warn "Revoke request to CA failed: $@" if $@; } }; -- 2.20.1