Proxmox/pve-access-control
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-access-control.git synced 2025-02-01 05:47:07 +03:00
Code Releases Activity

roles()/permissions(): also return propagate flag

Browse Source 
this information is already available, but not exposed. we need it for
dumping an effective permission tree of a given user/token.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-01-21 13:54:11 +01:00 committed by Thomas Lamprecht
parent 4937239091
commit 7e8bcaa754
9 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
PVE/AccessControl.pm
View File

@ -1365,13 +1365,13 @@ sub roles {
my $token_info = $cfg->{users}->{$username}->{tokens}->{$token}; my $token_info = $cfg->{users}->{$username}->{tokens}->{$token};
return () if !$token_info; return () if !$token_info;
my @user_roles = roles($cfg, $username, $path); my $user_roles = roles($cfg, $username, $path);
# return full user privileges # return full user privileges
return @user_roles if !$token_info->{privsep}; return $user_roles if !$token_info->{privsep};
} }
my $perm = {}; my $roles = {};
foreach my $p (sort keys %{$cfg->{acl}}) { foreach my $p (sort keys %{$cfg->{acl}}) {
my $final = ($path eq $p); my $final = ($path eq $p);
@ -1389,11 +1389,11 @@ sub roles {
if ($final || $propagate) { if ($final || $propagate) {
#print "APPLY ROLE $p $user $role\n"; #print "APPLY ROLE $p $user $role\n";
$new = {} if !$new; $new = {} if !$new;
$new->{$role} = 1; $new->{$role} = $propagate;
} }
} }
if ($new) { if ($new) {
$perm = $new; # overwrite previous settings $roles = $new; # overwrite previous settings
next; next;
} }
} }
@ -1405,11 +1405,11 @@ sub roles {
if ($final || $propagate) { if ($final || $propagate) {
#print "APPLY ROLE $p $user $role\n"; #print "APPLY ROLE $p $user $role\n";
$new = {} if !$new; $new = {} if !$new;
$new->{$role} = 1; $new->{$role} = $propagate;
} }
} }
if ($new) { if ($new) {
$perm = $new; # overwrite previous settings $roles = $new; # overwrite previous settings
next; # user privs always override group privs next; # user privs always override group privs
} }
} }
@ -1423,27 +1423,25 @@ sub roles {
if ($final || $propagate) { if ($final || $propagate) {
#print "APPLY ROLE $p \@$g $role\n"; #print "APPLY ROLE $p \@$g $role\n";
$new = {} if !$new; $new = {} if !$new;
$new->{$role} = 1; $new->{$role} = $propagate;
} }
} }
} }
} }
if ($new) { if ($new) {
$perm = $new; # overwrite previous settings $roles = $new; # overwrite previous settings
next; next;
} }
} }
return ('NoAccess') if defined ($perm->{NoAccess}); return { 'NoAccess' => $roles->{NoAccess} } if defined ($roles->{NoAccess});
#return () if defined ($perm->{NoAccess}); #return () if defined ($roles->{NoAccess});
#print "permission $user $path = " . Dumper ($perm); #print "permission $user $path = " . Dumper ($roles);
my @ra = keys %$perm;
#print "roles $user $path = " . join (',', @ra) . "\n"; #print "roles $user $path = " . join (',', @ra) . "\n";
return @ra; return $roles;
} }
sub remove_vm_access { sub remove_vm_access {

31
PVE/RPCEnvironment.pm
View File

@ -38,44 +38,44 @@ my $compile_acl_path = sub {
foreach my $pool (keys %{$cfg->{pools}}) { foreach my $pool (keys %{$cfg->{pools}}) {
my $d = $cfg->{pools}->{$pool}; my $d = $cfg->{pools}->{$pool};
my @ra = PVE::AccessControl::roles($cfg, $user, "/pool/$pool"); # pool roles my $pool_roles = PVE::AccessControl::roles($cfg, $user, "/pool/$pool"); # pool roles
next if !scalar(@ra); next if !scalar(keys %$pool_roles);
foreach my $vmid (keys %{$d->{vms}}) { foreach my $vmid (keys %{$d->{vms}}) {
for my $role (@ra) { for my $role (keys %$pool_roles) {
$data->{poolroles}->{"/vms/$vmid"}->{$role} = 1; $data->{poolroles}->{"/vms/$vmid"}->{$role} = 1;
} }
} }
foreach my $storeid (keys %{$d->{storage}}) { foreach my $storeid (keys %{$d->{storage}}) {
for my $role (@ra) { for my $role (keys %$pool_roles) {
$data->{poolroles}->{"/storage/$storeid"}->{$role} = 1; $data->{poolroles}->{"/storage/$storeid"}->{$role} = 1;
} }
} }
} }
} }
my @ra = PVE::AccessControl::roles($cfg, $user, $path); my $roles = PVE::AccessControl::roles($cfg, $user, $path);
# apply roles inherited from pools # apply roles inherited from pools
# Note: assume we do not want to propagate those privs # Note: assume we do not want to propagate those privs
if ($data->{poolroles}->{$path}) { if ($data->{poolroles}->{$path}) {
if (!($ra[0] && $ra[0] eq 'NoAccess')) { if (!defined($roles->{NoAccess})) {
if ($data->{poolroles}->{$path}->{NoAccess}) { if ($data->{poolroles}->{$path}->{NoAccess}) {
@ra = ('NoAccess'); $roles = { 'NoAccess' => 0 };
} else { } else {
foreach my $role (keys %{$data->{poolroles}->{$path}}) { foreach my $role (keys %{$data->{poolroles}->{$path}}) {
push @ra, $role; $roles->{$role} = 0 if !defined($roles->{$role});
} }
} }
} }
} }
$data->{roles}->{$path} = [ @ra ]; $data->{roles}->{$path} = $roles;
my $privs = {}; my $privs = {};
foreach my $role (@ra) { foreach my $role (keys %$roles) {
if (my $privset = $cfg->{roles}->{$role}) { if (my $privset = $cfg->{roles}->{$role}) {
foreach my $p (keys %$privset) { foreach my $p (keys %$privset) {
$privs->{$p} = 1; $privs->{$p} = $roles->{$role};
} }
} }
} }
@ -83,7 +83,7 @@ my $compile_acl_path = sub {
if ($username && $username ne 'root@pam') { if ($username && $username ne 'root@pam') {
# intersect user and token permissions # intersect user and token permissions
my $user_privs = $cache->{$username}->{privs}->{$path}; my $user_privs = $cache->{$username}->{privs}->{$path};
$privs = { map { $_ => 1 } grep { $user_privs->{$_} } keys %$privs }; $privs = { map { $_ => $user_privs->{$_} && $privs->{$_} } keys %$privs };
} }
$data->{privs}->{$path} = $privs; $data->{privs}->{$path} = $privs;
@ -96,13 +96,14 @@ sub permissions {
if ($user eq 'root@pam') { # root can do anything if ($user eq 'root@pam') { # root can do anything
my $cfg = $self->{user_cfg}; my $cfg = $self->{user_cfg};
return $cfg->{roles}->{'Administrator'}; return { map { $_ => 1 } keys %{$cfg->{roles}->{'Administrator'}} };
} }
if (PVE::AccessControl::pve_verify_tokenid($user, 1)) { if (PVE::AccessControl::pve_verify_tokenid($user, 1)) {
my ($username, $token) = PVE::AccessControl::split_tokenid($user); my ($username, $token) = PVE::AccessControl::split_tokenid($user);
my $cfg = $self->{user_cfg}; my $cfg = $self->{user_cfg};
my $token_info = $cfg->{users}->{$username}->{tokens}->{$token}; my $token_info = $cfg->{users}->{$username}->{tokens}->{$token};
return {} if !$token_info; return {} if !$token_info;
# ensure cache for user is populated # ensure cache for user is populated
@ -133,7 +134,7 @@ sub check {
foreach my $priv (@$privs) { foreach my $priv (@$privs) {
PVE::AccessControl::verify_privname($priv); PVE::AccessControl::verify_privname($priv);
if (!$perm->{$priv}) { if (!defined($perm->{$priv})) {
return undef if $noerr; return undef if $noerr;
raise_perm_exc("$path, $priv"); raise_perm_exc("$path, $priv");
} }
@ -150,7 +151,7 @@ sub check_any {
my $found = 0; my $found = 0;
foreach my $priv (@$privs) { foreach my $priv (@$privs) {
PVE::AccessControl::verify_privname($priv); PVE::AccessControl::verify_privname($priv);
if ($perm->{$priv}) { if (defined($perm->{$priv})) {
$found = 1; $found = 1;
last; last;
} }

5
test/perm-test1.pl
View File

@ -14,8 +14,8 @@ $rpcenv->init_request(userconfig => $cfgfn);
sub check_roles { sub check_roles {
my ($user, $path, $expected_result) = @_; my ($user, $path, $expected_result) = @_;
my @ra = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path); my $roles = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path);
my $res = join(',', sort @ra); my $res = join(',', sort keys %$roles);
die "unexpected result\nneed '${expected_result}'\ngot '$res'\n" die "unexpected result\nneed '${expected_result}'\ngot '$res'\n"
if $res ne $expected_result; if $res ne $expected_result;
@ -38,7 +38,6 @@ sub check_permission {
if $res ne $expected_result; if $res ne $expected_result;
print "PERM:$path:$user:$res\n"; print "PERM:$path:$user:$res\n";
} }
check_roles('max@pve', '/', ''); check_roles('max@pve', '/', '');

4
test/perm-test2.pl
View File

@ -14,8 +14,8 @@ $rpcenv->init_request(userconfig => $cfgfn);
sub check_roles { sub check_roles {
my ($user, $path, $expected_result) = @_; my ($user, $path, $expected_result) = @_;
my @ra = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path); my $roles = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path);
my $res = join(',', sort @ra); my $res = join(',', sort keys %$roles);
die "unexpected result\nneed '${expected_result}'\ngot '$res'\n" die "unexpected result\nneed '${expected_result}'\ngot '$res'\n"
if $res ne $expected_result; if $res ne $expected_result;

4
test/perm-test3.pl
View File

@ -14,8 +14,8 @@ $rpcenv->init_request(userconfig => $cfgfn);
sub check_roles { sub check_roles {
my ($user, $path, $expected_result) = @_; my ($user, $path, $expected_result) = @_;
my @ra = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path); my $roles = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path);
my $res = join(',', sort @ra); my $res = join(',', sort keys %$roles);
die "unexpected result\nneed '${expected_result}'\ngot '$res'\n" die "unexpected result\nneed '${expected_result}'\ngot '$res'\n"
if $res ne $expected_result; if $res ne $expected_result;

4
test/perm-test4.pl
View File

@ -14,8 +14,8 @@ $rpcenv->init_request(userconfig => $cfgfn);
sub check_roles { sub check_roles {
my ($user, $path, $expected_result) = @_; my ($user, $path, $expected_result) = @_;
my @ra = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path); my $roles = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path);
my $res = join(',', sort @ra); my $res = join(',', sort keys %$roles);
die "unexpected result\nneed '${expected_result}'\ngot '$res'\n" die "unexpected result\nneed '${expected_result}'\ngot '$res'\n"
if $res ne $expected_result; if $res ne $expected_result;

4
test/perm-test5.pl
View File

@ -14,8 +14,8 @@ $rpcenv->init_request(userconfig => $cfgfn);
sub check_roles { sub check_roles {
my ($user, $path, $expected_result) = @_; my ($user, $path, $expected_result) = @_;
my @ra = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path); my $roles = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path);
my $res = join(',', sort @ra); my $res = join(',', sort keys %$roles);
die "unexpected result\nneed '${expected_result}'\ngot '$res'\n" die "unexpected result\nneed '${expected_result}'\ngot '$res'\n"
if $res ne $expected_result; if $res ne $expected_result;

4
test/perm-test6.pl
View File

@ -14,8 +14,8 @@ $rpcenv->init_request(userconfig => $cfgfn);
sub check_roles { sub check_roles {
my ($user, $path, $expected_result) = @_; my ($user, $path, $expected_result) = @_;
my @ra = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path); my $roles = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path);
my $res = join(',', sort @ra); my $res = join(',', sort keys %$roles);
die "unexpected result\nneed '${expected_result}'\ngot '$res'\n" die "unexpected result\nneed '${expected_result}'\ngot '$res'\n"
if $res ne $expected_result; if $res ne $expected_result;

4
test/perm-test7.pl
View File

@ -14,8 +14,8 @@ $rpcenv->init_request(userconfig => $cfgfn);
sub check_roles { sub check_roles {
my ($user, $path, $expected_result) = @_; my ($user, $path, $expected_result) = @_;
my @ra = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path); my $roles = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path);
my $res = join(',', sort @ra); my $res = join(',', sort keys %$roles);
die "unexpected result\nneed '${expected_result}'\ngot '$res'\n" die "unexpected result\nneed '${expected_result}'\ngot '$res'\n"
if $res ne $expected_result; if $res ne $expected_result;