Bug fixes, and AuthN delegation.

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

Netdisco/lib/App/Netdisco/Daemon/Queue.pm

@@ -8,17 +8,6 @@ our @EXPORT = ();
 our @EXPORT_OK = qw/ add_jobs capacity_for take_jobs reset_jobs /;
 our %EXPORT_TAGS = ( all => \@EXPORT_OK );
 
-# static configuration for the in-memory local job queue
-setting('plugins')->{DBIC}->{daemon} = {
-    dsn => 'dbi:SQLite:dbname=:memory:',
-    options => {
-        AutoCommit => 1,
-        RaiseError => 1,
-        sqlite_use_immediate_transaction => 1,
-    },
-    schema_class => 'App::Netdisco::Daemon::DB',
-};
-
 schema('daemon')->deploy;
 my $queue = schema('daemon')->resultset('Admin');
 

Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm

@@ -50,7 +50,7 @@ sub worker_body {
       }
 
       debug "$type ($wid): sleeping now...";
-      sleep( setting('workers')->{sleep_time} || 5 );
+      sleep(1);
   }
 }
 

Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm

@@ -21,7 +21,7 @@ sub set_portcontrol {
 
   my $reconfig_check = port_reconfig_check($port);
   return job_error("Cannot alter port: $reconfig_check")
-    if length $reconfig_check;
+    if $reconfig_check;
 
   return _set_port_generic($job, 'up_admin');
 }
@@ -35,11 +35,11 @@ sub set_vlan {
 
   my $port_reconfig_check = port_reconfig_check($port);
   return job_error("Cannot alter port: $port_reconfig_check")
-    if length $port_reconfig_check;
+    if $port_reconfig_check;
 
   my $vlan_reconfig_check = vlan_reconfig_check($port);
   return job_error("Cannot alter vlan: $vlan_reconfig_check")
-    if length $vlan_reconfig_check;
+    if $vlan_reconfig_check;
 
   return _set_port_generic($job, 'vlan');
 }
@@ -96,7 +96,7 @@ sub set_power {
 
   my $reconfig_check = port_reconfig_check($port);
   return job_error("Cannot alter port: $reconfig_check")
-    if length $reconfig_check;
+    if $reconfig_check;
 
 
   my $ip = $job->device;

Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm

@@ -84,7 +84,7 @@ sub worker_body {
       # TODO also check for stale jobs in Netdisco DB
 
       debug "mgr ($wid): sleeping now...";
-      sleep( setting('workers')->{sleep_time} || 5 );
+      sleep( setting('workers')->{sleep_time} || 2 );
   }
 }
 

Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Arpnip.pm

@@ -1,81 +1,16 @@
 package App::Netdisco::Daemon::Worker::Poller::Arpnip;
 
-use Dancer qw/:moose :syntax :script/;
-use Dancer::Plugin::DBIC 'schema';
-
-use App::Netdisco::Util::SNMP 'snmp_connect';
-use App::Netdisco::Util::Device 'get_device';
 use App::Netdisco::Core::Arpnip 'do_arpnip';
-use App::Netdisco::Daemon::Util ':all';
-
-use NetAddr::IP::Lite ':lower';
 
 use Role::Tiny;
 use namespace::clean;
 
-# queue an arpnip job for all devices known to Netdisco
-sub arpwalk {
-  my ($self, $job) = @_;
+with 'App::Netdisco::Daemon::Worker::Poller::Common';
 
-  my $devices = schema('netdisco')->resultset('Device')->get_column('ip');
-  my $jobqueue = schema('netdisco')->resultset('Admin');
+sub arpnip_action { \&do_arpnip }
+sub arpnip_layer { 3 }
 
-  if ($job->subaction and $job->subaction eq 'after-discoverall') {
-      # make sure there are no incomplete discover jobs queued
-      my $discover = $jobqueue->search(
-        { action => 'discover', status => { -like => 'queued%' } }
-      )->count;
-
-      return job_defer("Deferred arpwalk due to pending discover jobs")
-        if $discover;
-  }
-
-  schema('netdisco')->txn_do(sub {
-    # clean up user submitted jobs older than 1min,
-    # assuming skew between schedulers' clocks is not greater than 1min
-    $jobqueue->search({
-        action => 'arpnip',
-        status => 'queued',
-        entered => { '<' => \"(now() - interval '1 minute')" },
-    })->delete;
-
-    # is scuppered by any user job submitted in last 1min (bad), or
-    # any similar job from another scheduler (good)
-    $jobqueue->populate([
-      map {{
-          device => $_,
-          action => 'arpnip',
-          status => 'queued',
-      }} ($devices->all)
-    ]);
-  });
-
-  return job_done("Queued arpnip job for all devices");
-}
-
-sub arpnip {
-  my ($self, $job) = @_;
-
-  my $host = NetAddr::IP::Lite->new($job->device);
-  my $device = get_device($host->addr);
-
-  if ($device->in_storage
-      and $device->vendor and $device->vendor eq 'netdisco') {
-      return job_done("Skipped arpnip for pseudo-device $host");
-  }
-
-  my $snmp = snmp_connect($device);
-  if (!defined $snmp) {
-      return job_error("arpnip failed: could not SNMP connect to $host");
-  }
-
-  unless ($snmp->has_layer(3)) {
-      return job_done("Skipped arpnip for device $host without OSI layer 3 capability");
-  }
-
-  do_arpnip($device, $snmp);
-
-  return job_done("Ended arpnip for ". $host->addr);
-}
+sub arpwalk { (shift)->_walk_body('arpnip', @_) }
+sub arpnip  { (shift)->_single_body('arpnip', @_) }
 
 1;

Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Common.pm

@@ -0,0 +1,86 @@
+package App::Netdisco::Daemon::Worker::Poller::Common;
+
+use Dancer qw/:moose :syntax :script/;
+use Dancer::Plugin::DBIC 'schema';
+
+use App::Netdisco::Util::SNMP 'snmp_connect';
+use App::Netdisco::Util::Device 'get_device';
+use App::Netdisco::Daemon::Util ':all';
+
+use NetAddr::IP::Lite ':lower';
+
+use Role::Tiny;
+use namespace::clean;
+
+# queue a job for all devices known to Netdisco
+sub _walk_body {
+  my ($self, $job_type, $job) = @_;
+
+  my $devices = schema('netdisco')->resultset('Device')->get_column('ip');
+  my $jobqueue = schema('netdisco')->resultset('Admin');
+
+  if ($job->subaction and $job->subaction eq 'after-discoverall') {
+      # make sure there are no incomplete discover jobs queued
+      my $discover = $jobqueue->search(
+        { action => 'discover', status => { -like => 'queued%' } }
+      )->count;
+
+      return job_defer("Deferred $job_type due to pending discover jobs")
+        if $discover;
+  }
+
+  schema('netdisco')->txn_do(sub {
+    # clean up user submitted jobs older than 1min,
+    # assuming skew between schedulers' clocks is not greater than 1min
+    $jobqueue->search({
+        action => $job_type,
+        status => 'queued',
+        entered => { '<' => \"(now() - interval '1 minute')" },
+    })->delete;
+
+    # is scuppered by any user job submitted in last 1min (bad), or
+    # any similar job from another scheduler (good)
+    $jobqueue->populate([
+      map {{
+          device => $_,
+          action => $job_type,
+          status => 'queued',
+      }} ($devices->all)
+    ]);
+  });
+
+  return job_done("Queued $job_type job for all devices");
+}
+
+sub _single_body {
+  my ($self, $job_type, $job) = @_;
+
+  my $action_method = $job_type .'_action';
+  my $job_action = $self->$action_method;
+
+  my $layer_method = $job_type .'_layer';
+  my $job_layer = $self->$layer_method;
+
+  my $host = NetAddr::IP::Lite->new($job->device);
+  my $device = get_device($host->addr);
+
+  if ($device->in_storage
+      and $device->vendor and $device->vendor eq 'netdisco') {
+      return job_done("Skipped $job_type for pseudo-device $host");
+  }
+
+  my $snmp = snmp_connect($device);
+  if (!defined $snmp) {
+      return job_error("$job_type failed: could not SNMP connect to $host");
+  }
+
+  unless ($snmp->has_layer( $job_layer )) {
+      return job_done("Skipped $job_type for device $host without OSI layer $job_layer capability");
+  }
+
+  $job_action->($device, $snmp);
+
+  return job_done("Ended $job_type for ". $host->addr);
+}
+
+1;

Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Macsuck.pm

@@ -1,71 +1,16 @@
 package App::Netdisco::Daemon::Worker::Poller::Macsuck;
 
-use Dancer qw/:moose :syntax :script/;
-use Dancer::Plugin::DBIC 'schema';
-
-use App::Netdisco::Util::SNMP 'snmp_connect';
-use App::Netdisco::Util::Device 'get_device';
-use App::Netdisco::Core::Macsuck ':all';
-use App::Netdisco::Daemon::Util ':all';
-
-use NetAddr::IP::Lite ':lower';
+use App::Netdisco::Core::Macsuck 'do_macsuck';
 
 use Role::Tiny;
 use namespace::clean;
 
-# queue a macsuck job for all devices known to Netdisco
-sub macwalk {
-  my ($self, $job) = @_;
+with 'App::Netdisco::Daemon::Worker::Poller::Common';
 
-  my $devices = schema('netdisco')->resultset('Device')->get_column('ip');
-  my $jobqueue = schema('netdisco')->resultset('Admin');
+sub macsuck_action { \&do_macsuck }
+sub macsuck_layer { 2 }
 
-  schema('netdisco')->txn_do(sub {
-    # clean up user submitted jobs older than 1min,
-    # assuming skew between schedulers' clocks is not greater than 1min
-    $jobqueue->search({
-        action => 'macsuck',
-        status => 'queued',
-        entered => { '<' => \"(now() - interval '1 minute')" },
-    })->delete;
-
-    # is scuppered by any user job submitted in last 1min (bad), or
-    # any similar job from another scheduler (good)
-    $jobqueue->populate([
-      map {{
-          device => $_,
-          action => 'macsuck',
-          status => 'queued',
-      }} ($devices->all)
-    ]);
-  });
-
-  return job_done("Queued macsuck job for all devices");
-}
-
-sub macsuck {
-  my ($self, $job) = @_;
-
-  my $host = NetAddr::IP::Lite->new($job->device);
-  my $device = get_device($host->addr);
-
-  if ($device->in_storage
-      and $device->vendor and $device->vendor eq 'netdisco') {
-      return job_done("Skipped macsuck for pseudo-device $host");
-  }
-
-  my $snmp = snmp_connect($device);
-  if (!defined $snmp) {
-      return job_error("macsuck failed: could not SNMP connect to $host");
-  }
-
-  unless ($snmp->has_layer(2)) {
-      return job_done("Skipped macsuck for device $host without OSI layer 2 capability");
-  }
-
-  do_macsuck($device, $snmp);
-
-  return job_done("Ended macsuck for ". $host->addr);
-}
+sub macwalk { (shift)->_walk_body('macsuck', @_) }
+sub macsuck { (shift)->_single_body('macsuck', @_) }
 
 1;