135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix ACL content accepted by check_acl_*

Browse Source
This commit is contained in:
Oliver Gorwits
2017-06-22 12:23:19 +01:00
parent 728e23cdf7
commit b9e6e928af
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Changes
View File

@@ -1,3 +1,9 @@
2.036001 - 2017-06-22
[BUG FIXES]
* fix ACL content accepted by check_acl_*
2.036000 - 2017-06-22
[NEW FEATURES]

4
lib/App/Netdisco/Util/Permission.pm
View File

@@ -40,7 +40,7 @@ C<$setting_name> can contain.
sub check_acl_no {
my ($thing, $setting_name) = @_;
return 1 unless $thing and $setting_name;
return check_acl($thing, setting($setting_name));
return check_acl($thing, (setting($setting_name) || $setting_name));
}
=head2 check_acl_only( $ip | $instance, $setting_name )
@@ -58,7 +58,7 @@ sub check_acl_only {
my ($thing, $setting_name) = @_;
return 0 unless $thing and $setting_name;
# logic to make an empty config be equivalent to 'any' (i.e. a match)
my $config = setting($setting_name);
my $config = (setting($setting_name) || $setting_name);
return 1 if not $config # undef or empty string
or ((ref [] eq ref $config) and not scalar @$config);
return check_acl($thing, $config);