mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-11-13 18:29:32 +01:00
A remote host whose login shell is tcsh came up on 1.48.0, when the local
sh rewrote ${SHELL:-/bin/sh} to the Codeman host's shell. Since #770 the
launch reaches the far end verbatim and runs tcsh itself, and tcsh refuses
-i -l -c, -l -c and -i -l, so every stock launch left a dead pane.
The login flags are now picked on the far end, in the shape of
loginShellArgs(): set -- -i -l, cleared for csh and tcsh, then
exec "${SHELL:-/bin/sh}" "$@". The text is one brace group, so
cd <path> && { ...; } still starts nothing when the cd fails. bsd-csh takes
every flag combination, csh is listed because it is tcsh on macOS and the BSDs.
The version probe keeps its one statement: the login shell parses it, not
/bin/sh, so fish and tcsh refuse it either way, as they did on 1.48.0.
Measured with the real builder on a real sshd in a throwaway Debian container
(tcsh 6.24.07, bsd-csh, fish 3.6, bash) and through a fake sshd with
tcsh 6.24.10, fish, zsh, dash and bash, a real Codeman server on tcsh included.
The tcsh disclosure comes out of the docs and the changeset. They keep the two
limits 1.48.0 had too: tcsh has no export, so the PATH bootstrap only prints an
error, and the tmux probe needs a command executable, which Debian lacks.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
210 lines
8.5 KiB
TypeScript
210 lines
8.5 KiB
TypeScript
import { mkdtempSync, rmSync } from 'node:fs';
|
|
import { tmpdir } from 'node:os';
|
|
import { join } from 'node:path';
|
|
import { afterEach, describe, expect, it } from 'vitest';
|
|
import { listClis } from '../src/config/cli-registry/registry.js';
|
|
import {
|
|
defaultRemoteCommandForMode,
|
|
readRemoteCases,
|
|
readRemoteHosts,
|
|
rehydrateRemoteHostFields,
|
|
remoteDisplayPath,
|
|
remoteSshTarget,
|
|
toSessionRemote,
|
|
writeRemoteCases,
|
|
writeRemoteHosts,
|
|
} from '../src/remote-hosts.js';
|
|
import { DockerHostSchema, RemoteHostSchema } from '../src/web/schemas.js';
|
|
|
|
describe('remote-hosts domain', () => {
|
|
let dir: string | null = null;
|
|
|
|
afterEach(() => {
|
|
if (dir) rmSync(dir, { recursive: true, force: true });
|
|
dir = null;
|
|
});
|
|
|
|
function configDir(): string {
|
|
dir = mkdtempSync(join(tmpdir(), 'codeman-remote-hosts-'));
|
|
return dir;
|
|
}
|
|
|
|
it('round-trips remote hosts and remote cases from a config directory', async () => {
|
|
const root = configDir();
|
|
await writeRemoteHosts(root, [
|
|
{
|
|
id: 'gpu-box',
|
|
label: 'GPU Box',
|
|
host: '10.0.0.42',
|
|
username: 'ubuntu',
|
|
commands: { codex: 'exec codx personal' },
|
|
},
|
|
]);
|
|
await writeRemoteCases(root, [
|
|
{ name: 'gpu-work', type: 'remote', hostId: 'gpu-box', remotePath: '/home/ubuntu/work' },
|
|
]);
|
|
|
|
await expect(readRemoteHosts(root)).resolves.toEqual([
|
|
{
|
|
id: 'gpu-box',
|
|
label: 'GPU Box',
|
|
host: '10.0.0.42',
|
|
username: 'ubuntu',
|
|
commands: { codex: 'exec codx personal' },
|
|
},
|
|
]);
|
|
await expect(readRemoteCases(root)).resolves.toEqual([
|
|
{ name: 'gpu-work', type: 'remote', hostId: 'gpu-box', remotePath: '/home/ubuntu/work' },
|
|
]);
|
|
});
|
|
|
|
it('returns safe mode defaults and remote display values', () => {
|
|
expect(defaultRemoteCommandForMode('shell')).toBe(
|
|
'{ set -- -i -l; case ${SHELL##*/} in csh|tcsh) set --;; esac; exec "${SHELL:-/bin/sh}" "$@"; }'
|
|
);
|
|
// Routed through an interactive login shell so per-user PATH entries (e.g.
|
|
// ~/.local/bin, ~/.opencode/bin) resolve — a bare `exec codex` sees only
|
|
// sshd's minimal default PATH and fails with "command not found".
|
|
expect(defaultRemoteCommandForMode('codex')).toBe(
|
|
'{ set -- -i -l; case ${SHELL##*/} in csh|tcsh) set --;; esac; exec "${SHELL:-/bin/sh}" "$@" -c \'codex\'; }'
|
|
);
|
|
// Mirrors the local claude default so the remote agent runs non-interactively.
|
|
expect(defaultRemoteCommandForMode('claude')).toBe(
|
|
'{ set -- -i -l; case ${SHELL##*/} in csh|tcsh) set --;; esac; exec "${SHELL:-/bin/sh}" "$@" -c \'claude --dangerously-skip-permissions\'; }'
|
|
);
|
|
expect(remoteSshTarget({ id: 'h1', label: 'H1', host: 'box.local', username: 'aamer' })).toBe('aamer@box.local');
|
|
expect(remoteDisplayPath({ username: 'aamer', host: 'box.local', path: '/opt/work' })).toBe(
|
|
'aamer@box.local:/opt/work'
|
|
);
|
|
});
|
|
|
|
it('carries the wake command from host config into the session', () => {
|
|
// The input route reads `session.remote.wakeCommand` — it must survive the host
|
|
// -> session mapping, or wake-on-LAN silently degrades to "no wake command".
|
|
const remote = toSessionRemote(
|
|
{
|
|
id: 'hufflepuff',
|
|
label: 'Hufflepuff',
|
|
host: '192.168.50.137',
|
|
username: 'j',
|
|
wakeCommand: '/home/joe/bin/whuff',
|
|
},
|
|
{ name: 'c', type: 'remote', hostId: 'hufflepuff', remotePath: '/home/j/work' }
|
|
);
|
|
expect(remote.wakeCommand).toBe('/home/joe/bin/whuff');
|
|
});
|
|
|
|
it('omits the wake command by default (feature off without a config entry)', () => {
|
|
const remote = toSessionRemote(
|
|
{ id: 'h', label: 'H', host: '10.0.0.1', username: 'j' },
|
|
{ name: 'c', type: 'remote', hostId: 'h', remotePath: '/tmp' }
|
|
);
|
|
expect(remote.wakeCommand).toBeUndefined();
|
|
});
|
|
|
|
describe('RemoteHostSchema wakeCommand', () => {
|
|
const host = { id: 'hufflepuff', label: 'Hufflepuff', host: '192.168.50.137', username: 'j' };
|
|
|
|
it('accepts an optional absolute executable path', () => {
|
|
expect(RemoteHostSchema.safeParse({ ...host, wakeCommand: '/home/joe/bin/whuff' }).success).toBe(true);
|
|
expect(RemoteHostSchema.safeParse(host).success).toBe(true);
|
|
});
|
|
|
|
it('rejects an argument list (spawn runs the path without a shell)', () => {
|
|
// `spawn('/home/joe/bin/whuff --mac 00:11:22')` would fail as a confusing
|
|
// ENOENT at wake time — refuse it at config time instead.
|
|
expect(RemoteHostSchema.safeParse({ ...host, wakeCommand: '/home/joe/bin/whuff --now' }).success).toBe(false);
|
|
});
|
|
|
|
it('rejects shell metacharacters as defence in depth', () => {
|
|
expect(RemoteHostSchema.safeParse({ ...host, wakeCommand: '/bin/sh$(id)' }).success).toBe(false);
|
|
expect(RemoteHostSchema.safeParse({ ...host, wakeCommand: '/bin/`id`' }).success).toBe(false);
|
|
});
|
|
|
|
it('accepts one or more MAC addresses and rejects anything else', () => {
|
|
expect(RemoteHostSchema.safeParse({ ...host, wakeMac: '04:d9:f5:80:c6:58' }).success).toBe(true);
|
|
expect(RemoteHostSchema.safeParse({ ...host, wakeMac: '04-d9-f5-80-c6-58, 1C:61:B4:20:58:EB' }).success).toBe(
|
|
true
|
|
);
|
|
expect(RemoteHostSchema.safeParse({ ...host, wakeMac: '04:d9:f5:80:c6' }).success).toBe(false);
|
|
expect(RemoteHostSchema.safeParse({ ...host, wakeMac: '04:d9:f5:80:c6:58; rm -rf /' }).success).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe('per-mode command overrides', () => {
|
|
const modes = ['shell', ...listClis().map((cli) => cli.id)];
|
|
const host = { id: 'h', label: 'H', host: '10.0.0.1', username: 'u' };
|
|
|
|
// `.strict()` refuses an unknown key, so a mode missing here cannot take an override, and
|
|
// `commands.*` is the documented way out for a login shell the stock launch cannot run.
|
|
it.each(modes)('accepts a %s override on a remote host and a docker host', (mode) => {
|
|
const commands = { [mode]: 'exec my-agent' };
|
|
const docker = { id: 'h', label: 'H', image: 'codeman/agent:base', commands };
|
|
expect(RemoteHostSchema.safeParse({ ...host, commands }).success).toBe(true);
|
|
expect(DockerHostSchema.safeParse(docker).success).toBe(true);
|
|
});
|
|
|
|
it('still refuses a key that is no mode', () => {
|
|
expect(RemoteHostSchema.safeParse({ ...host, commands: { nope: 'exec my-agent' } }).success).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe('rehydrateRemoteHostFields', () => {
|
|
const persisted = {
|
|
hostId: 'hufflepuff',
|
|
label: 'Hufflepuff',
|
|
host: '192.168.50.137',
|
|
username: 'j',
|
|
remotePath: '/home/j/work',
|
|
};
|
|
const hosts = (wakeCommand?: string) =>
|
|
new Map([
|
|
[
|
|
'hufflepuff',
|
|
{
|
|
id: 'hufflepuff',
|
|
label: 'Hufflepuff',
|
|
host: '192.168.50.137',
|
|
username: 'j',
|
|
...(wakeCommand ? { wakeCommand } : {}),
|
|
},
|
|
],
|
|
]);
|
|
|
|
it('adds a wake command that only exists in the host config', () => {
|
|
// The pre-existing-session case: the field was added to remote-hosts.json after
|
|
// this session was persisted, so recovery is the only place it can arrive.
|
|
expect(rehydrateRemoteHostFields(persisted, hosts('/home/joe/bin/whuff'))?.wakeCommand).toBe(
|
|
'/home/joe/bin/whuff'
|
|
);
|
|
});
|
|
|
|
it('treats the host config as authoritative (removing it turns the feature off)', () => {
|
|
const remote = { ...persisted, wakeCommand: '/home/joe/bin/whuff' };
|
|
expect(rehydrateRemoteHostFields(remote, hosts())?.wakeCommand).toBeUndefined();
|
|
});
|
|
|
|
it('refreshes a MAC that only exists in the host config', () => {
|
|
const withMac = new Map(
|
|
hosts()
|
|
.entries()
|
|
.map(([id, host]) => [id, { ...host, wakeMac: '04:d9:f5:80:c6:58' }] as const)
|
|
);
|
|
expect(rehydrateRemoteHostFields(persisted, withMac)?.wakeMac).toBe('04:d9:f5:80:c6:58');
|
|
});
|
|
|
|
it('leaves the block untouched when the host is gone or the session is local', () => {
|
|
expect(rehydrateRemoteHostFields(persisted, new Map())).toBe(persisted);
|
|
expect(rehydrateRemoteHostFields(undefined, hosts('/x'))).toBeUndefined();
|
|
});
|
|
|
|
it('keeps the other host-level fields as persisted', () => {
|
|
// Only wakeCommand is refreshed: silently re-pointing an existing pane's ssh
|
|
// options would be a behavior change nobody asked for.
|
|
const remote = { ...persisted, identityFile: '~/.ssh/pinned_key' };
|
|
const rehydrated = rehydrateRemoteHostFields(remote, hosts('/home/joe/bin/whuff'));
|
|
expect(rehydrated?.identityFile).toBe('~/.ssh/pinned_key');
|
|
});
|
|
});
|
|
});
|