Squashed commit of the following: commit 25bc026dc5e0177cd3aa81c11cdace091eb68f36 Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Jun 17 08:16:56 2013 +0100 bump version for new release commit d4042f6e8db42c7a85df4dcf9690fec72ad2db69 Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jun 16 18:27:52 2013 +0100 Job Queue page play/pause/refresh controls commit b6c9152516d7800409b7a73c5d0cdce6dd405492 Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jun 16 17:50:06 2013 +0100 limit size of job queue table commit ac9e5feb8b774071fcf4423dd862dced74dee9e6 Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jun 16 17:47:55 2013 +0100 update bugs link commit 9c0fb0e9aedc6297f4462c3cf88343f6d0df40b6 Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jun 16 17:41:29 2013 +0100 update MANIFEST commit 7aaa2fff91ed2b1839bdbb79081d90ad3e144f47 Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jun 16 17:40:35 2013 +0100 Fix Plack middleware config for Expiry commit 313e2cf014cf0da7cf85074e390ad394b28bf42d Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jun 16 17:23:00 2013 +0100 Support for delegated authentication with REMOTE_USER and X-REMOTE_USER commit 85e21f2bf296c4a5ca6b5afb5091694e56e3031f Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jun 16 14:24:08 2013 +0100 Add tooltip showing the job queue item logged status message commit 9b14f53ebed51eb46ea278807cfe8a2fbd28743c Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jun 16 13:43:26 2013 +0100 Increase default frequency of job queue polling to 2 seconds commit 6ba46818d8ab2100c652c8eb8e98bc6f5a54e273 Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jun 16 12:57:43 2013 +0100 workaround for https://github.com/PerlDancer/Dancer/issues/935 commit c7a2d8a9d45716959bedbbb8db4cdd82a5950642 Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jun 16 11:54:18 2013 +0100 Fix hyperlinks when running behind reverse proxy on custom path commit 0620efa404bc25cb0a9ada5aa6f1b092d5c4d482 Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Jun 15 18:31:19 2013 +0100 update deploy docs commit 857b1c7aa0fe832f8948349eda5211eb38ba3099 Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Jun 15 18:16:50 2013 +0100 add note about compiler dependency commit 02a2ad6b2c52db9fbc1e24bc8888f658dc7084ad Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Jun 15 17:44:29 2013 +0100 sort vlans, macs, ips in device port view commit 097bad77310728a98b261a2cfca4de7ab50be94b Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Jun 15 16:32:20 2013 +0100 hint when calling web in fg without starman commit 6425d89ddb2b56129c610482134482d8f9455d40 Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Jun 15 15:53:26 2013 +0100 macwalk and arpwalk refactored commit d527b9d05addc82fb38c84f6fea1aa5818fc68d5 Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Jun 13 22:27:34 2013 +0100 implement is_macsuckable and is_arpnipable commit 7af10ed313e25f5d99a22b53ba438225c2259069 Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Jun 13 22:17:39 2013 +0100 version bump commit 8ace3bf8fa48cf3e14bdf86fad5a4862aad50a4b Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Jun 13 22:14:05 2013 +0100 tidy up user menu commit e6eef605c248471dbfe7ec62cd04d73d653523ca Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Jun 13 22:02:52 2013 +0100 Add discoverall, macwalk, arpwalk items to the Admin Tasks menu commit 2631fabd1eccd8a3971e4762eebe57f406623bee Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Jun 13 21:21:50 2013 +0100 remove length() which only became sane in 5.12 commit a7b7169070a58685cacde26a3b6d462e74be9928 Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Jun 13 19:07:56 2013 +0100 Use DBIx::Class new collapsed query support when we can commit 77cddab8ba7033ccb1ecae257bafa4eef8f99f47 Author: Oliver Gorwits <oliver@cpan.org> Date: Wed Jun 12 17:26:47 2013 +0100 Database config simplified to only four essential settings commit 6ed0802bf2ab0fd898ce6945451b8ca6566ae551 Author: Oliver Gorwits <oliver@cpan.org> Date: Wed Jun 12 13:03:20 2013 +0100 Ask to set up guest user for Admin/Port Control rights in deploy script
73 lines
2.2 KiB
Perl
73 lines
2.2 KiB
Perl
package App::Netdisco::Web::Plugin::Search::Node;
|
|
|
|
use Dancer ':syntax';
|
|
use Dancer::Plugin::Ajax;
|
|
use Dancer::Plugin::DBIC;
|
|
|
|
use NetAddr::IP::Lite ':lower';
|
|
use Net::MAC ();
|
|
|
|
use App::Netdisco::Web::Plugin;
|
|
|
|
register_search_tab({ tag => 'node', label => 'Node' });
|
|
|
|
# nodes matching the param as an IP or DNS hostname or MAC
|
|
ajax '/ajax/content/search/node' => sub {
|
|
my $node = param('q');
|
|
send_error('Missing node', 400) unless $node;
|
|
content_type('text/html');
|
|
|
|
my $mac = Net::MAC->new(mac => $node, 'die' => 0, verbose => 0);
|
|
my @active = (param('archived') ? () : (-bool => 'active'));
|
|
|
|
if (! $mac->get_error) {
|
|
my $sightings = schema('netdisco')->resultset('Node')
|
|
->search_by_mac({mac => $mac->as_IEEE, @active});
|
|
|
|
my $ips = schema('netdisco')->resultset('NodeIp')
|
|
->search_by_mac({mac => $mac->as_IEEE, @active});
|
|
|
|
my $ports = schema('netdisco')->resultset('DevicePort')
|
|
->search({mac => $mac->as_IEEE});
|
|
|
|
return unless $sightings->count
|
|
or $ips->count
|
|
or $ports->count;
|
|
|
|
template 'ajax/search/node_by_mac.tt', {
|
|
ips => $ips,
|
|
sightings => $sightings,
|
|
ports => $ports,
|
|
}, { layout => undef };
|
|
}
|
|
else {
|
|
my $set;
|
|
|
|
if (my $ip = NetAddr::IP::Lite->new($node)) {
|
|
# search_by_ip() will extract cidr notation if necessary
|
|
$set = schema('netdisco')->resultset('NodeIp')
|
|
->search_by_ip({ip => $ip, @active});
|
|
}
|
|
else {
|
|
if (param('partial')) {
|
|
$node = "\%$node\%" if $node !~ m/%/;
|
|
}
|
|
elsif (setting('domain_suffix')) {
|
|
$node .= setting('domain_suffix')
|
|
if index($node, setting('domain_suffix')) == -1;
|
|
}
|
|
$set = schema('netdisco')->resultset('NodeIp')
|
|
->search_by_dns({dns => $node, @active});
|
|
}
|
|
return unless $set and $set->count;
|
|
$set = $set->search_rs({}, { order_by => 'me.mac' });
|
|
|
|
template 'ajax/search/node_by_ip.tt', {
|
|
macs => $set,
|
|
archive_filter => {@active},
|
|
}, { layout => undef };
|
|
}
|
|
};
|
|
|
|
true;
|