Squashed commit of the following: commit3fe8f383a7Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 11 17:07:42 2019 +0000 add debug lines and tested commit3249739e42Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 11 16:54:11 2019 +0000 change config name to get_credentials commite78558397aAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 11 16:51:11 2019 +0000 separate out generic device auth to DeviceAuth module commit249f05165fAuthor: Oliver Gorwits <oliver@cpan.org> Date: Wed Mar 6 18:43:31 2019 +0000 release 2.040007 commite3af64df77Author: Oliver Gorwits <oliver@cpan.org> Date: Wed Mar 6 18:42:47 2019 +0000 #521-redux fix wifi date search commit48857ae300Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 4 12:03:31 2019 +0000 release 2.040006 commite09dab5362Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 4 11:39:12 2019 +0000 #527 update List::MoreUtils version requirement commit6e7de3fff3Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 4 09:59:41 2019 +0000 release 2.040005 commit0c98318a45Author: Oliver Gorwits <oliver@spike.local> Date: Mon Mar 4 09:57:18 2019 +0000 #526 fix discover syntax bug commite9efc45182Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 14:56:48 2019 +0000 release 2.040004 commit6cdfd80d10Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 14:34:00 2019 +0000 allow undiscovered neighbors report to use discover_{waps,phones} setting commitac381e0802Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 14:13:20 2019 +0000 #506 was a red herring commitb83e614c85Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 13:00:36 2019 +0000 make discover_{phones,waps} work with LLDP capabilities as well commit189d234b55Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 12:47:38 2019 +0000 check discover_no_type and friends earlier on in neighbors list build commit9c956466f3Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 12:32:07 2019 +0000 also update default config for new discover_phones and discover_waps settings commit09d29954d2Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 12:26:50 2019 +0000 #512 fix regression in phone/wap discovery exclusion commit2bae91f1b6Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 12:01:34 2019 +0000 rename match_devicetype() to match_to_setting() commit57cb6ddb70Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 09:19:39 2019 +0000 fix for over-eager fix to #506 commitef560fb59aAuthor: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 22:41:40 2019 +0000 #506 relax device renumber so it works for an alias commit7a8bcb094eAuthor: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 22:23:39 2019 +0000 #521 Search Node Date Range not working commita643820a62Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 21:54:27 2019 +0000 #428 Port-Channels not showing in netmap commit5ba5bcd295Merge:e7aacddba1f95028Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 20:04:11 2019 +0000 Merge branch 'master' of github.com:netdisco/netdisco commite7aacddbc6Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 20:01:05 2019 +0000 #498 Map with VLAN filter omits unconnected devices commita1f95028caAuthor: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat Mar 2 19:54:22 2019 +0100 catch up with changes noticed that rc-sshcollector-core received updates to changes, add them here as well. didn't mention #499 & #522 commitce1b847ceaAuthor: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 18:47:44 2019 +0000 fix bug showing no nodes when only one matches in netmap commit78e30a7926Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 16:28:15 2019 +0000 #500 filtering in device/ports on native vlan duplicates entries commit9952f0c6c7Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 15:02:12 2019 +0000 #499 netdisco-do renumber reports wrong ip (inphobia) commitca3fd8f466Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 15:00:18 2019 +0000 #505 device renumber should update device port properties and device skips commit1265bc8470Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 14:52:21 2019 +0000 #520 catch slave ports defined without a master commitd4c7579c10Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 14:47:49 2019 +0000 #522 TypeAhead.pm can reference empty data (inphobia) commit77decc23b7Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 14:45:37 2019 +0000 #514 inconsistent results in ip inventory (inphobia) commit3f211650b8Author: nick n <39005454+inphobia@users.noreply.github.com> Date: Fri Mar 1 12:34:42 2019 +0100 last pieces for db schema upgrade last piece of #510
169 lines
5.5 KiB
Perl
169 lines
5.5 KiB
Perl
package App::Netdisco::Web::Plugin::Report::IpInventory;
|
|
|
|
use Dancer ':syntax';
|
|
use Dancer::Plugin::DBIC;
|
|
use Dancer::Plugin::Auth::Extensible;
|
|
|
|
use App::Netdisco::Web::Plugin;
|
|
use NetAddr::IP::Lite ':lower';
|
|
|
|
register_report(
|
|
{ category => 'IP',
|
|
tag => 'ipinventory',
|
|
label => 'IP Inventory',
|
|
provides_csv => 1,
|
|
}
|
|
);
|
|
|
|
get '/ajax/content/report/ipinventory' => require_login sub {
|
|
|
|
# Default to something simple with no results to prevent
|
|
# "Search failed!" error
|
|
(my $subnet = (param('subnet') || '0.0.0.0/32')) =~ s/\s//g;
|
|
$subnet = NetAddr::IP::Lite->new($subnet);
|
|
$subnet = NetAddr::IP::Lite->new('0.0.0.0/32')
|
|
if (! $subnet) or ($subnet->addr eq '0.0.0.0');
|
|
|
|
my $agenot = param('age_invert') || '0';
|
|
my ( $start, $end ) = param('daterange') =~ /(\d+-\d+-\d+)/gmx;
|
|
|
|
my $limit = param('limit') || 256;
|
|
my $never = param('never') || '0';
|
|
my $order = [{-desc => 'age'}, {-asc => 'ip'}];
|
|
|
|
# We need a reasonable limit to prevent a potential DoS, especially if
|
|
# 'never' is true. TODO: Need better input validation, both JS and
|
|
# server-side to provide user feedback
|
|
$limit = 8192 if $limit > 8192;
|
|
|
|
my $rs1 = schema('netdisco')->resultset('DeviceIp')->search(
|
|
undef,
|
|
{ join => 'device',
|
|
select => [
|
|
'alias AS ip',
|
|
\'NULL::macaddr as mac',
|
|
'creation AS time_first',
|
|
'device.last_discover AS time_last',
|
|
'dns',
|
|
\'true AS active',
|
|
\'false AS node',
|
|
\qq/replace( date_trunc( 'minute', age( now(), device.last_discover ) ) ::text, 'mon', 'month') AS age/
|
|
],
|
|
as => [qw( ip mac time_first time_last dns active node age)],
|
|
}
|
|
)->hri;
|
|
|
|
my $rs2 = schema('netdisco')->resultset('NodeIp')->search(
|
|
undef,
|
|
{ columns => [qw( ip mac time_first time_last dns active)],
|
|
'+select' => [ \'true AS node',
|
|
\qq/replace( date_trunc( 'minute', age( now(), time_last ) ) ::text, 'mon', 'month') AS age/
|
|
],
|
|
'+as' => [ 'node', 'age' ],
|
|
}
|
|
)->hri;
|
|
|
|
my $rs3 = schema('netdisco')->resultset('NodeNbt')->search(
|
|
undef,
|
|
{ columns => [qw( ip mac time_first time_last )],
|
|
'+select' => [
|
|
'nbname AS dns', 'active',
|
|
\'true AS node',
|
|
\qq/replace( date_trunc( 'minute', age( now(), time_last ) ) ::text, 'mon', 'month') AS age/
|
|
],
|
|
'+as' => [ 'dns', 'active', 'node', 'age' ],
|
|
}
|
|
)->hri;
|
|
|
|
my $rs_union = $rs1->union( [ $rs2, $rs3 ] );
|
|
|
|
if ( $never ) {
|
|
$subnet = NetAddr::IP::Lite->new('0.0.0.0/32') if ($subnet->bits ne 32);
|
|
|
|
my $rs4 = schema('netdisco')->resultset('Virtual::CidrIps')->search(
|
|
undef,
|
|
{ bind => [ $subnet->cidr ],
|
|
columns => [qw( ip mac time_first time_last dns active)],
|
|
'+select' => [ \'false AS node',
|
|
\qq/replace( date_trunc( 'minute', age( now(), time_last ) ) ::text, 'mon', 'month') AS age/
|
|
],
|
|
'+as' => [ 'node', 'age' ],
|
|
}
|
|
)->hri;
|
|
|
|
$rs_union = $rs_union->union( [$rs4] );
|
|
}
|
|
|
|
my $rs_sub = $rs_union->search(
|
|
{ ip => { '<<' => $subnet->cidr } },
|
|
{ select => [
|
|
\'DISTINCT ON (ip) ip',
|
|
'mac',
|
|
'dns',
|
|
\qq/date_trunc('second', time_last) AS time_last/,
|
|
\qq/date_trunc('second', time_first) AS time_first/,
|
|
'active',
|
|
'node',
|
|
'age'
|
|
],
|
|
as => [
|
|
'ip', 'mac', 'dns', 'time_last', 'time_first',
|
|
'active', 'node', 'age'
|
|
],
|
|
order_by => [{-asc => 'ip'}, {-desc => 'active'}, {-asc => 'node'}],
|
|
}
|
|
)->as_query;
|
|
|
|
my $rs;
|
|
if ( $start and $end ) {
|
|
$start = $start . ' 00:00:00';
|
|
$end = $end . ' 23:59:59';
|
|
|
|
if ( $agenot ) {
|
|
$rs = $rs_union->search(
|
|
{ -or => [
|
|
time_first => [ undef ],
|
|
time_last => [ { '<', $start }, { '>', $end } ]
|
|
]
|
|
},
|
|
{ from => { me => $rs_sub }, }
|
|
);
|
|
}
|
|
else {
|
|
$rs = $rs_union->search(
|
|
{ -or => [
|
|
-and => [
|
|
time_first => undef,
|
|
time_last => undef,
|
|
],
|
|
-and => [
|
|
time_last => { '>=', $start },
|
|
time_last => { '<=', $end },
|
|
],
|
|
],
|
|
},
|
|
{ from => { me => $rs_sub }, }
|
|
);
|
|
}
|
|
}
|
|
else {
|
|
$rs = $rs_union->search( undef, { from => { me => $rs_sub }, } );
|
|
}
|
|
|
|
my @results = $rs->order_by($order)->limit($limit)->all;
|
|
return unless scalar @results;
|
|
|
|
if ( request->is_ajax ) {
|
|
my $json = to_json( \@results );
|
|
template 'ajax/report/ipinventory.tt', { results => $json },
|
|
{ layout => undef };
|
|
}
|
|
else {
|
|
header( 'Content-Type' => 'text/comma-separated-values' );
|
|
template 'ajax/report/ipinventory_csv.tt', { results => \@results, },
|
|
{ layout => undef };
|
|
}
|
|
};
|
|
|
|
1;
|