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

#1062 allow job submit API to use extra field instead of subaction

Browse Source
This commit is contained in:
Oliver Gorwits
2023-07-20 16:19:13 +01:00
parent 663d5da1d3
commit 1eabe7064f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/App/Netdisco/Web/API/Queue.pm
View File

@@ -159,14 +159,19 @@ swagger_path {
}, },
], ],
responses => { default => {} }, responses => { default => {} },
}, post '/api/v1/queue/jobs' => require_role api_admin => sub { }, post '/api/v1/queue/jobs' => require_any_role [qw(api_admin port_control)] => sub {
my $data = request->body || ''; my $data = request->body || '';
my $jobs = (length $data ? try { from_json($data) } : []); my $jobs = (length $data ? try { from_json($data) } : []);
(ref [] eq ref $jobs) or send_error('Malformed body', 400); send_error('Malformed body', 400) if ref $jobs ne ref [];
foreach my $job (@$jobs) { foreach my $job (@$jobs) {
ref {} eq ref $job or send_error('Malformed job', 400); send_error('Malformed job', 400) if ref $job ne ref {};
send_error('Malformed job', 400) if !defined $job->{action};
send_error('Not Authorized', 403)
if ($job->{action} =~ m/^cf_/ and not user_has_role('port_control'))
or ($job->{action} !~ m/^cf_/ and not user_has_role('api_admin'));
$job->{username} = session('logged_in_user'); $job->{username} = session('logged_in_user');
$job->{userip} = request->remote_address; $job->{userip} = request->remote_address;
} }