|
|
@ -1,11 +1,14 @@ |
|
|
|
|
|
|
|
import { REP_PEACEFUL_STRING } from '../../consts'; |
|
|
|
|
|
|
|
|
|
|
|
import buildGetRequestHandler from '../buildGetRequestHandler'; |
|
|
|
import buildGetRequestHandler from '../buildGetRequestHandler'; |
|
|
|
import { sanitize } from '../../sanitize'; |
|
|
|
import { sanitize } from '../../sanitize'; |
|
|
|
import { date, stdout } from '../../shell'; |
|
|
|
import { date, stdout } from '../../shell'; |
|
|
|
|
|
|
|
|
|
|
|
export const getJob = buildGetRequestHandler((request, buildQueryOptions) => { |
|
|
|
export const getJob = buildGetRequestHandler((request, buildQueryOptions) => { |
|
|
|
const { start: rawStart } = request.query; |
|
|
|
const { start: rStart, command: rCommand } = request.query; |
|
|
|
|
|
|
|
|
|
|
|
const start = sanitize(rawStart, 'number'); |
|
|
|
const start = sanitize(rStart, 'number'); |
|
|
|
|
|
|
|
const jcmd = sanitize(rCommand, 'string'); |
|
|
|
|
|
|
|
|
|
|
|
let condModifiedDate = ''; |
|
|
|
let condModifiedDate = ''; |
|
|
|
|
|
|
|
|
|
|
@ -19,6 +22,12 @@ export const getJob = buildGetRequestHandler((request, buildQueryOptions) => { |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let condJobCommand = ''; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (REP_PEACEFUL_STRING.test(jcmd)) { |
|
|
|
|
|
|
|
condJobCommand = `AND job.job_command LIKE '%${jcmd}%'`; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
stdout(`condModifiedDate=[${condModifiedDate}]`); |
|
|
|
stdout(`condModifiedDate=[${condModifiedDate}]`); |
|
|
|
|
|
|
|
|
|
|
|
if (buildQueryOptions) { |
|
|
|
if (buildQueryOptions) { |
|
|
@ -78,5 +87,6 @@ export const getJob = buildGetRequestHandler((request, buildQueryOptions) => { |
|
|
|
JOIN hosts AS hos |
|
|
|
JOIN hosts AS hos |
|
|
|
ON job.job_host_uuid = hos.host_uuid |
|
|
|
ON job.job_host_uuid = hos.host_uuid |
|
|
|
WHERE (job.job_progress < 100 ${condModifiedDate}) |
|
|
|
WHERE (job.job_progress < 100 ${condModifiedDate}) |
|
|
|
|
|
|
|
${condJobCommand} |
|
|
|
AND job_name NOT LIKE 'get_server_screenshot%';`;
|
|
|
|
AND job_name NOT LIKE 'get_server_screenshot%';`;
|
|
|
|
}); |
|
|
|
}); |
|
|
|