From 9a92e7e2a243b485b3ef6172ca29ef3d378a73d5 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Sun, 16 Jun 2019 05:27:14 +0200 Subject: [PATCH 01/62] yaml whitespace matters so at least mention that as well as how to include it in tickets. --- .github/issue_template.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/issue_template.md b/.github/issue_template.md index 869ecf2d..386b0639 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -8,6 +8,11 @@ + + + + + ## Expected Behavior From a61159deb9a383ad4626d5c6dca95c5c33498d4b Mon Sep 17 00:00:00 2001 From: Christian Ramseyer Date: Tue, 18 Jun 2019 13:39:19 +0200 Subject: [PATCH 02/62] Fix device_auth formatting in POD --- lib/App/Netdisco/SSHCollector/Platform/ASA.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/App/Netdisco/SSHCollector/Platform/ASA.pm b/lib/App/Netdisco/SSHCollector/Platform/ASA.pm index 91bc3348..b12af4b2 100644 --- a/lib/App/Netdisco/SSHCollector/Platform/ASA.pm +++ b/lib/App/Netdisco/SSHCollector/Platform/ASA.pm @@ -16,14 +16,14 @@ C status after login: To use an C password separate from the login password, add an C under C tag in your configuration file: -device_auth: - - tag: sshasa - driver: cli - platform: ASA - only: '192.0.2.1' - username: oliver - password: letmein - enable_password: myenablepass + device_auth: + - tag: sshasa + driver: cli + platform: ASA + only: '192.0.2.1' + username: oliver + password: letmein + enable_password: myenablepass =cut From b58a62f300e17df0c34b47b983e70c744993c6e1 Mon Sep 17 00:00:00 2001 From: Christian Ramseyer Date: Tue, 18 Jun 2019 13:42:23 +0200 Subject: [PATCH 03/62] Properly escape angle brackets in C<> --- lib/App/Netdisco/SSHCollector/Platform/ASA.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco/SSHCollector/Platform/ASA.pm b/lib/App/Netdisco/SSHCollector/Platform/ASA.pm index b12af4b2..70952708 100644 --- a/lib/App/Netdisco/SSHCollector/Platform/ASA.pm +++ b/lib/App/Netdisco/SSHCollector/Platform/ASA.pm @@ -43,7 +43,7 @@ use Moo; Retrieve ARP and neighbor entries from device. C<$host> is the hostname or IP address of the device. C<$ssh> is a Net::OpenSSH connection to the device. -Returns a list of hashrefs in the format C<{ mac => MACADDR, ip => IPADDR }>. +Returns a list of hashrefs in the format C<{ mac =E MACADDR, ip =E IPADDR }>. =back From 441499f06352010d29f6413e6ec0f915b45dd337 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Tue, 18 Jun 2019 15:39:47 +0200 Subject: [PATCH 04/62] fix pod formatting as seen in b58a62f --- lib/App/Netdisco/SSHCollector/Platform/ACE.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco/SSHCollector/Platform/ACE.pm b/lib/App/Netdisco/SSHCollector/Platform/ACE.pm index e905e479..a3bb5ed6 100644 --- a/lib/App/Netdisco/SSHCollector/Platform/ACE.pm +++ b/lib/App/Netdisco/SSHCollector/Platform/ACE.pm @@ -36,7 +36,7 @@ use Moo; Retrieve ARP entries from device. C<$host> is the hostname or IP address of the device. C<$ssh> is a Net::OpenSSH connection to the device. -Returns a list of hashrefs in the format C<{ mac => MACADDR, ip => IPADDR }>. +Returns a list of hashrefs in the format C<{ mac =E MACADDR, ip =E IPADDR }>. =back From 469a9ce554825fbcefd84aa9be0b6f56666314b7 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Tue, 18 Jun 2019 15:41:10 +0200 Subject: [PATCH 05/62] fix pod formatting as seen in b58a62f --- lib/App/Netdisco/SSHCollector/Platform/BigIP.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco/SSHCollector/Platform/BigIP.pm b/lib/App/Netdisco/SSHCollector/Platform/BigIP.pm index df10ff6c..17a115d1 100644 --- a/lib/App/Netdisco/SSHCollector/Platform/BigIP.pm +++ b/lib/App/Netdisco/SSHCollector/Platform/BigIP.pm @@ -34,7 +34,7 @@ use Moo; Retrieve ARP entries from device. C<$host> is the hostname or IP address of the device. C<$ssh> is a Net::OpenSSH connection to the device. -Returns a list of hashrefs in the format C<{ mac => MACADDR, ip => IPADDR }>. +Returns a list of hashrefs in the format C<{ mac =E MACADDR, ip =E IPADDR }>. =back From ad8404739867dd572306e01893039d23deffa016 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Tue, 18 Jun 2019 15:44:02 +0200 Subject: [PATCH 06/62] fix pod as in a61159d --- lib/App/Netdisco/SSHCollector/Platform/CPVSX.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/App/Netdisco/SSHCollector/Platform/CPVSX.pm b/lib/App/Netdisco/SSHCollector/Platform/CPVSX.pm index 74292a95..2307cdb7 100644 --- a/lib/App/Netdisco/SSHCollector/Platform/CPVSX.pm +++ b/lib/App/Netdisco/SSHCollector/Platform/CPVSX.pm @@ -12,14 +12,14 @@ This collector uses "C" as the command for the arp utility on your system. Clish "C" does not work correctly in versions prior to R77.30. Config example: -device_auth: - - tag: sshcpvsx - driver: cli - platform: CPVSX - only: '192.0.2.1' - username: oliver - password: letmein - expert_password: letmein2 + device_auth: + - tag: sshcpvsx + driver: cli + platform: CPVSX + only: '192.0.2.1' + username: oliver + password: letmein + expert_password: letmein2 =cut From 8e0e27c1499c43ce939e3116a17744e661570d20 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Tue, 18 Jun 2019 15:45:51 +0200 Subject: [PATCH 07/62] fix pod formatting as seen in b58a62f & a61159d --- .../Netdisco/SSHCollector/Platform/FreeBSD.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/App/Netdisco/SSHCollector/Platform/FreeBSD.pm b/lib/App/Netdisco/SSHCollector/Platform/FreeBSD.pm index 061c9225..1e80ed8f 100644 --- a/lib/App/Netdisco/SSHCollector/Platform/FreeBSD.pm +++ b/lib/App/Netdisco/SSHCollector/Platform/FreeBSD.pm @@ -12,14 +12,14 @@ This collector uses "C" as the command for the arp utility on your system. If you wish to specify an absolute path, then add an C item to your configuration: -device_auth: - - tag: sshfreebsd - driver: cli - platform: FreeBSD - only: '192.0.2.1' - username: oliver - password: letmein - arp_command: '/usr/sbin/arp' + device_auth: + - tag: sshfreebsd + driver: cli + platform: FreeBSD + only: '192.0.2.1' + username: oliver + password: letmein + arp_command: '/usr/sbin/arp' =cut @@ -39,7 +39,7 @@ use Moo; Retrieve ARP entries from device. C<$host> is the hostname or IP address of the device. C<$ssh> is a Net::OpenSSH connection to the device. -Returns a list of hashrefs in the format C<{ mac => MACADDR, ip => IPADDR }>. +Returns a list of hashrefs in the format C<{ mac =E MACADDR, ip =E IPADDR }>. =back From 9006d83989392e9e288af54b394ce2a5e45bb8e8 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Tue, 18 Jun 2019 15:53:30 +0200 Subject: [PATCH 08/62] fix pod formatting and typos as seen in b58a62f & a61159d --- .../SSHCollector/Platform/GAIAEmbedded.pm | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/App/Netdisco/SSHCollector/Platform/GAIAEmbedded.pm b/lib/App/Netdisco/SSHCollector/Platform/GAIAEmbedded.pm index c4e3d775..d20df0ad 100644 --- a/lib/App/Netdisco/SSHCollector/Platform/GAIAEmbedded.pm +++ b/lib/App/Netdisco/SSHCollector/Platform/GAIAEmbedded.pm @@ -7,21 +7,21 @@ App::Netdisco::SSHCollector::Platform::GAIAEmbedded =head1 DESCRIPTION Collect ARP entries from Checkpoint GAIA embedded Systems -To get this Plugin to work you have to add an User like 'netdisco' with -'Network admin' right in the GAIA embedded OS +To get this Plugin to work you have to add a user like 'netdisco' with +'Network admin' rights in the GAIA embedded OS. This collector uses "C" as the command for the arp utility on your -system. If you wish to specify an absolute path, then add an C +system. If you wish to specify an absolute path, then add an C item to your configuration: -device_auth: - - tag: sshgaia - driver: cli - platform: GAIAEmbedded - only: '192.0.2.1' - username: oliver - password: letmein - arp_command: 'arp' + device_auth: + - tag: sshgaia + driver: cli + platform: GAIAEmbedded + only: '192.0.2.1' + username: oliver + password: letmein + arp_command: 'arp' =cut @@ -41,7 +41,7 @@ use Moo; Retrieve ARP entries from device. C<$host> is the hostname or IP address of the device. C<$ssh> is a Net::OpenSSH connection to the device. -Returns a list of hashrefs in the format C<{ mac => MACADDR, ip => IPADDR }>. +Returns a list of hashrefs in the format C<{ mac =E MACADDR, ip =E IPADDR }>. =back From 26ab5da1c10244f538072dee9c0109eaa8b0502b Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Tue, 18 Jun 2019 15:56:18 +0200 Subject: [PATCH 09/62] fix pod as in b58a62 --- lib/App/Netdisco/SSHCollector/Platform/IOS.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco/SSHCollector/Platform/IOS.pm b/lib/App/Netdisco/SSHCollector/Platform/IOS.pm index 64c3be76..d68d912a 100644 --- a/lib/App/Netdisco/SSHCollector/Platform/IOS.pm +++ b/lib/App/Netdisco/SSHCollector/Platform/IOS.pm @@ -27,7 +27,7 @@ use Moo; Retrieve ARP entries from device. C<$host> is the hostname or IP address of the device. C<$ssh> is a Net::OpenSSH connection to the device. -Returns a list of hashrefs in the format C<{ mac => MACADDR, ip => IPADDR }>. +Returns a list of hashrefs in the format C<{ mac =E MACADDR, ip =E IPADDR }>. =back From da5cdeb6026a488f7526e7e00374ad84fedffe02 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Tue, 18 Jun 2019 15:57:17 +0200 Subject: [PATCH 10/62] fix pod as in b58a62 --- lib/App/Netdisco/SSHCollector/Platform/IOSXR.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco/SSHCollector/Platform/IOSXR.pm b/lib/App/Netdisco/SSHCollector/Platform/IOSXR.pm index a3b1210c..3bf91470 100644 --- a/lib/App/Netdisco/SSHCollector/Platform/IOSXR.pm +++ b/lib/App/Netdisco/SSHCollector/Platform/IOSXR.pm @@ -27,7 +27,7 @@ use Moo; Retrieve ARP entries from device. C<$host> is the hostname or IP address of the device. C<$ssh> is a Net::OpenSSH connection to the device. -Returns a list of hashrefs in the format C<{ mac => MACADDR, ip => IPADDR }>. +Returns a list of hashrefs in the format C<{ mac =E MACADDR, ip =E IPADDR }>. =back From 1460d8864be5a23cd76ca229cc764bedb0d4a425 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Tue, 18 Jun 2019 15:58:20 +0200 Subject: [PATCH 11/62] fix pod as seen in b58a62f & a61159d --- .../Netdisco/SSHCollector/Platform/Linux.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/App/Netdisco/SSHCollector/Platform/Linux.pm b/lib/App/Netdisco/SSHCollector/Platform/Linux.pm index b0449267..46d22e12 100644 --- a/lib/App/Netdisco/SSHCollector/Platform/Linux.pm +++ b/lib/App/Netdisco/SSHCollector/Platform/Linux.pm @@ -12,14 +12,14 @@ This collector uses "C" as the command for the arp utility on your system. If you wish to specify an absolute path, then add an C item to your configuration: -device_auth: - - tag: sshlinux - driver: cli - platform: Linux - only: '192.0.2.1' - username: oliver - password: letmein - arp_command: '/usr/sbin/arp' + device_auth: + - tag: sshlinux + driver: cli + platform: Linux + only: '192.0.2.1' + username: oliver + password: letmein + arp_command: '/usr/sbin/arp' =cut @@ -39,7 +39,7 @@ use Moo; Retrieve ARP entries from device. C<$host> is the hostname or IP address of the device. C<$ssh> is a Net::OpenSSH connection to the device. -Returns a list of hashrefs in the format C<{ mac => MACADDR, ip => IPADDR }>. +Returns a list of hashrefs in the format C<{ mac =E MACADDR, ip =E IPADDR }>. =back From 6f8dfabc87f14b65bfd8f87aff85b07f8f8cea11 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Tue, 25 Jun 2019 03:42:18 +0200 Subject: [PATCH 12/62] a few more files to ignore (#609) --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index ecc05a24..bb308a4b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,7 @@ _build blib !.docker/hooks/* .idea +node_modules/* +yarn.lock +package.json +.stylelintrc From ceeccf8901c552d5daeabb2f25c4ce548cd38025 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sun, 30 Jun 2019 16:34:03 +0100 Subject: [PATCH 13/62] #610 better MAC addr input sanity checking --- lib/App/Netdisco/Web/Plugin/Search/Node.pm | 9 +++++++-- lib/App/Netdisco/Web/Search.pm | 7 ++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/App/Netdisco/Web/Plugin/Search/Node.pm b/lib/App/Netdisco/Web/Plugin/Search/Node.pm index 6b74c86d..54f08cf3 100644 --- a/lib/App/Netdisco/Web/Plugin/Search/Node.pm +++ b/lib/App/Netdisco/Web/Plugin/Search/Node.pm @@ -6,6 +6,7 @@ use Dancer::Plugin::DBIC; use Dancer::Plugin::Auth::Extensible; use NetAddr::IP::Lite ':lower'; +use Regexp::Common 'net'; use NetAddr::MAC (); use App::Netdisco::Web::Plugin; @@ -23,10 +24,14 @@ ajax '/ajax/content/search/node' => require_login sub { my ( $start, $end ) = param('daterange') =~ m/(\d+-\d+-\d+)/gmx; my $mac = NetAddr::MAC->new(mac => $node); - undef $mac if ($mac and $mac->as_ieee and ($mac->as_ieee eq '00:00:00:00')); - my @active = (param('archived') ? () : (-bool => 'active')); + undef $mac if + ($mac and $mac->as_ieee + and (($mac->as_ieee eq '00:00:00:00') + or ($mac->as_ieee !~ m/$RE{net}{MAC}/))); + my @active = (param('archived') ? () : (-bool => 'active')); my (@times, @wifitimes, @porttimes); + if ( $start and $end ) { $start = $start . ' 00:00:00'; $end = $end . ' 23:59:59'; diff --git a/lib/App/Netdisco/Web/Search.pm b/lib/App/Netdisco/Web/Search.pm index 2d2cb01d..73f3ac92 100644 --- a/lib/App/Netdisco/Web/Search.pm +++ b/lib/App/Netdisco/Web/Search.pm @@ -6,6 +6,7 @@ use Dancer::Plugin::DBIC; use Dancer::Plugin::Auth::Extensible; use App::Netdisco::Util::Web 'sql_match'; +use Regexp::Common 'net'; use NetAddr::MAC (); hook 'before_template' => sub { @@ -39,7 +40,11 @@ get '/search' => require_login sub { my $nd = $s->resultset('Device')->search_fuzzy($q); my ($likeval, $likeclause) = sql_match($q); my $mac = NetAddr::MAC->new($q); - undef $mac if ($mac and $mac->as_ieee and ($mac->as_ieee eq '00:00:00:00')); + + undef $mac if + ($mac and $mac->as_ieee + and (($mac->as_ieee eq '00:00:00:00') + or ($mac->as_ieee !~ m/$RE{net}{MAC}/))); if ($nd and $nd->count) { if ($nd->count == 1) { From 9ec9b1bca4cd88419fdc9c5a6491c6ebcc28d8ce Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sun, 30 Jun 2019 18:26:46 +0100 Subject: [PATCH 14/62] if user installs Pg they should use supported version --- lib/App/Netdisco.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco.pm b/lib/App/Netdisco.pm index 088b6ab0..c1d892c2 100644 --- a/lib/App/Netdisco.pm +++ b/lib/App/Netdisco.pm @@ -100,7 +100,7 @@ will take about 250MB including MIB files. root:~# useradd -m -p x -s /bin/bash netdisco Netdisco uses the PostgreSQL database server. Install PostgreSQL (at least -version 8.4) and then change to the PostgreSQL superuser (usually +version 9.4) and then change to the PostgreSQL superuser (usually C). Create a new database and PostgreSQL user for the Netdisco application: From f1891be3075c7078485d2eeae4140c3486a247a9 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Wed, 17 Jul 2019 04:06:38 +0200 Subject: [PATCH 15/62] typo noticed when checking docker config --- share/environments/deployment.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/share/environments/deployment.yml b/share/environments/deployment.yml index 7a97d5e2..fcde8244 100644 --- a/share/environments/deployment.yml +++ b/share/environments/deployment.yml @@ -20,8 +20,9 @@ database: # RECOMMENDED SETTINGS # -------------------- -# SNMP community string(s) -# ```````````````````````` +# Device authentication settings +# define snmp communities and ssh credentials here +# ```````````````````````````````````````````````` device_auth: - tag: 'default_v2_readonly' community: 'public' @@ -50,7 +51,7 @@ device_auth: # SNMP, which just clogs up the job queue. # ``````````````````````````````````````````````````````````````` #discover_waps: true -#disover_phones: false +#discover_phones: false # this is the schedule for automatically keeping netdisco up-to-date; # these are good defaults, so only uncomment if needing to change. From 5b9761cbae177740f3f4cf5060ef7be56b54dd1d Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Fri, 19 Jul 2019 01:14:27 +0200 Subject: [PATCH 16/62] netdisco-docker triage point netdisco docker users to the docker issue tracker as a first step, so we can spent less time on triaging issues. netdisco docker has some quirks not present in regular netdisco, if it turns out to be non container related we can always move the issue back to this tracker. btw, seems we need to change our issue templates, but only project admins can do so: "You are using an old version of issue templates. Please update to the new issue template workflow. Learn more." -> https://help.github.com/articles/about-issue-and-pull-request-templates --- .github/issue_template.md | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/issue_template.md b/.github/issue_template.md index 386b0639..94bdb323 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -1,17 +1,23 @@ - + - +STOP! If your ticket is about a device not being detected correctly, +see SNMP::Info: https://github.com/netdisco/snmp-info/issues/new - - +STOP! If you have new MIBs to submit, +see netdisco-mibs: https://github.com/netdisco/netdisco-mibs/issues/new - +STOP! If you are running a netdisco docker setup, +see netdisco-docker: https://github.com/netdisco/netdisco-docker/issues/new + +everything else about Netdisco's behaviour is good, here :-D + +when including netdisco config snippets, whitespace matters since it's a yaml file +for github issues it really helps if you include the relevant config parts in a codeblock (code fencing) +see the "code" subject on https://guides.github.com/features/mastering-markdown/ for that) +this should preserve spaces in the issue tracker and make troubleshooting quicker +--> - - - - ## Expected Behavior From d1a1235c8512c214c1521b5673e41428bea7f4fe Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Fri, 19 Jul 2019 04:16:06 +0200 Subject: [PATCH 17/62] handle row.power.power being NULL fixes this error, since device_port_power.power can be null: Argument "" isn't numeric in numeric gt (>) at /home/netdisco/perl5/lib/perl5/auto/share/dist/App-Netdisco/views/ajax/device/ports.tt line 251. currently only seen on cisco sb switches, which do have all other columns filled in ip | port | module | admin | status | class | power ---------------+------+--------+-------+------------+--------+------- 10.40.254.150 | fa2 | 1 | true | otherFault | class3 | 10.40.254.150 | fa16 | 1 | true | searching | class3 | 10.40.254.150 | fa3 | 1 | true | searching | class3 | ... --- share/views/ajax/device/ports.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/views/ajax/device/ports.tt b/share/views/ajax/device/ports.tt index d373a90b..668be5ef 100644 --- a/share/views/ajax/device/ports.tt +++ b/share/views/ajax/device/ports.tt @@ -244,7 +244,7 @@ [% END %] - [% IF row.power.power > 0 %] + [% IF row.power.power AND row.power.power > 0 %] [% row.power.power | html_entity %] mW [% ELSE %] ([% row.power.status | html_entity %]) From 4630879a1d4a5488f24cd3c997bdfbc197790862 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Fri, 19 Jul 2019 06:45:44 +0200 Subject: [PATCH 18/62] add poe on/off icons to legend inspired by the new wap icon --- share/views/sidebar/device/ports.tt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/views/sidebar/device/ports.tt b/share/views/sidebar/device/ports.tt index 9ba61e39..92a32a65 100644 --- a/share/views/sidebar/device/ports.tt +++ b/share/views/sidebar/device/ports.tt @@ -38,6 +38,8 @@
  •   Admin Disabled
  •   Error Disabled
  •   Blocking
    • +
  •   PoE Disabled
    • +
  •   PoE Enabled
  •   Manual Topology
  •   Neighbor Device
  •   Neighbor Inacessible
    • From e37a8347499e98db29aac2c87777cbc66e288663 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat, 3 Aug 2019 00:07:56 +0200 Subject: [PATCH 19/62] compare ieee mac against 6 iterations (#611) --- lib/App/Netdisco/Web/Plugin/Search/Node.pm | 2 +- lib/App/Netdisco/Web/Search.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/App/Netdisco/Web/Plugin/Search/Node.pm b/lib/App/Netdisco/Web/Plugin/Search/Node.pm index 54f08cf3..965b511e 100644 --- a/lib/App/Netdisco/Web/Plugin/Search/Node.pm +++ b/lib/App/Netdisco/Web/Plugin/Search/Node.pm @@ -26,7 +26,7 @@ ajax '/ajax/content/search/node' => require_login sub { my $mac = NetAddr::MAC->new(mac => $node); undef $mac if ($mac and $mac->as_ieee - and (($mac->as_ieee eq '00:00:00:00') + and (($mac->as_ieee eq '00:00:00:00:00:00') or ($mac->as_ieee !~ m/$RE{net}{MAC}/))); my @active = (param('archived') ? () : (-bool => 'active')); diff --git a/lib/App/Netdisco/Web/Search.pm b/lib/App/Netdisco/Web/Search.pm index 73f3ac92..b447b031 100644 --- a/lib/App/Netdisco/Web/Search.pm +++ b/lib/App/Netdisco/Web/Search.pm @@ -43,7 +43,7 @@ get '/search' => require_login sub { undef $mac if ($mac and $mac->as_ieee - and (($mac->as_ieee eq '00:00:00:00') + and (($mac->as_ieee eq '00:00:00:00:00:00') or ($mac->as_ieee !~ m/$RE{net}{MAC}/))); if ($nd and $nd->count) { From 8a8deccdbe473c9d2887f314f3d92bba9408bbf1 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat, 3 Aug 2019 00:12:03 +0200 Subject: [PATCH 20/62] make sidebar tiny bit wider (#625) --- share/public/css/netdisco.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/public/css/netdisco.css b/share/public/css/netdisco.css index ebc913b4..71136174 100644 --- a/share/public/css/netdisco.css +++ b/share/public/css/netdisco.css @@ -359,7 +359,7 @@ td > form.nd_inline-form { .container-fluid > .nd_sidebar { position: absolute; right: 20px; - width: 200px; + width: 205px; left: auto; } From 38b800e46f9cad4c92d197eea05590f60eb7a9b4 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Tue, 6 Aug 2019 02:02:43 +0200 Subject: [PATCH 21/62] fix travis i hope, seems they switched ubuntu versions to something more recent --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 854ccb40..3db9448d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: perl perl: - "5.30" - "5.10" +os: linux +dist: trusty addons: apt: packages: From 416a6939ecce3dd0c0035d5d650a1bed04b0f1b6 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Tue, 6 Aug 2019 23:51:45 +0200 Subject: [PATCH 22/62] you really need to install the packages we ask --- lib/App/Netdisco.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/App/Netdisco.pm b/lib/App/Netdisco.pm index c1d892c2..b4c2fb54 100644 --- a/lib/App/Netdisco.pm +++ b/lib/App/Netdisco.pm @@ -71,7 +71,8 @@ L. Netdisco has several Perl library dependencies which will be automatically installed. However it's required that you first install the following -operating system packages: +operating system packages, if not the installation will most likely fail +further down the road. On Ubuntu/Debian: From ad6dd2bb621bb09e8f5f3d11ae529519eea20620 Mon Sep 17 00:00:00 2001 From: David Sullivan Date: Fri, 16 Aug 2019 09:49:40 +0100 Subject: [PATCH 23/62] Change Port Free icon to be more accessible (#633) The port free icon currently only differs from the port down icon by colour, on higher resolutions with a colour vision impairment they're not very distinguishable, a slightly different icon fixes this. --- share/views/ajax/device/ports.tt | 2 +- share/views/ajax/search/port.tt | 2 +- share/views/sidebar/device/ports.tt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/views/ajax/device/ports.tt b/share/views/ajax/device/ports.tt index 668be5ef..1e96ccf4 100644 --- a/share/views/ajax/device/ports.tt +++ b/share/views/ajax/device/ports.tt @@ -39,7 +39,7 @@ [% ELSIF row.has_column_loaded('is_free') AND row.is_free %] [% ELSIF row.up_admin == 'up' AND (row.up != 'up' AND row.up != 'dormant') %] - + [% ELSE %] [% END %] diff --git a/share/views/ajax/search/port.tt b/share/views/ajax/search/port.tt index 99635b8d..8de18fd9 100644 --- a/share/views/ajax/search/port.tt +++ b/share/views/ajax/search/port.tt @@ -30,7 +30,7 @@ $(document).ready(function() { return''; } else if (row.up_admin == "up" && (row.up != "up" && row.up != "dormant")) { - return ''; + return ''; } else { return ''; diff --git a/share/views/sidebar/device/ports.tt b/share/views/sidebar/device/ports.tt index 92a32a65..9184345f 100644 --- a/share/views/sidebar/device/ports.tt +++ b/share/views/sidebar/device/ports.tt @@ -34,7 +34,7 @@
    •   Link Up
    •   Link Down
      • -
    •   Port Free
      • +
    •   Port Free
    •   Admin Disabled
    •   Error Disabled
    •   Blocking
      • From f031ae49922b0f3937f50d220e18ad098cd638fc Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat, 17 Aug 2019 10:18:43 +0200 Subject: [PATCH 24/62] typo --- lib/App/Netdisco/SSHCollector/Platform/ACE.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/App/Netdisco/SSHCollector/Platform/ACE.pm b/lib/App/Netdisco/SSHCollector/Platform/ACE.pm index a3bb5ed6..39ea3b85 100644 --- a/lib/App/Netdisco/SSHCollector/Platform/ACE.pm +++ b/lib/App/Netdisco/SSHCollector/Platform/ACE.pm @@ -1,7 +1,5 @@ package App::Netdisco::SSHCollector::Platform::ACE; -# vim: set expandtab tabstop=8 softtabstop=4 shiftwidth=4: - =head1 NAME App::Netdisco::SSHCollector::Platform::ACE @@ -13,7 +11,7 @@ virtual contexts with individual ARP tables. Contexts are enumerated with C, afterwards the commands C and C must be executed for every context. -The IOS shell does not permit to combine mulitple commands in a single +The IOS shell does not permit to combine multiple commands in a single line, and Net::OpenSSH uses individual connections for individual commands, so we need to use Expect to execute the changeto and show commands in the same context. From 92bc49f27444ff201cc2178132979e0d89c08850 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat, 17 Aug 2019 10:20:22 +0200 Subject: [PATCH 25/62] typo --- lib/App/Netdisco/DB/ResultSet/Admin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco/DB/ResultSet/Admin.pm b/lib/App/Netdisco/DB/ResultSet/Admin.pm index c1323cdc..a6f15c01 100644 --- a/lib/App/Netdisco/DB/ResultSet/Admin.pm +++ b/lib/App/Netdisco/DB/ResultSet/Admin.pm @@ -12,7 +12,7 @@ __PACKAGE__->load_components(qw/ =head2 skipped( $backend?, $max_deferrals?, $retry_after? ) -Retuns a correlated subquery for the set of C entries that apply +Returns a correlated subquery for the set of C entries that apply to some jobs. They match the device IP, current backend, and job action. Pass the C FQDN (or the current host will be used as a default), the From bf789cb57b55b9e37aebe6b700a4e4239711a36c Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat, 17 Aug 2019 10:25:49 +0200 Subject: [PATCH 26/62] typos --- lib/App/Netdisco/DB/ResultSet/Device.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/App/Netdisco/DB/ResultSet/Device.pm b/lib/App/Netdisco/DB/ResultSet/Device.pm index c53043b8..5520fedc 100644 --- a/lib/App/Netdisco/DB/ResultSet/Device.pm +++ b/lib/App/Netdisco/DB/ResultSet/Device.pm @@ -187,11 +187,11 @@ Will match exactly the C field. =item os -Will match exactly the C field, which is the operating sytem. +Will match exactly the C field, which is the operating system. =item os_ver -Will match exactly the C field, which is the operating sytem software version. +Will match exactly the C field, which is the operating system software version. =item vendor From 26f410f9ce9cd3447b22a77bcfa543c1a110b83f Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat, 17 Aug 2019 10:28:11 +0200 Subject: [PATCH 27/62] typo --- lib/App/Netdisco/Backend/Job.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco/Backend/Job.pm b/lib/App/Netdisco/Backend/Job.pm index bab5d036..34e97f1b 100644 --- a/lib/App/Netdisco/Backend/Job.pm +++ b/lib/App/Netdisco/Backend/Job.pm @@ -70,7 +70,7 @@ sub display_name { =head2 cancel -Log a status and prevent other stages from runnning. +Log a status and prevent other stages from running. =cut From 860985673b22f33e64a92d366b75894ba79911d5 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat, 17 Aug 2019 10:30:25 +0200 Subject: [PATCH 28/62] typo --- lib/App/Netdisco/Worker/Plugin/MakeRancidConf.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco/Worker/Plugin/MakeRancidConf.pm b/lib/App/Netdisco/Worker/Plugin/MakeRancidConf.pm index 5ab13c60..a43ac553 100644 --- a/lib/App/Netdisco/Worker/Plugin/MakeRancidConf.pm +++ b/lib/App/Netdisco/Worker/Plugin/MakeRancidConf.pm @@ -189,7 +189,7 @@ email config and creating the repository with C. =head2 C The location where the rancid configuration (F and -F) is installed. It will be used to check the existance +F) is installed. It will be used to check the existence of device types before exporting the devices to the rancid configuration. If no match is found the device will not be added to rancid. From d31cae99bc291b8fb9a8f9f32c5ea21ef0477cdf Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat, 17 Aug 2019 10:32:13 +0200 Subject: [PATCH 29/62] typo --- lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm index b8f0dee7..34d75c9d 100644 --- a/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm +++ b/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm @@ -95,7 +95,7 @@ port relationships. The Device database object can be a fresh L object which is not yet stored to the database. -A list of discovererd neighbors will be returned as [C<$ip>, C<$type>] tuples. +A list of discovered neighbors will be returned as [C<$ip>, C<$type>] tuples. =cut From 205a3932f23f4353abf59be0dae7a4cb4ba97473 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat, 17 Aug 2019 10:33:32 +0200 Subject: [PATCH 30/62] typo --- lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm b/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm index fc96e8f1..1e925c20 100644 --- a/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm +++ b/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm @@ -78,7 +78,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub { debug sprintf ' [%s] macsuck - %s updated forwarding table entries', $device->ip, $total_nodes; - # a use for $now ... need to archive dissapeared nodes + # a use for $now ... need to archive disappeared nodes my $archived = 0; if (setting('node_freshness')) { From 22cb988a8f9e92d867f3b35e3c88346d2cc48d6d Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat, 17 Aug 2019 10:34:19 +0200 Subject: [PATCH 31/62] typo --- lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm b/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm index 1e925c20..029adb2a 100644 --- a/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm +++ b/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm @@ -105,7 +105,7 @@ All four fields in the tuple are required. If you don't know the VLAN ID, Netdisco supports using ID "0". Optionally, a fifth argument can be the literal string passed to the time_last -field of the database record. If not provided, it defauls to C. +field of the database record. If not provided, it defaults to C. =cut From 131d80c95ee582ba9db397cb02579c382b22781e Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat, 17 Aug 2019 10:35:57 +0200 Subject: [PATCH 32/62] typo --- lib/App/Netdisco/Web/Plugin/Device/Ports.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco/Web/Plugin/Device/Ports.pm b/lib/App/Netdisco/Web/Plugin/Device/Ports.pm index be5f98ea..51ed71ff 100644 --- a/lib/App/Netdisco/Web/Plugin/Device/Ports.pm +++ b/lib/App/Netdisco/Web/Plugin/Device/Ports.pm @@ -31,7 +31,7 @@ get '/ajax/content/device/ports' => require_login sub { # change wildcard chars to SQL $f =~ s/\*/%/g; $f =~ s/\?/_/g; - # set wilcards at param boundaries + # set wildcards at param boundaries if ($f !~ m/[%_]/) { $f =~ s/^\%*/%/; $f =~ s/\%*$/%/; From 8a40559115be4dc5fc26be859215585778bc6b5d Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat, 17 Aug 2019 10:37:21 +0200 Subject: [PATCH 33/62] typos --- lib/App/Netdisco/DB/ResultSet.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/App/Netdisco/DB/ResultSet.pm b/lib/App/Netdisco/DB/ResultSet.pm index 22c25cf8..05fed78f 100644 --- a/lib/App/Netdisco/DB/ResultSet.pm +++ b/lib/App/Netdisco/DB/ResultSet.pm @@ -38,7 +38,7 @@ sub get_distinct_col { Returns a ResultSet for DataTables Server-side processing which populates the displayed table. Evaluates the supplied query parameters for filtering, -paging, and ordering information. Note: query paramters are expected to be +paging, and ordering information. Note: query parameters are expected to be passed as a reference to an expanded hash of hashes. Filtering if present, will generate simple LIKE matching conditions for each @@ -75,7 +75,7 @@ sub get_datatables_data { Returns the total records, after filtering (i.e. the total number of records after filtering has been applied - not just the number of records being returned for this page of data) for a datatables ResultSet and -query parameters. Note: query paramters are expected to be passed as a +query parameters. Note: query parameters are expected to be passed as a reference to an expanded hash of hashes. =cut From 2b4802d21a0903b7d6efdab5ec95a4e11818b61c Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat, 17 Aug 2019 10:43:30 +0200 Subject: [PATCH 34/62] typo --- lib/App/Netdisco.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco.pm b/lib/App/Netdisco.pm index b4c2fb54..15b59415 100644 --- a/lib/App/Netdisco.pm +++ b/lib/App/Netdisco.pm @@ -252,7 +252,7 @@ Then the process below should be run for each installation: The main black navigation bar has a search box which is smart enough to work out what you're looking for in most cases. For example device names, node IP -or MAC addreses, VLAN numbers, and so on. +or MAC addresses, VLAN numbers, and so on. =head2 Command-Line Device and Port Actions From 85b73e1493753f01bc38d0024f0e345f6aad5f48 Mon Sep 17 00:00:00 2001 From: jngreene Date: Sun, 18 Aug 2019 04:01:04 -0400 Subject: [PATCH 35/62] Modified to add Radius support (#621) Lines 110-112 commented out Lines 113-124 added Lines 233-249 added match_with_radius function --- lib/App/Netdisco/Web/Auth/Provider/DBIC.pm | 40 +++++++++++++++++++--- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm b/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm index a35f8d19..61a2d438 100644 --- a/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm +++ b/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm @@ -15,6 +15,10 @@ use Digest::MD5; use Net::LDAP; use Try::Tiny; +if (setting('radius') and ref {} eq ref setting('radius')) { + use Authen::Radius; + } + sub authenticate_user { my ($self, $username, $password) = @_; return unless defined $username; @@ -103,9 +107,21 @@ sub match_password { my $settings = $self->realm_settings; my $username_column = $settings->{users_username_column} || 'username'; - return $user->ldap - ? $self->match_with_ldap($password, $user->$username_column) - : $self->match_with_local_pass($password, $user); +# return $user->ldap +# ? $self->match_with_ldap($password, $user->$username_column) +# : $self->match_with_local_pass($password, $user); + my $pwmatch_result=0; + my $username = $user->$username_column; + + if ($user->ldap) { + $pwmatch_result = $self->match_with_ldap($password, $user->$username_column); + } else { + if ( setting('radius') and ref {} eq ref setting('radius') ) { + $pwmatch_result = ( $self->match_with_radius($password, $username) || $self->match_with_local_pass($password, $user) ); + } else { + $pwmatch_result = $self->match_with_local_pass($password, $user); + } + } } sub match_with_local_pass { @@ -214,5 +230,21 @@ sub _ldap_search { return undef; } - +sub match_with_radius { + my($self, $pass, $user) = @_; + return unless setting('radius') and ref {} eq ref setting('radius'); + my $conf = setting('radius'); + my $radius = new Authen::Radius(Host => $conf->{server}, Secret => $conf->{secret}); + Authen::Radius->load_dictionary(); + $radius->add_attributes( + { Name=> 'User-Name', Value => $user }, + { Name=> 'User-Password', Value => $pass }, + { Name => 'h323-return-code', Value => '0' }, # Cisco AV pair + { Name => 'Digest-Attributes', Value => { Method => 'REGISTER' } } + ); + $radius->send_packet(ACCESS_REQUEST); + my $type = $radius->recv_packet(); + my $radius_return = ($type eq ACCESS_ACCEPT)?1:0; + return $radius_return; +} 1; From c73c3e7569fee4cdc5e70cce5bd6ce555ebdb30e Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sun, 18 Aug 2019 09:16:57 +0100 Subject: [PATCH 36/62] improvements to radius patch --- Build.PL | 1 + lib/App/Netdisco/DB.pm | 2 +- lib/App/Netdisco/DB/Result/User.pm | 2 + .../Netdisco/DB/Result/Virtual/UserRole.pm | 3 + lib/App/Netdisco/Web/Auth/Provider/DBIC.pm | 64 ++++++++++--------- .../Netdisco/Web/Plugin/AdminTask/Users.pm | 2 + .../App-Netdisco-DB-58-59-PostgreSQL.sql | 7 ++ share/views/ajax/admintask/users.tt | 5 ++ share/views/ajax/admintask/users_csv.tt | 3 +- share/views/layouts/main.tt | 2 +- 10 files changed, 57 insertions(+), 34 deletions(-) create mode 100644 share/schema_versions/App-Netdisco-DB-58-59-PostgreSQL.sql diff --git a/Build.PL b/Build.PL index 3fb6f8c4..5097b335 100644 --- a/Build.PL +++ b/Build.PL @@ -26,6 +26,7 @@ Module::Build->new( 'App::cpanminus' => '1.6108', 'App::local::lib::helper' => '0.07', 'Archive::Extract' => '0', + 'Authen::Radius' => '0', 'CGI::Expand' => '2.05', 'Data::Printer' => '0', 'DBD::Pg' => '0', diff --git a/lib/App/Netdisco/DB.pm b/lib/App/Netdisco/DB.pm index baa9bd21..75040b9c 100644 --- a/lib/App/Netdisco/DB.pm +++ b/lib/App/Netdisco/DB.pm @@ -11,7 +11,7 @@ __PACKAGE__->load_namespaces( ); our # try to hide from kwalitee - $VERSION = 58; # schema version used for upgrades, keep as integer + $VERSION = 59; # schema version used for upgrades, keep as integer use Path::Class; use File::ShareDir 'dist_dir'; diff --git a/lib/App/Netdisco/DB/Result/User.pm b/lib/App/Netdisco/DB/Result/User.pm index 612019db..6e525547 100644 --- a/lib/App/Netdisco/DB/Result/User.pm +++ b/lib/App/Netdisco/DB/Result/User.pm @@ -29,6 +29,8 @@ __PACKAGE__->add_columns( { data_type => "boolean", default_value => \"false", is_nullable => 1 }, "ldap", { data_type => "boolean", default_value => \"false", is_nullable => 1 }, + "radius", + { data_type => "boolean", default_value => \"false", is_nullable => 1 }, "admin", { data_type => "boolean", default_value => \"false", is_nullable => 1 }, "fullname", diff --git a/lib/App/Netdisco/DB/Result/Virtual/UserRole.pm b/lib/App/Netdisco/DB/Result/Virtual/UserRole.pm index af960260..7e9f2910 100644 --- a/lib/App/Netdisco/DB/Result/Virtual/UserRole.pm +++ b/lib/App/Netdisco/DB/Result/Virtual/UserRole.pm @@ -20,6 +20,9 @@ __PACKAGE__->result_source_instance->view_definition(<realm_settings; my $username_column = $settings->{users_username_column} || 'username'; -# return $user->ldap -# ? $self->match_with_ldap($password, $user->$username_column) -# : $self->match_with_local_pass($password, $user); - my $pwmatch_result=0; + my $pwmatch_result = 0; my $username = $user->$username_column; if ($user->ldap) { - $pwmatch_result = $self->match_with_ldap($password, $user->$username_column); - } else { - if ( setting('radius') and ref {} eq ref setting('radius') ) { - $pwmatch_result = ( $self->match_with_radius($password, $username) || $self->match_with_local_pass($password, $user) ); - } else { - $pwmatch_result = $self->match_with_local_pass($password, $user); - } - } + $pwmatch_result = $self->match_with_ldap($password, $username); + } + elsif ($user->raidus) { + $pwmatch_result = $self->match_with_radius($password, $username); + } + else { + $pwmatch_result = $self->match_with_local_pass($password, $user); + } + + return $pwmatch_result; } sub match_with_local_pass { @@ -230,21 +226,27 @@ sub _ldap_search { return undef; } + sub match_with_radius { - my($self, $pass, $user) = @_; - return unless setting('radius') and ref {} eq ref setting('radius'); - my $conf = setting('radius'); - my $radius = new Authen::Radius(Host => $conf->{server}, Secret => $conf->{secret}); - Authen::Radius->load_dictionary(); - $radius->add_attributes( - { Name=> 'User-Name', Value => $user }, - { Name=> 'User-Password', Value => $pass }, - { Name => 'h323-return-code', Value => '0' }, # Cisco AV pair - { Name => 'Digest-Attributes', Value => { Method => 'REGISTER' } } - ); - $radius->send_packet(ACCESS_REQUEST); - my $type = $radius->recv_packet(); - my $radius_return = ($type eq ACCESS_ACCEPT)?1:0; - return $radius_return; + my($self, $pass, $user) = @_; + return unless setting('radius') and ref {} eq ref setting('radius'); + + my $conf = setting('radius'); + my $radius = Authen::Radius->new(Host => $conf->{server}, Secret => $conf->{secret}); + Authen::Radius->load_dictionary(); + + $radius->add_attributes( + { Name => 'User-Name', Value => $user }, + { Name => 'User-Password', Value => $pass }, + { Name => 'h323-return-code', Value => '0' }, # Cisco AV pair + { Name => 'Digest-Attributes', Value => { Method => 'REGISTER' } } + ); + $radius->send_packet(ACCESS_REQUEST); + + my $type = $radius->recv_packet(); + my $radius_return = ($type eq ACCESS_ACCEPT) ? 1 : 0; + + return $radius_return; } + 1; diff --git a/lib/App/Netdisco/Web/Plugin/AdminTask/Users.pm b/lib/App/Netdisco/Web/Plugin/AdminTask/Users.pm index 94893702..712e26ca 100644 --- a/lib/App/Netdisco/Web/Plugin/AdminTask/Users.pm +++ b/lib/App/Netdisco/Web/Plugin/AdminTask/Users.pm @@ -41,6 +41,7 @@ ajax '/ajax/control/admin/users/add' => require_role setting('defanged_admin') = password => _make_password(param('password')), fullname => param('fullname'), ldap => (param('ldap') ? \'true' : \'false'), + radius => (param('radius') ? \'true' : \'false'), port_control => (param('port_control') ? \'true' : \'false'), admin => (param('admin') ? \'true' : \'false'), note => param('note'), @@ -71,6 +72,7 @@ ajax '/ajax/control/admin/users/update' => require_role setting('defanged_admin' : ()), fullname => param('fullname'), ldap => (param('ldap') ? \'true' : \'false'), + radius => (param('radius') ? \'true' : \'false'), port_control => (param('port_control') ? \'true' : \'false'), admin => (param('admin') ? \'true' : \'false'), note => param('note'), diff --git a/share/schema_versions/App-Netdisco-DB-58-59-PostgreSQL.sql b/share/schema_versions/App-Netdisco-DB-58-59-PostgreSQL.sql new file mode 100644 index 00000000..8262af36 --- /dev/null +++ b/share/schema_versions/App-Netdisco-DB-58-59-PostgreSQL.sql @@ -0,0 +1,7 @@ +BEGIN; + +ALTER TABLE users ADD radius boolean; + +ALTER TABLE users ALTER radius SET DEFAULT false; + +COMMIT; diff --git a/share/views/ajax/admintask/users.tt b/share/views/ajax/admintask/users.tt index ab766b2e..7131a2a5 100644 --- a/share/views/ajax/admintask/users.tt +++ b/share/views/ajax/admintask/users.tt @@ -5,6 +5,7 @@ Username Password LDAP Auth + RADIUS Auth Port Control Administrator Created @@ -19,6 +20,7 @@ + @@ -45,6 +47,9 @@ + + + diff --git a/share/views/ajax/admintask/users_csv.tt b/share/views/ajax/admintask/users_csv.tt index 315e29c1..5005c6e8 100644 --- a/share/views/ajax/admintask/users_csv.tt +++ b/share/views/ajax/admintask/users_csv.tt @@ -1,6 +1,6 @@ [% USE CSV -%] [% CSV.dump([ 'Full Name' 'Username' - 'LDAP Auth' 'Port Control' 'Administrator' 'Created' + 'LDAP Auth' 'RADIUS Auth' 'Port Control' 'Administrator' 'Created' 'Last Login' 'Note']) %] [% FOREACH row IN results %] @@ -8,6 +8,7 @@ [% mylist.push(row.fullname) %] [% mylist.push(row.username) %] [% mylist.push(row.ldap) %] + [% mylist.push(row.radius) %] [% mylist.push(row.port_control) %] [% mylist.push(row.admin) %] [% mylist.push(row.created) %] diff --git a/share/views/layouts/main.tt b/share/views/layouts/main.tt index f1b12a34..c3ecac2f 100644 --- a/share/views/layouts/main.tt +++ b/share/views/layouts/main.tt @@ -181,7 +181,7 @@ [% session.logged_in_fullname || session.logged_in_user | html_entity %]
        - [% IF NOT user_has_role('ldap') %] + [% IF NOT ( user_has_role('ldap') OR user_has_role('radius') ) %]
      • Change Password
        • [% END %] [% IF NOT settings.no_auth %] From 26dbb714df9c5fdd1e27b08bfc25e966b9d8af22 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sun, 18 Aug 2019 10:49:57 +0100 Subject: [PATCH 37/62] #630 display full oui vendor --- bin/netdisco-deploy | 21 ++++++++++++------- .../Netdisco/Web/Plugin/Report/NodeVendor.pm | 10 ++++----- share/views/ajax/report/nodevendor.tt | 4 ++-- share/views/ajax/report/nodevendor_csv.tt | 4 ++-- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/bin/netdisco-deploy b/bin/netdisco-deploy index 32cd212e..f96891a4 100755 --- a/bin/netdisco-deploy +++ b/bin/netdisco-deploy @@ -257,7 +257,7 @@ sub deploy_oui { print color 'reset'; } -# This subroutine is from Wireshark's make-manuf +# This subroutine is baed on Wireshark's make-manuf # http://anonsvn.wireshark.org/wireshark/trunk/tools/make-manuf sub shorten { my $manuf = shift; @@ -271,22 +271,27 @@ sub shorten { # & isn't needed when Standalone $manuf =~ s/ \& / /g; + # remove junk whitespace + $manuf =~ s/\s+/ /g; + # Remove any "the", "inc", "plc" ... $manuf - =~ s/\s(the|inc|incorporated|plc|systems|corp|corporation|s\/a|a\/s|ab|ag|kg|gmbh|co|company|limited|ltd|holding|spa)(?= )//gi; + =~ s/\s(?:the|inc|incorporated|plc|systems|corp|corporation|s\/a|a\/s|ab|ag|kg|gmbh|co|company|limited|ltd|holding|spa)(?= )//gi; # Convert to consistent case $manuf =~ s/(\w+)/\u\L$1/g; - # Remove all spaces - $manuf =~ s/\s+//g; - # Deviating from make-manuf for HP $manuf =~ s/Hewlett[-]?Packard/Hp/; - # Truncate all names to a reasonable length, say, 8 characters. - # If the string contains UTF-8, this may be substantially more than 8 bytes. - $manuf = substr( $manuf, 0, 8 ); + # Truncate all names to first two words max 20 chars + if (length($manuf) > 21) { + my @twowords = grep {defined} (split ' ', $manuf)[0 .. 1]; + $manuf = join ' ', @twowords; + } + + # Remove all spaces + $manuf =~ s/\s+//g; return encode( "utf8", $manuf ); } diff --git a/lib/App/Netdisco/Web/Plugin/Report/NodeVendor.pm b/lib/App/Netdisco/Web/Plugin/Report/NodeVendor.pm index b8f61f53..6be6aa35 100644 --- a/lib/App/Netdisco/Web/Plugin/Report/NodeVendor.pm +++ b/lib/App/Netdisco/Web/Plugin/Report/NodeVendor.pm @@ -47,7 +47,7 @@ get '/ajax/content/report/nodevendor/data' => require_login sub { my $match = $vendor eq 'blank' ? undef : $vendor; $rs = $rs->search( { 'oui.abbrev' => $match }, - { '+columns' => [qw/ device.dns device.name oui.abbrev /], + { '+columns' => [qw/ device.dns device.name oui.abbrev oui.company /], join => [qw/ oui device /], collapse => 1, }); @@ -86,7 +86,7 @@ get '/ajax/content/report/nodevendor' => require_login sub { my $match = $vendor eq 'blank' ? undef : $vendor; $rs = $rs->search( { 'oui.abbrev' => $match }, - { '+columns' => [qw/ device.dns device.name oui.abbrev /], + { '+columns' => [qw/ device.dns device.name oui.abbrev oui.company /], join => [qw/ oui device /], collapse => 1, }); @@ -102,9 +102,9 @@ get '/ajax/content/report/nodevendor' => require_login sub { $rs = $rs->search( { }, { join => 'oui', - select => [ 'oui.abbrev', { count => {distinct => 'me.mac'}} ], - as => [qw/ vendor count /], - group_by => [qw/ oui.abbrev /] + select => [ 'oui.abbrev', 'oui.company', { count => {distinct => 'me.mac'}} ], + as => [qw/ abbrev vendor count /], + group_by => [qw/ oui.abbrev oui.company /] } )->order_by( { -desc => 'count' } ); diff --git a/share/views/ajax/report/nodevendor.tt b/share/views/ajax/report/nodevendor.tt index 178dda66..bbfcd0e8 100644 --- a/share/views/ajax/report/nodevendor.tt +++ b/share/views/ajax/report/nodevendor.tt @@ -43,7 +43,7 @@ $(document).ready(function() { }, { "data": 'oui.abbrev', "render": function(data, type, row, meta) { - return '' + he.encode(data ||'(Unknown Vendor)') + ''; + return '' + he.encode(row.oui.company ||'(Unknown Vendor)') + ''; } }, { "data": 'port', @@ -71,7 +71,7 @@ $(document).ready(function() { { "data": 'vendor', "render": function(data, type, row, meta) { - return '' + he.encode(data ||'(Unknown Vendor)') + ''; + return '' + he.encode(row.vendor ||'(Unknown Vendor)') + ''; } }, { "data": 'count', diff --git a/share/views/ajax/report/nodevendor_csv.tt b/share/views/ajax/report/nodevendor_csv.tt index 64ecd60a..d4d8c0d3 100644 --- a/share/views/ajax/report/nodevendor_csv.tt +++ b/share/views/ajax/report/nodevendor_csv.tt @@ -1,11 +1,11 @@ [% USE CSV -%] [% IF opt %] - [% CSV.dump(['MAC' 'Vendor' 'Company' 'Device' 'Port']) %] + [% CSV.dump(['MAC' 'Company' 'Device' 'Port']) %] [% FOREACH row IN results %] [% mylist = [] %] [% device = row.device.dns || row.device.name || row.switch %] - [% FOREACH col IN [ row.mac.upper row.oui.abbrev row.oui.company device row.port ] %] + [% FOREACH col IN [ row.mac.upper row.oui.company device row.port ] %] [% mylist.push(col) %] [% END %] [% CSV.dump(mylist) %] From 8d863113d9b1dd737593231ff9cdaceae1b1b6aa Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sun, 18 Aug 2019 11:05:55 +0100 Subject: [PATCH 38/62] show how to package own radius dictionary files --- lib/App/Netdisco/Web/Auth/Provider/DBIC.pm | 4 +++- share/radius_dictionaries/TODO | 0 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 share/radius_dictionaries/TODO diff --git a/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm b/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm index 69023e83..9b86037c 100644 --- a/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm +++ b/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm @@ -233,7 +233,9 @@ sub match_with_radius { my $conf = setting('radius'); my $radius = Authen::Radius->new(Host => $conf->{server}, Secret => $conf->{secret}); - Authen::Radius->load_dictionary(); + # my $dict_dir = Path::Class::Dir->new( dist_dir('App-Netdisco') ) + #  ->subdir('radius_dictionaries')->stringify; + Authen::Radius->load_dictionary(); # put $dict_dir in here once it's useful $radius->add_attributes( { Name => 'User-Name', Value => $user }, diff --git a/share/radius_dictionaries/TODO b/share/radius_dictionaries/TODO new file mode 100644 index 00000000..e69de29b From 1b89d20dc7dcdf32e0989f2bd9022b4d9edada60 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sun, 18 Aug 2019 11:19:34 +0100 Subject: [PATCH 39/62] #624 device layers search should be OR (not AND) --- lib/App/Netdisco/DB/ResultSet/Device.pm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/App/Netdisco/DB/ResultSet/Device.pm b/lib/App/Netdisco/DB/ResultSet/Device.pm index 5520fedc..fa5ce923 100644 --- a/lib/App/Netdisco/DB/ResultSet/Device.pm +++ b/lib/App/Netdisco/DB/ResultSet/Device.pm @@ -226,21 +226,20 @@ sub search_by_field { } # For Search on Layers - my @layer_search = ( '_', '_', '_', '_', '_', '_', '_' ); - # @layer_search is computer indexed, left->right my $layers = $p->{layers}; + my @layer_select = (); if ( defined $layers && ref $layers ) { foreach my $layer (@$layers) { next unless defined $layer and length($layer); next if ( $layer < 1 || $layer > 7 ); - $layer_search[ $layer - 1 ] = 1; + push @layer_select, + \[ 'substring(me.layers,9-?, 1)::int = 1', $layer ]; } } elsif ( defined $layers ) { - $layer_search[ $layers - 1 ] = 1; + push @layer_select, + \[ 'substring(me.layers,9-?, 1)::int = 1', $layers ]; } - # the database field is in order 87654321 - my $layer_string = join( '', reverse @layer_search ); return $rs ->search_rs({}, $attrs) @@ -252,8 +251,6 @@ sub search_by_field { { '-ilike' => "\%$p->{location}\%" }) : ()), ($p->{description} ? ('me.description' => { '-ilike' => "\%$p->{description}\%" }) : ()), - ($p->{layers} ? ('me.layers' => - { '-ilike' => "\%$layer_string" }) : ()), ($p->{model} ? ('me.model' => { '-in' => $p->{model} }) : ()), @@ -264,6 +261,8 @@ sub search_by_field { ($p->{vendor} ? ('me.vendor' => { '-in' => $p->{vendor} }) : ()), + ($p->{layers} ? (-or => \@layer_select) : ()), + ($p->{dns} ? ( -or => [ 'me.dns' => { '-ilike' => "\%$p->{dns}\%" }, From b72b1b38e060d0f733af660bd78595435dfd9747 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Mon, 19 Aug 2019 14:40:12 +0100 Subject: [PATCH 40/62] add relation to get latest node on port --- lib/App/Netdisco/DB/Result/DevicePort.pm | 28 +++++++++++++++++++++ lib/App/Netdisco/DB/ResultSet/DevicePort.pm | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/App/Netdisco/DB/Result/DevicePort.pm b/lib/App/Netdisco/DB/Result/DevicePort.pm index 0b1266e0..ed2bbe27 100644 --- a/lib/App/Netdisco/DB/Result/DevicePort.pm +++ b/lib/App/Netdisco/DB/Result/DevicePort.pm @@ -242,6 +242,34 @@ __PACKAGE__->belongs_to( neighbor_alias => 'App::Netdisco::DB::Result::DeviceIp' { join_type => 'LEFT' }, ); +=head2 last_node + +This relationship will return the last node that was seen on the port. + +The JOIN is of type "LEFT" in case there isn't any such node. + +=cut + +__PACKAGE__->belongs_to( last_node => 'App::Netdisco::DB::Result::Node', + sub { + my $args = shift; + return { + "$args->{foreign_alias}.mac" => { '=' => + $args->{self_resultsource}->schema->resultset('Node')->search({ + switch => { -ident => "$args->{self_alias}.ip"}, + port => { -ident => "$args->{self_alias}.port"} + },{ + rows => 1, + order_by => { -desc => ['time_last'] }, + columns => 'mac', + alias => 'lastnodesub' + })->as_query + } + }; + }, + { join_type => 'LEFT' }, +); + =head2 vlans As compared to C, this relationship returns a set of Device VLAN diff --git a/lib/App/Netdisco/DB/ResultSet/DevicePort.pm b/lib/App/Netdisco/DB/ResultSet/DevicePort.pm index 3ae4f80f..59bf21b6 100644 --- a/lib/App/Netdisco/DB/ResultSet/DevicePort.pm +++ b/lib/App/Netdisco/DB/ResultSet/DevicePort.pm @@ -40,7 +40,7 @@ sub with_times { }); } -=head2 with_free_ports +=head2 with_is_free This is a modifier for any C (including the helpers below) which will add the following additional synthesized columns to the result set: From 64fb05f55661e378db0b5d8c1dbb2dda3c536539 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Mon, 19 Aug 2019 16:28:43 +0100 Subject: [PATCH 41/62] fix for #633 --- share/views/ajax/device/ports.tt | 4 ++-- share/views/ajax/search/port.tt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/views/ajax/device/ports.tt b/share/views/ajax/device/ports.tt index 1e96ccf4..29f1f11c 100644 --- a/share/views/ajax/device/ports.tt +++ b/share/views/ajax/device/ports.tt @@ -37,9 +37,9 @@ [% ELSIF row.error_disable_cause %] [% ELSIF row.has_column_loaded('is_free') AND row.is_free %] - + [% ELSIF row.up_admin == 'up' AND (row.up != 'up' AND row.up != 'dormant') %] - + [% ELSE %] [% END %] diff --git a/share/views/ajax/search/port.tt b/share/views/ajax/search/port.tt index 8de18fd9..99635b8d 100644 --- a/share/views/ajax/search/port.tt +++ b/share/views/ajax/search/port.tt @@ -30,7 +30,7 @@ $(document).ready(function() { return''; } else if (row.up_admin == "up" && (row.up != "up" && row.up != "dormant")) { - return ''; + return ''; } else { return ''; From fcd07452c447b7637f2bc6d87baacf04a9daf36f Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Mon, 19 Aug 2019 16:52:56 +0100 Subject: [PATCH 42/62] fix for #633 --- share/views/ajax/device/ports.tt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/views/ajax/device/ports.tt b/share/views/ajax/device/ports.tt index 29f1f11c..44089ecc 100644 --- a/share/views/ajax/device/ports.tt +++ b/share/views/ajax/device/ports.tt @@ -39,7 +39,11 @@ [% ELSIF row.has_column_loaded('is_free') AND row.is_free %] [% ELSIF row.up_admin == 'up' AND (row.up != 'up' AND row.up != 'dormant') %] - + [% IF params.port_state == 'free' %] + + [% ELSE %] + + [% END %] [% ELSE %] [% END %] From 4c1d5d672d1c5a4108ff1eb321b1fa9d88a509bf Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Mon, 19 Aug 2019 22:57:03 +0100 Subject: [PATCH 43/62] fix for #633 --- lib/App/Netdisco/Web/Plugin/Device/Ports.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/App/Netdisco/Web/Plugin/Device/Ports.pm b/lib/App/Netdisco/Web/Plugin/Device/Ports.pm index 51ed71ff..9f994dcd 100644 --- a/lib/App/Netdisco/Web/Plugin/Device/Ports.pm +++ b/lib/App/Netdisco/Web/Plugin/Device/Ports.pm @@ -82,6 +82,7 @@ get '/ajax/content/device/ports' => require_login sub { }); } delete $port_state{free}; + ++$port_state{down}; } if (scalar keys %port_state < 3) { From 22302114cbeca4c9d774773a2788be0354aad514 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Mon, 19 Aug 2019 23:25:06 +0100 Subject: [PATCH 44/62] working free ports after reboot but bug: row expansion --- .../DB/Result/Virtual/PortUtilization.pm | 25 ++++++++++++++++--- lib/App/Netdisco/DB/ResultSet/DevicePort.pm | 22 ++++++++++------ .../Web/Plugin/Report/PortUtilization.pm | 2 +- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm b/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm index f08bac65..f0f0638e 100644 --- a/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm +++ b/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm @@ -17,11 +17,28 @@ __PACKAGE__->result_source_instance->view_definition(< ?::interval )) THEN 1 - ELSE 0 END) as ports_free - FROM device d LEFT JOIN device_port dp + sum(CASE + WHEN ( dp.type != 'propVirtual' AND dp.up_admin = 'up' AND dp.up != 'up' + AND (age(now(), to_timestamp(extract(epoch from d.last_discover) - (d.uptime/100))) < ?::interval) + AND (last_node.time_last IS NULL OR (age(now(), last_node.time_last)) > ?::interval) ) + THEN 1 + WHEN ( dp.type != 'propVirtual' AND dp.up_admin = 'up' AND dp.up != 'up' + AND (last_node.time_last IS NULL OR + (age(now(), to_timestamp(extract(epoch from d.last_discover) - (d.uptime - dp.lastchange)/100)) > ?::interval)) ) + THEN 1 + ELSE 0 + END) as ports_free + FROM device d + LEFT JOIN device_port dp ON d.ip = dp.ip + LEFT JOIN node last_node + ON last_node.mac = ( + SELECT lastnodesub.mac + FROM node lastnodesub + WHERE port = dp.port AND switch = dp.ip + ORDER BY time_last DESC + LIMIT '1' + ) GROUP BY d.dns, d.ip ORDER BY d.dns, d.ip ENDSQL diff --git a/lib/App/Netdisco/DB/ResultSet/DevicePort.pm b/lib/App/Netdisco/DB/ResultSet/DevicePort.pm index 59bf21b6..bdf26435 100644 --- a/lib/App/Netdisco/DB/ResultSet/DevicePort.pm +++ b/lib/App/Netdisco/DB/ResultSet/DevicePort.pm @@ -96,14 +96,22 @@ sub only_free_ports { ->search_rs($cond, $attrs) ->search( { - 'me.up' => { '!=' => 'up' }, - },{ - where => - \["age(now(), to_timestamp(extract(epoch from device.last_discover) " - ."- (device.uptime - me.lastchange)/100)) " - ."> ?::interval", + 'me.up_admin' => 'up', + 'me.up' => { '!=' => 'up' }, + 'me.type' => { '!=' => 'propVirtual' }, + -or => [ + -and => [ + \["age(now(), to_timestamp(extract(epoch from device.last_discover) - (device.uptime/100))) < ?::interval", + [{} => $interval]], + -or => [ + 'last_node.time_last' => undef, + \["age(now(), last_node.time_last) > ?::interval", [{} => $interval]], + ] + ], + \["age(now(), to_timestamp(extract(epoch from device.last_discover) - (device.uptime - me.lastchange)/100)) > ?::interval", [{} => $interval]], - join => 'device' }, + ], + },{ join => [qw/device last_node/] }, ); } diff --git a/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm b/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm index 399ee51e..ad06f3e7 100644 --- a/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm +++ b/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm @@ -20,7 +20,7 @@ get '/ajax/content/report/portutilization' => require_login sub { my $age_num = param('age_num') || 3; my $age_unit = param('age_unit') || 'months'; my @results = schema('netdisco')->resultset('Virtual::PortUtilization') - ->search(undef, { bind => [ "$age_num $age_unit" ] })->hri->all; + ->search(undef, { bind => [ "$age_num $age_unit", "$age_num $age_unit", "$age_num $age_unit" ] })->hri->all; if (request->is_ajax) { my $json = to_json (\@results); From d45745dd1d9c65f61fecf5f072365b0702c35291 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 20 Aug 2019 11:13:52 +0100 Subject: [PATCH 45/62] fixed only free ports in device ports view (showing free ports TODO) --- lib/App/Netdisco/DB/Result/DevicePort.pm | 25 +++------ .../Netdisco/DB/Result/Virtual/LastNode.pm | 54 +++++++++++++++++++ .../DB/Result/Virtual/PortUtilization.pm | 15 ++---- 3 files changed, 66 insertions(+), 28 deletions(-) create mode 100644 lib/App/Netdisco/DB/Result/Virtual/LastNode.pm diff --git a/lib/App/Netdisco/DB/Result/DevicePort.pm b/lib/App/Netdisco/DB/Result/DevicePort.pm index ed2bbe27..aef84ed7 100644 --- a/lib/App/Netdisco/DB/Result/DevicePort.pm +++ b/lib/App/Netdisco/DB/Result/DevicePort.pm @@ -250,24 +250,13 @@ The JOIN is of type "LEFT" in case there isn't any such node. =cut -__PACKAGE__->belongs_to( last_node => 'App::Netdisco::DB::Result::Node', - sub { - my $args = shift; - return { - "$args->{foreign_alias}.mac" => { '=' => - $args->{self_resultsource}->schema->resultset('Node')->search({ - switch => { -ident => "$args->{self_alias}.ip"}, - port => { -ident => "$args->{self_alias}.port"} - },{ - rows => 1, - order_by => { -desc => ['time_last'] }, - columns => 'mac', - alias => 'lastnodesub' - })->as_query - } - }; - }, - { join_type => 'LEFT' }, +__PACKAGE__->belongs_to( + last_node => 'App::Netdisco::DB::Result::Virtual::LastNode', { + 'foreign.switch' => 'self.ip', + 'foreign.port' => 'self.port', + }, { + join_type => 'LEFT', + } ); =head2 vlans diff --git a/lib/App/Netdisco/DB/Result/Virtual/LastNode.pm b/lib/App/Netdisco/DB/Result/Virtual/LastNode.pm new file mode 100644 index 00000000..8385a8ab --- /dev/null +++ b/lib/App/Netdisco/DB/Result/Virtual/LastNode.pm @@ -0,0 +1,54 @@ +package App::Netdisco::DB::Result::Virtual::LastNode; + +use strict; +use warnings; + +use base 'DBIx::Class::Core'; + +__PACKAGE__->table_class('DBIx::Class::ResultSource::View'); + +__PACKAGE__->table('last_node'); +__PACKAGE__->result_source_instance->is_virtual(1); +__PACKAGE__->result_source_instance->view_definition(<add_columns( + "mac", + { data_type => "macaddr", is_nullable => 0 }, + "switch", + { data_type => "inet", is_nullable => 0 }, + "port", + { data_type => "text", is_nullable => 0 }, + "active", + { data_type => "boolean", is_nullable => 1 }, + "oui", + { data_type => "varchar", is_nullable => 1, size => 8 }, + "time_first", + { + data_type => "timestamp", + default_value => \"current_timestamp", + is_nullable => 1, + original => { default_value => \"now()" }, + }, + "time_recent", + { + data_type => "timestamp", + default_value => \"current_timestamp", + is_nullable => 1, + original => { default_value => \"now()" }, + }, + "time_last", + { + data_type => "timestamp", + default_value => \"current_timestamp", + is_nullable => 1, + original => { default_value => \"now()" }, + }, + "vlan", + { data_type => "text", is_nullable => 0, default_value => '0' }, +); + +1; diff --git a/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm b/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm index f0f0638e..c822c114 100644 --- a/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm +++ b/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm @@ -23,22 +23,17 @@ __PACKAGE__->result_source_instance->view_definition(< ?::interval) ) THEN 1 WHEN ( dp.type != 'propVirtual' AND dp.up_admin = 'up' AND dp.up != 'up' - AND (last_node.time_last IS NULL OR - (age(now(), to_timestamp(extract(epoch from d.last_discover) - (d.uptime - dp.lastchange)/100)) > ?::interval)) ) + AND (age(now(), to_timestamp(extract(epoch from d.last_discover) - (d.uptime - dp.lastchange)/100)) > ?::interval) ) THEN 1 ELSE 0 END) as ports_free FROM device d LEFT JOIN device_port dp ON d.ip = dp.ip - LEFT JOIN node last_node - ON last_node.mac = ( - SELECT lastnodesub.mac - FROM node lastnodesub - WHERE port = dp.port AND switch = dp.ip - ORDER BY time_last DESC - LIMIT '1' - ) + LEFT JOIN + ( SELECT DISTINCT ON (switch, port) * FROM node + ORDER BY switch, port, time_last desc ) AS last_node + ON dp.port = last_node.port AND dp.ip = last_node.switch GROUP BY d.dns, d.ip ORDER BY d.dns, d.ip ENDSQL From fc8ed4691099fcf085a41d582068c5f865b001d9 Mon Sep 17 00:00:00 2001 From: Christian Ramseyer Date: Tue, 20 Aug 2019 19:55:59 +0200 Subject: [PATCH 46/62] Manually install Test::Compile 2.1.2 for Travis CI (#635) Seems to work, I'm merging this and add some comments in #622 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3db9448d..2ae006c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ branches: - /^2\.\d{6}$/ - 'master' install: + - wget https://github.com/egiles/test-compile/archive/v2.1.2.tar.gz + - cpanm -v v2.1.2.tar.gz - cpanm --quiet --notest PkgConfig Test::CChecker Alien::zlib::Static Alien::OpenSSL::Static Alien::SNMP script: | perl Build.PL && \ From 54a86112e4e2f3fc93a90ce723f226c748991486 Mon Sep 17 00:00:00 2001 From: Alan Buxey Date: Thu, 22 Aug 2019 14:25:24 +0100 Subject: [PATCH 47/62] fix raidus typo (#637) radius not raidus --- lib/App/Netdisco/Web/Auth/Provider/DBIC.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm b/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm index 9b86037c..bb6780be 100644 --- a/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm +++ b/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm @@ -110,7 +110,7 @@ sub match_password { if ($user->ldap) { $pwmatch_result = $self->match_with_ldap($password, $username); } - elsif ($user->raidus) { + elsif ($user->radius) { $pwmatch_result = $self->match_with_radius($password, $username); } else { From c8222380501dcb6362e828e8a1f27805c03882d3 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Thu, 22 Aug 2019 17:06:49 +0100 Subject: [PATCH 48/62] showing free ports works --- lib/App/Netdisco/DB/ResultSet/DevicePort.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/App/Netdisco/DB/ResultSet/DevicePort.pm b/lib/App/Netdisco/DB/ResultSet/DevicePort.pm index bdf26435..5f16c99d 100644 --- a/lib/App/Netdisco/DB/ResultSet/DevicePort.pm +++ b/lib/App/Netdisco/DB/ResultSet/DevicePort.pm @@ -67,12 +67,12 @@ sub with_is_free { ->search({}, { '+columns' => { is_free => - \["me.up != 'up' and " - ."age(now(), to_timestamp(extract(epoch from device.last_discover) " - ."- (device.uptime - me.lastchange)/100)) " - ."> ?::interval", - [{} => $interval]] }, - join => 'device', + \["me.up = ' up' AND me.up != 'up' AND me.type != 'propVirtual' AND " + ."((age(now(), to_timestamp(extract(epoch from device.last_discover) - (device.uptime/100))) < ?::interval " + ."AND (last_node.time_last IS NULL OR age(now(), last_node.time_last) > ?::interval)) " + ."OR age(now(), to_timestamp(extract(epoch from device.last_discover) - (device.uptime - me.lastchange)/100)) > ?::interval)", + [{} => $interval],[ {} => $interval],[ {} => $interval]] }, + join => [qw/device last_node/], }); } From a474e35cb9b15c5d426768601b6eeae36e37fd2f Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Thu, 22 Aug 2019 17:51:54 +0100 Subject: [PATCH 49/62] tweak column size in users page --- share/views/ajax/admintask/users.tt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/share/views/ajax/admintask/users.tt b/share/views/ajax/admintask/users.tt index 7131a2a5..2378a358 100644 --- a/share/views/ajax/admintask/users.tt +++ b/share/views/ajax/admintask/users.tt @@ -17,15 +17,15 @@ - - + + - + @@ -39,10 +39,10 @@ - + - + @@ -59,7 +59,7 @@ [% row.created | html_entity %] [% row.last_seen | html_entity %] - + From 8a66cf91af67abed82a9ec26968f490bfd62b37b Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Fri, 23 Aug 2019 09:22:21 +0100 Subject: [PATCH 50/62] typo fix in free ports --- lib/App/Netdisco/DB/ResultSet/DevicePort.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Netdisco/DB/ResultSet/DevicePort.pm b/lib/App/Netdisco/DB/ResultSet/DevicePort.pm index 5f16c99d..636ef569 100644 --- a/lib/App/Netdisco/DB/ResultSet/DevicePort.pm +++ b/lib/App/Netdisco/DB/ResultSet/DevicePort.pm @@ -67,7 +67,7 @@ sub with_is_free { ->search({}, { '+columns' => { is_free => - \["me.up = ' up' AND me.up != 'up' AND me.type != 'propVirtual' AND " + \["me.up_admin = 'up' AND me.up != 'up' AND me.type != 'propVirtual' AND " ."((age(now(), to_timestamp(extract(epoch from device.last_discover) - (device.uptime/100))) < ?::interval " ."AND (last_node.time_last IS NULL OR age(now(), last_node.time_last) > ?::interval)) " ."OR age(now(), to_timestamp(extract(epoch from device.last_discover) - (device.uptime - me.lastchange)/100)) > ?::interval)", From 86daf7174df2800eed4c1adcc1fe24d4be349876 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Fri, 23 Aug 2019 09:25:17 +0100 Subject: [PATCH 51/62] add comments --- lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm | 1 + lib/App/Netdisco/DB/ResultSet/DevicePort.pm | 2 ++ lib/App/Netdisco/Web/Plugin/Device/Ports.pm | 1 + 3 files changed, 4 insertions(+) diff --git a/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm b/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm index c822c114..a51e6ccc 100644 --- a/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm +++ b/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm @@ -7,6 +7,7 @@ use base 'DBIx::Class::Core'; __PACKAGE__->table_class('DBIx::Class::ResultSource::View'); +# NOTE this query is in `git grep 'THREE PLACES'` __PACKAGE__->table('port_utilization'); __PACKAGE__->result_source_instance->is_virtual(1); __PACKAGE__->result_source_instance->view_definition(<search({}, { '+columns' => { is_free => + # NOTE this query is in `git grep 'THREE PLACES'` \["me.up_admin = 'up' AND me.up != 'up' AND me.type != 'propVirtual' AND " ."((age(now(), to_timestamp(extract(epoch from device.last_discover) - (device.uptime/100))) < ?::interval " ."AND (last_node.time_last IS NULL OR age(now(), last_node.time_last) > ?::interval)) " @@ -96,6 +97,7 @@ sub only_free_ports { ->search_rs($cond, $attrs) ->search( { + # NOTE this query is in `git grep 'THREE PLACES'` 'me.up_admin' => 'up', 'me.up' => { '!=' => 'up' }, 'me.type' => { '!=' => 'propVirtual' }, diff --git a/lib/App/Netdisco/Web/Plugin/Device/Ports.pm b/lib/App/Netdisco/Web/Plugin/Device/Ports.pm index 9f994dcd..d4850b5b 100644 --- a/lib/App/Netdisco/Web/Plugin/Device/Ports.pm +++ b/lib/App/Netdisco/Web/Plugin/Device/Ports.pm @@ -82,6 +82,7 @@ get '/ajax/content/device/ports' => require_login sub { }); } delete $port_state{free}; + # showing free ports requires showing down ports ++$port_state{down}; } From bb6cf26b09d1495dbd9a26b8f6d838731e8c3f9a Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Fri, 23 Aug 2019 11:39:43 +0100 Subject: [PATCH 52/62] update manifest --- MANIFEST | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MANIFEST b/MANIFEST index 566cb575..8b3b366a 100644 --- a/MANIFEST +++ b/MANIFEST @@ -62,6 +62,7 @@ lib/App/Netdisco/DB/Result/Virtual/DevicePoeStatus.pm lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm lib/App/Netdisco/DB/Result/Virtual/DuplexMismatch.pm lib/App/Netdisco/DB/Result/Virtual/GenericReport.pm +lib/App/Netdisco/DB/Result/Virtual/LastNode.pm lib/App/Netdisco/DB/Result/Virtual/NodeIp4.pm lib/App/Netdisco/DB/Result/Virtual/NodeIp6.pm lib/App/Netdisco/DB/Result/Virtual/NodeMonitor.pm @@ -318,6 +319,7 @@ share/public/javascripts/netdisco_portcontrol.js share/public/javascripts/portsort.js share/public/javascripts/toastr.js share/public/javascripts/underscore.min.js +share/radius_dictionaries/TODO share/schema_versions/App-Netdisco-DB-1-2-PostgreSQL.sql share/schema_versions/App-Netdisco-DB-10-11-PostgreSQL.sql share/schema_versions/App-Netdisco-DB-11-12-PostgreSQL.sql @@ -371,6 +373,7 @@ share/schema_versions/App-Netdisco-DB-54-55-PostgreSQL.sql share/schema_versions/App-Netdisco-DB-55-56-PostgreSQL.sql share/schema_versions/App-Netdisco-DB-56-57-PostgreSQL.sql share/schema_versions/App-Netdisco-DB-57-58-PostgreSQL.sql +share/schema_versions/App-Netdisco-DB-58-59-PostgreSQL.sql share/schema_versions/App-Netdisco-DB-6-7-PostgreSQL.sql share/schema_versions/App-Netdisco-DB-7-8-PostgreSQL.sql share/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql From 0e06e3650a8ff964a5fa73264088a58b70979e55 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Fri, 23 Aug 2019 15:22:40 +0100 Subject: [PATCH 53/62] #606 update licence file --- LICENCE | 24 ------------------------ LICENSE.md | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 24 deletions(-) delete mode 100644 LICENCE create mode 100644 LICENSE.md diff --git a/LICENCE b/LICENCE deleted file mode 100644 index acff9c0b..00000000 --- a/LICENCE +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (c) 2012, The Netdisco Developer Team -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Netdisco Project nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE NETDISCO DEVELOPER TEAM BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..5c750980 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,29 @@ +BSD 3-Clause License + +Copyright (c) 2019, The Netdisco Developer Team. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 54fbc00407b191194296b4b0b327d42007530483 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Fri, 23 Aug 2019 20:25:39 +0200 Subject: [PATCH 54/62] license file renamed --- MANIFEST | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST b/MANIFEST index 8b3b366a..7b0766b8 100644 --- a/MANIFEST +++ b/MANIFEST @@ -238,7 +238,7 @@ lib/App/Netdisco/Worker/Plugin/Vlan/Core.pm lib/App/Netdisco/Worker/Runner.pm lib/App/Netdisco/Worker/Status.pm lib/Dancer/Template/NetdiscoTemplateToolkit.pm -LICENCE +LICENSE.md MANIFEST This list of files META.json META.yml From dbc3fae58849d592e2b8117a294a337c15377212 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Fri, 23 Aug 2019 20:54:24 +0200 Subject: [PATCH 55/62] set default to false in create statement this way existing users will be set to false instead of undef --- share/schema_versions/App-Netdisco-DB-58-59-PostgreSQL.sql | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/share/schema_versions/App-Netdisco-DB-58-59-PostgreSQL.sql b/share/schema_versions/App-Netdisco-DB-58-59-PostgreSQL.sql index 8262af36..cd073f78 100644 --- a/share/schema_versions/App-Netdisco-DB-58-59-PostgreSQL.sql +++ b/share/schema_versions/App-Netdisco-DB-58-59-PostgreSQL.sql @@ -1,7 +1,5 @@ BEGIN; -ALTER TABLE users ADD radius boolean; - -ALTER TABLE users ALTER radius SET DEFAULT false; +ALTER TABLE users ADD COLUMN "radius" boolean DEFAULT false; COMMIT; From adf80a167112f2e6a5537406411595078bcc909c Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Fri, 23 Aug 2019 21:05:55 +0200 Subject: [PATCH 56/62] i guess this should work too --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ae006c5..adce4b3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,7 @@ branches: - /^2\.\d{6}$/ - 'master' install: - - wget https://github.com/egiles/test-compile/archive/v2.1.2.tar.gz - - cpanm -v v2.1.2.tar.gz - - cpanm --quiet --notest PkgConfig Test::CChecker Alien::zlib::Static Alien::OpenSSL::Static Alien::SNMP + - cpanm --quiet --notest https://github.com/egiles/test-compile/archive/v2.1.2.tar.gz PkgConfig Test::CChecker Alien::zlib::Static Alien::OpenSSL::Static Alien::SNMP script: | perl Build.PL && \ ./Build && \ From 30759d7102e488a0b04fb48838b518867abe711c Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Tue, 27 Aug 2019 00:02:39 +0200 Subject: [PATCH 57/62] trailing whitespace --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index adce4b3d..dda9e6ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ addons: packages: - libsnmp-dev - phantomjs - - graphviz + - graphviz hosts: - localhost branches: From 2f4edb9225b6c85cad4221fd2d354aa86792ab0a Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Wed, 28 Aug 2019 22:39:12 +0200 Subject: [PATCH 58/62] more info equals faster troubleshooting --- .github/issue_template.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/issue_template.md b/.github/issue_template.md index 94bdb323..88acb104 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -1,4 +1,9 @@ @@ -48,6 +56,10 @@ this should preserve spaces in the issue tracker and make troubleshooting quicke * Netdisco version used: * SNMP::Info version used: +## Config info (deployment.yml) + + + ## Device information From 9730b87afa152113c961d913c88548da2be96072 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Wed, 28 Aug 2019 22:43:29 +0200 Subject: [PATCH 59/62] move some things around --- .github/issue_template.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/issue_template.md b/.github/issue_template.md index 88acb104..91bedb26 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -3,9 +3,6 @@ READ THIS FIRST! ---------------- - -Provide a general summary of the issue in the Title above - STOP! If your ticket is about a device not being detected correctly, see SNMP::Info: https://github.com/netdisco/snmp-info/issues/new @@ -15,15 +12,20 @@ see netdisco-mibs: https://github.com/netdisco/netdisco-mibs/issues/new STOP! If you are running a netdisco docker setup, see netdisco-docker: https://github.com/netdisco/netdisco-docker/issues/new + + everything else about Netdisco's behaviour is good, here :-D +the more info you can provide, the easier it is for us the help you, so please +fill out as many of the items below as possible. + +Provide a general summary of the issue in the Title above + when including netdisco config snippets, whitespace matters since it's a yaml file for github issues it really helps if you include the relevant config parts in a codeblock (code fencing) see the "code" subject on https://guides.github.com/features/mastering-markdown/ for that) this should preserve spaces in the issue tracker and make troubleshooting quicker -the more info you can provide, the easier it is for us the help you, so please -fill out as many of the items below as possible. --> From a734890055ce417273d7fc9c2a0434a95589cc49 Mon Sep 17 00:00:00 2001 From: nick n <39005454+inphobia@users.noreply.github.com> Date: Thu, 29 Aug 2019 02:22:28 +0200 Subject: [PATCH 60/62] some documentation fixes (#640) * a few more files to ignore * the pgtune we reference seems to be dead, provide a few alternatives. * steal pod syntax check from snmp::info, but don't bother with checking Test::Pod version. we want 1.22 or later, which was released in 2005 * reference the release notes in our wiki. changes you need to make manually during upgrades are documented there. * add pod test to manifest * term was defined around line 111 and then again at line 209, rename the second one --- MANIFEST | 1 + META.json | 12 ++++++++---- META.yml | 9 ++++++--- bin/netdisco-deploy | 26 +++++++++++++++++++------- lib/App/Netdisco.pm | 23 +++++++++++++++++------ xt/01-local-pod.t | 8 ++++++++ 6 files changed, 59 insertions(+), 20 deletions(-) create mode 100644 xt/01-local-pod.t diff --git a/MANIFEST b/MANIFEST index 7b0766b8..704eb7a5 100644 --- a/MANIFEST +++ b/MANIFEST @@ -508,6 +508,7 @@ share/views/sidebar/search/device.tt share/views/sidebar/search/node.tt share/views/sidebar/search/port.tt xt/00-compile.t +xt/01-local-pod.t xt/10-sort_port.t xt/11-portsort.t xt/20-checkacl.t diff --git a/META.json b/META.json index 1687f6cd..e4467c6f 100644 --- a/META.json +++ b/META.json @@ -4,7 +4,7 @@ "Oliver Gorwits " ], "dynamic_config" : 1, - "generated_by" : "Module::Build version 0.4224", + "generated_by" : "Module::Build version 0.4229", "license" : [ "bsd" ], @@ -39,6 +39,7 @@ "App::cpanminus" : "1.6108", "App::local::lib::helper" : "0.07", "Archive::Extract" : "0", + "Authen::Radius" : "0", "CGI::Expand" : "2.05", "DBD::Pg" : "0", "DBIx::Class" : "0.082841", @@ -143,7 +144,7 @@ }, "App::Netdisco::DB" : { "file" : "lib/App/Netdisco/DB.pm", - "version" : "58" + "version" : "59" }, "App::Netdisco::DB::ExplicitLocking" : { "file" : "lib/App/Netdisco/DB/ExplicitLocking.pm" @@ -268,6 +269,9 @@ "App::Netdisco::DB::Result::Virtual::GenericReport" : { "file" : "lib/App/Netdisco/DB/Result/Virtual/GenericReport.pm" }, + "App::Netdisco::DB::Result::Virtual::LastNode" : { + "file" : "lib/App/Netdisco/DB/Result/Virtual/LastNode.pm" + }, "App::Netdisco::DB::Result::Virtual::NodeIp4" : { "file" : "lib/App/Netdisco/DB/Result/Virtual/NodeIp4.pm" }, @@ -804,7 +808,7 @@ }, "homepage" : "http://netdisco.org/", "license" : [ - "http://opensource.org/licenses/BSD-3-Clause" + "http://opensource.org/licenses/bsd-license.php" ], "repository" : { "url" : "https://github.com/netdisco/netdisco" @@ -813,5 +817,5 @@ "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users" }, "version" : "2.042010", - "x_serialization_backend" : "JSON::PP version 2.97001" + "x_serialization_backend" : "JSON::PP version 4.02" } diff --git a/META.yml b/META.yml index c8b99498..7b79c6da 100644 --- a/META.yml +++ b/META.yml @@ -14,7 +14,7 @@ configure_requires: DBIx::Class: '0.082810' Module::Build: '0.42' dynamic_config: 1 -generated_by: 'Module::Build version 0.4224, CPAN::Meta::Converter version 2.150010' +generated_by: 'Module::Build version 0.4229, CPAN::Meta::Converter version 2.150010' license: bsd meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -38,7 +38,7 @@ provides: file: lib/App/Netdisco/Configuration.pm App::Netdisco::DB: file: lib/App/Netdisco/DB.pm - version: '58' + version: '59' App::Netdisco::DB::ExplicitLocking: file: lib/App/Netdisco/DB/ExplicitLocking.pm App::Netdisco::DB::Result::Admin: @@ -121,6 +121,8 @@ provides: file: lib/App/Netdisco/DB/Result/Virtual/DuplexMismatch.pm App::Netdisco::DB::Result::Virtual::GenericReport: file: lib/App/Netdisco/DB/Result/Virtual/GenericReport.pm + App::Netdisco::DB::Result::Virtual::LastNode: + file: lib/App/Netdisco/DB/Result/Virtual/LastNode.pm App::Netdisco::DB::Result::Virtual::NodeIp4: file: lib/App/Netdisco/DB/Result/Virtual/NodeIp4.pm App::Netdisco::DB::Result::Virtual::NodeIp6: @@ -483,6 +485,7 @@ requires: App::cpanminus: '1.6108' App::local::lib::helper: '0.07' Archive::Extract: '0' + Authen::Radius: '0' CGI::Expand: '2.05' DBD::Pg: '0' DBIx::Class: '0.082841' @@ -556,7 +559,7 @@ resources: MailingList: https://lists.sourceforge.net/lists/listinfo/netdisco-users bugtracker: https://github.com/netdisco/netdisco/issues homepage: http://netdisco.org/ - license: http://opensource.org/licenses/BSD-3-Clause + license: http://opensource.org/licenses/bsd-license.php repository: https://github.com/netdisco/netdisco version: '2.042010' x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff --git a/bin/netdisco-deploy b/bin/netdisco-deploy index f96891a4..bd9ff262 100755 --- a/bin/netdisco-deploy +++ b/bin/netdisco-deploy @@ -71,7 +71,7 @@ these is an optional service which the user is asked to confirm. Pre-existing requirements are that there be a database table created and a user with rights to create tables in that database. Both the table and user name must match those configured in your environment YAML file (default -C<~/environments/deployment.yml>). +F<~/environments/deployment.yml>). This script will download the latest MAC address vendor prefix data from the Internet, and update the OUI table in the database. Hence Internet access is @@ -80,10 +80,17 @@ required to run the script. Similarly the latest Netdisco MIB bundle is also downloaded and placed into the user's home directory (or C<$ENV{NETDISCO_HOME}>). +If you upgrade Netdisco make sure you run this script again to make sure +your config remains compatible. + +Before each upgrade also review the +L since +additional steps might be required! + =cut print color 'bold cyan'; -say 'This is the Netdisco II deployment script.'; +say 'This is the Netdisco 2 deployment script.'; say ''; say 'Before we continue, the following prerequisites must be in place:'; say ' * Database added to PostgreSQL for Netdisco'; @@ -92,6 +99,11 @@ say ' * "~/environments/deployment.yml" file configured with Database dsn/user/p say ' * A full backup of any existing Netdisco database data'; say ' * Internet access (for OUIs and MIBs)'; say ''; +say 'If you are upgrading Netdisco 2 read the release notes:'; +say 'https://github.com/netdisco/netdisco/wiki/Release-Notes'; +say 'There you will find required and incompatible changes'; +say 'which are not covered by this script.'; +say ''; say 'You will be asked to confirm all changes to your system.'; say ''; print color 'reset'; @@ -194,13 +206,13 @@ sub deploy_db { } sub get_userpass { - my $term = shift; - my $name = $term->get_reply(prompt => 'Username: '); - my $pass = $term->get_reply(prompt => 'Password: '); + my $upterm = shift; + my $name = $upterm->get_reply(prompt => 'Username: '); + my $pass = $upterm->get_reply(prompt => 'Password: '); unless ($name and $pass) { say 'username and password cannot be empty, please try again.'; - ($name, $pass) = get_userpass($term); + ($name, $pass) = get_userpass($upterm); } return ($name, $pass); @@ -257,7 +269,7 @@ sub deploy_oui { print color 'reset'; } -# This subroutine is baed on Wireshark's make-manuf +# This subroutine is based on Wireshark's make-manuf # http://anonsvn.wireshark.org/wireshark/trunk/tools/make-manuf sub shorten { my $manuf = shift; diff --git a/lib/App/Netdisco.pm b/lib/App/Netdisco.pm index 15b59415..3b139a82 100644 --- a/lib/App/Netdisco.pm +++ b/lib/App/Netdisco.pm @@ -116,14 +116,25 @@ application: You may wish to L so that local connections are working. The default PostgreSQL configuration -also needs tuning for modern server hardware. We recommend that you use the -C Python program to auto-tune your C file: +can also use tuning for modern server hardware. We recommend that you use one of the following +tools to tune your C file: =over 4 -=item * +=item L -L +Script that will check your operating system resources and settings as well as your +running PostgreSQL database and will make recommendations based on actual load. Works +on new netdisco installs but will make the best suggestions once the database contains +a bigger dataset. + +=item L + +A web based application which will recommend which parameters to change. + +=item L + +Program to auto-tune your C, regretfully not updated in a while. =back @@ -230,7 +241,7 @@ If you're running a version of Netdisco prior to 2.x then you should follow the full installation instructions, above. This process is for upgrading version 2.x only. -Before upgrading please review the latest L. +Before upgrading always review the latest L. Then the process below should be run for each installation: # upgrade Netdisco @@ -333,7 +344,7 @@ built upon. =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2011-2018 by The Netdisco Developer Team. +This software is copyright (c) 2011-2019 by The Netdisco Developer Team. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/xt/01-local-pod.t b/xt/01-local-pod.t new file mode 100644 index 00000000..bbbea32f --- /dev/null +++ b/xt/01-local-pod.t @@ -0,0 +1,8 @@ +#!/usr/bin/env perl + +use strict; +use warnings; +use Test::More; +use Test::Pod; + +all_pod_files_ok(); From 2897eda68481f248d61ae4e46b1f2113df0e3923 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 3 Sep 2019 09:09:55 +0100 Subject: [PATCH 61/62] #587 #561 update pseudo devices to better support ssh arpnip this patch resets all pseudo devices to have no layer3 support but adds a feature to the pseudo devices admin panel to enable layer3 support. it also changes arpnip and arpwalk behaviour to always permit the action if layer3 is available (ignoring the vendor). documentation will need updating to tell users to create pseudo devices with layer3 support when they want to arpnip an unsupported platform. arpnip with ssh/cli against a supported platform (one that can be discovered) will continue to work normally. Squashed commit of the following: commit 9dad5be81db0569a757978af4e0560431ba3d3ad Author: Oliver Gorwits Date: Tue Sep 3 09:03:53 2019 +0100 allow pseudo with layer 3 to run arpnip commit 7d97943fcde6240c2c2aa21c4bc38268d96ff1ec Author: Oliver Gorwits Date: Tue Sep 3 08:59:10 2019 +0100 allow pseudo devices with layer 2/3 capability commit d1fdf574e33d2454f00a28c0b04b494b45d8a920 Author: Oliver Gorwits Date: Tue Sep 3 08:55:41 2019 +0100 move pseudo and layer checks to is_able from is_able_now commit e0f72ef67df2128b67d3197cd6c2df8191173a8b Author: Oliver Gorwits Date: Tue Sep 3 08:51:42 2019 +0100 ports defaults to one commit 86ba01270cc4dd2b2167faa7dabfce1c319ee7af Author: Oliver Gorwits Date: Tue Sep 3 08:50:45 2019 +0100 add tooltip for arpnip toggle commit cdd2470228d07777567ffafe00b797376c1bc177 Author: Oliver Gorwits Date: Tue Sep 3 08:34:46 2019 +0100 simplify template commit 46236d68eae4b9bd8fcd47098782143051a62064 Author: Oliver Gorwits Date: Sun Sep 1 23:53:56 2019 +0100 a fix up for pseudo devices which need layer 3 commit 016d249efc83eeeff949ef120a30de2b7f5563cd Author: Oliver Gorwits Date: Sun Sep 1 20:37:11 2019 +0100 do not wrap buttons commit 1ec1402e0c0951a3de1e3f3492443f89299324bb Author: Oliver Gorwits Date: Sun Sep 1 20:33:03 2019 +0100 implement user settable layer-three service for pseudo devices commit a267efa3d8138e4a6b54f5585f19be423253626e Author: Oliver Gorwits Date: Sun Sep 1 18:39:22 2019 +0100 only set layer if successful action commit b108be5e23bee319dd761ae5970161cea4717d31 Author: Oliver Gorwits Date: Sun Sep 1 18:32:19 2019 +0100 should defer SNMP against pseudo devices commit 897ba3a62956a0f6f9bb708f5971e1f4d1474653 Merge: e0ddbaab a7348900 Author: Oliver Gorwits Date: Sun Sep 1 14:54:36 2019 +0100 Merge branch 'master' into og-pseudo-vs-cli-arpnip commit e0ddbaab0807fcfd7eb33de3a8b1df9ca394d99f Author: Oliver Gorwits Date: Mon Aug 26 11:35:13 2019 +0100 as last commit, for discover commit 61f9c89040912391ac94a67e1c2ab93c8fb207a9 Author: Oliver Gorwits Date: Sun Aug 25 23:55:38 2019 +0100 move pseudo and layer checks into is_*able functions commit 8b010d40238d5c7bb566249181da20a6ac7a68f6 Author: Oliver Gorwits Date: Sun Aug 25 18:38:11 2019 +0100 any device completing macsuck/arpnip must have that layer commit a11bce7863b29c12ed6219f7a828ed5340a1b521 Author: Oliver Gorwits Date: Sun Aug 25 18:33:27 2019 +0100 clean up device layers commit d2661bff61717dc74347cd9b3b5602bc6cb87bd9 Author: Oliver Gorwits Date: Sun Aug 25 18:18:02 2019 +0100 first make arpnip behave like other jobs towards pseudo devices --- lib/App/Netdisco/JobQueue/PostgreSQL.pm | 13 ++++++++ lib/App/Netdisco/Transport/SNMP.pm | 6 ++++ lib/App/Netdisco/Util/Device.pm | 30 +++++++++++++------ .../Web/Plugin/AdminTask/PseudoDevice.pm | 5 +++- lib/App/Netdisco/Worker/Plugin/Arpnip.pm | 3 -- .../Netdisco/Worker/Plugin/Arpnip/Nodes.pm | 28 +++++++++-------- lib/App/Netdisco/Worker/Plugin/Discover.pm | 3 -- lib/App/Netdisco/Worker/Plugin/Macsuck.pm | 6 ---- share/public/css/netdisco.css | 7 +++++ .../App-Netdisco-DB-58-59-PostgreSQL.sql | 6 ++++ share/views/ajax/admintask/pseudodevice.tt | 24 ++++++++++++++- share/views/ajax/admintask/users.tt | 4 +-- share/views/js/admintask.js | 3 +- 13 files changed, 99 insertions(+), 39 deletions(-) diff --git a/lib/App/Netdisco/JobQueue/PostgreSQL.pm b/lib/App/Netdisco/JobQueue/PostgreSQL.pm index e332131a..c8faf5b8 100644 --- a/lib/App/Netdisco/JobQueue/PostgreSQL.pm +++ b/lib/App/Netdisco/JobQueue/PostgreSQL.pm @@ -79,6 +79,19 @@ sub jq_warm_thrusters { actionset => $actionset{$_}, }, { key => 'primary' }) for keys %actionset; }); + + # fix up the pseudo devices which need layer 3 + # TODO remove this after next release + schema('netdisco')->txn_do(sub { + my @hosts = grep { defined } + map { schema('netdisco')->resultset('Device')->search_for_device($_->{only}) } + grep { exists $_->{only} and ref '' eq ref $_->{only} } + grep { exists $_->{driver} and $_->{driver} eq 'cli' } + @{ setting('device_auth') }; + + $_->update({ layers => \[q{overlay(layers placing '1' from 6 for 1)}] }) + for @hosts; + }); } sub jq_getsome { diff --git a/lib/App/Netdisco/Transport/SNMP.pm b/lib/App/Netdisco/Transport/SNMP.pm index f342155b..5fbf5fed 100644 --- a/lib/App/Netdisco/Transport/SNMP.pm +++ b/lib/App/Netdisco/Transport/SNMP.pm @@ -58,8 +58,11 @@ Returns C if the connection fails. sub reader_for { my ($class, $ip, $useclass) = @_; my $device = get_device($ip) or return undef; + return undef if $device->in_storage and $device->is_pseudo; + my $readers = $class->instance->readers or return undef; return $readers->{$device->ip} if exists $readers->{$device->ip}; + debug sprintf 'snmp reader cache warm: [%s]', $device->ip; return ($readers->{$device->ip} = _snmp_connect_generic('read', $device, $useclass)); @@ -104,8 +107,11 @@ Returns C if the connection fails. sub writer_for { my ($class, $ip, $useclass) = @_; my $device = get_device($ip) or return undef; + return undef if $device->in_storage and $device->is_pseudo; + my $writers = $class->instance->writers or return undef; return $writers->{$device->ip} if exists $writers->{$device->ip}; + debug sprintf 'snmp writer cache warm: [%s]', $device->ip; return ($writers->{$device->ip} = _snmp_connect_generic('write', $device, $useclass)); diff --git a/lib/App/Netdisco/Util/Device.pm b/lib/App/Netdisco/Util/Device.pm index e0fbd211..6c31583a 100644 --- a/lib/App/Netdisco/Util/Device.pm +++ b/lib/App/Netdisco/Util/Device.pm @@ -158,6 +158,8 @@ If C<$device_type> is also given, then C will be checked. Also respects C and C if either are set to false. +Also checks if the device is a pseudo device (vendor is C). + Returns false if the host is not permitted to discover the target device. =cut @@ -168,6 +170,9 @@ sub is_discoverable { $remote_type ||= ''; $remote_cap ||= []; + return _bail_msg("is_discoverable: $device is pseudo-device") + if $device->is_pseudo; + return _bail_msg("is_discoverable: $device matches wap_platforms but discover_waps is not enabled") if ((not setting('discover_waps')) and (match_to_setting($remote_type, 'wap_platforms') or @@ -192,9 +197,8 @@ sub is_discoverable { =head2 is_discoverable_now( $ip, $device_type? ) -Same as C, but also checks the last_discover field if the -device is in storage, and returns false if that host has been too recently -discovered. +Same as C, but also compares the C field +of the C to the C configuration. Returns false if the host is not permitted to discover the target device. @@ -222,6 +226,8 @@ the local configuration to arpnip the device. The configuration items C and C are checked against the given IP. +Also checks if the device reports layer 3 capability. + Returns false if the host is not permitted to arpnip the target device. =cut @@ -230,6 +236,9 @@ sub is_arpnipable { my $ip = shift; my $device = get_device($ip) or return 0; + return _bail_msg("is_arpnipable: $device has no layer 3 capability") + unless $device->has_layer(3); + return _bail_msg("is_arpnipable: $device matched arpnip_no") if check_acl_no($device, 'arpnip_no'); @@ -241,9 +250,8 @@ sub is_arpnipable { =head2 is_arpnipable_now( $ip ) -Same as C, but also checks the last_arpnip field if the -device is in storage, and returns false if that host has been too recently -arpnipped. +Same as C, but also compares the C field +of the C to the C configuration. Returns false if the host is not permitted to arpnip the target device. @@ -271,6 +279,8 @@ the local configuration to macsuck the device. The configuration items C and C are checked against the given IP. +Also checks if the device reports layer 2 capability. + Returns false if the host is not permitted to macsuck the target device. =cut @@ -279,6 +289,9 @@ sub is_macsuckable { my $ip = shift; my $device = get_device($ip) or return 0; + return _bail_msg("is_macsuckable: $device has no layer 2 capability") + unless $device->has_layer(2); + return _bail_msg("is_macsuckable: $device matched macsuck_no") if check_acl_no($device, 'macsuck_no'); @@ -290,9 +303,8 @@ sub is_macsuckable { =head2 is_macsuckable_now( $ip ) -Same as C, but also checks the last_macsuck field if the -device is in storage, and returns false if that host has been too recently -macsucked. +Same as C, but also compares the C field +of the C to the C configuration. Returns false if the host is not permitted to macsuck the target device. diff --git a/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm b/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm index 15d3f15d..dac18e58 100644 --- a/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm +++ b/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm @@ -36,7 +36,7 @@ ajax '/ajax/control/admin/pseudodevice/add' => require_role admin => sub { ip => param('ip'), dns => param('dns'), vendor => 'netdisco', - layers => '00000100', + layers => param('layers'), last_discover => \'now()', }); return unless $device; @@ -87,6 +87,9 @@ ajax '/ajax/control/admin/pseudodevice/update' => require_role admin => sub { })->delete; } } + + # also set layers + $device->update({layers => param('layers')}); }); }; diff --git a/lib/App/Netdisco/Worker/Plugin/Arpnip.pm b/lib/App/Netdisco/Worker/Plugin/Arpnip.pm index 12e8f1e3..1637b5df 100644 --- a/lib/App/Netdisco/Worker/Plugin/Arpnip.pm +++ b/lib/App/Netdisco/Worker/Plugin/Arpnip.pm @@ -16,9 +16,6 @@ register_worker({ phase => 'check' }, sub { return Status->error("arpnip skipped: $device not yet discovered") unless $device->in_storage; - return Status->info("arpnip skipped: $device has no layer 3 capability") - unless $device->has_layer(3); - return Status->info("arpnip skipped: $device is not arpnipable") unless is_arpnipable_now($device); diff --git a/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm b/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm index b6122f35..91ba0303 100644 --- a/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm +++ b/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm @@ -55,6 +55,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub { push @{ vars->{'v6arps'} }, @{get_arps_snmp($device, $snmp->ipv6_n2p_mac, $snmp->ipv6_n2p_addr) }; + $device->update({layers => \[q{overlay(layers placing '1' from 6 for 1)}]}); return Status->done("Gathered arp caches from $device"); }); @@ -82,24 +83,25 @@ sub get_arps_snmp { } register_worker({ phase => 'main', driver => 'cli' }, sub { - my ($job, $workerconf) = @_; + my ($job, $workerconf) = @_; - my $device = $job->device; - my $cli = App::Netdisco::Transport::SSH->session_for($device) - or return Status->defer("arpnip failed: could not SSH connect to $device"); + my $device = $job->device; + my $cli = App::Netdisco::Transport::SSH->session_for($device) + or return Status->defer("arpnip failed: could not SSH connect to $device"); - # should be both v4 and v6 - my @arps = @{ get_arps_cli($device, [$cli->arpnip]) }; + # should be both v4 and v6 + my @arps = @{ get_arps_cli($device, [$cli->arpnip]) }; - # cache v4 arp table - push @{ vars->{'v4arps'} }, - grep { NetAddr::IP::Lite->new($_->{ip})->bits == 32 } @arps; + # cache v4 arp table + push @{ vars->{'v4arps'} }, + grep { NetAddr::IP::Lite->new($_->{ip})->bits == 32 } @arps; - # cache v6 neighbor cache - push @{ vars->{'v6arps'} }, - grep { NetAddr::IP::Lite->new($_->{ip})->bits == 128 } @arps; + # cache v6 neighbor cache + push @{ vars->{'v6arps'} }, + grep { NetAddr::IP::Lite->new($_->{ip})->bits == 128 } @arps; - return Status->done("Gathered arp caches from $device"); + $device->update({layers => \[q{overlay(layers placing '1' from 6 for 1)}]}); + return Status->done("Gathered arp caches from $device"); }); sub get_arps_cli { diff --git a/lib/App/Netdisco/Worker/Plugin/Discover.pm b/lib/App/Netdisco/Worker/Plugin/Discover.pm index d65d274e..5934b8b3 100644 --- a/lib/App/Netdisco/Worker/Plugin/Discover.pm +++ b/lib/App/Netdisco/Worker/Plugin/Discover.pm @@ -16,9 +16,6 @@ register_worker({ phase => 'check' }, sub { return Status->error("discover failed: no device param (need -d ?)") if $device->ip eq '0.0.0.0'; - return Status->info("discover skipped: $device is pseudo-device") - if $device->is_pseudo; - # runner has already called get_device to promote $job->device return $job->cancel("fresh discover cancelled: $device already known") if $device->in_storage diff --git a/lib/App/Netdisco/Worker/Plugin/Macsuck.pm b/lib/App/Netdisco/Worker/Plugin/Macsuck.pm index 8f90fdf0..13b61065 100644 --- a/lib/App/Netdisco/Worker/Plugin/Macsuck.pm +++ b/lib/App/Netdisco/Worker/Plugin/Macsuck.pm @@ -16,12 +16,6 @@ register_worker({ phase => 'check' }, sub { return Status->error("macsuck skipped: $device not yet discovered") unless $device->in_storage; - return Status->info("macsuck skipped: $device is pseudo-device") - if $device->is_pseudo; - - return Status->info("macsuck skipped: $device has no layer 2 capability") - unless $device->has_layer(2); - return Status->info("macsuck skipped: $device is not macsuckable") unless is_macsuckable_now($device); diff --git a/share/public/css/netdisco.css b/share/public/css/netdisco.css index 71136174..5e2fedaf 100644 --- a/share/public/css/netdisco.css +++ b/share/public/css/netdisco.css @@ -245,6 +245,13 @@ td > form.nd_inline-form { text-decoration: none; } +/* badge for pseudo devices layer three toggle */ +.nd_layer-three-link { + text-decoration: none !important; + display: inline-block; + margin-left: -4px; +} + /* for the job control admin page play/pause links */ #nd_countdown-refresh:hover, #nd_countdown-control:hover { text-decoration: none; diff --git a/share/schema_versions/App-Netdisco-DB-58-59-PostgreSQL.sql b/share/schema_versions/App-Netdisco-DB-58-59-PostgreSQL.sql index cd073f78..53983c95 100644 --- a/share/schema_versions/App-Netdisco-DB-58-59-PostgreSQL.sql +++ b/share/schema_versions/App-Netdisco-DB-58-59-PostgreSQL.sql @@ -2,4 +2,10 @@ BEGIN; ALTER TABLE users ADD COLUMN "radius" boolean DEFAULT false; +UPDATE device SET layers = NULL WHERE vendor = 'netdisco'; + +UPDATE device SET layers = '00000000' WHERE layers IS NULL; + +ALTER TABLE device ALTER layers SET DEFAULT '00000000'; + COMMIT; diff --git a/share/views/ajax/admintask/pseudodevice.tt b/share/views/ajax/admintask/pseudodevice.tt index d08fce1b..7416eace 100644 --- a/share/views/ajax/admintask/pseudodevice.tt +++ b/share/views/ajax/admintask/pseudodevice.tt @@ -4,6 +4,7 @@ Device Name Device IP Number of Ports + Services Action @@ -11,7 +12,12 @@ - + + +    + 3     + + @@ -26,6 +32,11 @@ + +    + 3     + + @@ -68,6 +79,17 @@ $(document).ready(function() { } ], [% INCLUDE 'ajax/datatabledefaults.tt' -%] } ); + $('.nd_layer-three-link').click(function() { + var badge = $(this).children('span').first(); + var layers = $(this).parent().children('input').first(); + $(badge).toggleClass('badge-success'); + if ($(badge).hasClass('badge-success')) { + $(layers).attr('value', '00000100'); + } + else { + $(layers).attr('value', '00000000'); + } + }); } ); diff --git a/share/views/ajax/admintask/users.tt b/share/views/ajax/admintask/users.tt index 2378a358..f5fbfa05 100644 --- a/share/views/ajax/admintask/users.tt +++ b/share/views/ajax/admintask/users.tt @@ -26,7 +26,7 @@ - + @@ -62,7 +62,7 @@ - +