Changeset 2343

Timestamp:

04/09/20 18:01:14 (4 years ago)

Author:

nanardon

Message:

Ensure user object alias works in acl

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Acls/Acl.pm (modified) (2 diffs)
• t/21_acls.t (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Acls/Acl.pm

@@ -86 +86 @@
     # Foreach user, testing if this permission match:
     foreach my $u (@{ $self->{users} }) {
+        defined($u->{$perm}) or next;
         # Obj have attr eq login user
         if (substr($u->{user}, 0, 1) eq '$') { # check attr content
@@ -92 +93 @@
                 my $val = $obj->_get_c_field($attribute) or return;
                 my @vals = ref $val ? (@{ $val }) : ($val);
-                return $u->{$perm} if (defined($u->{$perm}) && grep { $_ eq $who } @vals);
+                foreach (@vals) {
+                    my $uobj = $obj->base->get_object('user', $_) or next;
+                    return $u->{$perm} if ($uobj->id eq $who);
+                }
             }
         # user is in group
         } elsif (substr($u->{user}, 0, 1) eq '%') { # group
             my $group = substr($u->{user}, 1);
-            return $u->{$perm} if (defined($u->{$perm}) && grep { $group eq $_ } grep { $_ } @{$groups ||[]});
+            return $u->{$perm} if (grep { $group eq $_ } grep { $_ } @{$groups ||[]});
         # any user
         } elsif ($u->{user} eq '*' || $u->{user} eq $who) {
             # TODO deference alias for SQL base
             # $obj->base->get_objects(...) ?
-            return $u->{$perm} if (defined($u->{$perm}));
+            return $u->{$perm};
         # any authenticated user
         } elsif (lc($u->{user}) eq '@authenticated' && $who) {
-            return $u->{$perm} if (defined($u->{$perm}));
+            return $u->{$perm};
         # not login
         } elsif (lc($u->{user}) eq '@anonymous' && $who eq "") {
-            return $u->{$perm} if (defined($u->{$perm}));
+            return $u->{$perm};
         }
     }

trunk/LATMOS-Accounts/t/21_acls.t

@@ -54 +54 @@
 }
 
+sub base { return $_[0] }
+
+sub get_object { return $_[0] }
+
 sub type {
     $_[0]->{type}