Add secrets-bao module and conditional Tailnet headscale auth

flakes/common/nix_modules/tailnet.nix

@@ -4,17 +4,9 @@
   lib,
   ...
 }:
-let
-  hasSecret =
-    secret:
-    let
-      secrets = config.age.secrets or { };
-    in
-    secrets ? ${secret} && secrets.${secret} != null;
-in
 {
   environment.systemPackages = with pkgs; [ tailscale ];
-  services.tailscale = lib.mkIf (hasSecret "headscale_auth") {
+  services.tailscale = {
     enable = true;
     openFirewall = true;
     useRoutingFeatures = "client";

flakes/secrets-bao/flake.nix

@@ -6,7 +6,12 @@
   outputs = { ... }:
     {
       nixosModules = {
-        default = import ./nixos-module.nix;
+        default = {
+          imports = [
+            (import ./nixos-module.nix)
+            (import ./nixos-configchanges.nix)
+          ];
+        };
       };
     };
 }

flakes/secrets-bao/nixos-configchanges.nix

@@ -0,0 +1,10 @@
+{ config, lib, ... }:
+let
+  cfg = config.ringofstorms.secretsBao;
+  secrets = cfg.secrets or { };
+in
+{
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge (lib.mapAttrsToList (_: s: s.configChanges { path = s.path; }) secrets)
+  );
+}

flakes/secrets-bao/nixos-module.nix

@@ -7,11 +7,27 @@
 let
   cfg = config.ringofstorms.secretsBao;
 
-  mkJwtMintScript = pkgs.writeShellScript "zitadel-mint-jwt" ''
+  mkJwtMintScript = pkgs.writeShellScript "zitadel-mint-jwt-impl" ''
     #!/usr/bin/env bash
     set -euo pipefail
 
     key_json="${cfg.zitadelKeyPath}"
+    token_endpoint="${cfg.zitadelTokenEndpoint}"
+    issuer="${cfg.zitadelIssuer}"
+
+    debug_enabled="${if cfg.debugMint then "true" else "false"}"
+    request_roles="${if cfg.requestProjectRoles then "true" else "false"}"
+
+    debug() {
+      if [ "$debug_enabled" = "true" ] || [ -n "${DEBUG:-}" ]; then
+        echo "[zitadel-mint] $*" >&2
+      fi
+    }
+
+    if [ ! -f "$key_json" ]; then
+      echo "KEY_JSON not found: $key_json" >&2
+      exit 1
+    fi
 
     kid="$(${pkgs.jq}/bin/jq -r .keyId "$key_json")"
     sub="$(${pkgs.jq}/bin/jq -r .userId "$key_json")"
@@ -26,11 +42,13 @@ let
     exp="$(( now + ${toString cfg.jwtLifetimeSeconds} ))"
     jti="$(${pkgs.openssl}/bin/openssl rand -hex 16)"
 
+    debug "kid=$kid sub=$sub iss=$sub aud=$issuer iat=$now exp=$exp jti=$jti"
+
     header="$(${pkgs.jq}/bin/jq -cn --arg kid "$kid" '{alg:"RS256",typ:"JWT",kid:$kid}')"
     payload="$(${pkgs.jq}/bin/jq -cn \
       --arg iss "$sub" \
       --arg sub "$sub" \
-      --arg aud "${cfg.zitadelTokenEndpoint}" \
+      --arg aud "$issuer" \
       --arg jti "$jti" \
       --argjson iat "$now" \
       --argjson exp "$exp" \
@@ -46,41 +64,135 @@ let
     sig="$(${pkgs.coreutils}/bin/printf '%s' "$h64.$p64" | ${pkgs.openssl}/bin/openssl dgst -sha256 -sign "$pem_file" | b64url)"
     assertion="$h64.$p64.$sig"
 
-    resp=""
+    scope="${cfg.zitadelScope}"
-    if ! resp="$(${pkgs.curl}/bin/curl -sS --fail-with-body \
+    roles_scope="urn:zitadel:iam:org:projects:roles"
-      --connect-timeout 5 --max-time 30 \
+
-      --retry 20 --retry-delay 2 --retry-all-errors \
+    if [ -z "$scope" ]; then
-      -X POST "${cfg.zitadelTokenEndpoint}" \
+      scope="openid urn:zitadel:iam:org:project:id:${cfg.zitadelProjectId}:aud"
+    fi
+
+    # Always request project roles unless explicitly disabled.
+    if [ "$request_roles" = "true" ]; then
+      if [[ " $scope " != *" $roles_scope "* ]]; then
+        scope="$scope $roles_scope"
+      fi
+    fi
+
+    debug "token_endpoint=$token_endpoint"
+    debug "scope=$scope"
+
+    response_with_status="$(${pkgs.curl}/bin/curl -sS --fail-with-body \
+      --connect-timeout 3 --max-time 15 \
+      --retry 8 --retry-delay 2 --retry-max-time 60 --retry-all-errors \
+      -X POST "$token_endpoint" \
       -H 'content-type: application/x-www-form-urlencoded' \
+      -w $'\n%{http_code}' \
       --data-urlencode 'grant_type=urn:ietf:params:oauth:grant-type:jwt-bearer' \
       --data-urlencode "assertion=$assertion" \
-      --data-urlencode "scope=${cfg.zitadelScopes}" \
+      --data-urlencode "scope=$scope" \
-    )"; then
+    )"
-      echo "Zitadel token endpoint returned error; response:" >&2
+
-      echo "$resp" >&2
+    http_status="${"$"}{response_with_status##*$'\n'}"
+    response_body="${"$"}{response_with_status%$'\n'*}"
+
+    if [ "$http_status" != "200" ]; then
+      echo "token endpoint failed (HTTP $http_status):" >&2
+      echo "$response_body" >&2
       exit 1
     fi
 
-    token="$(${pkgs.jq}/bin/jq -r '.access_token // empty' <<<"$resp" 2>/dev/null || true)"
+    if [ "${toString cfg.debugMint}" = "true" ]; then
-    if [ -z "$token" ] || [ "$token" = "null" ]; then
+      debug "token endpoint response: $response_body"
-      echo "Zitadel token mint did not return access_token; response:" >&2
+    fi
-      echo "$resp" >&2
+
+    access_token="$(${pkgs.coreutils}/bin/printf '%s' "$response_body" | ${pkgs.jq}/bin/jq -r '.access_token // empty')"
+    id_token="$(${pkgs.coreutils}/bin/printf '%s' "$response_body" | ${pkgs.jq}/bin/jq -r '.id_token // empty')"
+
+    decode_payload() {
+      local token="$1"
+      local payload_b64 payload_json
+
+      payload_b64="$(${pkgs.coreutils}/bin/printf '%s' "$token" | ${pkgs.coreutils}/bin/cut -d. -f2)"
+      payload_json="$(${pkgs.coreutils}/bin/printf '%s' "$payload_b64" | ${pkgs.jq}/bin/jq -Rr '
+        gsub("-"; "+")
+        | gsub("_"; "/")
+        | . + ("=" * ((4 - (length % 4)) % 4))
+        | @base64d
+      ' 2>/dev/null || true)"
+
+      ${pkgs.coreutils}/bin/printf '%s' "$payload_json"
+    }
+
+    has_roles_claim() {
+      local token="$1"
+      local payload
+      payload="$(decode_payload "$token")"
+      if [ -z "$payload" ]; then
+        return 1
+      fi
+      ${pkgs.jq}/bin/jq -e 'has("urn:zitadel:iam:org:projects:roles") or has("urn:zitadel:iam:org:project:roles") or has("flatRolesClaim")' <<<"$payload" >/dev/null 2>&1
+    }
+
+    token=""
+    token_source=""
+
+    if [[ "$access_token" == *.*.* ]] && has_roles_claim "$access_token"; then
+      token="$access_token"
+      token_source="access_token(with_roles)"
+    elif [[ "$id_token" == *.*.* ]] && has_roles_claim "$id_token"; then
+      token="$id_token"
+      token_source="id_token(with_roles)"
+    elif [[ "$access_token" == *.*.* ]]; then
+      token="$access_token"
+      token_source="access_token"
+    elif [[ "$id_token" == *.*.* ]]; then
+      token="$id_token"
+      token_source="id_token"
+    else
+      echo "no JWT found in response (.access_token/.id_token)." >&2
+      echo "Response was:" >&2
+      echo "$response_body" >&2
       exit 1
     fi
 
-    # Quick sanity check: JWT should have 2 dots.
+    debug "selected=$token_source"
-    if ! ${pkgs.gnugrep}/bin/grep -q '\\.' <<<"$token"; then
+
-      echo "Zitadel access_token does not look like a JWT; response:" >&2
+    if [ "${toString cfg.debugMint}" = "true" ] || [ -n "${DEBUG:-}" ]; then
-      echo "$resp" >&2
+      payload="$(decode_payload "$token")"
-      exit 1
+      if [ -n "$payload" ]; then
+        debug "jwt.payload=$(echo "$payload" | ${pkgs.jq}/bin/jq -c '.')"
+      else
+        debug "jwt.payload=<decode_failed>"
+      fi
     fi
 
     ${pkgs.coreutils}/bin/printf '%s' "$token"
   '';
 
+  zitadelMintJwt = pkgs.writeShellScriptBin "zitadel-mint-jwt" ''
+    #!/usr/bin/env bash
+    set -euo pipefail
+
+    # Keep behavior consistent between CLI + systemd.
+    export KEY_JSON="${cfg.zitadelKeyPath}"
+    export TOKEN_ENDPOINT="${cfg.zitadelTokenEndpoint}"
+    export ZITADEL_ISSUER="${cfg.zitadelIssuer}"
+    export ZITADEL_PROJECT_ID="${cfg.zitadelProjectId}"
+    export ZITADEL_SCOPE="${cfg.zitadelScope}"
+    export ZITADEL_REQUEST_PROJECT_ROLES="${if cfg.requestProjectRoles then "true" else "false"}"
+
+    if [ "${toString cfg.debugMint}" = "true" ]; then
+      export DEBUG=1
+    fi
+
+    exec ${mkJwtMintScript}
+  '';
+
   zitadelHost =
     let
-      noProto = lib.strings.removePrefix "https://" (lib.strings.removePrefix "http://" cfg.zitadelTokenEndpoint);
+      noProto = lib.strings.removePrefix "https://" (
+        lib.strings.removePrefix "http://" cfg.zitadelTokenEndpoint
+      );
     in
     builtins.head (lib.strings.splitString "/" noProto);
 
@@ -95,6 +207,7 @@ let
         config = {
           role = "${cfg.openBaoRole}"
           path = "${cfg.zitadelJwtPath}"
+          remove_jwt_after_reading = false
         }
       }
 
@@ -152,9 +265,34 @@ in
       default = "https://sso.joshuabell.xyz/oauth/v2/token";
     };
 
-    zitadelScopes = lib.mkOption {
+    # If empty, the mint script will build a scope.
+    zitadelScope = lib.mkOption {
       type = lib.types.str;
-      default = "openid profile email";
+      default = "";
+    };
+
+    zitadelIssuer = lib.mkOption {
+      type = lib.types.str;
+      default = "https://sso.joshuabell.xyz";
+      description = "Issuer / audience for the JWT bearer assertion (base URL, not /oauth/*).";
+    };
+
+    zitadelProjectId = lib.mkOption {
+      type = lib.types.str;
+      default = "";
+      description = "Zitadel Project -> Resource ID (used to request aud scope).";
+    };
+
+    requestProjectRoles = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = "Request urn:zitadel:iam:org:projects:roles in scope.";
+    };
+
+    debugMint = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Enable verbose mint logs (stderr).";
     };
 
     jwtLifetimeSeconds = lib.mkOption {
@@ -226,6 +364,18 @@ in
                 description = "Field under .Data.data to render.";
               };
 
+              dependencies = lib.mkOption {
+                type = lib.types.listOf lib.types.str;
+                default = [ ];
+                description = "Systemd service names to restart after this secret is rendered.";
+              };
+
+              configChanges = lib.mkOption {
+                type = lib.types.functionTo lib.types.attrs;
+                default = { path, ... }: { };
+                description = "Function that returns extra config given { path = secret.path; }.";
+              };
+
               template = lib.mkOption {
                 type = lib.types.nullOr lib.types.lines;
                 default = null;
@@ -239,16 +389,19 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.enable (lib.mkMerge [
-    assertions = lib.mapAttrsToList (name: s: {
+    {
-      assertion = (s.template != null) || (s.kvPath != null);
+      assertions = lib.mapAttrsToList (name: s: {
-      message = "ringofstorms.secretsBao.secrets.${name} must set either template or kvPath";
+        assertion = (s.template != null) || (s.kvPath != null);
-    }) cfg.secrets;
+        message = "ringofstorms.secretsBao.secrets.${name} must set either template or kvPath";
-    environment.systemPackages = [
+      }) cfg.secrets;
+
+      environment.systemPackages = [
       pkgs.jq
       pkgs.curl
       pkgs.openssl
       pkgs.openbao
+      zitadelMintJwt
     ];
 
     systemd.tmpfiles.rules = [
@@ -267,6 +420,7 @@ in
             "nss-lookup.target"
             "NetworkManager-wait-online.service"
             "systemd-resolved.service"
+            "time-sync.target"
           ];
           wants = [
             "network-online.target"
@@ -299,6 +453,21 @@ in
 
               echo "zitadel-mint-jwt: starting (host=${zitadelHost})" >&2
 
+              # Best-effort: wait briefly for time sync + DNS.
+              for i in {1..10}; do
+                if ${pkgs.systemd}/bin/timedatectl show -p NTPSynchronized --value 2>/dev/null | ${pkgs.gnugrep}/bin/grep -qi true; then
+                  break
+                fi
+                sleep 1
+              done
+
+              for i in {1..10}; do
+                if ${pkgs.systemd}/bin/resolvectl query ${zitadelHost} >/dev/null 2>&1; then
+                  break
+                fi
+                sleep 1
+              done
+
               jwt_is_valid() {
                 local token="$1"
                 local payload_b64 payload_json exp now
@@ -331,7 +500,7 @@ in
                 exit 0
               fi
 
-              jwt="$(${mkJwtMintScript})"
+              jwt="$(${zitadelMintJwt}/bin/zitadel-mint-jwt)"
 
               if [ -z "$jwt" ] || [ "$jwt" = "null" ]; then
                 echo "Failed to mint Zitadel access token" >&2
@@ -352,8 +521,14 @@ in
         vault-agent = {
           description = "OpenBao agent for rendering secrets";
           wantedBy = [ "multi-user.target" ];
-          after = [ "network-online.target" "zitadel-mint-jwt.service" ];
+          after = [
-          wants = [ "network-online.target" "zitadel-mint-jwt.service" ];
+            "network-online.target"
+            "zitadel-mint-jwt.service"
+          ];
+          wants = [
+            "network-online.target"
+            "zitadel-mint-jwt.service"
+          ];
 
           serviceConfig = {
             Type = "simple";
@@ -374,6 +549,7 @@ in
           description = "Wait for OpenBao secret ${name}";
           after = [ "vault-agent.service" ];
           requires = [ "vault-agent.service" ];
+          wantedBy = map (svc: "${svc}.service") secret.dependencies;
           startLimitIntervalSec = 300;
           startLimitBurst = 3;
 
@@ -390,26 +566,33 @@ in
 
               for i in {1..60}; do
                 if [ -s "$p" ]; then
-                  exit 0
+                  break
                 fi
                 sleep 1
               done
 
-              echo "Secret file not rendered: $p" >&2
+              if [ ! -s "$p" ]; then
-              exit 1
+                echo "Secret file not rendered: $p" >&2
+                exit 1
+              fi
+
+              ${lib.concatStringsSep "\n" (map (svc: ''
+                echo "Restarting ${svc} due to secret ${name}" >&2
+                systemctl try-restart ${lib.escapeShellArg (svc + ".service")} || true
+              '') secret.dependencies)}
             '';
           };
         }
       ) cfg.secrets)
     ];
 
-    age.secrets = lib.mapAttrs' (
+      age.secrets = lib.mapAttrs' (
-      name: secret:
+        name: secret:
-      lib.nameValuePair name {
+        lib.nameValuePair name {
-        file = null;
+          file = null;
-        path = secret.path;
+          path = secret.path;
-      }
+        }
-    ) cfg.secrets;
+      ) cfg.secrets;
-  };
+    }
+  ]);
 }
-

hosts/juni/flake.nix

@@ -86,59 +86,60 @@
               inputs.common.nixosModules.timezone_auto
               inputs.common.nixosModules.tty_caps_esc
               inputs.common.nixosModules.zsh
-              # inputs.common.nixosModules.tailnet
+              inputs.common.nixosModules.tailnet
               inputs.common.nixosModules.remote_lio_builds
 
-              ({
+              (
-                ringofstorms.secretsBao = {
+                { config, ... }:
-                  enable = true;
+                {
-                  zitadelKeyPath = "/machine-key.json";
-                  openBaoAddr = "https://sec.joshuabell.xyz";
-                  jwtAuthMountPath = "auth/zitadel-jwt";
-                  openBaoRole = "machines";
-                  secrets = {
-                    headscale_auth = {
-                      path = "/run/secrets/headscale_auth";
-                      kvPath = "kv/data/machines/home_roaming/headscale_auth";
-                      field = "value";
-                    };
 
-                    nix2github = {
+                  ringofstorms.secretsBao = {
-                      path = "/run/secrets/nix2github";
+                    enable = true;
-                      owner = "josh";
+                    zitadelKeyPath = "/machine-key.json";
-                      group = "users";
+                    openBaoAddr = "https://sec.joshuabell.xyz";
-                      kvPath = "kv/data/machines/home_roaming/nix2github";
+                    jwtAuthMountPath = "auth/zitadel-jwt";
-                      field = "private_key";
+                    openBaoRole = "machines";
-                    };
+                    zitadelIssuer = "https://sso.joshuabell.xyz";
-                    nix2bitbucket = {
+                    zitadelProjectId = "344379162166820867";
-                      path = "/run/secrets/nix2bitbucket";
+                    debugMint = true;
-                      owner = "josh";
+                    secrets = {
-                      group = "users";
+                      headscale_auth = {
-                      kvPath = "kv/data/machines/home_roaming/nix2bitbucket";
+                        kvPath = "kv/data/machines/home_roaming/headscale_auth";
-                      field = "private_key";
+                        dependencies = [ "tailscaled" ];
-                    };
+                        configChanges = { path, ... }: {
-                    nix2gitforgejo = {
+                          services.tailscale.authKeyFile = path;
-                      path = "/run/secrets/nix2gitforgejo";
+                        };
-                      owner = "josh";
+                      };
-                      group = "users";
+
-                      kvPath = "kv/data/machines/home_roaming/nix2gitforgejo";
+                      nix2github = {
-                      field = "private_key";
+                        owner = "josh";
-                    };
+                        group = "users";
-                    nix2lio = {
+                        kvPath = "kv/data/machines/home_roaming/nix2github";
-                      path = "/run/secrets/nix2lio";
+                      };
-                      owner = "josh";
+                      nix2bitbucket = {
-                      group = "users";
+                        owner = "josh";
-                      kvPath = "kv/data/machines/home_roaming/nix2lio";
+                        group = "users";
-                      field = "private_key";
+                        kvPath = "kv/data/machines/home_roaming/nix2bitbucket";
+                      };
+                      nix2gitforgejo = {
+                        owner = "josh";
+                        group = "users";
+                        kvPath = "kv/data/machines/home_roaming/nix2gitforgejo";
+                      };
+                      nix2lio = {
+                        owner = "josh";
+                        group = "users";
+                        kvPath = "kv/data/machines/home_roaming/nix2lio";
+                      };
                     };
                   };
-                };
 
-                systemd.services.tailscaled = {
+                  systemd.services.tailscaled = {
-                  after = [ "openbao-secret-headscale_auth.service" ];
+                    after = [ "openbao-secret-headscale_auth.service" ];
-                  requires = [ "openbao-secret-headscale_auth.service" ];
+                    requires = [ "openbao-secret-headscale_auth.service" ];
-                };
+                  };
-              })
+                }
+              )
 
               # inputs.beszel.nixosModules.agent
               # ({