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 04E8176FBA for ; Thu, 21 Oct 2021 11:10:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F3A5D1B401 for ; Thu, 21 Oct 2021 11:10:45 +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 id 7CAFC1B3F2 for ; Thu, 21 Oct 2021 11:10:45 +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 55A2A458F9 for ; Thu, 21 Oct 2021 11:10:45 +0200 (CEST) From: Dominik Csapak To: pmg-devel@lists.proxmox.com Date: Thu, 21 Oct 2021 11:10:44 +0200 Message-Id: <20211021091044.2135964-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211021091044.2135964-1-d.csapak@proxmox.com> References: <20211021091044.2135964-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.285 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 Subject: [pmg-devel] [PATCH pmg-rs 1/1] fix #3688: handle optional meta property of the directory 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: Thu, 21 Oct 2021 09:10:46 -0000 meta is optional so handle that, fixes the issue where one could not create an account on custom ACME endpoints without a meta property since it could not be parsed Signed-off-by: Dominik Csapak --- needs proxmox-acme-rs to be bumped and the depency adapted in Cargo.toml src/acme.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/acme.rs b/src/acme.rs index 9a57624..a1b5278 100644 --- a/src/acme.rs +++ b/src/acme.rs @@ -265,10 +265,11 @@ pub mod export { /// Get the directory's meta information. #[export] - pub fn get_meta(#[try_from_ref] this: &Acme) -> Result { - Ok(Meta::clone( - this.inner.lock().unwrap().client.directory()?.meta(), - )) + pub fn get_meta(#[try_from_ref] this: &Acme) -> Result, Error> { + match this.inner.lock().unwrap().client.directory()?.meta() { + Some(meta) => Ok(Some(meta.clone())), + None => Ok(None), + } } /// Get the account's directory URL. -- 2.30.2