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

check_acl call fixes

Browse Source
This commit is contained in:
Oliver Gorwits
2017-05-30 11:38:34 +01:00
parent e0d2517387
commit d007d72015
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/netdisco-rancid-export
View File

@@ -73,7 +73,7 @@ foreach my $d (@devices) {
my $old = $d->get_column( 'old' ); my $old = $d->get_column( 'old' );
my $devgroup = 'other'; my $devgroup = 'other';
foreach my $g (keys %$groups) { foreach my $g (keys %$groups) {
if (check_acl( $d, $groups->{$g} )) { if (check_acl_only( $d, $groups->{$g} )) {
$devgroup = $g; $devgroup = $g;
last; last;
} }

5
lib/App/Netdisco/Core/Discover.pm
View File

@@ -5,6 +5,7 @@ use Dancer::Plugin::DBIC 'schema';
use App::Netdisco::Util::Device use App::Netdisco::Util::Device
qw/get_device match_devicetype is_discoverable/; qw/get_device match_devicetype is_discoverable/;
use App::Netdisco::Util::Permission 'check_acl_only';
use App::Netdisco::Util::DNS ':all'; use App::Netdisco::Util::DNS ':all';
use App::Netdisco::JobQueue qw/jq_queued jq_insert/; use App::Netdisco::JobQueue qw/jq_queued jq_insert/;
use NetAddr::IP::Lite ':lower'; use NetAddr::IP::Lite ':lower';
@@ -76,8 +77,8 @@ sub set_canonical_ip {
foreach my $key (sort keys %$map) { foreach my $key (sort keys %$map) {
# lhs matches device, rhs matches device_ip # lhs matches device, rhs matches device_ip
if (check_acl($device, $key) if (check_acl_only($device, $key)
and check_acl($alias, $map->{$key})) { and check_acl_only($alias, $map->{$key})) {
if ($snmp->snmp_connect_ip( $alias->alias )) { if ($snmp->snmp_connect_ip( $alias->alias )) {
$new_ip = $alias->alias; $new_ip = $alias->alias;

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

@@ -8,7 +8,7 @@ use Net::DNS;
use AnyEvent::DNS; use AnyEvent::DNS;
use NetAddr::IP::Lite ':lower'; use NetAddr::IP::Lite ':lower';
use App::Netdisco::Util::Permission 'check_acl'; use App::Netdisco::Util::Permission 'check_acl_no';
use base 'Exporter'; use base 'Exporter';
our @EXPORT = (); our @EXPORT = ();
@@ -129,7 +129,7 @@ sub hostnames_resolve_async {
IP: foreach my $hash_ref (@$ips) { IP: foreach my $hash_ref (@$ips) {
my $ip = $hash_ref->{'ip'} || $hash_ref->{'alias'}; my $ip = $hash_ref->{'ip'} || $hash_ref->{'alias'};
next IP if check_acl($ip, $skip); next IP if check_acl_no($ip, $skip);
# check /etc/hosts file and short-circuit if found # check /etc/hosts file and short-circuit if found
foreach my $name (reverse sort keys %HOSTS) { foreach my $name (reverse sort keys %HOSTS) {

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

@@ -2,7 +2,7 @@ package App::Netdisco::Util::SNMP;
use Dancer qw/:syntax :script/; use Dancer qw/:syntax :script/;
use App::Netdisco::Util::Device 'get_device'; use App::Netdisco::Util::Device 'get_device';
use App::Netdisco::Util::Permission qw/check_acl_no check_acl/; use App::Netdisco::Util::Permission ':all';
use SNMP::Info; use SNMP::Info;
use Try::Tiny; use Try::Tiny;
@@ -300,7 +300,7 @@ sub _build_communities {
if not $stanza->{tag} if not $stanza->{tag}
and !exists $stanza->{community}; and !exists $stanza->{community};
if ($stanza->{$mode} and check_acl($device, $stanza->{only})) { if ($stanza->{$mode} and check_acl_only($device, $stanza->{only})) {
if ($device->in_storage and if ($device->in_storage and
$stored_tag and $stored_tag eq $stanza->{tag}) { $stored_tag and $stored_tag eq $stanza->{tag}) {
# last known-good by tag # last known-good by tag