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

Do not leak SNMP community string into debug output (unless LEAK_COMMUNITY=1)

Browse Source
This commit is contained in:
Oliver Gorwits
2014-08-04 22:33:08 +01:00
parent f3a9296b6b
commit 06ba99e4e6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -12,6 +12,7 @@
* Add "AP" as a hint for WAP support * Add "AP" as a hint for WAP support
* Attempt to keep PID and logfile as netdisco user even when running as root * Attempt to keep PID and logfile as netdisco user even when running as root
* Show netdisco-do docs on options error * Show netdisco-do docs on options error
* Do not leak SNMP community string into debug output (unless SHOW_COMMUNITY=1)
[BUG FIXES] [BUG FIXES]

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

@@ -136,13 +136,15 @@ sub _snmp_connect_generic {
sub _try_connect { sub _try_connect {
my ($device, $class, $comm, $mode, $snmp_args) = @_; my ($device, $class, $comm, $mode, $snmp_args) = @_;
my %comm_args = _mk_info_commargs($comm); my %comm_args = _mk_info_commargs($comm);
my $debug_comm = ( $comm->{community}
? $ENV{SHOW_COMMUNITY} ? $comm->{community} : '<hidden>'
: "v3user:$comm->{user}" );
my $info = undef; my $info = undef;
try { try {
debug debug
sprintf '[%s] try_connect with ver: %s, class: %s, comm: %s', sprintf '[%s] try_connect with ver: %s, class: %s, comm: %s',
$snmp_args->{DestHost}, $snmp_args->{Version}, $class, $snmp_args->{DestHost}, $snmp_args->{Version}, $class, $debug_comm;
($comm->{community} || "v3user:$comm->{user}");
Module::Load::load $class; Module::Load::load $class;
$info = $class->new(%$snmp_args, %comm_args); $info = $class->new(%$snmp_args, %comm_args);
@@ -154,8 +156,7 @@ sub _try_connect {
$class = $info->device_type; $class = $info->device_type;
debug debug
sprintf '[%s] try_connect with ver: %s, new class: %s, comm: %s', sprintf '[%s] try_connect with ver: %s, new class: %s, comm: %s',
$snmp_args->{DestHost}, $snmp_args->{Version}, $class, $snmp_args->{DestHost}, $snmp_args->{Version}, $class, $debug_comm;
($comm->{community} || "v3user:$comm->{user}");
Module::Load::load $class; Module::Load::load $class;
$info = $class->new(%$snmp_args, %comm_args); $info = $class->new(%$snmp_args, %comm_args);