Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/tools/docker.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,14 @@ export const handlers = {
},

docker_logs: async (params) => {
const tail = parseInt(params.tail, 10) || 100;
return await run(`docker logs --tail ${tail} ${shellEscape(params.container)}`);
if (params.tail != null) {
const tail = parseInt(params.tail, 10);
if (!Number.isFinite(tail) || tail <= 0 || tail > 10000) {
return { error: 'Invalid tail value: must be between 1 and 10000' };
}
return await run(`docker logs --tail ${tail} ${shellEscape(params.container)}`);
}
return await run(`docker logs --tail 100 ${shellEscape(params.container)}`);
},

docker_exec: async (params) => {
Expand Down
13 changes: 10 additions & 3 deletions src/tools/monitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,24 @@ export const handlers = {
},

system_logs: async (params) => {
const lines = parseInt(params.lines, 10) || 50;
let finalLines = 50;
if (params.lines != null) {
const lines = parseInt(params.lines, 10);
if (!Number.isFinite(lines) || lines <= 0 || lines > 10000) {
return { error: 'Invalid lines value: must be between 1 and 10000' };
}
finalLines = lines;
}
const source = params.source || 'journalctl';
const filter = params.filter;

if (source === 'journalctl') {
const filterArg = filter ? ` -g ${shellEscape(filter)}` : '';
return await run(`journalctl -n ${lines}${filterArg} --no-pager`);
return await run(`journalctl -n ${finalLines}${filterArg} --no-pager`);
}

// Reading a log file
const filterCmd = filter ? ` | grep -i ${shellEscape(filter)}` : '';
return await run(`tail -n ${lines} ${shellEscape(source)}${filterCmd}`);
return await run(`tail -n ${finalLines} ${shellEscape(source)}${filterCmd}`);
},
};