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

allow check_acl to accept Device or NetAddr::IP instance

Browse Source
This commit is contained in:
Oliver Gorwits
2017-05-06 14:19:19 +01:00
parent c31059bc01
commit 7673f3ee1e
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,17 +70,15 @@ regualr expressions (which you can achieve with nonmatching lookahead).
To match any device, use "C<any>". To match no devices we suggest using To match any device, use "C<any>". To match no devices we suggest using
"C<broadcast>" in the list. "C<broadcast>" in the list.
Device property regular expressions are anchored (that is, they must match the
whole string). Device name regexp are not anchored.
Default operation is to return true if I<any> of the items matches. To enforce
requirement that I<all> items match, include "C<op:and>" anywhere in the list.
=cut =cut
sub check_acl { sub check_acl {
my ($thing, $config) = @_; my ($thing, $config) = @_;
my $real_ip = (blessed $thing ? $thing->ip : $thing); my $real_ip = (
(blessed $thing and $thing->can('ip')) ? $thing->ip : (
(blessed $thing and $thing->can('addr')) ? $thing->addr : $thing ));
return 0 if blessed $real_ip; # class we do not understand
my $addr = NetAddr::IP::Lite->new($real_ip); my $addr = NetAddr::IP::Lite->new($real_ip);
my $name = hostname_from_ip($addr->addr) || '!!NO_HOSTNAME!!'; my $name = hostname_from_ip($addr->addr) || '!!NO_HOSTNAME!!';
my $all = (scalar grep {m/^op:and$/} @$config); my $all = (scalar grep {m/^op:and$/} @$config);