135/snmp-info
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore check that the MIB leaf is accessible when validating AUTOLOAD method calls

Browse Source 
Restore corresponding test
Move live snmp_connect_ip() test to 10_remote_snmplabs.t so that tests requiring Internet access are within one file
This commit is contained in:
Eric A. Miller
2018-04-11 21:09:57 -04:00
parent 75dcf74148
commit facdf0aafe
3 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/SNMP/Info.pm
View File

@@ -4625,7 +4625,8 @@ sub _validate_autoload_method {
# If we were given a fully qualified OID because we don't have the MIB # If we were given a fully qualified OID because we don't have the MIB
# file, it will translate above but we won't be able to check access so # file, it will translate above but we won't be able to check access so
# skip the check and return # skip the check and return
if ($access && $method =~ /^set/ && $access !~ /Write|Create/) { if ($access && ($method =~ /^set/ && $access !~ /Write|Create/)
|| ($method !~ /^set/ && $access eq 'NoAccess')) {
print print
"SNMP::Info::_validate_autoload_method($attr : $oid) Not accessable for requested operation.\n" "SNMP::Info::_validate_autoload_method($attr : $oid) Not accessable for requested operation.\n"

3
xt/10_remote_snmplabs.t
View File

@@ -29,6 +29,9 @@ ok((!defined $info->error()), 'No error on initial connection');
like($info->name(), qr/\w+/, 'name is "new system name"'); like($info->name(), qr/\w+/, 'name is "new system name"');
is($info->class(), 'SNMP::Info::Layer3::NetSNMP', 'class is Layer3::NetSNMP'); is($info->class(), 'SNMP::Info::Layer3::NetSNMP', 'class is Layer3::NetSNMP');
is($info->snmp_connect_ip('demo.snmplabs.com', 2, 'public'),
1, 'Connect to demo.snmplabs.com returns 1');
done_testing; done_testing;
sub _build_mibdirs { sub _build_mibdirs {

33
xt/lib/Test/SNMP/Info.pm
View File

@@ -1170,11 +1170,10 @@ sub load_all : Tests(6) {
2 => '1/3/1, 10/100 Ethernet TX', 2 => '1/3/1, 10/100 Ethernet TX',
3 => '1/3/2, 10/100 Ethernet TX' 3 => '1/3/2, 10/100 Ethernet TX'
}, },
'.1.3.6.1.2.1.2.2.1.3' => {1 => 24, 2 => 6, 3 => 6}, '.1.3.6.1.2.1.2.2.1.3' => {1 => 24, 2 => 6, 3 => 6},
'.1.3.6.1.2.1.2.2.1.4' => {1 => 1500, 2 => 1514, 3 => 1514}, '.1.3.6.1.2.1.2.2.1.4' => {1 => 1500, 2 => 1514, 3 => 1514},
'.1.3.6.1.2.1.2.2.1.5' => {1 => 0, 2 => 100000000, 3 => 1000000000,}, '.1.3.6.1.2.1.2.2.1.5' => {1 => 0, 2 => 100000000, 3 => 1000000000,},
'.1.3.6.1.2.1.31.1.1.1.1' => {1 => 'system', 2 => '1/3/1', 3 => '1/3/2'}, '.1.3.6.1.2.1.31.1.1.1.15' => {1 => 0, 2 => 100, 3 => 1000,},
'.1.3.6.1.2.1.31.1.1.1.15' => {1 => 0, 2 => 100, 3 => 1000,},
}; };
# Data is stored unmunged, OID's will be resolved and cache entries stored # Data is stored unmunged, OID's will be resolved and cache entries stored
@@ -1186,11 +1185,10 @@ sub load_all : Tests(6) {
2 => '1/3/1, 10/100 Ethernet TX', 2 => '1/3/1, 10/100 Ethernet TX',
3 => '1/3/2, 10/100 Ethernet TX' 3 => '1/3/2, 10/100 Ethernet TX'
}, },
'i_type' => {1 => 24, 2 => 6, 3 => 6}, 'i_type' => {1 => 24, 2 => 6, 3 => 6},
'i_mtu' => {1 => 1500, 2 => 1514, 3 => 1514}, 'i_mtu' => {1 => 1500, 2 => 1514, 3 => 1514},
'i_speed' => {1 => 0, 2 => 100000000, 3 => 1000000000,}, 'i_speed' => {1 => 0, 2 => 100000000, 3 => 1000000000,},
'i_name' => {1 => 'system', 2 => '1/3/1', 3 => '1/3/2'}, 'i_speed_high' => {1 => 0, 2 => 100, 3 => 1000,},
'i_speed_high' => {1 => 0, 2 => 100, 3 => 1000,},
# In base class defined as ifIndex # In base class defined as ifIndex
'interfaces' => {1 => 1, 2 => 2, 3 => 3,}, 'interfaces' => {1 => 1, 2 => 2, 3 => 3,},
@@ -1441,7 +1439,7 @@ sub private_show_attr : Tests(3) {
); );
} }
sub snmp_connect_ip : Tests(4) { sub snmp_connect_ip : Tests(3) {
my $test = shift; my $test = shift;
can_ok($test->{info}, 'snmp_connect_ip'); can_ok($test->{info}, 'snmp_connect_ip');
@@ -1451,8 +1449,7 @@ sub snmp_connect_ip : Tests(4) {
is($test->{info}->snmp_connect_ip('0.0.0.0', 2, 'public'), is($test->{info}->snmp_connect_ip('0.0.0.0', 2, 'public'),
undef, 'Connect to zeros returns undef'); undef, 'Connect to zeros returns undef');
is($test->{info}->snmp_connect_ip('demo.snmplabs.com', 2, 'public'), # Live call moved to 10_remote_snmplabs.t
1, 'Connect to demo.snmplabs.com returns 1');
} }
sub modify_port_list : Tests(4) { sub modify_port_list : Tests(4) {
@@ -1593,15 +1590,9 @@ sub private_validate_autoload_method : Tests(8) {
q(Func 'ifPromiscuousMode_raw' validates) q(Func 'ifPromiscuousMode_raw' validates)
); );
}; };
TODO: {
local $TODO
= "Check MIB access for non set methods in _validate_autoload_method"
if 1;
# Test that not-accessible leaf returns undef IF-MIB::ifStackHigherLayer is($test->{info}->_validate_autoload_method('ifStackHigherLayer'),
is($test->{info}->_validate_autoload_method('ifStackHigherLayer'), undef, q(MIB leaf 'ifStackHigherLayer' not-accessible, returns undef));
undef, q(MIB leaf 'ifStackHigherLayer' not-accessible, returns undef));
}
# Test that read-only leaf won't validate set_ # Test that read-only leaf won't validate set_
is($test->{info}->_validate_autoload_method('set_i_lastchange'), is($test->{info}->_validate_autoload_method('set_i_lastchange'),