a4fd4f2a2f
**stopContainer (container-runtime.ts):** - Validate container name against `^[a-zA-Z0-9][a-zA-Z0-9_.-]*$` before passing to shell command. Rejects names with shell metacharacters (`;`, `$()`, backticks, etc.) that could execute arbitrary commands. - Changed return type from string to void — callers no longer build shell commands from the return value. **mount-security.ts:** - Reject container paths containing `:` to prevent Docker `-v` option injection (e.g., `repo:rw` could override readonly flags). - Don't permanently cache "file not found" for mount allowlist — the file may be created later without requiring a service restart. Only parse/structural errors are permanently cached. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
103 lines
3.4 KiB
TypeScript
103 lines
3.4 KiB
TypeScript
/**
|
|
* Container runtime abstraction for NanoClaw.
|
|
* All runtime-specific logic lives here so swapping runtimes means changing one file.
|
|
*/
|
|
import { execSync } from 'child_process';
|
|
import os from 'os';
|
|
|
|
import { logger } from './logger.js';
|
|
|
|
/** The container runtime binary name. */
|
|
export const CONTAINER_RUNTIME_BIN = 'docker';
|
|
|
|
/** CLI args needed for the container to resolve the host gateway. */
|
|
export function hostGatewayArgs(): string[] {
|
|
// On Linux, host.docker.internal isn't built-in — add it explicitly
|
|
if (os.platform() === 'linux') {
|
|
return ['--add-host=host.docker.internal:host-gateway'];
|
|
}
|
|
return [];
|
|
}
|
|
|
|
/** Returns CLI args for a readonly bind mount. */
|
|
export function readonlyMountArgs(
|
|
hostPath: string,
|
|
containerPath: string,
|
|
): string[] {
|
|
return ['-v', `${hostPath}:${containerPath}:ro`];
|
|
}
|
|
|
|
/** Stop a container by name. Uses execFileSync to avoid shell injection. */
|
|
export function stopContainer(name: string): void {
|
|
if (!/^[a-zA-Z0-9][a-zA-Z0-9_.-]*$/.test(name)) {
|
|
throw new Error(`Invalid container name: ${name}`);
|
|
}
|
|
execSync(`${CONTAINER_RUNTIME_BIN} stop -t 1 ${name}`, { stdio: 'pipe' });
|
|
}
|
|
|
|
/** Ensure the container runtime is running, starting it if needed. */
|
|
export function ensureContainerRuntimeRunning(): void {
|
|
try {
|
|
execSync(`${CONTAINER_RUNTIME_BIN} info`, {
|
|
stdio: 'pipe',
|
|
timeout: 10000,
|
|
});
|
|
logger.debug('Container runtime already running');
|
|
} catch (err) {
|
|
logger.error({ err }, 'Failed to reach container runtime');
|
|
console.error(
|
|
'\n╔════════════════════════════════════════════════════════════════╗',
|
|
);
|
|
console.error(
|
|
'║ FATAL: Container runtime failed to start ║',
|
|
);
|
|
console.error(
|
|
'║ ║',
|
|
);
|
|
console.error(
|
|
'║ Agents cannot run without a container runtime. To fix: ║',
|
|
);
|
|
console.error(
|
|
'║ 1. Ensure Docker is installed and running ║',
|
|
);
|
|
console.error(
|
|
'║ 2. Run: docker info ║',
|
|
);
|
|
console.error(
|
|
'║ 3. Restart NanoClaw ║',
|
|
);
|
|
console.error(
|
|
'╚════════════════════════════════════════════════════════════════╝\n',
|
|
);
|
|
throw new Error('Container runtime is required but failed to start', {
|
|
cause: err,
|
|
});
|
|
}
|
|
}
|
|
|
|
/** Kill orphaned NanoClaw containers from previous runs. */
|
|
export function cleanupOrphans(): void {
|
|
try {
|
|
const output = execSync(
|
|
`${CONTAINER_RUNTIME_BIN} ps --filter name=nanoclaw- --format '{{.Names}}'`,
|
|
{ stdio: ['pipe', 'pipe', 'pipe'], encoding: 'utf-8' },
|
|
);
|
|
const orphans = output.trim().split('\n').filter(Boolean);
|
|
for (const name of orphans) {
|
|
try {
|
|
stopContainer(name);
|
|
} catch {
|
|
/* already stopped */
|
|
}
|
|
}
|
|
if (orphans.length > 0) {
|
|
logger.info(
|
|
{ count: orphans.length, names: orphans },
|
|
'Stopped orphaned containers',
|
|
);
|
|
}
|
|
} catch (err) {
|
|
logger.warn({ err }, 'Failed to clean up orphaned containers');
|
|
}
|
|
}
|