beatzaplenty/nixos
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix(sops): hard-fail on missing admin key and expand literal ~ in key path' (#79) from worktree-structured-nibbling-nova into main

Browse Source 
Reviewed-on: #79
This commit is contained in:
beatzaplenty
2026-07-26 19:43:57 +00:00
parent 2514d3bc89 8c19ee9d72
commit 479444d26a
2 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/nixos/home.nix
+1 -1
View File
@@ -27,7 +27,7 @@
# Optional: set environment vars # Optional: set environment vars
sessionVariables = { sessionVariables = {
EDITOR = "vim"; EDITOR = "vim";
SOPS_AGE_KEY_FILE = "~/.config/sops/age/keys.txt"; SOPS_AGE_KEY_FILE = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
}; };
file = { file = {
scripts/secrets/sync-host-keys.sh
+16 -25
View File
@@ -85,6 +85,10 @@ ensure_admin_decrypt_key() {
fi fi
local key_file="$DEFAULT_SOPS_AGE_KEY_FILE" local key_file="$DEFAULT_SOPS_AGE_KEY_FILE"
# Expand a leading ~ that survived variable substitution without tilde
# expansion (happens when SOPS_AGE_KEY_FILE or XDG_CONFIG_HOME is set with
# a literal ~ in the caller's environment).
key_file="${key_file/#~\//$HOME/}"
if [[ -s "$key_file" ]]; then if [[ -s "$key_file" ]]; then
echo "Found existing sops age key at ${key_file}." echo "Found existing sops age key at ${key_file}."
@@ -93,36 +97,23 @@ ensure_admin_decrypt_key() {
if [[ "$dry_run" -eq 1 ]]; then if [[ "$dry_run" -eq 1 ]]; then
echo "[dry-run] No sops age decryption key found (checked \$SOPS_AGE_KEY, \$SOPS_AGE_KEY_FILE, ${key_file})." echo "[dry-run] No sops age decryption key found (checked \$SOPS_AGE_KEY, \$SOPS_AGE_KEY_FILE, ${key_file})."
echo "[dry-run] Would generate a new one here -- continuing the dry run without one; any" echo "[dry-run] Continuing dry run without one -- any 'would re-encrypt' output below"
echo "[dry-run] 'would re-encrypt' output below couldn't actually run for real yet." echo "[dry-run] couldn't actually run for real until a key is present."
return return
fi fi
echo "No sops age decryption key found (checked \$SOPS_AGE_KEY, \$SOPS_AGE_KEY_FILE, ${key_file})." cat >&2 <<EOF
echo "Generating a new one at ${key_file}..." No sops age decryption key found (checked \$SOPS_AGE_KEY, \$SOPS_AGE_KEY_FILE, ${key_file}).
mkdir -p "$(dirname "$key_file")"
nix-shell "${NIX_OPTS[@]}" -p age --run "age-keygen -o '${key_file}'" 2>&1 | grep -v "^Public key:" || true
local new_pub
new_pub="$(age_pubkey_from_identity_file "$key_file")"
cat <<EOF Place your admin age private key at ${key_file}, or set SOPS_AGE_KEY (inline
key) or SOPS_AGE_KEY_FILE (path to a different key file) and re-run.
A brand-new age key was just generated -- it cannot decrypt anything that If the key is truly missing (not just mislocated), this is a manual recovery
already exists in secrets/*.yaml, since nothing was ever encrypted for it. situation -- generating a brand-new admin key won't help, since it cannot
That trust can't be bootstrapped automatically (nobody can decrypt a file decrypt anything already encrypted for the old one. Each secrets/*.yaml is
for a recipient that didn't exist when it was last encrypted). also encrypted for its respective host key(s), so a running deployed host can
still decrypt what it needs -- but the admin key is required for re-encryption
To actually use this key: (e.g. adding new recipients via sops updatekeys).
1. Have someone who currently CAN decrypt replace the &admin entry in
.sops.yaml with this public key:
${new_pub}
2. They re-encrypt every secrets/*.yaml:
sops updatekeys --yes secrets/common.yaml
sops updatekeys --yes secrets/nix-cache.yaml
sops updatekeys --yes secrets/server.yaml
3. Re-run this script.
Exiting without making any other changes.
EOF EOF
exit 1 exit 1
} }