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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8B80A76FB8 for ; Thu, 21 Oct 2021 11:10:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 759661B3F1 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E48491B3DE for ; Thu, 21 Oct 2021 11:10:44 +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 BE35D468DC for ; Thu, 21 Oct 2021 11:10:44 +0200 (CEST) From: Dominik Csapak To: pmg-devel@lists.proxmox.com Date: Thu, 21 Oct 2021 11:10:43 +0200 Message-Id: <20211021091044.2135964-2-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.286 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 proxmox-acme-rs 1/1] directory: make meta object optional 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:45 -0000 some custom ACME endpoints do not have a TOS, and thus do not return a meta property at all Signed-off-by: Dominik Csapak --- src/directory.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/directory.rs b/src/directory.rs index 474b615..755ea8c 100644 --- a/src/directory.rs +++ b/src/directory.rs @@ -36,7 +36,8 @@ pub struct DirectoryData { /// Metadata object, for additional information which aren't directly part of the API /// itself, such as the terms of service. - pub meta: Meta, + #[serde(skip_serializing_if = "Option::is_none")] + pub meta: Option, } /// The directory's "meta" object. @@ -57,7 +58,10 @@ impl Directory { /// Get the ToS URL. pub fn terms_of_service_url(&self) -> Option<&str> { - self.data.meta.terms_of_service.as_deref() + match &self.data.meta { + Some(meta) => meta.terms_of_service.as_deref(), + None => None, + } } /// Get the "newNonce" URL. Use `HEAD` requests on this to get a new nonce. @@ -76,7 +80,7 @@ impl Directory { /// Access to the in the Acme spec defined metadata structure. /// Currently only contains the ToS URL already exposed via the `terms_of_service_url()` /// method. - pub fn meta(&self) -> &Meta { - &self.data.meta + pub fn meta(&self) -> Option<&Meta> { + self.data.meta.as_ref() } } -- 2.30.2