135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug in where workerconf acls are checked

Browse Source
This commit is contained in:
Oliver Gorwits
2017-09-29 08:00:32 +01:00
parent 2a74e0befa
commit 10b5f6cbc4
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/App/Netdisco/Worker/Plugin.pm
View File

@@ -26,20 +26,24 @@ register 'register_worker' => sub {
my $worker = sub { my $worker = sub {
my $job = shift or return Status->error('missing job param'); my $job = shift or return Status->error('missing job param');
my $no = (exists $workerconf->{no} ? $workerconf->{no} : undef); # worker might be vendor/platform specific
my $only = (exists $workerconf->{only} ? $workerconf->{only} : undef); if (ref $job->device) {
my $no = (exists $workerconf->{no} ? $workerconf->{no} : undef);
my $only = (exists $workerconf->{only} ? $workerconf->{only} : undef);
my $defer = Status->defer('worker is not applicable to this device');
return $defer if $no and check_acl_no($job->device, $no);
return $defer if $only and not check_acl_only($job->device, $only);
}
my @newuserconf = (); my @newuserconf = ();
my @userconf = @{ setting('device_auth') || [] }; my @userconf = @{ setting('device_auth') || [] };
# reduce device_auth by driver, worker's only/no # reduce device_auth by driver
foreach my $stanza (@userconf) { foreach my $stanza (@userconf) {
if (ref $job->device) {
next if $no and check_acl_no($job->device, $no);
next if $only and not check_acl_only($job->device, $only);
}
next if exists $stanza->{driver} and exists $workerconf->{driver} next if exists $stanza->{driver} and exists $workerconf->{driver}
and (($stanza->{driver} || '') ne ($workerconf->{driver} || '')); and (($stanza->{driver} || '') ne ($workerconf->{driver} || ''));
push @newuserconf, $stanza; push @newuserconf, $stanza;
} }