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 E569D705A2 for ; Thu, 24 Jun 2021 12:17:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BCE6099CB for ; Thu, 24 Jun 2021 12:17:23 +0200 (CEST) Received: from dev7.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4F334997B for ; Thu, 24 Jun 2021 12:17:21 +0200 (CEST) Received: by dev7.proxmox.com (Postfix, from userid 0) id 221D780F3F; Thu, 24 Jun 2021 12:17:21 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Thu, 24 Jun 2021 12:17:16 +0200 Message-Id: <20210624101719.2113280-7-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210624101719.2113280-1-dietmar@proxmox.com> References: <20210624101719.2113280-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.642 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 RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS 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 v2 6/9] implement new helper is_active_user_id() 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: Thu, 24 Jun 2021 10:17:53 -0000 --- src/config/cached_user_info.rs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/config/cached_user_info.rs b/src/config/cached_user_info.rs index c85d643c..a574043f 100644 --- a/src/config/cached_user_info.rs +++ b/src/config/cached_user_info.rs @@ -65,10 +65,8 @@ impl CachedUserInfo { } } - /// 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(); - + /// Test if a user_id is enabled and not expired + pub fn is_active_user_id(&self, userid: &Userid) -> bool { if let Ok(info) = self.user_cfg.lookup::("user", userid.as_str()) { if !info.enable.unwrap_or(true) { return false; @@ -78,7 +76,17 @@ impl CachedUserInfo { return false; } } + true } else { + false + } + } + + /// 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(); + + if !self.is_active_user_id(userid) { return false; } -- 2.30.2