From: Oguz Bektas <o.bektas@proxmox.com>
Date: Tue, 31 May 2022 10:58:52 +0000 (+0200)
Subject: user check: fix expiration/enable order
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d0cce79f8b52d3feead2e92b94971a67e04ba977;p=pve-access-control.git

user check: fix expiration/enable order

Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm
index 1306576..eea6e14 100644
--- a/src/PVE/AccessControl.pm
+++ b/src/PVE/AccessControl.pm
@@ -653,15 +653,15 @@ sub check_user_enabled {
     my $data = check_user_exist($usercfg, $username, $noerr);
     return undef if !$data;
 
-    return 1 if $data->{enable};
-
-    die "user '$username' is disabled\n" if !$noerr;
-
     my $ctime = time();
     my $expire = $usercfg->{users}->{$username}->{expire};
 
     die "account expired\n" if $expire && ($expire < $ctime);
 
+    return 1 if $data->{enable};
+
+    die "user '$username' is disabled\n" if !$noerr;
+
     return undef;
 }