Squashed commit of the following: commit3fe8f383a7Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 11 17:07:42 2019 +0000 add debug lines and tested commit3249739e42Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 11 16:54:11 2019 +0000 change config name to get_credentials commite78558397aAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 11 16:51:11 2019 +0000 separate out generic device auth to DeviceAuth module commit249f05165fAuthor: Oliver Gorwits <oliver@cpan.org> Date: Wed Mar 6 18:43:31 2019 +0000 release 2.040007 commite3af64df77Author: Oliver Gorwits <oliver@cpan.org> Date: Wed Mar 6 18:42:47 2019 +0000 #521-redux fix wifi date search commit48857ae300Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 4 12:03:31 2019 +0000 release 2.040006 commite09dab5362Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 4 11:39:12 2019 +0000 #527 update List::MoreUtils version requirement commit6e7de3fff3Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 4 09:59:41 2019 +0000 release 2.040005 commit0c98318a45Author: Oliver Gorwits <oliver@spike.local> Date: Mon Mar 4 09:57:18 2019 +0000 #526 fix discover syntax bug commite9efc45182Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 14:56:48 2019 +0000 release 2.040004 commit6cdfd80d10Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 14:34:00 2019 +0000 allow undiscovered neighbors report to use discover_{waps,phones} setting commitac381e0802Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 14:13:20 2019 +0000 #506 was a red herring commitb83e614c85Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 13:00:36 2019 +0000 make discover_{phones,waps} work with LLDP capabilities as well commit189d234b55Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 12:47:38 2019 +0000 check discover_no_type and friends earlier on in neighbors list build commit9c956466f3Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 12:32:07 2019 +0000 also update default config for new discover_phones and discover_waps settings commit09d29954d2Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 12:26:50 2019 +0000 #512 fix regression in phone/wap discovery exclusion commit2bae91f1b6Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 12:01:34 2019 +0000 rename match_devicetype() to match_to_setting() commit57cb6ddb70Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 09:19:39 2019 +0000 fix for over-eager fix to #506 commitef560fb59aAuthor: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 22:41:40 2019 +0000 #506 relax device renumber so it works for an alias commit7a8bcb094eAuthor: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 22:23:39 2019 +0000 #521 Search Node Date Range not working commita643820a62Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 21:54:27 2019 +0000 #428 Port-Channels not showing in netmap commit5ba5bcd295Merge:e7aacddba1f95028Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 20:04:11 2019 +0000 Merge branch 'master' of github.com:netdisco/netdisco commite7aacddbc6Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 20:01:05 2019 +0000 #498 Map with VLAN filter omits unconnected devices commita1f95028caAuthor: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat Mar 2 19:54:22 2019 +0100 catch up with changes noticed that rc-sshcollector-core received updates to changes, add them here as well. didn't mention #499 & #522 commitce1b847ceaAuthor: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 18:47:44 2019 +0000 fix bug showing no nodes when only one matches in netmap commit78e30a7926Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 16:28:15 2019 +0000 #500 filtering in device/ports on native vlan duplicates entries commit9952f0c6c7Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 15:02:12 2019 +0000 #499 netdisco-do renumber reports wrong ip (inphobia) commitca3fd8f466Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 15:00:18 2019 +0000 #505 device renumber should update device port properties and device skips commit1265bc8470Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 14:52:21 2019 +0000 #520 catch slave ports defined without a master commitd4c7579c10Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 14:47:49 2019 +0000 #522 TypeAhead.pm can reference empty data (inphobia) commit77decc23b7Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 14:45:37 2019 +0000 #514 inconsistent results in ip inventory (inphobia) commit3f211650b8Author: nick n <39005454+inphobia@users.noreply.github.com> Date: Fri Mar 1 12:34:42 2019 +0100 last pieces for db schema upgrade last piece of #510
		
			
				
	
	
		
			92 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Perl
		
	
	
	
	
	
			
		
		
	
	
			92 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Perl
		
	
	
	
	
	
package App::Netdisco::Web::Device;
 | 
						||
 | 
						||
use Dancer ':syntax';
 | 
						||
use Dancer::Plugin::Ajax;
 | 
						||
use Dancer::Plugin::DBIC;
 | 
						||
use Dancer::Plugin::Auth::Extensible;
 | 
						||
 | 
						||
use URI ();
 | 
						||
use URL::Encode 'url_params_mixed';
 | 
						||
use App::Netdisco::Util::Device 'match_to_setting';
 | 
						||
 | 
						||
# build view settings for port connected nodes and devices
 | 
						||
set('connected_properties' => [
 | 
						||
  sort { $a->{idx} <=> $b->{idx} }
 | 
						||
  map  {{ name => $_, %{ setting('sidebar_defaults')->{'device_ports'}->{$_} } }}
 | 
						||
  grep { $_ =~ m/^n_/ } keys %{ setting('sidebar_defaults')->{'device_ports'} }
 | 
						||
]);
 | 
						||
 | 
						||
hook 'before_template' => sub {
 | 
						||
  my $tokens = shift;
 | 
						||
 | 
						||
  # allow checking of discoverability of remote connected device
 | 
						||
  $tokens->{has_snmp} = sub { not match_to_setting(shift, 'discover_no_type') };
 | 
						||
 | 
						||
  my $defaults = var('sidebar_defaults')->{'device_ports'}
 | 
						||
    or return;
 | 
						||
 | 
						||
  # override ports form defaults with cookie settings
 | 
						||
  # always do this so that embedded links to device ports page have user prefs
 | 
						||
  if (param('reset')) {
 | 
						||
    cookie('nd_ports-form' => '', expires => '-1 day');
 | 
						||
  }
 | 
						||
  elsif (my $cookie = cookie('nd_ports-form')) {
 | 
						||
    my $cdata = url_params_mixed($cookie);
 | 
						||
 | 
						||
    if ($cdata and (ref {} eq ref $cdata)) {
 | 
						||
      foreach my $key (keys %{ $defaults }) {
 | 
						||
        $defaults->{$key} = $cdata->{$key};
 | 
						||
      }
 | 
						||
    }
 | 
						||
  }
 | 
						||
 | 
						||
  # used in the device search sidebar template to set selected items
 | 
						||
  foreach my $opt (qw/hgroup lgroup/) {
 | 
						||
      my $p = (ref [] eq ref param($opt) ? param($opt)
 | 
						||
                                          : (param($opt) ? [param($opt)] : []));
 | 
						||
      $tokens->{"${opt}_lkp"} = { map { $_ => 1 } @$p };
 | 
						||
  }
 | 
						||
 | 
						||
  return if param('reset')
 | 
						||
    or not var('sidebar_key') or (var('sidebar_key') ne 'device_ports');
 | 
						||
 | 
						||
  # update cookie from params we just recieved in form submit
 | 
						||
  my $uri = URI->new();
 | 
						||
  foreach my $key (keys %{ $defaults }) {
 | 
						||
    $uri->query_param($key => param($key));
 | 
						||
  }
 | 
						||
  cookie('nd_ports-form' => $uri->query(), expires => '365 days');
 | 
						||
};
 | 
						||
 | 
						||
get '/device' => require_login sub {
 | 
						||
    my $q = param('q');
 | 
						||
    my $devices = schema('netdisco')->resultset('Device');
 | 
						||
 | 
						||
    # we are passed either dns or ip
 | 
						||
    my $dev = $devices->search({
 | 
						||
        -or => [
 | 
						||
            \[ 'host(me.ip) = ?' => [ bind_value => $q ] ],
 | 
						||
            'me.dns' => $q,
 | 
						||
        ],
 | 
						||
    });
 | 
						||
 | 
						||
    if ($dev->count == 0) {
 | 
						||
        return redirect uri_for('/', {nosuchdevice => 1, device => $q})->path_query;
 | 
						||
    }
 | 
						||
 | 
						||
    # if passed dns, need to check for duplicates
 | 
						||
    # and use only ip for q param, if there are duplicates.
 | 
						||
    my $first = $dev->first;
 | 
						||
    my $others = ($devices->search({dns => $first->dns})->count() - 1);
 | 
						||
 | 
						||
    params->{'tab'} ||= 'details';
 | 
						||
    template 'device', {
 | 
						||
      display_name => ($others ? $first->ip : ($first->dns || $first->ip)),
 | 
						||
      lgroup_list => [ schema('netdisco')->resultset('Device')->get_distinct_col('location') ],
 | 
						||
      hgroup_list => setting('host_group_displaynames'),
 | 
						||
      device => params->{'tab'},
 | 
						||
    };
 | 
						||
};
 | 
						||
 | 
						||
true;
 |