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

diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm
index 44f4a01..1ba1596 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";
 	}
     }