From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <w.bumiller@proxmox.com>
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 19124B8BF2
for <pmg-devel@lists.proxmox.com>; Wed, 6 Dec 2023 12:38:20 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id E6EAEA96
for <pmg-devel@lists.proxmox.com>; Wed, 6 Dec 2023 12:37:49 +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 <pmg-devel@lists.proxmox.com>; Wed, 6 Dec 2023 12:37:49 +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 2417341011
for <pmg-devel@lists.proxmox.com>; Wed, 6 Dec 2023 12:37:49 +0100 (CET)
Date: Wed, 6 Dec 2023 12:37:48 +0100
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Folke Gleumes <f.gleumes@proxmox.com>
Cc: pmg-devel@lists.proxmox.com
Message-ID: <umgwp6fwwzugmvso3xgu5awntho3nqfarzf6rzoh6mnufl5uee@btxd52vro4s4>
References: <20231114141408.228705-1-f.gleumes@proxmox.com>
<20231114141408.228705-7-f.gleumes@proxmox.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231114141408.228705-7-f.gleumes@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.096 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
T_SCC_BODY_TEXT_LINE -0.01 -
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [acme.rs]
Subject: [pmg-devel] applied: [PATCH perl-rs 5/8] acme: add eab fields for
pmg
X-BeenThere: pmg-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Mail Gateway development discussion
<pmg-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/>
List-Post: <mailto:pmg-devel@lists.proxmox.com>
List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 06 Dec 2023 11:38:20 -0000
applied
On Tue, Nov 14, 2023 at 03:14:05PM +0100, Folke Gleumes wrote:
> Signed-off-by: Folke Gleumes <f.gleumes@proxmox.com>
> ---
> pmg-rs/src/acme.rs | 18 +++++++++++++-----
> 1 file changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/pmg-rs/src/acme.rs b/pmg-rs/src/acme.rs
> index b38e1ea..fe1e465 100644
> --- a/pmg-rs/src/acme.rs
> +++ b/pmg-rs/src/acme.rs
> @@ -79,6 +79,7 @@ impl Inner {
> tos_agreed: bool,
> contact: Vec<String>,
> rsa_bits: Option<u32>,
> + eab_creds: Option<(String, String)>,
> ) -> Result<(), Error> {
> self.tos = if tos_agreed {
> self.client.terms_of_service_url()?.map(str::to_owned)
> @@ -86,7 +87,9 @@ impl Inner {
> None
> };
>
> - let _account = self.client.new_account(contact, tos_agreed, rsa_bits)?;
> + let _account = self
> + .client
> + .new_account(contact, tos_agreed, rsa_bits, eab_creds)?;
> let file = OpenOptions::new()
> .write(true)
> .create(true)
> @@ -238,11 +241,16 @@ pub mod export {
> tos_agreed: bool,
> contact: Vec<String>,
> rsa_bits: Option<u32>,
> + eab_kid: Option<String>,
> + eab_hmac_key: Option<String>,
> ) -> Result<(), Error> {
> - this.inner
> - .lock()
> - .unwrap()
> - .new_account(account_path, tos_agreed, contact, rsa_bits)
> + this.inner.lock().unwrap().new_account(
> + account_path,
> + tos_agreed,
> + contact,
> + rsa_bits,
> + eab_kid.zip(eab_hmac_key),
> + )
> }
>
> /// Get the directory's meta information.
> --
> 2.39.2