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 40AD9695C5 for ; Mon, 18 Jan 2021 15:11:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3CD7513D7D for ; Mon, 18 Jan 2021 15:11:18 +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 2F23413D73 for ; Mon, 18 Jan 2021 15:11:17 +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 E35554605D for ; Mon, 18 Jan 2021 15:11:16 +0100 (CET) From: Wolfgang Bumiller To: pbs-devel@lists.proxmox.com Date: Mon, 18 Jan 2021 15:11:16 +0100 Message-Id: <20210118141116.29902-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.048 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 Subject: [pbs-devel] [PATCH backup] tfa: remove/empty description for recovery keys X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jan 2021 14:11:48 -0000 While the user chosen description is not allowed to be empty, we do leave it empty for recovery keys, as a "dummy description" makes little sense... Signed-off-by: Wolfgang Bumiller --- src/config/tfa.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/tfa.rs b/src/config/tfa.rs index aff1b3d8..f957cd75 100644 --- a/src/config/tfa.rs +++ b/src/config/tfa.rs @@ -343,6 +343,7 @@ pub struct TfaInfo { pub id: String, /// User chosen description for this entry. + #[serde(skip_serializing_if = "String::is_empty")] pub description: String, /// Creation time of this entry as unix epoch. @@ -359,7 +360,7 @@ impl TfaInfo { pub(crate) fn recovery(created: i64) -> Self { Self { id: "recovery".to_string(), - description: "recovery keys".to_string(), + description: String::new(), enable: true, created, } -- 2.20.1