X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=PVE%2FAccessControl.pm;h=ad97a426c6df7aa4627383d5e2a12b6d42ac7583;hb=9efcb5612917dc2d58d94972f4b8d7eadf462d73;hp=44f4a01ad241ee423e27c282c934563dfa567ac5;hpb=e149b1c6c9954c07672d63f23f696d5b1e6c11d4;p=pve-access-control.git

diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm
index 44f4a01..ad97a42 100644
--- a/PVE/AccessControl.pm
+++ b/PVE/AccessControl.pm
@@ -965,6 +965,8 @@ sub parse_user_config {
 	} elsif ($et eq 'acl') {
 	    my ($propagate, $pathtxt, $uglist, $rolelist) = @data;
 
+	    $propagate = $propagate ? 1 : 0;
+
 	    if (my $path = normalize_path($pathtxt)) {
 		foreach my $role (split_list($rolelist)) {
 
@@ -974,8 +976,9 @@ sub parse_user_config {
 		    }
 
 		    foreach my $ug (split_list($uglist)) {
-			if ($ug =~ m/^@(\S+)$/) {
-			    my $group = $1;
+			my ($group) = $ug =~ m/^@(\S+)$/;
+
+			if ($group && verify_groupname($group, 1)) {
 			    if ($cfg->{groups}->{$group}) { # group exists
 				$cfg->{acl}->{$path}->{groups}->{$group}->{$role} = $propagate;
 			    } else {
@@ -1048,7 +1051,7 @@ sub write_user_config {
 
     my $data = '';
 
-    foreach my $user (keys %{$cfg->{users}}) {
+    foreach my $user (sort keys %{$cfg->{users}}) {
 	my $d = $cfg->{users}->{$user};
 	my $firstname = $d->{firstname} ? PVE::Tools::encode_text($d->{firstname}) : '';
 	my $lastname = $d->{lastname} ? PVE::Tools::encode_text($d->{lastname}) : '';
@@ -1062,30 +1065,30 @@ sub write_user_config {
 
     $data .= "\n";
 
-    foreach my $group (keys %{$cfg->{groups}}) {
+    foreach my $group (sort keys %{$cfg->{groups}}) {
 	my $d = $cfg->{groups}->{$group};
-	my $list = join (',', keys %{$d->{users}});
+	my $list = join (',', sort keys %{$d->{users}});
 	my $comment = $d->{comment} ? PVE::Tools::encode_text($d->{comment}) : '';
 	$data .= "group:$group:$list:$comment:\n";
     }
 
     $data .= "\n";
 
-    foreach my $pool (keys %{$cfg->{pools}}) {
+    foreach my $pool (sort keys %{$cfg->{pools}}) {
 	my $d = $cfg->{pools}->{$pool};
-	my $vmlist = join (',', keys %{$d->{vms}});
-	my $storelist = join (',', keys %{$d->{storage}});
+	my $vmlist = join (',', sort keys %{$d->{vms}});
+	my $storelist = join (',', sort keys %{$d->{storage}});
 	my $comment = $d->{comment} ? PVE::Tools::encode_text($d->{comment}) : '';
 	$data .= "pool:$pool:$comment:$vmlist:$storelist:\n";
     }
 
     $data .= "\n";
 
-    foreach my $role (keys %{$cfg->{roles}}) {
+    foreach my $role (sort keys %{$cfg->{roles}}) {
 	next if $special_roles->{$role};
 
 	my $d = $cfg->{roles}->{$role};
-	my $list = join (',', keys %$d);
+	my $list = join (',', sort keys %$d);
 	$data .= "role:$role:$list:\n";
     }
 
@@ -1134,11 +1137,11 @@ sub write_user_config {
 	}
 
 	foreach my $rolelist (sort keys %{$ra->{0}}) {
-	    my $uglist = join (',', keys %{$ra->{0}->{$rolelist}});
+	    my $uglist = join (',', sort keys %{$ra->{0}->{$rolelist}});
 	    $data .= "acl:0:$path:$uglist:$rolelist:\n";
 	}
 	foreach my $rolelist (sort keys %{$ra->{1}}) {
-	    my $uglist = join (',', keys %{$ra->{1}->{$rolelist}});
+	    my $uglist = join (',', sort keys %{$ra->{1}->{$rolelist}});
 	    $data .= "acl:1:$path:$uglist:$rolelist:\n";
 	}
     }
@@ -1272,43 +1275,6 @@ sub roles {
     return @ra;
 }
 
-sub permission {
-    my ($cfg, $user, $path) = @_;
-
-    $user = PVE::Auth::Plugin::verify_username($user, 1);
-    return {} if !$user;
-
-    my @ra = roles($cfg, $user, $path);
-
-    my $privs = {};
-
-    foreach my $role (@ra) {
-	if (my $privset = $cfg->{roles}->{$role}) {
-	    foreach my $p (keys %$privset) {
-		$privs->{$p} = 1;
-	    }
-	}
-    }
-
-    #print "priviledges $user $path = " . Dumper ($privs);
-
-    return $privs;
-}
-
-sub check_permissions {
-    my ($username, $path, $privlist) = @_;
-
-    $path = normalize_path($path);
-    my $usercfg = cfs_read_file('user.cfg');
-    my $perm = permission($usercfg, $username, $path);
-
-    foreach my $priv (split_list($privlist)) {
-	return undef if !$perm->{$priv};
-    };
-
-    return 1;
-}
-
 sub remove_vm_access {
     my ($vmid) = @_;
     my $delVMaccessFn = sub {