From 8f818a64f2f0f3a833fc842d52a675358ec64c9c Mon Sep 17 00:00:00 2001 From: Igor Soarez Date: Wed, 18 Nov 2026 14:02:09 +0000 Subject: szecret: buckets beside the old store -- get/has/put/mv/rekey/list/check/enrol, admins from SZECRET_ADMINS_COMMAND; rotate retired (fleet hardening 12) A bucket is a directory of secrets with one set of readers: its recipients file plus the admins, the full set recorded in .szecret by rekey. put refuses when the readers or admins drift from that set, or with no admins; a plain put of a new name goes to admin-only, one still in the old store is rewritten there. The old store keeps working throughout. link/claude.sh leaves out an MCP server whose secret is in a bucket this host doesn't read. Design: cloud-setup docs/proposal-secret-roles.md. --- secrets/enrol.sh | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100755 secrets/enrol.sh (limited to 'secrets/enrol.sh') diff --git a/secrets/enrol.sh b/secrets/enrol.sh new file mode 100755 index 0000000..2f1d61e --- /dev/null +++ b/secrets/enrol.sh @@ -0,0 +1,75 @@ +#!/bin/bash + +set -euo pipefail + +if [[ "$#" -gt 0 && ("$1" == "-h" || "$1" == "--help") ]]; then + cat <&2 echo "szecret: this machine is already enrolled (${identity})" + keys_in "${identity_pub}" + exit 0 +fi + +mkdir -p "$(dirname "${identity}")" +chmod 700 "$(dirname "${identity}")" +tmp="$(mktemp "${identity}.XXXXXX")" +trap 'rm -f "${tmp}"' EXIT +rm -f "${tmp}" + +case "${kind}" in + file) + (umask 077 && age-keygen -o "${tmp}" 2>/dev/null) + pub="$(age-keygen -y "${tmp}")" + ;; + tpm) + exists age-plugin-tpm || die "--tpm needs age-plugin-tpm, which is not installed; no key made" + [[ -e /dev/tpmrm0 ]] || die "--tpm: no TPM here (/dev/tpmrm0); no key made" + (umask 077 && age-plugin-tpm --generate -o "${tmp}") || die "age-plugin-tpm could not make a key; no key made" + pub="$(age-plugin-tpm -y "${tmp}")" + ;; + se) + exists age-plugin-se || die "--se needs age-plugin-se, which is not installed; no key made" + (umask 077 && age-plugin-se keygen --access-control=none -o "${tmp}") \ + || die "age-plugin-se could not make a key (is there a Secure Enclave, and is the screen unlocked?); no key made" + pub="$(age-plugin-se recipients -i "${tmp}")" + ;; +esac + +[[ "${pub}" =~ ^age1[0-9a-z]+$ ]] || die "the new key's public half doesn't look like one: ${pub:-nothing}; no key made" +chmod 600 "${tmp}" +echo "${pub}" > "${identity_pub}.tmp" +mv "${identity_pub}.tmp" "${identity_pub}" +mv "${tmp}" "${identity}" +>&2 echo "szecret: enrolled; add this machine's public key to cloud-setup's szecret/hosts:" +echo "${pub}" -- cgit v1.2.3