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

Fix table methods when defined as an OID which will not completely translate to a fully qualified textual leaf

Browse Source
This commit is contained in:
Eric A. Miller
2018-04-22 00:30:31 -04:00
parent bd85ebc8d6
commit 603345205a
3 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Changes
View File

@@ -1,3 +1,10 @@
Version 3.56 (2018-04-22)
[BUG FIXES]
* Fix table methods when defined as an OID which will not completely
translate to a fully qualified textual leaf
Version 3.55 (2018-04-19) Version 3.55 (2018-04-19)
[NEW FEATURES] [NEW FEATURES]

12
lib/SNMP/Info.pm
View File

@@ -4285,7 +4285,10 @@ sub _load_attr {
# the match to make sure we didn't leave the table during getnext # the match to make sure we didn't leave the table during getnext
# requests # requests
my ($leaf) = $qual_leaf =~ /::(\w+)$/; my ($leaf) = $qual_leaf =~ /::(.+)$/;
# If we weren't able to translate, we'll only have an OID
$leaf = $oid unless defined $leaf;
$self->debug() $self->debug()
and print "SNMP::Info::_load_attr $method : $qual_leaf", and print "SNMP::Info::_load_attr $method : $qual_leaf",
@@ -4656,7 +4659,12 @@ sub _validate_autoload_method {
} }
# Validate that we have proper access for the operation # Validate that we have proper access for the operation
my $access = $SNMP::MIB{$oid}{'access'} || ''; my $access = '';
# Prevent autovivification by checking that MIB leaf exists
if (exists $SNMP::MIB{$oid}) {
$access = $SNMP::MIB{$oid}{'access'} || '';
}
# 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

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

@@ -1271,7 +1271,7 @@ sub my_all : Tests(9) {
'... call to all() returns test data, no call to load_all()'); '... call to all() returns test data, no call to load_all()');
} }
sub private_load_attr : Tests(16) { sub private_load_attr : Tests(18) {
my $test = shift; my $test = shift;
can_ok($test->{info}, '_load_attr'); can_ok($test->{info}, '_load_attr');
@@ -1299,6 +1299,10 @@ sub private_load_attr : Tests(16) {
'IF-MIB::ifCounterDiscontinuityTime' => {0 => 'NOSUCHINSTANCE'}, 'IF-MIB::ifCounterDiscontinuityTime' => {0 => 'NOSUCHINSTANCE'},
'IF-MIB::ifHCOutOctets' => 'IF-MIB::ifHCOutOctets' =>
{1 => 0, 2 => 1828306359704, 3 => 1002545943585, 4 => 'ENDOFMIBVIEW'}, {1 => 0, 2 => 1828306359704, 3 => 1002545943585, 4 => 'ENDOFMIBVIEW'},
# Tables to test partial and full OIDs
'.1.3.6.1.4.1.171.12.1.1.12' => {1 => 'partial', 2 => 'oid', 3 => 'data'},
'.100.3.6.1.4.1.171.12.1.1.12' => {2 => 'full', 3 => 'oid', 4 => 'leaf'},
}; };
# Load cache with data to for initial tests # Load cache with data to for initial tests
@@ -1414,6 +1418,23 @@ sub private_load_attr : Tests(16) {
cmp_deeply($test->{info}->cache(), cmp_deeply($test->{info}->cache(),
$expected_cache, 'Cache contains expected data'); $expected_cache, 'Cache contains expected data');
# Test OID based table fetches
# This is from Layer3::DLink will only partially resolve
$test->{info}{funcs}{partial_oid} = '.1.3.6.1.4.1.171.12.1.1.12';
my $expected_p_oid_data = {1 => 'partial', 2 => 'oid', 3 => 'data'};
cmp_deeply($test->{info}->partial_oid(),
$expected_p_oid_data, 'Partial translated OID leaf returns expected data');
# This is a bogus OID will not translate at all
$test->{info}{funcs}{full_oid} = '.100.3.6.1.4.1.171.12.1.1.12';
my $expected_f_oid_data = {2 => 'full', 3 => 'oid', 4 => 'leaf'};
cmp_deeply($test->{info}->full_oid(),
$expected_f_oid_data, 'Full OID leaf returns expected data');
} }
sub private_show_attr : Tests(3) { sub private_show_attr : Tests(3) {