rename user_enabled to check_user_enabled

And add $noerr parameter.

diff --git a/PVE/API2/AccessControl.pm b/PVE/API2/AccessControl.pm
index 916b1674bede08534d47270d64c893501d3dab7b..5967c50ea30200caf6a2fb042b03edf176348d27 100644 (file)
--- a/PVE/API2/AccessControl.pm
+++ b/PVE/API2/AccessControl.pm
@@ -140,6 +140,9 @@ __PACKAGE__->register_method ({
        my $token;
        eval {
 
+           # test if user exists and is enabled
+           $rpcenv->check_user_enabled($username);
+
            if ($param->{path} && $param->{privs}) {
                my $privs = [ PVE::Tools::split_list($param->{privs}) ];
                my $path = PVE::AccessControl::normalize_path($param->{path});
@@ -154,9 +157,6 @@ __PACKAGE__->register_method ({
                # got valid ticket
                # Note: root@pam can create tickets for other users
                
-               # test if user exists and is enabled
-               my $usercfg = cfs_read_file('user.cfg');
-               die "no such user ('$username')\n" if !user_enabled($usercfg, $username);
            } else {
                $username = PVE::AccessControl::authenticate_user($username, $param->{password});
            }

diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm
index 9396537d411bf908c5b7ff07571362d165d1d07c..b06ca3b2dfe7bfa87db6998d27df58852dd87845 100644 (file)
--- a/PVE/AccessControl.pm
+++ b/PVE/AccessControl.pm
@@ -323,10 +323,10 @@ sub authenticate_user_domain {
     }
 }
 
-sub user_enabled {
-    my ($usercfg, $username) = @_;
+sub check_user_enabled {
+    my ($usercfg, $username, $noerr) = @_;
 
-    $username = verify_username($username, 1);
+    $username = verify_username($username, $noerr);
     return undef if !$username;
  
     return 1 if $usercfg && $usercfg->{users}->{$username} &&
@@ -334,7 +334,9 @@ sub user_enabled {
 
     return 1 if $username eq 'root@pam'; # root is always enabled
 
-    return 0;
+    die "no such user ('$username')\n" if !$noerr;
+ 
+    return undef;
 }
 
 # password should be utf8 encoded
@@ -349,9 +351,10 @@ sub authenticate_user {
 
     my $usercfg = cfs_read_file('user.cfg');
 
-    if (!user_enabled($usercfg, $username)) {
+    eval { check_user_enabled($usercfg, $username); };
+    if (my $err = $@) {
        sleep(2);
-       die "no such user ('$username')\n";
+       die $err;
     }
 
     my $ctime = time();

diff --git a/PVE/RPCEnvironment.pm b/PVE/RPCEnvironment.pm
index f65a776134b271a8d6b0c8e3fd5c1e8280997280..19276badcadd46c95c24935186493f65a9612adb 100644 (file)
--- a/PVE/RPCEnvironment.pm
+++ b/PVE/RPCEnvironment.pm
@@ -165,11 +165,11 @@ sub check {
     return 1;
 };
 
-sub user_enabled {
-    my ($self, $user) = @_;
+sub check_user_enabled {
+    my ($self, $user, $noerr) = @_;
     
     my $cfg = $self->{user_cfg};
-    return PVE::AccessControl::user_enabled($cfg, $user);
+    return PVE::AccessControl::check_user_enabled($cfg, $user, $noerr);
 }
 
 # initialize environment - must be called once at program startup