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 1CD8F6509F for ; Mon, 2 Nov 2020 11:48:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 11013220AC for ; Mon, 2 Nov 2020 11:48:17 +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 9A43F220A2 for ; Mon, 2 Nov 2020 11:48:16 +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 5DE3545EDF for ; Mon, 2 Nov 2020 11:48:16 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Mon, 2 Nov 2020 11:48:09 +0100 Message-Id: <20201102104811.1315280-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 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 proxmox-backup 1/3] user.cfg/user info: add test constructors 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, 02 Nov 2020 10:48:47 -0000 Signed-off-by: Fabian Grünbichler --- src/config/cached_user_info.rs | 8 ++++++++ src/config/user.rs | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/config/cached_user_info.rs b/src/config/cached_user_info.rs index f56c07a8..518cf050 100644 --- a/src/config/cached_user_info.rs +++ b/src/config/cached_user_info.rs @@ -57,6 +57,14 @@ impl CachedUserInfo { Ok(config) } + #[cfg(test)] + pub(crate) fn test_new(user_cfg: SectionConfigData, acl_tree: AclTree) -> Self { + Self { + user_cfg: Arc::new(user_cfg), + acl_tree: Arc::new(acl_tree), + } + } + /// Test if a authentication id is enabled and not expired pub fn is_active_auth_id(&self, auth_id: &Authid) -> bool { let userid = auth_id.user(); diff --git a/src/config/user.rs b/src/config/user.rs index 5966c96d..3254183b 100644 --- a/src/config/user.rs +++ b/src/config/user.rs @@ -241,6 +241,14 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { Ok(()) } +#[cfg(test)] +pub(crate) fn test_cfg_from_str(raw: &str) -> Result<(SectionConfigData, [u8;32]), Error> { + let cfg = init(); + let parsed = cfg.parse("test_user_cfg", raw)?; + + Ok((parsed, [0;32])) +} + // shell completion helper pub fn complete_userid(_arg: &str, _param: &HashMap) -> Vec { match config() { -- 2.20.1