X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=blobdiff_plain;f=PVE%2FAPI2%2FAccessControl.pm;h=46b55104238da897f3d2e8c809bcd97fb1ad8efc;hp=916b1674bede08534d47270d64c893501d3dab7b;hb=12683df7c4ee7dd10257a35189998ebe2bde5597;hpb=a427cecb2b9f1cb5a527c93d3f654cb9ac879675

diff --git a/PVE/API2/AccessControl.pm b/PVE/API2/AccessControl.pm
index 916b167..46b5510 100644
--- a/PVE/API2/AccessControl.pm
+++ b/PVE/API2/AccessControl.pm
@@ -3,6 +3,7 @@ package PVE::API2::AccessControl;
 use strict;
 use warnings;
 
+use PVE::Exception qw(raise raise_perm_exc);
 use PVE::SafeSyslog;
 use PVE::RPCEnvironment;
 use PVE::Cluster qw(cfs_read_file);
@@ -77,17 +78,63 @@ __PACKAGE__->register_method ({
 	}
 
 	push @$res, { subdir => 'ticket' };
+	push @$res, { subdir => 'password' };
 
 	return $res;
     }});
 
+
+my $verify_auth = sub {
+    my ($rpcenv, $username, $pw_or_ticket, $path, $privs) = @_;
+
+    my $normpath = PVE::AccessControl::normalize_path($path);
+
+    my $ticketuser;
+    if (($ticketuser = PVE::AccessControl::verify_ticket($pw_or_ticket, 1)) &&
+	($ticketuser eq $username)) {
+	# valid ticket
+    } elsif (PVE::AccessControl::verify_vnc_ticket($pw_or_ticket, $username, $normpath, 1)) {
+	# valid vnc ticket
+    } else {
+	$username = PVE::AccessControl::authenticate_user($username, $pw_or_ticket);
+    }
+
+    my $privlist = [ PVE::Tools::split_list($privs) ];
+    if (!($normpath && scalar(@$privlist) && $rpcenv->check($username, $normpath, $privlist))) {
+	die "no permission ($path, $privs)\n";
+    }
+
+    return { username => $username };
+};
+
+my $create_ticket = sub {
+    my ($rpcenv, $username, $pw_or_ticket) = @_;
+
+    my $ticketuser;
+    if (($ticketuser = PVE::AccessControl::verify_ticket($pw_or_ticket, 1)) &&
+	($ticketuser eq 'root@pam' || $ticketuser eq $username)) {
+	# valid ticket. Note: root@pam can create tickets for other users
+    } else {
+	$username = PVE::AccessControl::authenticate_user($username, $pw_or_ticket);
+    }
+
+    my $ticket = PVE::AccessControl::assemble_ticket($username);
+    my $csrftoken = PVE::AccessControl::assemble_csrf_prevention_token($username);
+
+    return {
+	ticket => $ticket,
+	username => $username,
+	CSRFPreventionToken => $csrftoken,
+    };
+};
+
 __PACKAGE__->register_method ({
     name => 'create_ticket', 
     path => 'ticket', 
     method => 'POST',
     permissions => { user => 'world' },
     protected => 1, # else we can't access shadow files
-    description => "Create authentication ticket.",
+    description => "Create or verify authentication ticket.",
     parameters => {
 	additionalProperties => 0,
 	properties => {
@@ -104,14 +151,14 @@ __PACKAGE__->register_method ({
 		type => 'string',
 	    },
 	    path => {
-		description => "Only create ticket if user have access 'privs' on 'path'",
+		description => "Verify ticket, and check if user have access 'privs' on 'path'",
 		type => 'string',
 		requires => 'privs',
 		optional => 1,
 		maxLength => 64,
 	    },
 	    privs => { 
-		description => "Only create ticket if user have access 'privs' on 'path'",
+		description => "Verify ticket, and check if user have access 'privs' on 'path'",
 		type => 'string' , format => 'pve-priv-list',
 		requires => 'path',
 		optional => 1,
@@ -122,9 +169,9 @@ __PACKAGE__->register_method ({
     returns => {
 	type => "object",
 	properties => {
-	    ticket => { type => 'string' },
 	    username => { type => 'string' },
-	    CSRFPreventionToken => { type => 'string' },
+	    ticket => { type => 'string', optional => 1},
+	    CSRFPreventionToken => { type => 'string', optional => 1 },
 	}
     },
     code => sub {
@@ -134,47 +181,84 @@ __PACKAGE__->register_method ({
 	$username .= "\@$param->{realm}" if $param->{realm};
 
 	my $rpcenv = PVE::RPCEnvironment::get();
-	my $clientip = $rpcenv->get_client_ip() || '';
 
-	my $ticket;
-	my $token;
+	my $res;
+
 	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});
-		if (!($path && scalar(@$privs) && $rpcenv->check($username, $path, $privs))) {
-		    die "no permission ($param->{path}, $param->{privs})\n";
-		}
-	    }
-
-	    my $tmp;
-	    if (($tmp = PVE::AccessControl::verify_ticket($param->{password}, 1)) &&
-		($tmp eq 'root@pam' || $tmp eq $username)) {
-		# 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);
+		$res = &$verify_auth($rpcenv, $username, $param->{password},
+				     $param->{path}, $param->{privs});
 	    } else {
-		$username = PVE::AccessControl::authenticate_user($username, $param->{password});
+		$res = &$create_ticket($rpcenv, $username, $param->{password});
 	    }
-	    $ticket = PVE::AccessControl::assemble_ticket($username);
-	    $token = PVE::AccessControl::assemble_csrf_prevention_token($username);
 	};
 	if (my $err = $@) {
+	    my $clientip = $rpcenv->get_client_ip() || '';
 	    syslog('err', "authentication failure; rhost=$clientip user=$username msg=$err");
 	    die $err;
 	}
 
 	PVE::Cluster::log_msg('info', 'root@pam', "successful auth for user '$username'");
 
-	return {
-	    ticket => $ticket,
-	    username => $username,
-	    CSRFPreventionToken => $token,
-	};
+	return $res;
+    }});
+
+__PACKAGE__->register_method ({
+    name => 'change_passsword', 
+    path => 'password', 
+    method => 'PUT',
+    permissions => { 
+	description => "Each user is allowed to change his own password. A user can change the password of another user if he has modify permission on /access/groups/<group> on a group where user <userid> is member of.",
+	check => [ 'or', 
+		   ['userid-param', 'self'],
+		   ['userid-group', ['User.Modify']],
+	    ],
+    },
+    protected => 1, # else we can't access shadow files
+    description => "Change user password.",
+    parameters => {
+	additionalProperties => 0,
+	properties => {
+	    userid => get_standard_option('userid'),
+	    password => { 
+		description => "The new password.",
+		type => 'string',
+		minLength => 5, 
+		maxLength => 64,
+	    },
+	}
+    },
+    returns => { type => "null" },
+    code => sub {
+	my ($param) = @_;
+
+	my $rpcenv = PVE::RPCEnvironment::get();
+	my $authuser = $rpcenv->get_user();
+
+	my ($userid, $ruid, $realm) = PVE::AccessControl::verify_username($param->{userid});
+
+	$rpcenv->check_user_exist($userid);
+
+	if ($authuser eq 'root@pam') {
+	    # OK - root can change anything
+	} else {
+	    if ($authuser eq $userid) {
+		$rpcenv->check_user_enabled($userid);
+		# OK - each user can change its own password
+	    } else {
+		# only root may change root password
+		raise_perm_exc() if $userid eq 'root@pam';
+	    }
+	}
+
+	PVE::AccessControl::domain_set_password($realm, $ruid, $param->{password});
+
+	PVE::Cluster::log_msg('info', 'root@pam', "changed password for user '$userid'");
+
+	return undef;
     }});
 
 1;