public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dietmar Maurer <dietmar@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v2 6/9] implement new helper is_active_user_id()
Date: Thu, 24 Jun 2021 12:17:16 +0200	[thread overview]
Message-ID: <20210624101719.2113280-7-dietmar@proxmox.com> (raw)
In-Reply-To: <20210624101719.2113280-1-dietmar@proxmox.com>

---
 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>("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




  parent reply	other threads:[~2021-06-24 10:17 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-24 10:17 [pbs-devel] [PATCH proxmox-backup v2 0/9] OpenID connect realms Dietmar Maurer
2021-06-24 10:17 ` [pbs-devel] [PATCH proxmox-backup v2 1/9] depend on proxmox-openid-rs Dietmar Maurer
2021-06-24 10:17 ` [pbs-devel] [PATCH proxmox-backup v2 2/9] config: new domains.cfg to configure openid realm Dietmar Maurer
2021-06-24 10:17 ` [pbs-devel] [PATCH proxmox-backup v2 3/9] check_acl_path: add /access/domains and /access/openid Dietmar Maurer
2021-06-24 10:17 ` [pbs-devel] [PATCH proxmox-backup v2 4/9] add API to manage openid realms Dietmar Maurer
2021-06-24 10:17 ` [pbs-devel] [PATCH proxmox-backup v2 5/9] cli: add CLI " Dietmar Maurer
2021-06-24 10:17 ` Dietmar Maurer [this message]
2021-06-24 10:17 ` [pbs-devel] [PATCH proxmox-backup v2 7/9] cleanup user/token is_active() check Dietmar Maurer
2021-06-24 10:17 ` [pbs-devel] [PATCH proxmox-backup v2 8/9] api: add openid redirect/login API Dietmar Maurer
2021-06-24 10:17 ` [pbs-devel] [PATCH proxmox-backup v2 9/9] ui: implement OpenId login Dietmar Maurer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210624101719.2113280-7-dietmar@proxmox.com \
    --to=dietmar@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal