Two parallel, additive paths so a host gets its secrets out of the box; the manual setup wizard stays the floor (no config = no-op). clawdie-vault-fetch (new): language-neutral bw bridge. Reads a 0600 ~/.config/vault-bootstrap.env, pulls keys from the agent-secrets collection (item name = env var name, value in password field, so no jq), prints KEY=VALUE or --write-env upserts 0600. Exit codes distinguish skip (3, no bootstrap) / broken (1) / no bw (4). Pinned @bitwarden/cli@2026.5.0 for offline bundling; staged in configure_live_operator_session. clawdie-live-seed: extend the CLAWDIESEED FAT32 importer from the authorized_keys allowlist to a per-agent directory convention — /<agent>/ with env (merged 0600), harness.toml (pi|zot|local), soul/ (staged), ssh/authorized_keys. Live USB single-agent (first dir = active); extra dirs staged + flagged for deployed multi-agent. Optional consume-and-shred. Import core is unit-testable via CLAWDIE_SEED_TEST. README rewritten to document the per-agent contract and the operator decision to allow plaintext secrets on the seed (seeded sticks are secret-bearing media; 0600 landing + shred mitigations). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
320 lines
11 KiB
Bash
320 lines
11 KiB
Bash
#!/bin/sh
|
|
# Clawdie operator USB live seed importer.
|
|
# Reads operator-provided files from the FAT32 CLAWDIESEED partition
|
|
# (mountable on Linux/macOS/Windows pre- or post-flash) and installs them into
|
|
# the live system at every boot. Idempotent by design: editing the seed and
|
|
# rebooting re-applies it. Failure is never fatal — a missing/empty/unmountable
|
|
# seed logs and continues so the operator can still log in via SDDM.
|
|
#
|
|
# Two layers of contract (see clawdie-live-seed.README.txt for the operator view):
|
|
# 1. Legacy top-level allowlist: /authorized_keys, /ssh/authorized_keys.
|
|
# 2. Per-agent directories: /<agent-name>/ holding env, soul/, harness.toml,
|
|
# ssh/authorized_keys. On the live USB (single agent) the first agent dir
|
|
# maps to the clawdie user; on a deployed host the importer loops every dir
|
|
# (multi-agent provisioning is a documented follow-up seam).
|
|
#
|
|
# SECURITY: this partition is plaintext FAT32. By operator decision the env
|
|
# files here may carry secrets (provider API keys, vault-bootstrap creds).
|
|
# Treat seeded sticks as secret-bearing media. The importer lands secrets 0600
|
|
# owned by the agent user and supports optional consume-and-shred (a /shred
|
|
# marker file on the seed) to wipe env files after import.
|
|
#
|
|
# Runs before LOGIN so sshd sees imported authorized_keys on first attach.
|
|
|
|
# PROVIDE: clawdie_live_seed
|
|
# REQUIRE: FILESYSTEMS devfs
|
|
# BEFORE: LOGIN
|
|
# KEYWORD: nojail
|
|
|
|
# rc.subr only exists on the FreeBSD target. Guard it so the import functions
|
|
# below can be sourced and unit-tested on a non-FreeBSD host (CLAWDIE_SEED_TEST=1).
|
|
if [ -r /etc/rc.subr ]; then
|
|
. /etc/rc.subr
|
|
fi
|
|
|
|
name="clawdie_live_seed"
|
|
rcvar="${name}_enable"
|
|
start_cmd="${name}_start"
|
|
stop_cmd=":"
|
|
status_cmd="${name}_status"
|
|
extra_commands="status"
|
|
|
|
SEED_LABEL="CLAWDIESEED"
|
|
SEED_MOUNT="${SEED_MOUNT:-/mnt/clawdie-seed}"
|
|
SEED_LOG="${SEED_LOG:-/var/log/clawdie-live-seed.log}"
|
|
SEED_USER="${SEED_USER:-clawdie}"
|
|
SEED_USER_HOME="${SEED_USER_HOME:-/home/clawdie}"
|
|
# Where imported agent payloads are staged. Runtime consumption (loading a soul
|
|
# into the agent workspace cwd, launching the chosen harness) reads from here.
|
|
SEED_IMPORT_ROOT="${SEED_IMPORT_ROOT:-/var/db/clawdie/seed}"
|
|
# Directory names reserved at the seed root (not treated as agent dirs).
|
|
SEED_RESERVED_DIRS="ssh"
|
|
# Valid harness values mirror Colibri's AgentRuntime enum (colibri-glasspane).
|
|
SEED_VALID_HARNESSES="pi zot local"
|
|
|
|
_seed_log() {
|
|
printf '%s %s\n' "$(date '+%Y-%m-%dT%H:%M:%S')" "$1" >>"${SEED_LOG}" 2>/dev/null || true
|
|
}
|
|
|
|
_seed_find_partition() {
|
|
for _candidate in \
|
|
"/dev/msdosfs/${SEED_LABEL}" \
|
|
"/dev/gpt/${SEED_LABEL}" \
|
|
"/dev/label/${SEED_LABEL}"
|
|
do
|
|
if [ -e "${_candidate}" ]; then
|
|
echo "${_candidate}"
|
|
return 0
|
|
fi
|
|
done
|
|
|
|
if command -v gpart >/dev/null 2>&1; then
|
|
gpart show -lp 2>/dev/null \
|
|
| awk -v label="${SEED_LABEL}" '
|
|
$0 ~ label {
|
|
for (i = 1; i <= NF; i++) {
|
|
if ($i ~ "^/dev/") { print $i; exit }
|
|
}
|
|
}
|
|
'
|
|
fi
|
|
return 0
|
|
}
|
|
|
|
_seed_install_authorized_keys() {
|
|
_src="$1"
|
|
_user="${2:-${SEED_USER}}"
|
|
_home="${3:-${SEED_USER_HOME}}"
|
|
|
|
_ssh_dir="${_home}/.ssh"
|
|
_dst="${_ssh_dir}/authorized_keys"
|
|
|
|
mkdir -p "${_ssh_dir}"
|
|
chown "${_user}:${_user}" "${_ssh_dir}" 2>/dev/null || true
|
|
chmod 0700 "${_ssh_dir}"
|
|
|
|
# Strip CRLF so keys created on Windows/Linux editors don't get rejected
|
|
# by sshd for trailing whitespace.
|
|
tr -d '\r' <"${_src}" >"${_dst}.new"
|
|
mv -f "${_dst}.new" "${_dst}"
|
|
chown "${_user}:${_user}" "${_dst}" 2>/dev/null || true
|
|
chmod 0600 "${_dst}"
|
|
|
|
_seed_log "installed authorized_keys from ${_src} -> ${_dst}"
|
|
}
|
|
|
|
# Merge KEY=VALUE pairs from a plaintext env file into a target .env, preserving
|
|
# keys the source does not mention and replacing those it does. Lands 0600 owned
|
|
# by the agent user. Mirrors clawdie-vault-fetch's --write-env upsert.
|
|
_seed_import_env() {
|
|
_src="$1"
|
|
_dst="$2"
|
|
_user="${3:-${SEED_USER}}"
|
|
|
|
[ -f "${_src}" ] || return 0
|
|
|
|
mkdir -p "$(dirname "${_dst}")"
|
|
touch "${_dst}"
|
|
chmod 0600 "${_dst}"
|
|
|
|
_merged="${_dst}.seedmerge"
|
|
cp "${_dst}" "${_merged}" 2>/dev/null || : >"${_merged}"
|
|
|
|
_count=0
|
|
while IFS= read -r _line || [ -n "${_line}" ]; do
|
|
# Skip blanks, comments, and lines without a KEY=.
|
|
case "${_line}" in
|
|
''|'#'*) continue ;;
|
|
*=*) : ;;
|
|
*) continue ;;
|
|
esac
|
|
_line="$(printf '%s' "${_line}" | tr -d '\r')"
|
|
_k="${_line%%=*}"
|
|
grep -v "^${_k}=" "${_merged}" >"${_merged}.tmp" 2>/dev/null || : >"${_merged}.tmp"
|
|
mv "${_merged}.tmp" "${_merged}"
|
|
printf '%s\n' "${_line}" >>"${_merged}"
|
|
_count=$((_count + 1))
|
|
done <"${_src}"
|
|
|
|
cp "${_merged}" "${_dst}"
|
|
chmod 0600 "${_dst}"
|
|
chown "${_user}:${_user}" "${_dst}" 2>/dev/null || true
|
|
rm -f "${_merged}"
|
|
_seed_log "imported ${_count} env key(s) from ${_src} -> ${_dst}"
|
|
}
|
|
|
|
# Validate + record a harness descriptor. We only parse the `harness` value to
|
|
# sanity-check it against the AgentRuntime enum; the full file is staged as-is
|
|
# for the runtime to read.
|
|
_seed_import_harness() {
|
|
_src="$1"
|
|
_stage="$2"
|
|
|
|
[ -f "${_src}" ] || return 0
|
|
|
|
_h="$(grep -E '^[[:space:]]*harness[[:space:]]*=' "${_src}" 2>/dev/null \
|
|
| head -n 1 | sed -E 's/^[^=]*=[[:space:]]*"?([A-Za-z]+)"?.*/\1/' | tr 'A-Z' 'a-z')"
|
|
_ok=0
|
|
for _v in ${SEED_VALID_HARNESSES}; do
|
|
[ "${_h}" = "${_v}" ] && _ok=1
|
|
done
|
|
if [ "${_ok}" -ne 1 ]; then
|
|
_seed_log "WARN harness '${_h:-<none>}' in ${_src} not in {${SEED_VALID_HARNESSES}} — recording anyway"
|
|
fi
|
|
|
|
mkdir -p "${_stage}"
|
|
cp "${_src}" "${_stage}/harness.toml" 2>/dev/null || true
|
|
_seed_log "recorded harness '${_h:-<none>}' -> ${_stage}/harness.toml"
|
|
}
|
|
|
|
# Stage a soul/ backup tree for later consumption by the agent workspace.
|
|
_seed_import_soul() {
|
|
_src="$1"
|
|
_stage="$2"
|
|
|
|
[ -d "${_src}" ] || return 0
|
|
|
|
mkdir -p "${_stage}/soul"
|
|
# cp -R is portable; the tree is small (layered-soul ~600 KB).
|
|
cp -R "${_src}/." "${_stage}/soul/" 2>/dev/null || true
|
|
_seed_log "staged soul backup ${_src} -> ${_stage}/soul"
|
|
}
|
|
|
|
# Import one /<agent-name>/ directory. On the live USB this is called once with
|
|
# the clawdie user/home as the target; on a deployed host the caller loops.
|
|
_seed_import_agent_dir() {
|
|
_dir="$1" # absolute path to the agent dir on the mounted seed
|
|
_agent="$2" # agent name (already validated)
|
|
_user="$3"
|
|
_home="$4"
|
|
|
|
_stage="${SEED_IMPORT_ROOT}/${_agent}"
|
|
mkdir -p "${_stage}"
|
|
printf '%s\n' "${_agent}" >"${_stage}/agent-name" 2>/dev/null || true
|
|
|
|
_seed_import_env "${_dir}/env" "${_home}/.env" "${_user}"
|
|
_seed_import_harness "${_dir}/harness.toml" "${_stage}"
|
|
_seed_import_soul "${_dir}/soul" "${_stage}"
|
|
if [ -f "${_dir}/ssh/authorized_keys" ]; then
|
|
_seed_install_authorized_keys "${_dir}/ssh/authorized_keys" "${_user}" "${_home}"
|
|
fi
|
|
|
|
_seed_log "imported agent dir '${_agent}' -> stage ${_stage}, user ${_user}"
|
|
}
|
|
|
|
# Return 0 if NAME is a safe agent directory name (no traversal, not reserved).
|
|
_seed_agent_name_ok() {
|
|
_n="$1"
|
|
case "${_n}" in
|
|
''|.|..|*/*) return 1 ;;
|
|
esac
|
|
# Allowlist characters to keep this off the filesystem's sharp edges.
|
|
case "${_n}" in
|
|
*[!A-Za-z0-9._-]*) return 1 ;;
|
|
esac
|
|
for _r in ${SEED_RESERVED_DIRS}; do
|
|
[ "${_n}" = "${_r}" ] && return 1
|
|
done
|
|
return 0
|
|
}
|
|
|
|
# Core import routine, factored out of the rc start_cmd so it can be tested
|
|
# against a pre-mounted directory (CLAWDIE_SEED_TEST). Operates on $SEED_MOUNT.
|
|
_seed_import_tree() {
|
|
_imported=0
|
|
|
|
# Layer 1: legacy top-level authorized_keys (default clawdie user).
|
|
if [ -f "${SEED_MOUNT}/ssh/authorized_keys" ]; then
|
|
_seed_install_authorized_keys "${SEED_MOUNT}/ssh/authorized_keys"
|
|
_imported=1
|
|
elif [ -f "${SEED_MOUNT}/authorized_keys" ]; then
|
|
_seed_install_authorized_keys "${SEED_MOUNT}/authorized_keys"
|
|
_imported=1
|
|
fi
|
|
|
|
# Layer 2: per-agent directories. On the live USB (single agent) the first
|
|
# valid dir, sorted, maps to the clawdie user. Additional dirs are staged
|
|
# but flagged: deployed multi-agent provisioning is the follow-up seam.
|
|
_first=1
|
|
for _entry in "${SEED_MOUNT}"/*; do
|
|
[ -d "${_entry}" ] || continue
|
|
_agent="$(basename "${_entry}")"
|
|
if ! _seed_agent_name_ok "${_agent}"; then
|
|
[ "${_agent}" = "ssh" ] || _seed_log "skipping non-agent dir '${_agent}'"
|
|
continue
|
|
fi
|
|
|
|
if [ "${_first}" -eq 1 ]; then
|
|
_seed_import_agent_dir "${_entry}" "${_agent}" "${SEED_USER}" "${SEED_USER_HOME}"
|
|
printf '%s\n' "${_agent}" >"${SEED_IMPORT_ROOT}/active-agent" 2>/dev/null || true
|
|
_first=0
|
|
_imported=1
|
|
else
|
|
# Stage payload for visibility but do not provision a second live
|
|
# identity — the live USB is single-agent.
|
|
_seed_import_agent_dir "${_entry}" "${_agent}" "${SEED_USER}" "${SEED_USER_HOME}.${_agent}"
|
|
_seed_log "NOTE additional agent dir '${_agent}' staged; deployed multi-agent provisioning not yet wired"
|
|
fi
|
|
done
|
|
|
|
if [ "${_imported}" -eq 0 ]; then
|
|
_seed_log "no allowlisted files or agent dirs on seed — nothing to import"
|
|
fi
|
|
return 0
|
|
}
|
|
|
|
clawdie_live_seed_start() {
|
|
: >>"${SEED_LOG}" 2>/dev/null || true
|
|
mkdir -p "${SEED_IMPORT_ROOT}" 2>/dev/null || true
|
|
|
|
_dev=$(_seed_find_partition)
|
|
if [ -z "${_dev:-}" ]; then
|
|
_seed_log "no ${SEED_LABEL} partition found — skipping import"
|
|
return 0
|
|
fi
|
|
|
|
mkdir -p "${SEED_MOUNT}"
|
|
if ! mount -t msdosfs -o ro "${_dev}" "${SEED_MOUNT}" 2>>"${SEED_LOG}"; then
|
|
_seed_log "mount failed on ${_dev} — skipping import"
|
|
return 0
|
|
fi
|
|
|
|
_seed_import_tree
|
|
|
|
# Optional consume-and-shred: a /shred marker on the seed asks us to wipe
|
|
# env files after import so secrets do not persist on the stick. Requires a
|
|
# brief RW remount; off unless the operator opts in per stick.
|
|
if [ -f "${SEED_MOUNT}/shred" ]; then
|
|
umount "${SEED_MOUNT}" 2>/dev/null || true
|
|
if mount -t msdosfs "${_dev}" "${SEED_MOUNT}" 2>>"${SEED_LOG}"; then
|
|
find "${SEED_MOUNT}" -name env -type f -exec rm -f {} + 2>/dev/null || true
|
|
rm -f "${SEED_MOUNT}/shred" 2>/dev/null || true
|
|
_seed_log "consume-and-shred: wiped env files from seed"
|
|
else
|
|
_seed_log "consume-and-shred requested but RW remount failed — env left on seed"
|
|
fi
|
|
fi
|
|
|
|
umount "${SEED_MOUNT}" 2>/dev/null || true
|
|
return 0
|
|
}
|
|
|
|
clawdie_live_seed_status() {
|
|
if [ -s "${SEED_LOG}" ]; then
|
|
echo "${name}: one-shot importer; last run log tail:"
|
|
tail -n 5 "${SEED_LOG}"
|
|
return 0
|
|
fi
|
|
echo "${name}: not yet run this boot (no log at ${SEED_LOG})"
|
|
return 1
|
|
}
|
|
|
|
# On FreeBSD, hand off to rc.subr. Under test (no rc.subr / CLAWDIE_SEED_TEST),
|
|
# skip it so the functions above can be exercised directly.
|
|
if [ -n "${CLAWDIE_SEED_TEST:-}" ]; then
|
|
:
|
|
elif command -v run_rc_command >/dev/null 2>&1; then
|
|
load_rc_config "$name"
|
|
: "${clawdie_live_seed_enable:=YES}"
|
|
run_rc_command "$1"
|
|
fi
|